Skip to content

Commit e8487c0

Browse files
authored
incorporate multienv (#2993)
- remove loadenv.js
1 parent 33bc0c1 commit e8487c0

File tree

6 files changed

+22
-37
lines changed

6 files changed

+22
-37
lines changed

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
"production": "sh scripts/production.sh",
2222
"publish-assets": "sh scripts/publish-assets.sh",
2323
"start": "sh scripts/start.sh",
24-
"task": "node -r coffeescript/register -r @babel/register -r ./src/lib/loadenv",
24+
"task": "node -r coffeescript/register -r @babel/register -r ./scripts/autoenv",
2525
"test:watch": "yarn jest -- --watch --runInBand",
2626
"test": "sh scripts/test.sh",
2727
"type-check": "tsc --pretty --noEmit",
28-
"webpack": "node --max_old_space_size=2048 -r ./src/lib/loadenv -r @babel/register node_modules/.bin/webpack --config ./webpack"
28+
"webpack": "node --max_old_space_size=2048 -r ./scripts/autoenv -r @babel/register node_modules/.bin/webpack --config ./webpack"
2929
},
3030
"resolutions": {
3131
"babel-core": "7.0.0-bridge.0",
@@ -38,6 +38,7 @@
3838
"@artsy/bucket-assets": "1.0.3",
3939
"@artsy/express-reloadable": "1.5.0",
4040
"@artsy/gemup": "0.1.0",
41+
"@artsy/multienv": "^1.2.0",
4142
"@artsy/palette": "10.1.0",
4243
"@artsy/reaction": "29.2.1",
4344
"@babel/cli": "7.0.0",

scripts/autoenv.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// load multienv with default environment files
2+
const { loadEnvs } = require("@artsy/multienv")
3+
loadEnvs(".env.shared", ".env")

scripts/production.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ fi
1111
export COMMIT_HASH=`cat COMMIT_HASH.txt`
1212
export ASSET_MANIFEST=$(curl --silent $CDN_URL/manifest-$COMMIT_HASH.json)
1313

14-
node ./src --colors
14+
node ./src/index.js --colors

src/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
const { loadEnvs } = require("@artsy/multienv")
2+
13
require("regenerator-runtime/runtime")
24
require("coffeescript/register")
35
require("@babel/register")({
46
extensions: [".js", ".jsx", ".mjs", ".ts", ".tsx"],
57
})
6-
require("./lib/loadenv")
8+
loadEnvs(".env.shared", ".env")
79
require("./boot")

src/lib/loadenv.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

yarn.lock

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,13 @@
168168
dependencies:
169169
uuid "^8.3.0"
170170

171+
"@artsy/multienv@^1.2.0":
172+
version "1.2.0"
173+
resolved "https://registry.yarnpkg.com/@artsy/multienv/-/multienv-1.2.0.tgz#ff4bb0b86ee8bb1c2867e5d887931d274024e68a"
174+
integrity sha512-ElwKuJ4DVw3/X27t/v+/hBJLNx4gP76foiVTX11kguiurzBFDln3k/nRTYnalOkU+33nCWgZnpj5elI4jUPqSg==
175+
dependencies:
176+
dotenv "^10.0.0"
177+
171178
"@artsy/palette@10.1.0":
172179
version "10.1.0"
173180
resolved "https://registry.yarnpkg.com/@artsy/palette/-/palette-10.1.0.tgz#bceb841d339871451c47bed51c80d86b0a03609e"
@@ -5074,6 +5081,11 @@ dotenv@8.2.0:
50745081
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
50755082
integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
50765083

5084+
dotenv@^10.0.0:
5085+
version "10.0.0"
5086+
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
5087+
integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
5088+
50775089
draft-convert@2.0.0:
50785090
version "2.0.0"
50795091
resolved "https://registry.yarnpkg.com/draft-convert/-/draft-convert-2.0.0.tgz#e7afbc8054bfb2f53464e6dd47e50125403879d8"

0 commit comments

Comments
 (0)