Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Relay use the Webpack mode #4386

Merged
merged 1 commit into from
Nov 20, 2018
Merged

Relay use the Webpack mode #4386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sbrunner: bad copy paste: development is missing the last character.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Development is the default, why do you need to pass it here?

"typecheck": "tsc --pretty",
"doc": "typedoc --module system --target ES6 --name ngeo --out apidoc src/ contribs/gmf/src/"
},
Expand Down
64 changes: 34 additions & 30 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
};