scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-29 17:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: replace npm-run-all with concurrently (#25492)

Browse Source 
* replace npm-run-all with concurrently

* fix scripts

* Bump date-fns, fix script so it correctly passes args

* kill others on fail
This commit is contained in:
Chelsea Shaw
2024-02-16 15:34:57 -06:00
committed by GitHub
parent 94fb339b31
commit db957a50c5
2 changed files with 50 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ui/package.json
View File

@@ -13,14 +13,14 @@
"build:dev": "ember build",
"lint:css": "stylelint \"**/*.css\"",
"lint:css:fix": "yarn lint:css --fix",
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
"lint:fix": "concurrently -c \"auto\" -n lint: \"yarn:lint:*:fix\"",
"lint:hbs": "ember-template-lint '**/*.hbs'",
"lint:hbs:quiet": "ember-template-lint '**/*.hbs' --quiet",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:quiet": "eslint . --cache --quiet",
"lint:js:fix": "eslint . --fix",
"fmt": "npm-run-all --aggregate-output --continue-on-error --parallel fmt:*",
"fmt": "concurrently -c \"auto\" -n fmt: \"yarn:fmt:*\"",
"fmt:js": "prettier --config .prettierrc.js --write '{app,tests,config,lib}/**/*.js'",
"fmt:hbs": "prettier --config .prettierrc.js --write '**/*.hbs'",
"fmt:styles": "prettier --write app/styles/**/*.*",
@@ -28,8 +28,8 @@
"start2": "ember server --proxy=http://localhost:8202 --port=4202",
"start:chroot": "ember server --proxy=http://localhost:8300 --port=4300",
"start:mirage": "start () { MIRAGE_DEV_HANDLER=$1 yarn run start; }; start",
"test": "npm-run-all --print-name lint:js:quiet lint:hbs:quiet && node scripts/start-vault.js",
"test:enos": "npm-run-all lint:js:quiet lint:hbs:quiet && node scripts/enos-test-ember.js",
"test": "concurrently --kill-others-on-fail -P -c \"auto\" -n lint:js,lint:hbs,vault \"yarn:lint:js:quiet\" \"yarn:lint:hbs:quiet\" \"node scripts/start-vault.js {@}\" --",
"test:enos": "concurrently --kill-others-on-fail -P -c \"auto\" -n lint:js,lint:hbs,enos \"yarn:lint:js:quiet\" \"yarn:lint:hbs:quiet\" \"node scripts/enos-test-ember.js {@}\" --",
"test:oss": "yarn run test -f='!enterprise' --split=8 --preserve-test-name --parallel",
"test:quick": "node scripts/start-vault.js --split=8 --preserve-test-name --parallel",
"test:quick-oss": "yarn test:quick -f='!enterprise' --split=8 --preserve-test-name --parallel",
@@ -109,6 +109,7 @@
"broccoli-sri-hash": "meirish/broccoli-sri-hash#rooturl",
"codemirror": "^5.58.2",
"columnify": "^1.5.4",
"concurrently": "^8.2.2",
"d3-axis": "^1.0.8",
"d3-ease": "^1.0.5",
"d3-scale": "^1.0.7",
@@ -116,7 +117,7 @@
"d3-time-format": "^2.1.1",
"d3-tip": "^0.9.1",
"d3-transition": "^1.2.0",
"date-fns": "^2.16.1",
"date-fns": "^2.30.0",
"date-fns-tz": "^1.2.2",
"deepmerge": "^4.0.0",
"doctoc": "^2.2.0",
@@ -185,7 +186,6 @@
"lint-staged": "^10.5.1",
"loader.js": "^4.7.0",
"normalize.css": "4.1.1",
"npm-run-all": "^4.1.5",
"pkijs": "^2.2.2",
"pretender": "^3.4.3",
"prettier": "2.8.7",

191
ui/yarn.lock
View File

@@ -12199,6 +12199,26 @@ __metadata:
languageName: node
linkType: hard
"concurrently@npm:^8.2.2":
version: 8.2.2
resolution: "concurrently@npm:8.2.2"
dependencies:
chalk: ^4.1.2
date-fns: ^2.30.0
lodash: ^4.17.21
rxjs: ^7.8.1
shell-quote: ^1.8.1
spawn-command: 0.0.2
supports-color: ^8.1.1
tree-kill: ^1.2.2
yargs: ^17.7.2
bin:
conc: dist/bin/concurrently.js
concurrently: dist/bin/concurrently.js
checksum: 8ac774df06869773438f1bf91025180c52d5b53139bc86cf47659136c0d97461d0579c515d848d1e945d4e3e0cafe646b2ea18af8d74259b46abddcfe39b2c6c
languageName: node
linkType: hard
"configstore@npm:^5.0.1":
version: 5.0.1
resolution: "configstore@npm:5.0.1"
@@ -12554,7 +12574,7 @@ __metadata:
languageName: node
linkType: hard
"cross-spawn@npm:^6.0.0, cross-spawn@npm:^6.0.5":
"cross-spawn@npm:^6.0.0":
version: 6.0.5
resolution: "cross-spawn@npm:6.0.5"
dependencies:
@@ -13244,14 +13264,7 @@ __metadata:
languageName: node
linkType: hard
"date-fns@npm:^2.16.1":
version: 2.21.1
resolution: "date-fns@npm:2.21.1"
checksum: 4ff90f6ab6b9e92d4605530704303aa269f40a4a2fe3624628e2a0310b06bd36d8a18867c2ddf88844afa54bc71a33b5b93c97c927da8989e9d05d32471dbd75
languageName: node
linkType: hard
"date-fns@npm:^2.29.2":
"date-fns@npm:^2.29.2, date-fns@npm:^2.30.0":
version: 2.30.0
resolution: "date-fns@npm:2.30.0"
dependencies:
@@ -18786,13 +18799,6 @@ __metadata:
languageName: node
linkType: hard
"hosted-git-info@npm:^2.1.4":
version: 2.8.9
resolution: "hosted-git-info@npm:2.8.9"
checksum: c955394bdab888a1e9bb10eb33029e0f7ce5a2ac7b3f158099dc8c486c99e73809dca609f5694b223920ca2174db33d32b12f9a2a47141dc59607c29da5a62dd
languageName: node
linkType: hard
"hosted-git-info@npm:^4.0.1":
version: 4.1.0
resolution: "hosted-git-info@npm:4.1.0"
@@ -20173,7 +20179,7 @@ __metadata:
languageName: node
linkType: hard
"json-parse-better-errors@npm:^1.0.1, json-parse-better-errors@npm:^1.0.2":
"json-parse-better-errors@npm:^1.0.2":
version: 1.0.2
resolution: "json-parse-better-errors@npm:1.0.2"
checksum: ff2b5ba2a70e88fd97a3cb28c1840144c5ce8fae9cbeeddba15afa333a5c407cf0e42300cd0a2885dbb055227fe68d405070faad941beeffbfde9cf3b2c78c5d
@@ -20538,18 +20544,6 @@ __metadata:
languageName: node
linkType: hard
"load-json-file@npm:^4.0.0":
version: 4.0.0
resolution: "load-json-file@npm:4.0.0"
dependencies:
graceful-fs: ^4.1.2
parse-json: ^4.0.0
pify: ^3.0.0
strip-bom: ^3.0.0
checksum: 8f5d6d93ba64a9620445ee9bde4d98b1eac32cf6c8c2d20d44abfa41a6945e7969456ab5f1ca2fb06ee32e206c9769a20eec7002fe290de462e8c884b6b8b356
languageName: node
linkType: hard
"loader-runner@npm:^2.4.0":
version: 2.4.0
resolution: "loader-runner@npm:2.4.0"
@@ -21560,13 +21554,6 @@ __metadata:
languageName: node
linkType: hard
"memorystream@npm:^0.3.1":
version: 0.3.1
resolution: "memorystream@npm:0.3.1"
checksum: f18b42440d24d09516d01466c06adf797df7873f0d40aa7db02e5fb9ed83074e5e65412d0720901d7069363465f82dc4f8bcb44f0cde271567a61426ce6ca2e9
languageName: node
linkType: hard
"meow@npm:^10.1.5":
version: 10.1.5
resolution: "meow@npm:10.1.5"
@@ -22503,18 +22490,6 @@ __metadata:
languageName: node
linkType: hard
"normalize-package-data@npm:^2.3.2":
version: 2.5.0
resolution: "normalize-package-data@npm:2.5.0"
dependencies:
hosted-git-info: ^2.1.4
resolve: ^1.10.0
semver: 2 || 3 || 4 || 5
validate-npm-package-license: ^3.0.1
checksum: 7999112efc35a6259bc22db460540cae06564aa65d0271e3bdfa86876d08b0e578b7b5b0028ee61b23f1cae9fc0e7847e4edc0948d3068a39a2a82853efc8499
languageName: node
linkType: hard
"normalize-package-data@npm:^3.0.2":
version: 3.0.3
resolution: "normalize-package-data@npm:3.0.3"
@@ -22576,27 +22551,6 @@ __metadata:
languageName: node
linkType: hard
"npm-run-all@npm:^4.1.5":
version: 4.1.5
resolution: "npm-run-all@npm:4.1.5"
dependencies:
ansi-styles: ^3.2.1
chalk: ^2.4.1
cross-spawn: ^6.0.5
memorystream: ^0.3.1
minimatch: ^3.0.4
pidtree: ^0.3.0
read-pkg: ^3.0.0
shell-quote: ^1.6.1
string.prototype.padend: ^3.0.0
bin:
npm-run-all: bin/npm-run-all/index.js
run-p: bin/run-p/index.js
run-s: bin/run-s/index.js
checksum: 373b72c6a36564da13c1642c1fd9bb4dcc756bce7a3648f883772f02661095319820834ff813762d2fee403e9b40c1cd27c8685807c107440f10eb19c006d4a0
languageName: node
linkType: hard
"npm-run-path@npm:^2.0.0":
version: 2.0.2
resolution: "npm-run-path@npm:2.0.2"
@@ -23193,16 +23147,6 @@ __metadata:
languageName: node
linkType: hard
"parse-json@npm:^4.0.0":
version: 4.0.0
resolution: "parse-json@npm:4.0.0"
dependencies:
error-ex: ^1.3.1
json-parse-better-errors: ^1.0.1
checksum: 0fe227d410a61090c247e34fa210552b834613c006c2c64d9a05cfe9e89cf8b4246d1246b1a99524b53b313e9ac024438d0680f67e33eaed7e6f38db64cfe7b5
languageName: node
linkType: hard
"parse-json@npm:^5.0.0, parse-json@npm:^5.2.0":
version: 5.2.0
resolution: "parse-json@npm:5.2.0"
@@ -23395,15 +23339,6 @@ __metadata:
languageName: node
linkType: hard
"path-type@npm:^3.0.0":
version: 3.0.0
resolution: "path-type@npm:3.0.0"
dependencies:
pify: ^3.0.0
checksum: 735b35e256bad181f38fa021033b1c33cfbe62ead42bb2222b56c210e42938eecb272ae1949f3b6db4ac39597a61b44edd8384623ec4d79bfdc9a9c0f12537a6
languageName: node
linkType: hard
"path-type@npm:^4.0.0":
version: 4.0.0
resolution: "path-type@npm:4.0.0"
@@ -23459,22 +23394,6 @@ __metadata:
languageName: node
linkType: hard
"pidtree@npm:^0.3.0":
version: 0.3.1
resolution: "pidtree@npm:0.3.1"
bin:
pidtree: bin/pidtree.js
checksum: eb49025099f1af89a4696f7673351421f13420f3397b963c901fe23a1c9c2ff50f4750321970d4472c0ffbb065e4a6c3c27f75e226cc62284b19e21d32ce7012
languageName: node
linkType: hard
"pify@npm:^3.0.0":
version: 3.0.0
resolution: "pify@npm:3.0.0"
checksum: 6cdcbc3567d5c412450c53261a3f10991665d660961e06605decf4544a61a97a54fefe70a68d5c37080ff9d6f4cf51444c90198d1ba9f9309a6c0d6e9f5c4fde
languageName: node
linkType: hard
"pify@npm:^4.0.1":
version: 4.0.1
resolution: "pify@npm:4.0.1"
@@ -24195,17 +24114,6 @@ __metadata:
languageName: node
linkType: hard
"read-pkg@npm:^3.0.0":
version: 3.0.0
resolution: "read-pkg@npm:3.0.0"
dependencies:
load-json-file: ^4.0.0
normalize-package-data: ^2.3.2
path-type: ^3.0.0
checksum: 398903ebae6c7e9965419a1062924436cc0b6f516c42c4679a90290d2f87448ed8f977e7aa2dbba4aa1ac09248628c43e493ac25b2bc76640e946035200e34c6
languageName: node
linkType: hard
"read-pkg@npm:^6.0.0":
version: 6.0.0
resolution: "read-pkg@npm:6.0.0"
@@ -25168,7 +25076,7 @@ __metadata:
languageName: node
linkType: hard
"rxjs@npm:^7.5.5":
"rxjs@npm:^7.5.5, rxjs@npm:^7.8.1":
version: 7.8.1
resolution: "rxjs@npm:7.8.1"
dependencies:
@@ -25394,15 +25302,6 @@ __metadata:
languageName: node
linkType: hard
"semver@npm:2 || 3 || 4 || 5":
version: 5.7.2
resolution: "semver@npm:5.7.2"
bin:
semver: bin/semver
checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686
languageName: node
linkType: hard
"semver@npm:7.0.0":
version: 7.0.0
resolution: "semver@npm:7.0.0"
@@ -25649,13 +25548,6 @@ __metadata:
languageName: node
linkType: hard
"shell-quote@npm:^1.6.1":
version: 1.7.2
resolution: "shell-quote@npm:1.7.2"
checksum: efad426fb25d8a54d06363f1f45774aa9e195f62f14fa696d542b44bfe418ab41206448b63af18d726c62e099e66d9a3f4f44858b9ea2ce4b794b41b802672d1
languageName: node
linkType: hard
"shell-quote@npm:^1.8.1":
version: 1.8.1
resolution: "shell-quote@npm:1.8.1"
@@ -26046,6 +25938,13 @@ __metadata:
languageName: node
linkType: hard
"spawn-command@npm:0.0.2":
version: 0.0.2
resolution: "spawn-command@npm:0.0.2"
checksum: e35c5d28177b4d461d33c88cc11f6f3a5079e2b132c11e1746453bbb7a0c0b8a634f07541a2a234fa4758239d88203b758def509161b651e81958894c0b4b64b
languageName: node
linkType: hard
"spdx-correct@npm:^3.0.0":
version: 3.1.1
resolution: "spdx-correct@npm:3.1.1"
@@ -26352,17 +26251,6 @@ __metadata:
languageName: node
linkType: hard
"string.prototype.padend@npm:^3.0.0":
version: 3.1.4
resolution: "string.prototype.padend@npm:3.1.4"
dependencies:
call-bind: ^1.0.2
define-properties: ^1.1.4
es-abstract: ^1.20.4
checksum: 76e07238fe31dc12177428f0436b7ed6985f6a7ba97470fd53e4f0a6d9860bfee127d81957f3073cc879b434233df143825d140581e1340278053ad993c92f6c
languageName: node
linkType: hard
"string.prototype.startswith@npm:^0.2.0":
version: 0.2.0
resolution: "string.prototype.startswith@npm:0.2.0"
@@ -26715,7 +26603,7 @@ __metadata:
languageName: node
linkType: hard
"supports-color@npm:^8.0.0":
"supports-color@npm:^8.0.0, supports-color@npm:^8.1.1":
version: 8.1.1
resolution: "supports-color@npm:8.1.1"
dependencies:
@@ -27290,6 +27178,15 @@ __metadata:
languageName: node
linkType: hard
"tree-kill@npm:^1.2.2":
version: 1.2.2
resolution: "tree-kill@npm:1.2.2"
bin:
tree-kill: cli.js
checksum: 49117f5f410d19c84b0464d29afb9642c863bc5ba40fcb9a245d474c6d5cc64d1b177a6e6713129eb346b40aebb9d4631d967517f9fbe8251c35b21b13cd96c7
languageName: node
linkType: hard
"tree-sync@npm:^1.2.2":
version: 1.4.0
resolution: "tree-sync@npm:1.4.0"
@@ -28048,6 +27945,7 @@ __metadata:
broccoli-sri-hash: "meirish/broccoli-sri-hash#rooturl"
codemirror: ^5.58.2
columnify: ^1.5.4
concurrently: ^8.2.2
d3-axis: ^1.0.8
d3-ease: ^1.0.5
d3-scale: ^1.0.7
@@ -28055,7 +27953,7 @@ __metadata:
d3-time-format: ^2.1.1
d3-tip: ^0.9.1
d3-transition: ^1.2.0
date-fns: ^2.16.1
date-fns: ^2.30.0
date-fns-tz: ^1.2.2
deepmerge: ^4.0.0
doctoc: ^2.2.0
@@ -28127,7 +28025,6 @@ __metadata:
loader.js: ^4.7.0
node-notifier: ^8.0.1
normalize.css: 4.1.1
npm-run-all: ^4.1.5
pkijs: ^2.2.2
pretender: ^3.4.3
prettier: 2.8.7
@@ -28924,7 +28821,7 @@ __metadata:
languageName: node
linkType: hard
"yargs@npm:^17.7.1":
"yargs@npm:^17.7.1, yargs@npm:^17.7.2":
version: 17.7.2
resolution: "yargs@npm:17.7.2"
dependencies: