Merge pull request #4386 from camptocamp/webpack-mode

Relay use the Webpack mode
camptocamp · Nov 20, 2018 · 6606874 · 6606874
2 parents 8a021b1 + 409ac0e
commit 6606874
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 37 deletions.
diff --git a/package.json b/package.json
@@ -3,14 +3,14 @@
   "version": "2.4.0",
   "description": "AngularJS OpenLayers Library",
   "scripts": {
-    "build-ngeo-examples": "TARGET=ngeo-examples webpack --progress --debug",
-    "build-gmf-examples": "TARGET=gmf-examples webpack --progress --debug",
-    "build-gmf-apps": "TARGET=gmf-apps webpack --progress --debug",
+    "build-ngeo-examples": "TARGET=ngeo-examples webpack --mode development --progress --debug",
+    "build-gmf-examples": "TARGET=gmf-examples webpack --mode development --progress --debug",
+    "build-gmf-apps": "TARGET=gmf-apps webpack --mode development --progress --debug",
     "build-api": "webpack --config buildtools/webpack.api.js --mode development --library demo",
-    "serve-ngeo-examples": "DEV_SERVER=1 TARGET=ngeo-examples webpack-dev-server --https --cert=private.crt --key=private.key --port 3000 --progress --watch --bail --debug",
-    "serve-gmf-examples": "DEV_SERVER=1 TARGET=gmf-examples webpack-dev-server --https --cert=private.crt --key=private.key --port 3000 --progress --watch --bail --debug",
-    "serve-gmf-apps": "DEV_SERVER=1 TARGET=gmf-apps webpack-dev-server --https --cert=private.crt --key=private.key --port 3000 --progress --watch --bail --debug",
-    "serve-api": "webpack-dev-server --mode development --content-base api/dist/ --config buildtools/webpack.api.js --https --cert=private.crt --key=private.key --port 3000 --progress --watch --bail --debug",
+    "serve-ngeo-examples": "DEV_SERVER=1 TARGET=ngeo-examples webpack-dev-server --https --cert=private.crt --key=private.key --port 3000 --mode developmen --progress --watch --bail --debug",
+    "serve-gmf-examples": "DEV_SERVER=1 TARGET=gmf-examples webpack-dev-server --https --cert=private.crt --key=private.key --port 3000 --mode developmen --progress --watch --bail --debug",
+    "serve-gmf-apps": "DEV_SERVER=1 TARGET=gmf-apps webpack-dev-server --https --cert=private.crt --key=private.key --port 3000 --mode developmen --progress --watch --bail --debug",
+    "serve-api": "webpack-dev-server --mode development --content-base api/dist/ --config buildtools/webpack.api.js --https --cert=private.crt --key=private.key --port 3000 --mode developmen --progress --watch --bail --debug",
     "typecheck": "tsc --pretty",
     "doc": "typedoc --module system --target ES6 --name ngeo --out apidoc src/ contribs/gmf/src/"
   },

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,34 +1,38 @@
-const webpackMerge = require('webpack-merge');
-const commons = require('./buildtools/webpack.commons');
+module.exports = (env, args) => {
+  const nodeEnv = args.mode || 'development';
+  process.env['NODE_ENV'] = nodeEnv;
 
-let config = commons.config;
+  const webpackMerge = require('webpack-merge');
+  const commons = require('./buildtools/webpack.commons');
 
-const nodeEnv = process.env['NODE_ENV'] || 'development';
-switch (nodeEnv) {
-  case 'development':
-    config = webpackMerge(config, require('./buildtools/webpack.dev'));
-    break;
-  case 'production':
-    config = webpackMerge(config, require('./buildtools/webpack.prod'));
-    break;
-  default:
-    console.log(`The 'NODE_ENV' environment variable is set to an invalid value: ${process.env.NODE_ENV}.`);
-    process.exit(2);
-}
+  let config = commons.config;
 
-switch (process.env.TARGET) {
-  case 'ngeo-examples':
-    config = webpackMerge(config, require('./buildtools/webpack.ngeoexamples'));
-    break;
-  case 'gmf-examples':
-    config = webpackMerge(config, require('./buildtools/webpack.gmfexamples'));
-    break;
-  case 'gmf-apps':
-    config = webpackMerge(config, require('./buildtools/webpack.gmfapps'));
-    break;
-  default:
-    console.log(`The 'TARGET' environment variable is set to an invalid value: ${process.env.TARGET}.`);
-    process.exit(2);
-}
+  switch (nodeEnv) {
+    case 'development':
+      config = webpackMerge(config, require('./buildtools/webpack.dev'));
+      break;
+    case 'production':
+      config = webpackMerge(config, require('./buildtools/webpack.prod'));
+      break;
+    default:
+      console.log(`The 'NODE_ENV' environment variable is set to an invalid value: ${process.env.NODE_ENV}.`);
+      process.exit(2);
+  }
 
-module.exports = config;
+  switch (process.env.TARGET) {
+    case 'ngeo-examples':
+      config = webpackMerge(config, require('./buildtools/webpack.ngeoexamples'));
+      break;
+    case 'gmf-examples':
+      config = webpackMerge(config, require('./buildtools/webpack.gmfexamples'));
+      break;
+    case 'gmf-apps':
+      config = webpackMerge(config, require('./buildtools/webpack.gmfapps'));
+      break;
+    default:
+      console.log(`The 'TARGET' environment variable is set to an invalid value: ${process.env.TARGET}.`);
+      process.exit(2);
+  }
+
+  return config;
+};