sforkowany z mirror/soapbox
Merge branch 'conventional-webpack' into 'develop'
Use conventional Webpack config file See merge request soapbox-pub/soapbox-fe!766v1.x.x
commit
8cfc2f9d2d
|
@ -11,3 +11,4 @@ yarn-error.log*
|
|||
/static/
|
||||
/static-test/
|
||||
/public/
|
||||
/dist/
|
||||
|
|
|
@ -16,9 +16,9 @@
|
|||
"url": "https://gitlab.com/soapbox-pub/soapbox-fe/-/issues"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "npx webpack-dev-server --config webpack",
|
||||
"start": "npx webpack-dev-server",
|
||||
"dev": "${npm_execpath} run start",
|
||||
"build": "npx webpack --config webpack",
|
||||
"build": "npx webpack",
|
||||
"jsdoc": "npx jsdoc -c jsdoc.conf.js",
|
||||
"manage:translations": "node ./webpack/translationRunner.js",
|
||||
"test": "${npm_execpath} run test:lint && ${npm_execpath} run test:jest",
|
||||
|
|
|
@ -6,7 +6,7 @@ switch(NODE_ENV) {
|
|||
case 'development':
|
||||
case 'production':
|
||||
case 'test':
|
||||
module.exports = require(`./${NODE_ENV}`); break;
|
||||
module.exports = require(`./webpack/${NODE_ENV}`); break;
|
||||
default:
|
||||
console.error('ERROR: NODE_ENV must be set to either `development`, `test`, or `production`.');
|
||||
process.exit(1);
|
Ładowanie…
Reference in New Issue