From fd4785e5f660ce84cf9b818a20d36a52e370d188 Mon Sep 17 00:00:00 2001 From: Diego Antonelli Date: Mon, 25 Nov 2019 18:16:00 +0100 Subject: [PATCH] fix(maps-web): fixing uppercase Maps --- packages-web/maps/src/package.xml | 2 +- .../TestProjects/Mendix7/widgets/Maps.mpk | Bin 133542 -> 133542 bytes .../TestProjects/Mendix8/widgets/Maps.mpk | Bin 133542 -> 133542 bytes packages-web/maps/webpack.config.dev.js | 1 - packages-web/maps/webpack.config.prod.js | 23 +++++++++++++++++- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/packages-web/maps/src/package.xml b/packages-web/maps/src/package.xml index c0542a6f26..c359662690 100644 --- a/packages-web/maps/src/package.xml +++ b/packages-web/maps/src/package.xml @@ -5,7 +5,7 @@ - + diff --git a/packages-web/maps/tests/TestProjects/Mendix7/widgets/Maps.mpk b/packages-web/maps/tests/TestProjects/Mendix7/widgets/Maps.mpk index 5d921c269c57ac89ca1c3f6e6a080681ab4ce096..cd9e2d171184effe7ac5daa78f2b46c5646c183b 100644 GIT binary patch delta 488 zcmZ2BnPb^x4xRvSW)=|!1`ZB}-4i$RsC{GFGjX%Yw`roxdnQ&+Kg-Q1&jDokU(a~; zZ2A{&MveNzv(4p_ZgS}yQpmHAyU!`nrugm0_P_u3Ki$4D_XPL+b0uL1I^`M{gw8eF zCS>sAQvqYqY2$m|Unhu8vdEj;aO?NKQxP1E+cLIFu6z}>jb~#=;)HY+vG88U*WG^n zyh7U1A^|7v9XvK=-a~uKrAvOCRFa5YxPLa=-BtfeJoIaAqfIWqV9~jmzMCQL9m8qS zubrmqG2doN&FOzsa<6UvgdfkQ{J8P{@~1bvFmEw1fc$Zuhfxjep&vYqx?qL|FQW<2 ztJC9n8MOs{6AOy;NT}0woxIr{Cvb5(nD=wk&8SiT;H)(N#vZ2b+X{IWa`zP_+7!S2*#7t5{-@h7W_&udJb3Qehc5jN7f!7U z+IBMW!`FvQPr_36h<{R)QYpN%OD5|5Z|!77maGe5SxYt<=SU_A9$s+5Lq~6`)9cgg zq)ddgd7cGy-8*<}%Djj6mP?oX=yweWZT`2;WLN0lmlNWClx;Ivc9An;)A=&SJ@*)| zX=inrs>ghrDKlsOk(YaT?G-{e{&LZq(lBo^Fo67Vo`+El?4ch#jJjZk1}~!t z(5utqcp0??a}x`S^m|Q?QBRQBX rg`rMjWU^<5#12qmDNuqjclvz}CULM0K&}|VO(;s;Il)RBIhj-ewG*?& diff --git a/packages-web/maps/tests/TestProjects/Mendix8/widgets/Maps.mpk b/packages-web/maps/tests/TestProjects/Mendix8/widgets/Maps.mpk index 5d921c269c57ac89ca1c3f6e6a080681ab4ce096..cd9e2d171184effe7ac5daa78f2b46c5646c183b 100644 GIT binary patch delta 488 zcmZ2BnPb^x4xRvSW)=|!1`ZB}-4i$RsC{GFGjX%Yw`roxdnQ&+Kg-Q1&jDokU(a~; zZ2A{&MveNzv(4p_ZgS}yQpmHAyU!`nrugm0_P_u3Ki$4D_XPL+b0uL1I^`M{gw8eF zCS>sAQvqYqY2$m|Unhu8vdEj;aO?NKQxP1E+cLIFu6z}>jb~#=;)HY+vG88U*WG^n zyh7U1A^|7v9XvK=-a~uKrAvOCRFa5YxPLa=-BtfeJoIaAqfIWqV9~jmzMCQL9m8qS zubrmqG2doN&FOzsa<6UvgdfkQ{J8P{@~1bvFmEw1fc$Zuhfxjep&vYqx?qL|FQW<2 ztJC9n8MOs{6AOy;NT}0woxIr{Cvb5(nD=wk&8SiT;H)(N#vZ2b+X{IWa`zP_+7!S2*#7t5{-@h7W_&udJb3Qehc5jN7f!7U z+IBMW!`FvQPr_36h<{R)QYpN%OD5|5Z|!77maGe5SxYt<=SU_A9$s+5Lq~6`)9cgg zq)ddgd7cGy-8*<}%Djj6mP?oX=yweWZT`2;WLN0lmlNWClx;Ivc9An;)A=&SJ@*)| zX=inrs>ghrDKlsOk(YaT?G-{e{&LZq(lBo^Fo67Vo`+El?4ch#jJjZk1}~!t z(5utqcp0??a}x`S^m|Q?QBRQBX rg`rMjWU^<5#12qmDNuqjclvz}CULM0K&}|VO(;s;Il)RBIhj-ewG*?& diff --git a/packages-web/maps/webpack.config.dev.js b/packages-web/maps/webpack.config.dev.js index cf71364900..501a104bb7 100644 --- a/packages-web/maps/webpack.config.dev.js +++ b/packages-web/maps/webpack.config.dev.js @@ -1,6 +1,5 @@ const merge = require("webpack-merge"); const baseConfig = require("../utils-react-widgets/configs/webpack.config.dev"); -const MiniCssExtractPlugin = require("mini-css-extract-plugin"); const customConfig = { module: { diff --git a/packages-web/maps/webpack.config.prod.js b/packages-web/maps/webpack.config.prod.js index 37dcbcc195..82ad07491b 100644 --- a/packages-web/maps/webpack.config.prod.js +++ b/packages-web/maps/webpack.config.prod.js @@ -1,7 +1,28 @@ const merge = require("webpack-merge"); const baseConfig = require("../utils-react-widgets/configs/webpack.config.prod"); +const MiniCssExtractPlugin = require("mini-css-extract-plugin"); const customConfig = { + output: { + filename: "widgets/com/mendix/widget/custom/Maps/Maps.js" + }, + module: { + rules: [ + { + test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/, + loader: "url-loader" + } + ] + }, + plugins: [ + new MiniCssExtractPlugin({ + filename: "./widgets/com/mendix/widget/custom/Maps/ui/Maps.css", + ignoreOrder: false + }) + ] +}; + +const customPreviewConfig = { module: { rules: [ { @@ -12,4 +33,4 @@ const customConfig = { } }; -module.exports = [merge(baseConfig[0], customConfig), merge(baseConfig[1], customConfig)]; +module.exports = [merge(baseConfig[0], customConfig), merge(baseConfig[1], customPreviewConfig)];