Apply upgrades

camptocamp · Sep 6, 2024 · feaa174 · feaa174
1 parent b80c205
commit feaa174
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -126,7 +126,7 @@ RUN --mount=type=cache,target=/var/cache,sharing=locked \
     && npm-packages \
         @types @typescript-eslint @storybook ol-cesium jasmine-core karma karma-chrome-launcher \
         karma-jasmine karma-sinon karma-sourcemap-loader karma-webpack \
-        react react-dom cypress chromatic jscodeshift sass start-server-and-test \
+        react react-dom cypress chromatic jscodeshift start-server-and-test \
         typedoc typescript \
         angular-gettext-tools commander puppeteer url-parse eslint \
         --src=package.json --src=node_modules/ngeo/package.json --dst=npm-packages \

diff --git a/build.mk b/build.mk
@@ -13,7 +13,7 @@ STATIC_PATH = geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.p
 APPS_PACKAGE_PATH = geoportal/c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal
 APPS_HTML_FILES = $(addprefix $(APPS_PACKAGE_PATH)/static-ngeo/js/apps/, $(addsuffix .html.ejs, $(APPS)))
 APPS_JS_FILES = $(addprefix $(APPS_PACKAGE_PATH)/static-ngeo/js/apps/Controller, $(addsuffix .js, $(APPS)))
-APPS_SASS_FILES += $(addprefix $(APPS_PACKAGE_PATH)/static-ngeo/js/apps/sass/, $(addsuffix .scss, $(filter-out iframe_api, $(APPS))))
+APPS_SASS_FILES += $(addprefix $(APPS_PACKAGE_PATH)/static-ngeo/js/apps/sass/, $(addsuffix .scss, $(APPS)))
 APPS_SASS_FILES += $(addprefix $(APPS_PACKAGE_PATH)/static-ngeo/js/apps/sass/vars_, $(addsuffix .scss, $(filter-out iframe_api, $(APPS))))
 APPS_FILES = $(APPS_HTML_FILES) $(APPS_JS_FILES) $(APPS_SASS_FILES) \
 	$(APPS_PACKAGE_PATH)/static-ngeo/js/apps/contextualdata.html \

diff --git a/..._geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.commons.js b/..._geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.commons.js
@@ -1,5 +1,4 @@
 const commons = require('ngeo/buildtools/webpack.commons.js');
-const SassPlugin = require('ngeo/buildtools/webpack.plugin.js');
 
 const config = commons({
   DllReferencePluginOptions: {
@@ -8,11 +7,4 @@ const config = commons({
   browsers: 'defaults, > 0.1% in CH, > 0.1% in FR, Firefox ESR and supports es6-class and not iOS < 10',
 });
 
-for (const plugin of config.plugins) {
-  if (plugin instanceof SassPlugin) {
-    plugin.options.preReplacements = [[new RegExp('\\${VISIBLE_ENTRY_POINT}', 'g'), 'visible-entry-point']];
-    plugin.options.postReplacements = [[new RegExp('visible-entry-point', 'g'), '${VISIBLE_ENTRY_POINT}']];
-  }
-}
-
 module.exports = () => config;