Skip to content

Commit c355842

Browse files
committed
feat(*) default npm task webpack/build/build-prod/build-prod-all now on api.github.com
Made sure those tasks could be used (and customized by contributers), without needing topheman-apis-proxy
1 parent 5cc496f commit c355842

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
"dev": "echo 'deprecated, use npm run webpack-dev' && npm run webpack-dev",
99
"dev-mock": "echo 'deprecated, use npm run webpack-mock' && npm run webpack-mock",
1010
"build": "./node_modules/.bin/webpack --progress && ./node_modules/.bin/gulp build",
11-
"build-prod": "API_ROOT_URL='https://topheman-apis-proxy.herokuapp.com/github' NODE_ENV=production ./node_modules/.bin/webpack --progress -p && NODE_ENV=production ./node_modules/.bin/gulp build",
12-
"build-prod-all": "npm run build-prod && API_ROOT_URL='https://topheman-apis-proxy.herokuapp.com/github' DEVTOOLS=true NODE_ENV=production npm run build",
11+
"build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --progress -p && NODE_ENV=production ./node_modules/.bin/gulp build",
12+
"build-prod-owner": "API_ROOT_URL='https://topheman-apis-proxy.herokuapp.com/github' npm run build-prod",
13+
"build-prod-all": "npm run build-prod && DEVTOOLS=true NODE_ENV=production npm run build",
14+
"build-prod-all-owner": "API_ROOT_URL='https://topheman-apis-proxy.herokuapp.com/github' npm run build-prod-all",
1315
"serve-build": "cd build && ../node_modules/.bin/serve --port 9001",
1416
"webpack": "./node_modules/.bin/webpack-dev-server --progress --colors --hot",
15-
"webpack-dev": "DEVTOOLS=true npm run webpack",
17+
"webpack-dev": "API_ROOT_URL='http://localhost:8000/github' DEVTOOLS=true npm run webpack",
1618
"webpack-mock": "DEVTOOLS=true NODE_ENV=mock npm run webpack",
17-
"webpack-dev-simple": "API_ROOT_URL='https://api.github.com' DEVTOOLS=true npm run webpack"
19+
"webpack-dev-simple": "DEVTOOLS=true npm run webpack"
1820
},
1921
"repository": {
2022
"type": "git",

webpack.config.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ console.log('Launched in ' + (MODE_DEV_SERVER ? 'dev-server' : 'build') + ' mode
1313

1414
var NODE_ENV = process.env.NODE_ENV ? process.env.NODE_ENV.toLowerCase() : 'dev';
1515
var DEVTOOLS = process.env.DEVTOOLS ? JSON.parse(process.env.DEVTOOLS) : false;
16-
var API_ROOT_URL = process.env.API_ROOT_URL ? process.env.API_ROOT_URL : 'http://localhost:8000/github';
16+
var API_ROOT_URL = process.env.API_ROOT_URL ? process.env.API_ROOT_URL : 'https://api.github.com';
1717
var STUB_MOCK_TIMEOUT = process.env.STUB_MOCK_TIMEOUT ? process.env.STUB_MOCK_TIMEOUT : 400;
1818

19+
var SOURCEMAPS_ACTIVE = NODE_ENV !== 'production' || DEVTOOLS === true;
20+
1921
if(NODE_ENV === 'production'){
2022
console.log('PRODUCTION mode');
2123
}
@@ -39,6 +41,9 @@ if( !(/^https?:\/\/.*(?!\/).$/.test(API_ROOT_URL)) ) {
3941
console.log('[WARNING] Your API_ROOT_URL should not have any trailing slash');
4042
}
4143
console.log('API_ROOT_URL',API_ROOT_URL);
44+
if(SOURCEMAPS_ACTIVE){
45+
console.log('SOURCEMAPS activated');
46+
}
4247

4348
/** before build */
4449

@@ -119,7 +124,7 @@ var config = {
119124
},
120125
cache: true,
121126
debug: NODE_ENV === 'production' ? false : true,
122-
devtool: DEVTOOLS ? "sourcemap" : false,
127+
devtool: NODE_ENV !== 'production' || DEVTOOLS === true ? "sourcemap" : false,
123128
devServer: {
124129
contentBase: './public',
125130
inline: true

0 commit comments

Comments
 (0)