Skip to content

Commit 44d9a52

Browse files
authored
chore(deps): replace npm-run-all2 with concurrently better exit handling (#2356)
1 parent 6f44a60 commit 44d9a52

File tree

6 files changed

+37
-65
lines changed

6 files changed

+37
-65
lines changed

demos/aurelia/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
"cypress": "catalog:",
5757
"cypress-real-events": "catalog:",
5858
"dompurify": "catalog:",
59-
"npm-run-all2": "catalog:",
6059
"sass": "catalog:",
6160
"tslib": "catalog:",
6261
"typescript": "catalog:",

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
"docs:1": "// install the framework you want to use (ie: 'angular:install') or 'pnpm install' to install everything",
1616
"docs:2": "// Start Dev by choosing the appropriate framework below (ie: 'dev:angular'), the single word 'dev' is to start the Vanilla flavor (default)",
1717
"docs:3": "// Start Cypress tests by choosing your framework (ie: 'angular:cypress'), default is 'cypress' to test Vanilla flavor (default)",
18-
"dev": "pnpm build:universal && run-p dev:watch vite:watch",
19-
"dev:angular": "pnpm build:universal && run-p universal:watch angular:watch",
20-
"dev:aurelia": "pnpm build:universal && pnpm aurelia:build:framework && run-p universal:watch aurelia:watch",
21-
"dev:react": "pnpm build:universal && pnpm react:build:framework && run-p universal:watch react:watch",
22-
"dev:vue": "pnpm build:universal && pnpm vue:build:framework && run-p universal:watch vue:watch",
18+
"dev": "pnpm build:universal && concurrently --kill-others-on-fail --prefix none --raw \"pnpm dev:watch\" \"pnpm vite:watch\"",
19+
"dev:angular": "pnpm build:universal && concurrently --kill-others-on-fail --prefix none --raw \"pnpm universal:watch\" \"pnpm angular:watch\"",
20+
"dev:aurelia": "pnpm build:universal && pnpm aurelia:build:framework && concurrently --kill-others-on-fail --prefix none --raw \"pnpm universal:watch\" \"pnpm aurelia:watch\"",
21+
"dev:react": "pnpm build:universal && pnpm react:build:framework && concurrently --kill-others-on-fail --prefix none --raw \"pnpm universal:watch\" \"pnpm react:watch\"",
22+
"dev:vue": "pnpm build:universal && pnpm vue:build:framework && concurrently --kill-others-on-fail --prefix none --raw \"pnpm universal:watch\" \"pnpm vue:watch\"",
2323
"dev:watch": "lerna watch --no-bail --scope=@slickgrid-universal/* --glob=\"src/**/*.{ts,scss}\" --ignored=\"**/*.spec.ts\" -- cross-env-shell pnpm run -r --filter $LERNA_PACKAGE_NAME dev",
2424
"build": "pnpm clean && pnpm lint && pnpm build:universal && pnpm build:wrappers",
2525
"bundle:zip": "pnpm clean && pnpm lint && pnpm build:universal && pnpm -r --stream --filter=./packages/** run bundle:zip",
@@ -114,7 +114,7 @@
114114
"globals": "catalog:",
115115
"jsdom": "catalog:",
116116
"jsdom-global": "catalog:",
117-
"npm-run-all2": "catalog:",
117+
"concurrently": "catalog:",
118118
"oxlint": "catalog:",
119119
"prettier": "^3.8.1",
120120
"remove-glob": "catalog:",

packages/common/build-watch.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { copyfiles } from 'native-copyfiles';
21
import { exec } from 'node:child_process';
32
import { basename } from 'node:path';
3+
import { copyfiles } from 'native-copyfiles';
44

55
/**
66
* Special script used by the Watch in Development which will compile TypeScript files with tsc incremental and/or SASS files when changes occurs.
@@ -31,7 +31,7 @@ async function run() {
3131
for (const changedFile of changedFiles) {
3232
const fileWithExtension = basename(changedFile);
3333
const relativeFile = `./src/styles/${fileWithExtension}`;
34-
copyfiles([relativeFile, 'dist/styles/sass'], { flat: true }, (err) => {
34+
copyfiles([relativeFile], 'dist/styles/sass', { flat: true }, (err) => {
3535
err ? console.error(err) : console.log(`Copied "${fileWithExtension}" to "dist/styles/sass"`);
3636
});
3737
}

packages/common/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"scripts": {
3535
"are-types-wrong": "pnpx @arethetypeswrong/cli --pack .",
3636
"build": "pnpm run clean && tsc && pnpm run sass:bundle",
37-
"sass:bundle": "run-s sass:build sass:copy",
37+
"sass:bundle": "pnpm run sass:build && pnpm run sass:copy",
3838
"build:incremental": "tsc --incremental --declaration",
3939
"clean": "remove dist tsconfig.tsbuildinfo",
4040
"dev": "node build-watch.mjs",
@@ -46,15 +46,15 @@
4646
"sass-build-task:scss-compile:material-lite": "sass src/styles/slickgrid-theme-material.lite.scss dist/styles/css/slickgrid-theme-material.lite.css --style=compressed --quiet-deps --no-source-map --load-path=node_modules",
4747
"sass-build-task:scss-compile:salesforce": "sass src/styles/slickgrid-theme-salesforce.scss dist/styles/css/slickgrid-theme-salesforce.css --style=compressed --quiet-deps --no-source-map --load-path=node_modules",
4848
"sass-build-task:scss-compile:salesforce-lite": "sass src/styles/slickgrid-theme-salesforce.lite.scss dist/styles/css/slickgrid-theme-salesforce.lite.css --style=compressed --quiet-deps --no-source-map --load-path=node_modules",
49-
"sass:build": "run-p sass-build-task:scss-compile:* && pnpm run sass:build:postcss",
49+
"sass:build": "concurrently --prefix none \"pnpm:sass-build-task:scss-compile:*\" && pnpm run sass:build:postcss",
5050
"sass:build:postcss": "postcss --no-map --use cssnano --use autoprefixer --dir dist/styles/css dist/styles/css --style=compressed --quiet-deps --no-source-map",
5151
"sass:copy": "copyfiles \"./src/styles/*.scss\" dist/styles/sass --flat --stat",
5252
"sass:watch:default": "npm run sass-build-task:scss-compile:default -- --watch",
5353
"sass:watch:bootstrap": "npm run sass-build-task:scss-compile:bootstrap -- --watch",
5454
"sass:watch:material": "npm run sass-build-task:scss-compile:material -- --watch",
5555
"sass:watch:salesforce": "npm run sass-build-task:scss-compile:salesforce -- --watch",
56-
"sass:watch": "run-p sass:watch:*",
57-
"sass:watch-all": "run-p \"sass-build-task:scss-compile:* --watch\" --"
56+
"sass:watch": "concurrently --prefix none \"pnpm:sass:watch:*\"",
57+
"sass:watch-all": "concurrently --prefix none \"pnpm:sass-build-task:scss-compile:* --watch\""
5858
},
5959
"browserslist": [
6060
"baseline widely available"
@@ -77,8 +77,8 @@
7777
"devDependencies": {
7878
"autoprefixer": "^10.4.23",
7979
"cssnano": "^7.1.2",
80+
"concurrently": "catalog:",
8081
"native-copyfiles": "catalog:",
81-
"npm-run-all2": "catalog:",
8282
"postcss": "^8.5.6",
8383
"postcss-cli": "^11.0.1",
8484
"sass": "catalog:"

pnpm-lock.yaml

Lines changed: 23 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ catalog:
1818
'@vitest/coverage-v8': ^4.0.18
1919
'@vitest/ui': ^4.0.18
2020
bootstrap: ^5.3.8
21+
concurrently: ^9.2.1
2122
cross-env: ^10.1.0
2223
cypress: ^15.9.0
2324
cypress-real-events: ^1.15.0
@@ -30,7 +31,6 @@ catalog:
3031
jsdom-global: ^3.0.2
3132
multiple-select-vanilla: ^4.4.1
3233
native-copyfiles: ^2.0.1
33-
npm-run-all2: ^8.0.4
3434
oxlint: ^1.42.0
3535
remove-glob: ^1.2.0
3636
rxjs: ^7.8.2

0 commit comments

Comments
 (0)