diff --git a/scripts/default.env b/.env.defaults similarity index 100% rename from scripts/default.env rename to .env.defaults diff --git a/package.json b/package.json index 631190d49cb0fdd1e75c4b566a84d91654de8ca2..5d8c7f777e5cd49102efb903ebc89c5c14f59b8e 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ "url": "https://github.com/mozilla/hubs/issues" }, "scripts": { - "postinstall": "node ./scripts/postinstall.js", "start": "webpack-dev-server --mode=development", "build": "rimraf ./dist && webpack --mode=production", "doc": "node ./scripts/doc/build.js", diff --git a/scripts/hab-build-and-push.sh b/scripts/hab-build-and-push.sh index bfe60faff8d3a59811fb0e9db07211f9b12433e8..48693732a8902bc487f72eb87e8ff27a02fa9af5 100755 --- a/scripts/hab-build-and-push.sh +++ b/scripts/hab-build-and-push.sh @@ -23,9 +23,6 @@ rm /usr/bin/env ln -s "$(hab pkg path core/coreutils)/bin/env" /usr/bin/env hab pkg install -b core/coreutils core/bash core/node core/git core/aws-cli -# todo: consider more elegant ways to accomplish this -cp scripts/default.env .env - npm ci --verbose --no-progress npm run build mkdir dist/pages diff --git a/scripts/postinstall.js b/scripts/postinstall.js deleted file mode 100644 index 4d88d1a2654a946e73096ecf9be91ad8243c4b1b..0000000000000000000000000000000000000000 --- a/scripts/postinstall.js +++ /dev/null @@ -1,9 +0,0 @@ -const fs = require("fs"); -const path = require("path"); - -const src = path.join(__dirname, "default.env"); -const dst = path.join(__dirname, "..", ".env"); - -if (!fs.existsSync()) { - fs.copyFileSync(src, dst); -} diff --git a/webpack.config.js b/webpack.config.js index ddbec2c9be50b3ccf9849d2424b0ecdcde4bd679..126247f03a99dcb5589f214702377ad7dfc6ae30 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,5 +1,7 @@ -// Variables in .env will be added to process.env -require("dotenv").config(); +// Variables in .env and .env.defaults will be added to process.env +const dotenv = require("dotenv"); +dotenv.config({ path: ".env" }); +dotenv.config({ path: ".env.defaults" }); const fs = require("fs"); const path = require("path");