Skip to content

Commit 78f0464

Browse files
committed
chore: use npm-run-all for consistency
1 parent ce1a5e0 commit 78f0464

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed

2nd-gen/package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
"scripts": {
1919
"build": "yarn workspaces foreach --from '{@spectrum-web-components/core,@adobe/swc}' --recursive run build",
2020
"clean": "yarn workspaces foreach --from '{@spectrum-web-components/core,@adobe/swc}' --recursive run clean",
21+
"dev:analyze": "yarn workspace @adobe/swc analyze:watch",
22+
"dev:core": "yarn workspace @spectrum-web-components/core dev",
2123
"lint": "eslint . --ext .ts,.js,.json",
22-
"start": "yarn workspace @spectrum-web-components/core dev & yarn workspace @adobe/swc analyze:watch & yarn workspace @adobe/swc storybook",
24+
"start": "run-p dev:core dev:analyze storybook",
25+
"storybook": "yarn workspace @adobe/swc storybook",
2326
"storybook:build": "yarn workspace @adobe/swc storybook:build",
2427
"test": "yarn workspace @adobe/swc test"
2528
},
@@ -28,7 +31,8 @@
2831
],
2932
"devDependencies": {
3033
"eslint": "8.57.1",
31-
"eslint-plugin-simple-import-sort": "12.1.1"
34+
"eslint-plugin-simple-import-sort": "12.1.1",
35+
"npm-run-all2": "7.0.2"
3236
},
3337
"keywords": [
3438
"design-system",

2nd-gen/packages/swc/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
}
3131
},
3232
"main": "./dist/index.js",
33+
"module": "./dist/index.js",
3334
"files": [
3435
"dist/"
3536
],
@@ -39,12 +40,13 @@
3940
"build": "vite build",
4041
"clean": "rimraf dist",
4142
"dev": "vite build --watch",
43+
"dev:core": "yarn workspace @spectrum-web-components/core dev",
4244
"storybook": "yarn analyze && storybook dev -p 6006",
4345
"storybook:build": "yarn analyze && storybook build",
4446
"test": "vitest --run",
4547
"test:coverage": "vitest --coverage",
4648
"test:ui": "vitest --ui",
47-
"test:watch": "yarn workspace @spectrum-web-components/core dev & vitest"
49+
"test:watch": "run-p dev:core vitest"
4850
},
4951
"types": "./dist/index.d.ts",
5052
"dependencies": {
@@ -96,6 +98,5 @@
9698
"customElements": ".storybook/custom-elements.json",
9799
"publishConfig": {
98100
"access": "public"
99-
},
100-
"module": "./dist/index.js"
101+
}
101102
}

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,19 @@
1414
},
1515
"type": "module",
1616
"scripts": {
17-
"build": "yarn build:2nd-gen && yarn build:1st-gen",
17+
"build": "run-s build:2nd-gen build:1st-gen",
1818
"build:1st-gen": "yarn workspace @spectrum-web-components/1st-gen build",
1919
"build:2nd-gen": "yarn workspace @spectrum-web-components/2nd-gen build",
20-
"lint": "yarn lint:1st-gen && yarn lint:2nd-gen",
20+
"lint": "run-s lint:2nd-gen lint:1st-gen",
2121
"lint:1st-gen": "yarn workspace @spectrum-web-components/1st-gen lint",
2222
"lint:2nd-gen": "yarn workspace @spectrum-web-components/2nd-gen lint",
2323
"postinstall": "husky || true",
2424
"publish": "node ./scripts/publish.js",
25-
"publish:nightly": "node ./scripts/publish.js --snapshot --tag nightly",
2625
"publish:snapshot": "node ./scripts/publish.js --snapshot --tag snapshot",
27-
"start": "yarn start:2nd-gen & yarn start:1st-gen",
26+
"start": "run-p start:2nd-gen start:1st-gen",
2827
"start:1st-gen": "yarn workspace @spectrum-web-components/1st-gen start",
2928
"start:2nd-gen": "yarn workspace @spectrum-web-components/2nd-gen start",
30-
"test": "yarn test:1st-gen & yarn test:2nd-gen",
29+
"test": "run-p test:2nd-gen test:1st-gen",
3130
"test:1st-gen": "yarn workspace @spectrum-web-components/1st-gen test",
3231
"test:2nd-gen": "yarn workspace @spectrum-web-components/2nd-gen test"
3332
},
@@ -49,6 +48,7 @@
4948
"genversion": "3.2.0",
5049
"husky": "9.1.7",
5150
"lint-staged": "16.2.6",
51+
"npm-run-all2": "7.0.2",
5252
"replace-in-file": "8.3.0",
5353
"yargs": "17.7.2"
5454
},

yarn.lock

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5390,7 +5390,7 @@ __metadata:
53905390
mocha-junit-reporter: "npm:2.2.1"
53915391
next: "npm:14.2.33"
53925392
node-fetch: "npm:3.3.2"
5393-
npm-run-all2: "npm:8.0.4"
5393+
npm-run-all2: "npm:7.0.2"
53945394
patch-package: "npm:^8.0.0"
53955395
pinst: "npm:3.0.0"
53965396
prettier: "npm:3.6.2"
@@ -5421,6 +5421,7 @@ __metadata:
54215421
dependencies:
54225422
eslint: "npm:8.57.1"
54235423
eslint-plugin-simple-import-sort: "npm:12.1.1"
5424+
npm-run-all2: "npm:7.0.2"
54245425
languageName: unknown
54255426
linkType: soft
54265427

@@ -23052,14 +23053,14 @@ __metadata:
2305223053
languageName: node
2305323054
linkType: hard
2305423055

23055-
"npm-run-all2@npm:8.0.4":
23056-
version: 8.0.4
23057-
resolution: "npm-run-all2@npm:8.0.4"
23056+
"npm-run-all2@npm:7.0.2":
23057+
version: 7.0.2
23058+
resolution: "npm-run-all2@npm:7.0.2"
2305823059
dependencies:
2305923060
ansi-styles: "npm:^6.2.1"
2306023061
cross-spawn: "npm:^7.0.6"
2306123062
memorystream: "npm:^0.3.1"
23062-
picomatch: "npm:^4.0.2"
23063+
minimatch: "npm:^9.0.0"
2306323064
pidtree: "npm:^0.6.0"
2306423065
read-package-json-fast: "npm:^4.0.0"
2306523066
shell-quote: "npm:^1.7.3"
@@ -23069,7 +23070,7 @@ __metadata:
2306923070
npm-run-all2: bin/npm-run-all/index.js
2307023071
run-p: bin/run-p/index.js
2307123072
run-s: bin/run-s/index.js
23072-
checksum: 10c0/cfc2987df224e55456629301991b5fa6980cc644d1836fe3c22d74a4508512737d30389795b759bb5d659103e54281c59741ecdc0241cfd2615cb9bffbf7cceb
23073+
checksum: 10c0/4606c0cdaad9dc7dbe5a6ae432b1aabea25e2ffd541f959307e5c34247d0658952f98352b8ce45f925241af304c6718b2198b425f234e0e9fbc30b342cedb121
2307323074
languageName: node
2307423075
linkType: hard
2307523076

@@ -27159,6 +27160,7 @@ __metadata:
2715927160
genversion: "npm:3.2.0"
2716027161
husky: "npm:9.1.7"
2716127162
lint-staged: "npm:16.2.6"
27163+
npm-run-all2: "npm:7.0.2"
2716227164
replace-in-file: "npm:8.3.0"
2716327165
yargs: "npm:17.7.2"
2716427166
languageName: unknown

0 commit comments

Comments
 (0)