Merge branch 'conventional-webpack' into 'develop'

Use conventional Webpack config file

See merge request soapbox-pub/soapbox-fe!766
merge-requests/767/merge
Alex Gleason 3 years ago
commit 8cfc2f9d2d

1
.gitignore vendored

@ -11,3 +11,4 @@ yarn-error.log*
/static/ /static/
/static-test/ /static-test/
/public/ /public/
/dist/

@ -16,9 +16,9 @@
"url": "https://gitlab.com/soapbox-pub/soapbox-fe/-/issues" "url": "https://gitlab.com/soapbox-pub/soapbox-fe/-/issues"
}, },
"scripts": { "scripts": {
"start": "npx webpack-dev-server --config webpack", "start": "npx webpack-dev-server",
"dev": "${npm_execpath} run start", "dev": "${npm_execpath} run start",
"build": "npx webpack --config webpack", "build": "npx webpack",
"jsdoc": "npx jsdoc -c jsdoc.conf.js", "jsdoc": "npx jsdoc -c jsdoc.conf.js",
"manage:translations": "node ./webpack/translationRunner.js", "manage:translations": "node ./webpack/translationRunner.js",
"test": "${npm_execpath} run test:lint && ${npm_execpath} run test:jest", "test": "${npm_execpath} run test:lint && ${npm_execpath} run test:jest",

@ -6,7 +6,7 @@ switch(NODE_ENV) {
case 'development': case 'development':
case 'production': case 'production':
case 'test': case 'test':
module.exports = require(`./${NODE_ENV}`); break; module.exports = require(`./webpack/${NODE_ENV}`); break;
default: default:
console.error('ERROR: NODE_ENV must be set to either `development`, `test`, or `production`.'); console.error('ERROR: NODE_ENV must be set to either `development`, `test`, or `production`.');
process.exit(1); process.exit(1);
Loading…
Cancel
Save