Skip to content

Commit f50e1ba

Browse files
Merge branch 'cross-env' into 'master'
Using cross-env to set env vars cross platform See merge request csc/discord-bot!5
2 parents 92407cf + 909897f commit f50e1ba

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "index.js",
66
"scripts": {
77
"dev": "concurrently \"yarn run-dev\" \"yarn watch\"",
8-
"run-dev": "NODE_ENV=dev nodemon index.ts",
8+
"run-dev": "cross-env NODE_ENV=dev nodemon index.ts",
99
"watch": "tsc --watch",
1010
"build": "tsc",
1111
"test": "echo \"Error: no test specified\" && exit 1"
@@ -32,6 +32,7 @@
3232
"@types/winston": "^2.4.4",
3333
"@typescript-eslint/eslint-plugin": "^4.22.0",
3434
"@typescript-eslint/parser": "^4.22.0",
35+
"cross-env": "^7.0.3",
3536
"eslint": "^7.25.0",
3637
"eslint-config-prettier": "^8.3.0",
3738
"eslint-plugin-prettier": "^3.4.0",

yarn.lock

+8-1
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,14 @@ create-require@^1.1.0:
647647
resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
648648
integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
649649

650-
cross-spawn@^7.0.2:
650+
cross-env@^7.0.3:
651+
version "7.0.3"
652+
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
653+
integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
654+
dependencies:
655+
cross-spawn "^7.0.1"
656+
657+
cross-spawn@^7.0.1, cross-spawn@^7.0.2:
651658
version "7.0.3"
652659
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
653660
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==

0 commit comments

Comments
 (0)