sourcemaps off on CI

OpenConceptLab · Jun 19, 2023 · eaa2adc · eaa2adc
1 parent d2134a2
commit eaa2adc
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,6 +13,7 @@ ENV HOTJAR_ID=${HOTJAR_ID}
 ENV LOGIN_REDIRECT_URL=${LOGIN_REDIRECT_URL}
 ENV OIDC_RP_CLIENT_ID=${OIDC_RP_CLIENT_ID}
 ENV OIDC_RP_CLIENT_SECRET=${OIDC_RP_CLIENT_SECRET}
+ENV SOURCE_MAPS=${SOURCE_MAPS:-true}
 RUN mkdir /app
 WORKDIR /app
 ENV PATH /app/node_modules/.bin:$PATH

diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
@@ -0,0 +1,10 @@
+version: '3.4'
+
+services:
+  web:
+    image: openconceptlab/oclweb2:${TAG-latest}
+    build:
+      context: .
+      args:
+        NODE_ENV: production
+        SOURCE_MAPS: false
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -8,6 +8,7 @@ services:
       target: build
       args:
         NODE_ENV: development
+        SOURCE_MAPS: false
     ports:
       - "4000:4000"
       - "4001:35729"

diff --git a/docker-compose.sso.yml b/docker-compose.sso.yml
@@ -8,6 +8,7 @@ services:
       target: build
       args:
         NODE_ENV: development
+        SOURCE_MAPS: false
     ports:
       - "4000:4000"
       - "4001:35729"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       context: .
       args:
         NODE_ENV: production
+        SOURCE_MAPS: true
     ports:
       - "4000:4000"
     restart: on-failure
@@ -16,6 +17,7 @@ services:
       - WEB_PORT=4000
       - RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY-6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI}
       - GA_ACCOUNT_ID=${GA_ACCOUNT_ID-UA-000000-01}
+      - SOURCE_MAPS=${SOURCE_MAPS-false}
       - ERRBIT_URL
       - ERRBIT_KEY
       - HOTJAR_ID
diff --git a/package.json b/package.json
@@ -44,8 +44,8 @@
     "stacktrace-js": "^2.0.2"
   },
   "scripts": {
-    "start": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --progress --host 0.0.0.0 --port ${WEB_PORT} --env.API_URL=${API_URL} --env.NODE_ENV=${NODE_ENV} --env.RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY} --env.GA_ACCOUNT_ID=${GA_ACCOUNT_ID} --env.HOTJAR_ID=${HOTJAR_ID} --env.ERRBIT_URL=${ERRBIT_URL} --env.ERRBIT_KEY=${ERRBIT_KEY} --env.LOGIN_REDIRECT_URL=${LOGIN_REDIRECT_URL} --env.OIDC_RP_CLIENT_ID=${OIDC_RP_CLIENT_ID} --env.OIDC_RP_CLIENT_SECRET=${OIDC_RP_CLIENT_SECRET} --mode ${NODE_ENV} --hot",
-    "build": "./node_modules/webpack/bin/webpack.js --progress --host 0.0.0.0 --port 443 --env.API_URL=${API_URL} --env.NODE_ENV=${NODE_ENV} --env.RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY} --env.GA_ACCOUNT_ID=${GA_ACCOUNT_ID} --env.HOTJAR_ID=${HOTJAR_ID} --env.ERRBIT_URL=${ERRBIT_URL} --env.ERRBIT_KEY=${ERRBIT_KEY} --env.LOGIN_REDIRECT_URL=${LOGIN_REDIRECT_URL} --env.OIDC_RP_CLIENT_ID=${OIDC_RP_CLIENT_ID} --env.OIDC_RP_CLIENT_SECRET=${OIDC_RP_CLIENT_SECRET} --mode ${NODE_ENV}",
+    "start": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --progress --host 0.0.0.0 --port ${WEB_PORT} --env.API_URL=${API_URL} --env.NODE_ENV=${NODE_ENV} --env.RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY} --env.GA_ACCOUNT_ID=${GA_ACCOUNT_ID} --env.HOTJAR_ID=${HOTJAR_ID} --env.ERRBIT_URL=${ERRBIT_URL} --env.ERRBIT_KEY=${ERRBIT_KEY} --env.LOGIN_REDIRECT_URL=${LOGIN_REDIRECT_URL} --env.OIDC_RP_CLIENT_ID=${OIDC_RP_CLIENT_ID} --env.OIDC_RP_CLIENT_SECRET=${OIDC_RP_CLIENT_SECRET} --env.SOURCE_MAPS=${SOURCE_MAPS} --mode ${NODE_ENV} --hot",
+    "build": "./node_modules/webpack/bin/webpack.js --progress --host 0.0.0.0 --port 443 --env.API_URL=${API_URL} --env.NODE_ENV=${NODE_ENV} --env.RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY} --env.GA_ACCOUNT_ID=${GA_ACCOUNT_ID} --env.HOTJAR_ID=${HOTJAR_ID} --env.ERRBIT_URL=${ERRBIT_URL} --env.ERRBIT_KEY=${ERRBIT_KEY} --env.LOGIN_REDIRECT_URL=${LOGIN_REDIRECT_URL} --env.OIDC_RP_CLIENT_ID=${OIDC_RP_CLIENT_ID} --env.OIDC_RP_CLIENT_SECRET=${OIDC_RP_CLIENT_SECRET} --env.SOURCE_MAPS=${SOURCE_MAPS} --mode ${NODE_ENV}",
     "eslint": "./node_modules/.bin/eslint ./src"
   },
   "devDependencies": {

diff --git a/webpack.config.js b/webpack.config.js
@@ -6,6 +6,7 @@ const { ProvidePlugin, DefinePlugin, IgnorePlugin } = require('webpack');
 
 module.exports = (env) => {
   const isProduction = env.NODE_ENV === 'production';
+  const sourceMaps = (env.SOURCE_MAPS === 'true' || env.SOURCE_MAPS === true);
   return {
     mode: env.NODE_ENV,
     module: {
@@ -93,7 +94,7 @@ module.exports = (env) => {
         index: 'index.html',
       },
     },
-    devtool: env.NODE_ENV == 'production' ? "source-map" : undefined,
+    devtool: (isProduction && sourceMaps) ? "source-map" : undefined,
     plugins: [
       new HtmlWebpackPlugin({
         template: './public/index.html',
@@ -117,6 +118,7 @@ module.exports = (env) => {
         'process.env.LOGIN_REDIRECT_URL': JSON.stringify(env.LOGIN_REDIRECT_URL),
         'process.env.OIDC_RP_CLIENT_ID': JSON.stringify(env.OIDC_RP_CLIENT_ID),
         'process.env.OIDC_RP_CLIENT_SECRET': JSON.stringify(env.OIDC_RP_CLIENT_SECRET),
+        'process.env.SOURCE_MAPS': sourceMaps,
       }),
       new IgnorePlugin({ resourceRegExp: /moment\/locale\// })
     ],