From 68df716b0c76f6430044d4dd8e84fbebdbd9b9a6 Mon Sep 17 00:00:00 2001 From: Benjamin Dittes Date: Thu, 10 Oct 2019 16:52:42 +0200 Subject: [PATCH] allow running ./server.js also for prod/ --- package.json | 2 +- server.js | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f13ee43cad..2fb8ae90a6 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "check-types": "tsc --noEmit --pretty", "watch-types": "tsc --noEmit --pretty --watch --preserveWatchOutput", "production-build": "export NODE_ENV=production; rm -rf prod/* && webpack --config ./webpack.production.config.js --progress --profile --colors && babel -D -d prod/app --extensions .js,.ts app && cp *.js prod/", - "run-production": "export NODE_ENV=production; cd prod && node server.js", + "run-production": "export NODE_ENV=production; node server.js", "dev-server": "./node_modules/.bin/nodemon ./server.js --ignore 'app/dist/*' --watch 'app/api' --watch 'app/shared' --exec babel-node --extensions .js,.ts", "webpack-server": "babel-node --extensions .js,.ts ./webpack/webpack.server.js", "hot": "export HOT=true;npm run watch-types & npm run dev-server & npm run webpack-server", diff --git a/server.js b/server.js index 384d116d4c..ee185f68e8 100644 --- a/server.js +++ b/server.js @@ -1,6 +1,13 @@ require('@babel/register')(); +const { NODE_ENV } = process.env; + + require.extensions['.scss'] = function scss() {}; require.extensions['.css'] = function css() {}; -require('./app/server.js'); +if (NODE_ENV == 'production') { + require('./prod/app/server.js'); +} else { + require('./app/server.js'); +}