From 5919eca242e8dcc39f24f90b47cadb4a32106bd3 Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Wed, 16 Jun 2021 13:47:29 +0300 Subject: [PATCH] Revert "fix build" This reverts commit d47dfa868f7ad80e6c8503765b8b07e021e55c01. --- .github/workflows/container.yml | 2 +- images/favicon.ico | Bin 0 -> 15406 bytes index.html | 2 +- webpack.config.js | 34 +++++++++++++++++++++----------- 4 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 images/favicon.ico diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index b33a12c..266862c 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -28,7 +28,7 @@ jobs: node-version: 14 - run: npm install - - run: npm run prod + - run: npm run build env: CI: true diff --git a/images/favicon.ico b/images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..7b1548e8f05e5c18eefd1c4533d4ef0a2dde42eb GIT binary patch literal 15406 zcmeHNZ)_Xo8Na66w1GC2!Bm#S_s2e;T_i@)BtEgO?bs%vQH92L_uhrH5l9mZ^}{sL z4@`n=nl^1{(m+T^h{1<_LkP5QqfO#JX%gq3lQ_;F{7FyM3#|btQZ(;0>MFZ2ZxEksk(>p4U}hD61;r zb2KO0MtBSxl^Vww_uRPziR*S!NLXihfrt;eCs(N|S@;0WO~&){)Q9)6bQWFsHV z%Y8J@$Vew=H4sMgj2&mvs2xu>@|BAvA9GI(ALN2qQJ9Nk9lCqsH#8?3bH|5iUhcz$ znU~sx8Iv$fOdvjC$CHgoGcT2kC7;R1?=r;npvh;BF>&^3CMJJN^SmvN)xQ3xMI75> z@biB*`E<$<(sMK?+xn3!5ll!wX}ad0S!vz)nc3qN(cd7R=k zZ{)9dUO;D!;>}!SSOCH+L+SUj_b5E@0owA&Hdjg z@Zh-v`J=OibMg^}uoP3U-_Egp@B4S+8gq1=k2Q|mQOt$spdMWwnklvshOnAjuRZY+F5ozf1STQcm%(2bm|fCO=^*hGL!KHe+M%@lzP{PBBax59;pmDJLK7 z^Azjk+l&p*y{|DTzU1_r$fSvo?vAg?Pgsg!?#b6SlgkNfi18LCO<9JJe_k%eFliF` z6KnDl){YUUTZ-{pncL6zLNaBD$@7LZxwn`@m!`tHxH3Os3~}Z>lai^z?}g%+t;`vp z{Fx!9mP|1<`h<}E^7j^#rX$FeC~%UGFodO;g1r()dgeFy^cMy{cgYauo@0%3F8l_G z7(y~ZbF$e!UqrZ_zM>)JDj)qnc_?YxFoIs72@)#JENQRmQSx<4FMy}=IJXJyLZ zPj2l`U)4QPMmF-HHxeamJ|+?;j_tSxyl1daRU#8uhFoeAogLM{}(7oY(1^?G^eA0L3yPDE>3hRS<4$OEDB{bAXFDi{q;|w{|gaUkCJ|N7VnhCiiu!_r3kC)%i4O=zt~eM5l7>Xqh z;v&v!_vt8St2^pNZ|H(94_caM=yzmu`jCDmkL1uVSuCZW;)sK|FfJ0e6IUf|x_js- zG+DZ5Xz7S6)>w)g_vufWXEcXi&!XxX)l1=sgSc!?aF@bW%C5_?7oZ9HM;&`dg*>Vl zgZ>!wkD~si^%I`Bh*NWqzF3H_))D=ySD*{}$AaZ@n7-%R>JuQjQPrave0><2hg#wRQ9p7jY7IInGM>3{T=D@ulIw>!hzmVG ztpE5UrT8jkXX1>Ad>OlsC?)>hS>kV?35i4Kb3%V&5&b~NciJe{00(g~aXLfXmC{*? zr+x3loyhf1FKWj1FXD(J}TpS^%S z^q2a{M;OAQFT8|-xVd+UtJ-><_>VQ8Ychn)JEo9XM!ynTG9Td`*tehwwNE{UYq*GY zb_L_O(KL5B@5_8-V+qfv-yses?yt*6@BgB={VICgIgI76dfw0{etBJIjhS^K;y%7jZ9KVSFmEv(&Ax zhV`wYuwS>J_M0pk9G`1?m;p-U|E=>gZ`e literal 0 HcmV?d00001 diff --git a/index.html b/index.html index ae61a56..3b2efd7 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ - + diff --git a/webpack.config.js b/webpack.config.js index cea7324..766ea71 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -32,16 +32,6 @@ var common = { // inject details of output file at end of body inject: 'body', }), - new CopyWebpackPlugin({ - patterns: [ - { - from: './images/*.*', - }, - { - from: 'favicon.ico', - }, - ], - }), ], resolve: { modules: [path.join(__dirname, 'src'), 'node_modules'], @@ -136,7 +126,11 @@ if (MODE === 'development') { }); }, }, - plugins: [], + plugins: [ + new CopyWebpackPlugin({ + patterns: [{ from: './images/*.*' }], + }), + ], }); } @@ -167,6 +161,14 @@ if (MODE === 'production') { verbose: true, dry: false, }), + // Copy static assets + new CopyWebpackPlugin({ + patterns: [ + { + from: 'src/assets', + }, + ], + }), new MiniCssExtractPlugin({ // Options similar to the same options in webpackOptions.output // both options are optional @@ -185,6 +187,16 @@ if (MODE === 'production') { }, }, }, + { + test: /\.css$/, + exclude: [/elm-stuff/, /node_modules/], + use: [MiniCssExtractPlugin.loader, 'css-loader?url=false'], + }, + { + test: /\.scss$/, + exclude: [/elm-stuff/, /node_modules/], + use: [MiniCssExtractPlugin.loader, 'css-loader?url=false', 'sass-loader'], + }, ], }, });