From cd93dc42246219295a83f9ccb610003ae88b655f Mon Sep 17 00:00:00 2001
From: Tomasz Knapik <hi@tmkn.org>
Date: Tue, 15 Jan 2019 17:44:32 +0000
Subject: [PATCH] Configure production env variables
---
.dev-env | 1 -
.../static_src/src/app/webpack.base.config.js | 4 +---
.../static_src/src/app/webpack.dev.config.js | 4 ++--
.../static_src/src/app/webpack.prod.config.js | 10 ++++------
package-lock.json | 19 -------------------
package.json | 1 -
6 files changed, 7 insertions(+), 32 deletions(-)
delete mode 100644 .dev-env
diff --git a/.dev-env b/.dev-env
deleted file mode 100644
index 4704c2d06..000000000
--- a/.dev-env
+++ /dev/null
@@ -1 +0,0 @@
-API_BASE_URL="http://apply.localhost:8000"
diff --git a/opentech/static_src/src/app/webpack.base.config.js b/opentech/static_src/src/app/webpack.base.config.js
index 8d1aa48a5..74ed1fe33 100644
--- a/opentech/static_src/src/app/webpack.base.config.js
+++ b/opentech/static_src/src/app/webpack.base.config.js
@@ -10,9 +10,7 @@ module.exports = {
filename: '[name]-[hash].js'
},
- plugins: [
- new Dotenv(),
- ],
+ plugins: [],
module: {
rules: [
diff --git a/opentech/static_src/src/app/webpack.dev.config.js b/opentech/static_src/src/app/webpack.dev.config.js
index 35dd1193a..73fedc45c 100644
--- a/opentech/static_src/src/app/webpack.dev.config.js
+++ b/opentech/static_src/src/app/webpack.dev.config.js
@@ -13,8 +13,8 @@ config.plugins = config.plugins.concat([
new webpack.HotModuleReplacementPlugin(),
new webpack.NoEmitOnErrorsPlugin(),
new BundleTracker({filename: './opentech/static_compiled/app/webpack-stats.json'}),
- new Dotenv({
- path: '.dev-env',
+ new webpack.EnvironmentPlugin({
+ API_BASE_URL: 'http://apply.localhost:8000/',
}),
])
diff --git a/opentech/static_src/src/app/webpack.prod.config.js b/opentech/static_src/src/app/webpack.prod.config.js
index 9b0ff64ac..9f85413c0 100644
--- a/opentech/static_src/src/app/webpack.prod.config.js
+++ b/opentech/static_src/src/app/webpack.prod.config.js
@@ -7,12 +7,10 @@ config.output.path = require('path').resolve('./assets/dist')
config.plugins = config.plugins.concat([
new BundleTracker({filename: './opentech/static_compiled/app/webpack-stats-prod.json'}),
-
- // removes a lot of debugging code in React
- new webpack.DefinePlugin({
- 'process.env': {
- 'NODE_ENV': JSON.stringify('production')
- }}),
+ new webpack.EnvironmentPlugin({
+ NODE_ENV: 'production',
+ API_BASE_URL: null ,
+ }),
])
config.optimization = {
diff --git a/package-lock.json b/package-lock.json
index f24c1d4de..20f5a048a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3065,25 +3065,6 @@
"domelementtype": "1"
}
},
- "dotenv": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz",
- "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow=="
- },
- "dotenv-expand": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-4.2.0.tgz",
- "integrity": "sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU="
- },
- "dotenv-webpack": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-1.6.0.tgz",
- "integrity": "sha512-jTbHXmcVw3KMVhTdgthYNLWWHRGtucrADpZWwVCdiP+pCvuWvxLcUadwEnmz8Wqv/d2UAJxJhp1jrxGlMYCetg==",
- "requires": {
- "dotenv": "^5.0.1",
- "dotenv-expand": "^4.0.1"
- }
- },
"duplexer": {
"version": "0.1.1",
"resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
diff --git a/package.json b/package.json
index abcc5c130..d1dc670a2 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,6 @@
"@babel/polyfill": "^7.2.5",
"@svgr/webpack": "^4.1.0",
"del": "^3.0.0",
- "dotenv-webpack": "^1.6.0",
"gulp": "^4.0.0",
"gulp-babel": "^8.0.0",
"gulp-clean-css": "^3.10.0",
--
GitLab