Skip to content

Commit 8c4e772

Browse files
committed
Add cross env for windows and escape some node bin executables
1 parent 6bd0b5f commit 8c4e772

File tree

2 files changed

+36
-4
lines changed

2 files changed

+36
-4
lines changed

package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"test:pretty": "npm run test -- --verbose",
1212
"test:coverage": "npm run test -- --coverage",
1313
"pretest:black-box": "./node_modules/.bin/tslint -c ./tslint.json -t stylish './test/black-box/**/*.ts'",
14-
"test:black-box": "npm run banner test && NODE_ENV=test ./node_modules/.bin/jest ./test/black-box -i",
14+
"test:black-box": "npm run banner test && cross-env NODE_ENV=test ./node_modules/.bin/jest ./test/black-box -i",
1515
"test:black-box:pretty": "npm run test:black-box -- --verbose",
1616
"lint": "./node_modules/.bin/tslint -c ./tslint.json -p tsconfig.json 'src/**/*.ts' --format stylish",
1717
"transpile": "./node_modules/.bin/tsc",
@@ -27,9 +27,9 @@
2727
"console:dev": "npm run ts-node -- ./src/console/commander.ts",
2828
"console:help": "npm run ts-node:fast -- ./src/console/commander.ts --help",
2929
"setup": "npm run banner setup && yarn install && npm run db:migrate && npm run db:seed",
30-
"serve": "npm run banner serve && ./node_modules/.bin/nodemon --watch 'src/**/*.ts' --watch 'src/**/*.json' --watch '.env'",
30+
"serve": "npm run banner serve && \"./node_modules/.bin/nodemon\" --watch 'src/**/*.ts' --watch 'src/**/*.json' --watch '.env'",
3131
"clean": "npm run banner clean && npm run clean:dist",
32-
"test": "npm run banner test && NODE_ENV=test ./node_modules/.bin/jest ./test/unit",
32+
"test": "npm run banner test && cross-env NODE_ENV=test \"./node_modules/.bin/jest\" ./test/unit",
3333
"build": "npm run banner build && npm run lint && npm run clean:dist && npm run transpile && npm run copy:assets",
3434
"start": "node dist/app.js"
3535
},
@@ -146,5 +146,8 @@
146146
"testEnvironment": "node",
147147
"setupTestFrameworkScriptFile": "./test/unit/lib/setup.ts"
148148
},
149-
"license": "MIT"
149+
"license": "MIT",
150+
"devDependencies": {
151+
"cross-env": "^5.0.1"
152+
}
150153
}

yarn.lock

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,6 +1136,13 @@ create-error@~0.3.1:
11361136
version "0.3.1"
11371137
resolved "https://registry.yarnpkg.com/create-error/-/create-error-0.3.1.tgz#69810245a629e654432bf04377360003a5351a23"
11381138

1139+
cross-env@^5.0.1:
1140+
version "5.0.1"
1141+
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.0.1.tgz#ff4e72ea43b47da2486b43a7f2043b2609e44913"
1142+
dependencies:
1143+
cross-spawn "^5.1.0"
1144+
is-windows "^1.0.0"
1145+
11391146
cross-spawn-async@^2.1.1:
11401147
version "2.2.5"
11411148
resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
@@ -1150,6 +1157,14 @@ cross-spawn@^4.0.0:
11501157
lru-cache "^4.0.1"
11511158
which "^1.2.9"
11521159

1160+
cross-spawn@^5.1.0:
1161+
version "5.1.0"
1162+
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
1163+
dependencies:
1164+
lru-cache "^4.0.1"
1165+
shebang-command "^1.2.0"
1166+
which "^1.2.9"
1167+
11531168
cryptiles@2.x.x:
11541169
version "2.0.5"
11551170
resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -2305,6 +2320,10 @@ is-windows@^0.2.0:
23052320
version "0.2.0"
23062321
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
23072322

2323+
is-windows@^1.0.0:
2324+
version "1.0.1"
2325+
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
2326+
23082327
isarray@0.0.1:
23092328
version "0.0.1"
23102329
resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -4064,6 +4083,16 @@ setprototypeof@1.0.3:
40644083
version "1.0.3"
40654084
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
40664085

4086+
shebang-command@^1.2.0:
4087+
version "1.2.0"
4088+
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
4089+
dependencies:
4090+
shebang-regex "^1.0.0"
4091+
4092+
shebang-regex@^1.0.0:
4093+
version "1.0.0"
4094+
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
4095+
40674096
shellwords@^0.1.0:
40684097
version "0.1.0"
40694098
resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.0.tgz#66afd47b6a12932d9071cbfd98a52e785cd0ba14"

0 commit comments

Comments
 (0)