diff --git a/apps/api-documenter/package.json b/apps/api-documenter/package.json index 4e3b986993..d396d63a54 100644 --- a/apps/api-documenter/package.json +++ b/apps/api-documenter/package.json @@ -10,7 +10,9 @@ "homepage": "https://api-extractor.com/", "license": "MIT", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "bin": { "api-documenter": "./bin/api-documenter" diff --git a/apps/api-extractor-model/package.json b/apps/api-extractor-model/package.json index 7cdbe3ba2d..00e8522880 100644 --- a/apps/api-extractor-model/package.json +++ b/apps/api-extractor-model/package.json @@ -12,7 +12,9 @@ "typings": "dist/rollup.d.ts", "license": "MIT", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "@microsoft/tsdoc": "0.13.2", diff --git a/apps/api-extractor/package.json b/apps/api-extractor/package.json index c6774d10dc..0bb5599f12 100644 --- a/apps/api-extractor/package.json +++ b/apps/api-extractor/package.json @@ -32,7 +32,9 @@ }, "license": "MIT", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "@microsoft/api-extractor-model": "workspace:*", diff --git a/apps/heft/package.json b/apps/heft/package.json index 144f541f15..a612d5e3f3 100644 --- a/apps/heft/package.json +++ b/apps/heft/package.json @@ -28,8 +28,10 @@ }, "license": "MIT", "scripts": { - "build": "heft test --clean", - "start": "heft test --clean --watch" + "build": "heft build --clean", + "start": "heft test --clean --watch", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "@rushstack/heft-config-file": "workspace:*", diff --git a/apps/rundown/package.json b/apps/rundown/package.json index 1f7522ae69..fd253d8aab 100644 --- a/apps/rundown/package.json +++ b/apps/rundown/package.json @@ -13,7 +13,8 @@ "engineStrict": true, "homepage": "https://rushstack.io", "scripts": { - "build": "heft build --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "bin": { "rundown": "./bin/rundown" diff --git a/apps/rush-lib/package.json b/apps/rush-lib/package.json index 8def47eb81..0b7de8df18 100644 --- a/apps/rush-lib/package.json +++ b/apps/rush-lib/package.json @@ -15,7 +15,9 @@ "main": "lib/index.js", "typings": "dist/rush-lib.d.ts", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "license": "MIT", "dependencies": { diff --git a/apps/rush/package.json b/apps/rush/package.json index 06a047f3e7..53e87bd3a1 100644 --- a/apps/rush/package.json +++ b/apps/rush/package.json @@ -24,8 +24,10 @@ "engineStrict": true, "homepage": "https://rushjs.io", "scripts": { - "build": "heft test --clean", - "start": "node lib/start-dev-docs.js" + "build": "heft build --clean", + "start": "node lib/start-dev-docs.js", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "bin": { "rush": "./bin/rush", diff --git a/build-tests-samples/heft-node-basic-tutorial/package.json b/build-tests-samples/heft-node-basic-tutorial/package.json index 70792d7b5f..1e18955054 100644 --- a/build-tests-samples/heft-node-basic-tutorial/package.json +++ b/build-tests-samples/heft-node-basic-tutorial/package.json @@ -6,7 +6,9 @@ "main": "lib/index.js", "license": "MIT", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests-samples/heft-node-jest-tutorial/package.json b/build-tests-samples/heft-node-jest-tutorial/package.json index f6103a8f85..029b8c1ee8 100644 --- a/build-tests-samples/heft-node-jest-tutorial/package.json +++ b/build-tests-samples/heft-node-jest-tutorial/package.json @@ -5,7 +5,9 @@ "private": true, "license": "MIT", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests-samples/heft-node-rig-tutorial/package.json b/build-tests-samples/heft-node-rig-tutorial/package.json index d8339313a1..4f3ca90363 100644 --- a/build-tests-samples/heft-node-rig-tutorial/package.json +++ b/build-tests-samples/heft-node-rig-tutorial/package.json @@ -6,7 +6,9 @@ "main": "lib/index.js", "license": "MIT", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests-samples/heft-storybook-react-tutorial-storykit/package.json b/build-tests-samples/heft-storybook-react-tutorial-storykit/package.json index 0d96a282bb..dee97f6648 100644 --- a/build-tests-samples/heft-storybook-react-tutorial-storykit/package.json +++ b/build-tests-samples/heft-storybook-react-tutorial-storykit/package.json @@ -7,7 +7,8 @@ "module": "dist/index.js", "types": "dist/index.d.ts", "scripts": { - "build": "" + "build": "", + "_phase:build": "" }, "devDependencies": { "@babel/core": "^7.14.8", diff --git a/build-tests-samples/heft-storybook-react-tutorial/package.json b/build-tests-samples/heft-storybook-react-tutorial/package.json index c7361aaee9..deb2da050d 100644 --- a/build-tests-samples/heft-storybook-react-tutorial/package.json +++ b/build-tests-samples/heft-storybook-react-tutorial/package.json @@ -4,8 +4,10 @@ "version": "1.0.0", "private": true, "scripts": { - "build": "heft test --clean", - "start": "heft start" + "build": "heft build --clean", + "start": "heft start", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests-samples/heft-webpack-basic-tutorial/package.json b/build-tests-samples/heft-webpack-basic-tutorial/package.json index b8d6816ae2..af9e80d2da 100644 --- a/build-tests-samples/heft-webpack-basic-tutorial/package.json +++ b/build-tests-samples/heft-webpack-basic-tutorial/package.json @@ -4,8 +4,10 @@ "version": "1.0.0", "private": true, "scripts": { - "build": "heft test --clean", - "start": "heft start" + "build": "heft build --clean", + "start": "heft start", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests-samples/packlets-tutorial/package.json b/build-tests-samples/packlets-tutorial/package.json index 5407dac563..0cc9a07cb5 100644 --- a/build-tests-samples/packlets-tutorial/package.json +++ b/build-tests-samples/packlets-tutorial/package.json @@ -6,7 +6,8 @@ "license": "MIT", "scripts": { "build": "heft build --clean", - "start": "node lib/start.js" + "start": "node lib/start.js", + "_phase:build": "heft build --clean" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests/api-documenter-test/package.json b/build-tests/api-documenter-test/package.json index 9c1a9b8f63..15c8073110 100644 --- a/build-tests/api-documenter-test/package.json +++ b/build-tests/api-documenter-test/package.json @@ -6,7 +6,8 @@ "main": "lib/index.js", "typings": "lib/index.d.ts", "scripts": { - "build": "node build.js" + "build": "node build.js", + "_phase:build": "node build.js" }, "devDependencies": { "@microsoft/api-documenter": "workspace:*", diff --git a/build-tests/api-extractor-lib1-test/package.json b/build-tests/api-extractor-lib1-test/package.json index 056a3f9527..7c3be14095 100644 --- a/build-tests/api-extractor-lib1-test/package.json +++ b/build-tests/api-extractor-lib1-test/package.json @@ -6,7 +6,8 @@ "main": "lib/index.js", "typings": "dist/api-extractor-lib1-test.d.ts", "scripts": { - "build": "node build.js" + "build": "node build.js", + "_phase:build": "node build.js" }, "devDependencies": { "@microsoft/api-extractor": "workspace:*", diff --git a/build-tests/api-extractor-lib2-test/package.json b/build-tests/api-extractor-lib2-test/package.json index 3376cb9bfe..d822c2dd74 100644 --- a/build-tests/api-extractor-lib2-test/package.json +++ b/build-tests/api-extractor-lib2-test/package.json @@ -6,7 +6,8 @@ "main": "lib/index.js", "typings": "dist/api-extractor-lib2-test.d.ts", "scripts": { - "build": "node build.js" + "build": "node build.js", + "_phase:build": "node build.js" }, "devDependencies": { "@microsoft/api-extractor": "workspace:*", diff --git a/build-tests/api-extractor-lib3-test/package.json b/build-tests/api-extractor-lib3-test/package.json index ae13abf9c0..a7f115a828 100644 --- a/build-tests/api-extractor-lib3-test/package.json +++ b/build-tests/api-extractor-lib3-test/package.json @@ -6,7 +6,8 @@ "main": "lib/index.js", "typings": "dist/api-extractor-lib3-test.d.ts", "scripts": { - "build": "node build.js" + "build": "node build.js", + "_phase:build": "node build.js" }, "dependencies": { "api-extractor-lib1-test": "workspace:*" diff --git a/build-tests/api-extractor-scenarios/package.json b/build-tests/api-extractor-scenarios/package.json index 3c948258e5..bbb10bdbb5 100644 --- a/build-tests/api-extractor-scenarios/package.json +++ b/build-tests/api-extractor-scenarios/package.json @@ -6,7 +6,8 @@ "main": "lib/index.js", "typings": "dist/internal/api-extractor-test-01.d.ts", "scripts": { - "build": "node build.js" + "build": "node build.js", + "_phase:build": "node build.js" }, "devDependencies": { "@microsoft/api-extractor": "workspace:*", diff --git a/build-tests/api-extractor-test-01/package.json b/build-tests/api-extractor-test-01/package.json index a405b2ef43..d233df8bc5 100644 --- a/build-tests/api-extractor-test-01/package.json +++ b/build-tests/api-extractor-test-01/package.json @@ -6,7 +6,8 @@ "main": "lib/index.js", "typings": "dist/api-extractor-test-01.d.ts", "scripts": { - "build": "node build.js" + "build": "node build.js", + "_phase:build": "node build.js" }, "dependencies": { "@types/jest": "27.4.0", diff --git a/build-tests/api-extractor-test-02/package.json b/build-tests/api-extractor-test-02/package.json index d0a5f3c9ba..301973f47d 100644 --- a/build-tests/api-extractor-test-02/package.json +++ b/build-tests/api-extractor-test-02/package.json @@ -6,7 +6,8 @@ "main": "lib/index.js", "typings": "dist/api-extractor-test-02.d.ts", "scripts": { - "build": "node build.js" + "build": "node build.js", + "_phase:build": "node build.js" }, "dependencies": { "@types/semver": "7.3.5", diff --git a/build-tests/api-extractor-test-03/package.json b/build-tests/api-extractor-test-03/package.json index 6ee4aec112..2817b32b0b 100644 --- a/build-tests/api-extractor-test-03/package.json +++ b/build-tests/api-extractor-test-03/package.json @@ -4,7 +4,8 @@ "version": "1.0.0", "private": true, "scripts": { - "build": "node build.js" + "build": "node build.js", + "_phase:build": "node build.js" }, "devDependencies": { "@types/jest": "27.4.0", diff --git a/build-tests/api-extractor-test-04/package.json b/build-tests/api-extractor-test-04/package.json index c546a9bdc7..0680ec6b71 100644 --- a/build-tests/api-extractor-test-04/package.json +++ b/build-tests/api-extractor-test-04/package.json @@ -6,7 +6,8 @@ "main": "lib/index.js", "typings": "dist/api-extractor-test-04.d.ts", "scripts": { - "build": "node build.js" + "build": "node build.js", + "_phase:build": "node build.js" }, "dependencies": { "@microsoft/api-extractor": "workspace:*", diff --git a/build-tests/eslint-7-test/package.json b/build-tests/eslint-7-test/package.json index 5622b3f5d0..e747fd72de 100644 --- a/build-tests/eslint-7-test/package.json +++ b/build-tests/eslint-7-test/package.json @@ -6,7 +6,8 @@ "main": "lib/index.js", "license": "MIT", "scripts": { - "build": "heft build --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests/heft-action-plugin-test/package.json b/build-tests/heft-action-plugin-test/package.json index f82daf3c61..3951447c4b 100644 --- a/build-tests/heft-action-plugin-test/package.json +++ b/build-tests/heft-action-plugin-test/package.json @@ -5,7 +5,8 @@ "private": true, "license": "MIT", "scripts": { - "build": "heft my-custom-action" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "devDependencies": { "@rushstack/heft": "workspace:*", diff --git a/build-tests/heft-action-plugin/package.json b/build-tests/heft-action-plugin/package.json index ece4a48635..a11860d49a 100644 --- a/build-tests/heft-action-plugin/package.json +++ b/build-tests/heft-action-plugin/package.json @@ -6,7 +6,8 @@ "main": "lib/index.js", "license": "MIT", "scripts": { - "build": "heft build --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests/heft-copy-files-test/package.json b/build-tests/heft-copy-files-test/package.json index 71c5e7c5e3..80338c4999 100644 --- a/build-tests/heft-copy-files-test/package.json +++ b/build-tests/heft-copy-files-test/package.json @@ -5,7 +5,8 @@ "private": true, "license": "MIT", "scripts": { - "build": "heft build --clean --verbose" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "devDependencies": { "@rushstack/heft": "workspace:*" diff --git a/build-tests/heft-example-plugin-01/package.json b/build-tests/heft-example-plugin-01/package.json index ad52bc80b8..36ede9473b 100644 --- a/build-tests/heft-example-plugin-01/package.json +++ b/build-tests/heft-example-plugin-01/package.json @@ -7,7 +7,8 @@ "typings": "./lib/index.d.ts", "scripts": { "build": "heft build --clean", - "start": "heft start" + "start": "heft start", + "_phase:build": "heft build --clean" }, "dependencies": { "tapable": "1.1.3" diff --git a/build-tests/heft-example-plugin-02/package.json b/build-tests/heft-example-plugin-02/package.json index b0188b45c3..f2bbdab1aa 100644 --- a/build-tests/heft-example-plugin-02/package.json +++ b/build-tests/heft-example-plugin-02/package.json @@ -7,7 +7,8 @@ "typings": "./lib/index.d.ts", "scripts": { "build": "heft build --clean", - "start": "heft start" + "start": "heft start", + "_phase:build": "heft build --clean" }, "peerDependencies": { "heft-example-plugin-01": "workspace:*" diff --git a/build-tests/heft-fastify-test/package.json b/build-tests/heft-fastify-test/package.json index a482e56028..069005cb51 100644 --- a/build-tests/heft-fastify-test/package.json +++ b/build-tests/heft-fastify-test/package.json @@ -8,7 +8,8 @@ "scripts": { "build": "heft build --clean", "start": "heft start --clean", - "serve": "node lib/start.js" + "serve": "node lib/start.js", + "_phase:build": "heft build --clean" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests/heft-jest-reporters-test/package.json b/build-tests/heft-jest-reporters-test/package.json index 3b4a098e06..03f843cb2a 100644 --- a/build-tests/heft-jest-reporters-test/package.json +++ b/build-tests/heft-jest-reporters-test/package.json @@ -4,8 +4,10 @@ "version": "1.0.0", "private": true, "scripts": { - "build": "heft test --clean", - "start": "heft start" + "build": "heft build --clean", + "start": "heft start", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@jest/reporters": "~27.4.2", diff --git a/build-tests/heft-minimal-rig-test/package.json b/build-tests/heft-minimal-rig-test/package.json index 6149d7194b..39df3c62c5 100644 --- a/build-tests/heft-minimal-rig-test/package.json +++ b/build-tests/heft-minimal-rig-test/package.json @@ -5,7 +5,8 @@ "private": true, "license": "MIT", "scripts": { - "build": "" + "build": "", + "_phase:build": "" }, "dependencies": { "typescript": "~4.5.2", diff --git a/build-tests/heft-minimal-rig-usage-test/package.json b/build-tests/heft-minimal-rig-usage-test/package.json index 98a42a29cb..1d90367309 100644 --- a/build-tests/heft-minimal-rig-usage-test/package.json +++ b/build-tests/heft-minimal-rig-usage-test/package.json @@ -5,7 +5,9 @@ "private": true, "license": "MIT", "scripts": { - "build": "heft test --clean --verbose" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/heft": "workspace:*", diff --git a/build-tests/heft-node-everything-esm-module-test/package.json b/build-tests/heft-node-everything-esm-module-test/package.json index 6ab9e05c45..38db09d46c 100644 --- a/build-tests/heft-node-everything-esm-module-test/package.json +++ b/build-tests/heft-node-everything-esm-module-test/package.json @@ -7,7 +7,9 @@ "type": "module", "license": "MIT", "scripts": { - "build": "heft test --clean --verbose" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@microsoft/api-extractor": "workspace:*", diff --git a/build-tests/heft-node-everything-test/package.json b/build-tests/heft-node-everything-test/package.json index 27b6431403..4269308e02 100644 --- a/build-tests/heft-node-everything-test/package.json +++ b/build-tests/heft-node-everything-test/package.json @@ -6,7 +6,9 @@ "main": "lib/index.js", "license": "MIT", "scripts": { - "build": "heft test --clean --verbose" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@microsoft/api-extractor": "workspace:*", diff --git a/build-tests/heft-parameter-plugin-test/package.json b/build-tests/heft-parameter-plugin-test/package.json index 4f202c3f3e..cef071d37b 100644 --- a/build-tests/heft-parameter-plugin-test/package.json +++ b/build-tests/heft-parameter-plugin-test/package.json @@ -5,7 +5,9 @@ "private": true, "license": "MIT", "scripts": { - "build": "heft test --clean --custom-parameter --custom-string-parameter test --custom-number-parameter 5 --custom-string-list-parameter eevee -x togepi -x mareep --custom-choice-parameter red --custom-choice-list-parameter totodile -y gudetama -y wobbuffet" + "build": "heft test --clean --custom-parameter --custom-string-parameter test --custom-number-parameter 5 --custom-string-list-parameter eevee -x togepi -x mareep --custom-choice-parameter red --custom-choice-list-parameter totodile -y gudetama -y wobbuffet", + "_phase:build": "", + "_phase:test": "heft test --custom-parameter --custom-string-parameter test --custom-number-parameter 5 --custom-string-list-parameter eevee -x togepi -x mareep --custom-choice-parameter red --custom-choice-list-parameter totodile -y gudetama -y wobbuffet" }, "devDependencies": { "@rushstack/heft": "workspace:*", diff --git a/build-tests/heft-parameter-plugin/package.json b/build-tests/heft-parameter-plugin/package.json index 875c707380..b2c706f31e 100644 --- a/build-tests/heft-parameter-plugin/package.json +++ b/build-tests/heft-parameter-plugin/package.json @@ -6,7 +6,8 @@ "main": "lib/index.js", "license": "MIT", "scripts": { - "build": "heft build --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests/heft-sass-test/package.json b/build-tests/heft-sass-test/package.json index 4514a98cac..b825476f09 100644 --- a/build-tests/heft-sass-test/package.json +++ b/build-tests/heft-sass-test/package.json @@ -4,8 +4,10 @@ "version": "1.0.0", "private": true, "scripts": { - "build": "heft test --clean", - "start": "heft start --clean" + "build": "heft build --clean", + "start": "heft start --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests/heft-typescript-composite-test/package.json b/build-tests/heft-typescript-composite-test/package.json index 5101a51360..8e30d83ec0 100644 --- a/build-tests/heft-typescript-composite-test/package.json +++ b/build-tests/heft-typescript-composite-test/package.json @@ -4,8 +4,10 @@ "version": "1.0.0", "private": true, "scripts": { - "build": "heft test --clean", - "start": "heft start" + "build": "heft build --clean", + "start": "heft start", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests/heft-web-rig-library-test/package.json b/build-tests/heft-web-rig-library-test/package.json index 473e9619d5..ef37db8463 100644 --- a/build-tests/heft-web-rig-library-test/package.json +++ b/build-tests/heft-web-rig-library-test/package.json @@ -6,7 +6,9 @@ "main": "lib/index.js", "license": "MIT", "scripts": { - "build": "heft test --clean --verbose" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/heft": "workspace:*", diff --git a/build-tests/heft-webpack4-everything-test/package.json b/build-tests/heft-webpack4-everything-test/package.json index 3bf5905c1a..c7e2294ae4 100644 --- a/build-tests/heft-webpack4-everything-test/package.json +++ b/build-tests/heft-webpack4-everything-test/package.json @@ -4,8 +4,10 @@ "version": "1.0.0", "private": true, "scripts": { - "build": "heft test --clean", - "start": "heft start" + "build": "heft build --clean", + "start": "heft start", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests/heft-webpack5-everything-test/package.json b/build-tests/heft-webpack5-everything-test/package.json index 978bbea599..bf5898aeba 100644 --- a/build-tests/heft-webpack5-everything-test/package.json +++ b/build-tests/heft-webpack5-everything-test/package.json @@ -4,8 +4,10 @@ "version": "1.0.0", "private": true, "scripts": { - "build": "heft test --clean", - "start": "heft start" + "build": "heft build --clean", + "start": "heft start", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests/install-test-workspace/package.json b/build-tests/install-test-workspace/package.json index ba7ed4c1a5..69804a656c 100644 --- a/build-tests/install-test-workspace/package.json +++ b/build-tests/install-test-workspace/package.json @@ -4,7 +4,8 @@ "version": "1.0.0", "private": true, "scripts": { - "build": "node build.js" + "build": "node build.js", + "_phase:build": "node build.js" }, "devDependencies": { "@microsoft/rush-lib": "workspace:*", diff --git a/build-tests/localization-plugin-test-01/package.json b/build-tests/localization-plugin-test-01/package.json index 47c2636366..da1eea8614 100644 --- a/build-tests/localization-plugin-test-01/package.json +++ b/build-tests/localization-plugin-test-01/package.json @@ -5,7 +5,8 @@ "private": true, "scripts": { "build": "node build.js", - "serve": "node serve.js" + "serve": "node serve.js", + "_phase:build": "node build.js" }, "dependencies": { "@rushstack/localization-plugin": "workspace:*", diff --git a/build-tests/localization-plugin-test-02/package.json b/build-tests/localization-plugin-test-02/package.json index 14196923f4..b6279eeca0 100644 --- a/build-tests/localization-plugin-test-02/package.json +++ b/build-tests/localization-plugin-test-02/package.json @@ -5,7 +5,8 @@ "private": true, "scripts": { "build": "node build.js", - "serve": "node serve.js" + "serve": "node serve.js", + "_phase:build": "node build.js" }, "dependencies": { "@rushstack/localization-plugin": "workspace:*", diff --git a/build-tests/localization-plugin-test-03/package.json b/build-tests/localization-plugin-test-03/package.json index 7039e0a2b6..6334b1471c 100644 --- a/build-tests/localization-plugin-test-03/package.json +++ b/build-tests/localization-plugin-test-03/package.json @@ -5,7 +5,8 @@ "private": true, "scripts": { "build": "node build.js", - "serve": "node serve.js" + "serve": "node serve.js", + "_phase:build": "node build.js" }, "dependencies": { "@rushstack/localization-plugin": "workspace:*", diff --git a/build-tests/rush-project-change-analyzer-test/package.json b/build-tests/rush-project-change-analyzer-test/package.json index 579fdb795c..72e61605a3 100644 --- a/build-tests/rush-project-change-analyzer-test/package.json +++ b/build-tests/rush-project-change-analyzer-test/package.json @@ -5,7 +5,8 @@ "private": true, "scripts": { "build": "heft build --clean", - "start": "heft start" + "start": "heft start", + "_phase:build": "heft build --clean" }, "dependencies": { "@microsoft/rush-lib": "workspace:*", diff --git a/build-tests/set-webpack-public-path-plugin-webpack4-test/package.json b/build-tests/set-webpack-public-path-plugin-webpack4-test/package.json index 8f8113f447..c7aff87179 100644 --- a/build-tests/set-webpack-public-path-plugin-webpack4-test/package.json +++ b/build-tests/set-webpack-public-path-plugin-webpack4-test/package.json @@ -4,8 +4,10 @@ "version": "1.0.0", "private": true, "scripts": { - "build": "heft test --clean", - "start": "heft start" + "build": "heft build --clean", + "start": "heft start", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/build-tests/ts-command-line-test/package.json b/build-tests/ts-command-line-test/package.json index 4fcc24d830..7c3a9f97f8 100644 --- a/build-tests/ts-command-line-test/package.json +++ b/build-tests/ts-command-line-test/package.json @@ -5,7 +5,8 @@ "private": true, "scripts": { "build": "node build.js", - "start": "node ./lib/start.js" + "start": "node ./lib/start.js", + "_phase:build": "node build.js" }, "devDependencies": { "@rushstack/ts-command-line": "workspace:*", diff --git a/common/config/rush/build-cache.json b/common/config/rush/build-cache.json index b21fad494a..a9e6919dba 100644 --- a/common/config/rush/build-cache.json +++ b/common/config/rush/build-cache.json @@ -23,7 +23,7 @@ * Setting this property overrides the cache entry ID. If this property is set, it must contain * a [hash] token. It may also contain a [projectName] or a [projectName:normalize] token. */ - // "cacheEntryNamePattern": "[projectName:normalize]-[hash]" + "cacheEntryNamePattern": "[projectName:normalize]-[phaseName:normalize]-[hash]", /** * Use this configuration with "cacheProvider"="azure-blob-storage" diff --git a/common/config/rush/command-line.json b/common/config/rush/command-line.json index 5d9172bd6c..92746dbea7 100644 --- a/common/config/rush/command-line.json +++ b/common/config/rush/command-line.json @@ -11,6 +11,17 @@ * "rush my-global-command --help". */ "commands": [ + { + "commandKind": "phased", + "name": "build", + "summary": "Build all projects that haven't been built, or have changed since they were last built.", + "description": "Build all projects that haven't been built, or have changed since they were last built.", + "safeForSimultaneousRushProcesses": false, + + "enableParallelism": true, + "incremental": true, + "phases": ["_phase:build", "_phase:test"] + }, // { // /** // * (Required) Determines the type of custom command. @@ -181,6 +192,25 @@ } ], + "phases": [ + { + "name": "_phase:build", + "dependencies": { + "upstream": ["_phase:build"] + }, + "ignoreMissingScript": true, + "allowWarningsOnSuccess": false + }, + { + "name": "_phase:test", + "dependencies": { + "self": ["_phase:build"] + }, + "ignoreMissingScript": true, + "allowWarningsOnSuccess": false + } + ], + /** * Custom "parameters" introduce new parameters for specified Rush command-line commands. * For example, you might define a "--production" parameter for the "rush build" command. @@ -310,12 +340,14 @@ "longName": "--no-color", "parameterKind": "flag", "description": "disable colors in the build log, defaults to 'true'", + "associatedPhases": ["_phase:build", "_phase:test"], "associatedCommands": ["build", "rebuild"] }, { "longName": "--production", "parameterKind": "flag", "description": "Perform a production build, including minification and localization steps", + "associatedPhases": ["_phase:build", "_phase:test"], "associatedCommands": ["build", "rebuild"] } ] diff --git a/common/config/rush/experiments.json b/common/config/rush/experiments.json index d9ed82466a..5004a1d5e8 100644 --- a/common/config/rush/experiments.json +++ b/common/config/rush/experiments.json @@ -15,7 +15,7 @@ * By default, 'rush update' passes --no-prefer-frozen-lockfile to 'pnpm install'. * Set this option to true to pass '--prefer-frozen-lockfile' instead to minimize shrinkwrap changes. */ - "usePnpmPreferFrozenLockfileForRushUpdate": true + "usePnpmPreferFrozenLockfileForRushUpdate": true, /** * If using the 'preventManualShrinkwrapChanges' option, restricts the hash to only include the layout of external dependencies. @@ -35,4 +35,10 @@ * This will not replay warnings from the cached build. */ // "buildCacheWithAllowWarningsInSuccessfulBuild": true + + /** + * If true, the phased commands feature is enabled. To use this feature, create a "phased" command + * in common/config/rush/command-line.json. + */ + "phasedCommands": true } diff --git a/common/config/rush/rush-plugins.json b/common/config/rush/rush-plugins.json new file mode 100644 index 0000000000..fbc34d4c91 --- /dev/null +++ b/common/config/rush/rush-plugins.json @@ -0,0 +1,25 @@ +/** + * This configuration file manages Rush's plugin feature. + */ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush-plugins.schema.json", + "plugins": [ + /** + * Each item defines a plugin configuration used by Rush. + */ + // { + // /** + // * The name of the rush plugin package. + // */ + // "packageName": "@scope/my-rush-plugin", + // /** + // * The name of the plugin provided by rush plugin package + // */ + // "pluginName": "my-plugin-name", + // /** + // * Autoinstaller name used to install the plugin. + // */ + // "autoinstallerName": "plugins" + // } + ] +} diff --git a/eslint/eslint-config/package.json b/eslint/eslint-config/package.json index 722b21a22d..758adfa325 100644 --- a/eslint/eslint-config/package.json +++ b/eslint/eslint-config/package.json @@ -10,7 +10,8 @@ }, "homepage": "https://rushstack.io", "scripts": { - "build": "" + "build": "", + "_phase:build": "" }, "keywords": [ "eslint", diff --git a/eslint/eslint-patch/package.json b/eslint/eslint-patch/package.json index d4bf51a7d3..9a403891ea 100644 --- a/eslint/eslint-patch/package.json +++ b/eslint/eslint-patch/package.json @@ -11,7 +11,8 @@ }, "homepage": "https://rushstack.io", "scripts": { - "build": "heft build --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "keywords": [ "eslintrc", diff --git a/eslint/eslint-plugin-packlets/package.json b/eslint/eslint-plugin-packlets/package.json index 24142c0e20..a5a181f50d 100644 --- a/eslint/eslint-plugin-packlets/package.json +++ b/eslint/eslint-plugin-packlets/package.json @@ -18,7 +18,9 @@ "main": "lib/index.js", "typings": "lib/index.d.ts", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "@rushstack/tree-pattern": "workspace:*", diff --git a/eslint/eslint-plugin-security/package.json b/eslint/eslint-plugin-security/package.json index 156b3c4331..ff9362487a 100644 --- a/eslint/eslint-plugin-security/package.json +++ b/eslint/eslint-plugin-security/package.json @@ -17,7 +17,9 @@ "main": "lib/index.js", "typings": "lib/index.d.ts", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "@rushstack/tree-pattern": "workspace:*", diff --git a/eslint/eslint-plugin/package.json b/eslint/eslint-plugin/package.json index da9f9a31cc..90322da0c6 100644 --- a/eslint/eslint-plugin/package.json +++ b/eslint/eslint-plugin/package.json @@ -21,7 +21,9 @@ "main": "lib/index.js", "typings": "lib/index.d.ts", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "@rushstack/tree-pattern": "workspace:*", diff --git a/heft-plugins/heft-dev-cert-plugin/package.json b/heft-plugins/heft-dev-cert-plugin/package.json index 7ff2cb39fc..b3f38298e1 100644 --- a/heft-plugins/heft-dev-cert-plugin/package.json +++ b/heft-plugins/heft-dev-cert-plugin/package.json @@ -12,8 +12,10 @@ "types": "dist/heft-dev-cert-plugin.d.ts", "license": "MIT", "scripts": { - "build": "heft test --clean", - "start": "heft test --clean --watch" + "build": "heft build --clean", + "start": "heft test --clean --watch", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "peerDependencies": { "@rushstack/heft": "^0.44.2" diff --git a/heft-plugins/heft-jest-plugin/package.json b/heft-plugins/heft-jest-plugin/package.json index f825e51d87..4e88a17949 100644 --- a/heft-plugins/heft-jest-plugin/package.json +++ b/heft-plugins/heft-jest-plugin/package.json @@ -12,8 +12,10 @@ "types": "dist/heft-jest-plugin.d.ts", "license": "MIT", "scripts": { - "build": "heft test --clean", - "start": "heft test --clean --watch" + "build": "heft build --clean", + "start": "heft test --clean --watch", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "peerDependencies": { "@rushstack/heft": "^0.44.2" diff --git a/heft-plugins/heft-sass-plugin/package.json b/heft-plugins/heft-sass-plugin/package.json index c0214152a4..b6078a9951 100644 --- a/heft-plugins/heft-sass-plugin/package.json +++ b/heft-plugins/heft-sass-plugin/package.json @@ -12,8 +12,10 @@ "types": "dist/heft-sass-plugin.d.ts", "license": "MIT", "scripts": { - "build": "heft test --clean", - "start": "heft test --clean --watch" + "build": "heft build --clean", + "start": "heft test --clean --watch", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "peerDependencies": { "@rushstack/heft": "^0.44.2" diff --git a/heft-plugins/heft-storybook-plugin/package.json b/heft-plugins/heft-storybook-plugin/package.json index 5850012f48..0c1bb6556f 100644 --- a/heft-plugins/heft-storybook-plugin/package.json +++ b/heft-plugins/heft-storybook-plugin/package.json @@ -12,8 +12,10 @@ "types": "dist/heft-storybook-plugin.d.ts", "license": "MIT", "scripts": { - "build": "heft test --clean", - "start": "heft test --clean --watch" + "build": "heft build --clean", + "start": "heft test --clean --watch", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "peerDependencies": { "@rushstack/heft": "^0.44.2" diff --git a/heft-plugins/heft-webpack4-plugin/package.json b/heft-plugins/heft-webpack4-plugin/package.json index 243e8848b5..7c8a25d165 100644 --- a/heft-plugins/heft-webpack4-plugin/package.json +++ b/heft-plugins/heft-webpack4-plugin/package.json @@ -12,8 +12,10 @@ "types": "dist/heft-webpack4-plugin.d.ts", "license": "MIT", "scripts": { - "build": "heft test --clean", - "start": "heft test --clean --watch" + "build": "heft build --clean", + "start": "heft test --clean --watch", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "peerDependencies": { "@rushstack/heft": "^0.44.2" diff --git a/heft-plugins/heft-webpack5-plugin/package.json b/heft-plugins/heft-webpack5-plugin/package.json index 8b40f2a03a..3c41709ad5 100644 --- a/heft-plugins/heft-webpack5-plugin/package.json +++ b/heft-plugins/heft-webpack5-plugin/package.json @@ -12,8 +12,10 @@ "types": "dist/heft-webpack5-plugin.d.ts", "license": "MIT", "scripts": { - "build": "heft test --clean", - "start": "heft test --clean --watch" + "build": "heft build --clean", + "start": "heft test --clean --watch", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "peerDependencies": { "@rushstack/heft": "^0.44.2" diff --git a/libraries/debug-certificate-manager/package.json b/libraries/debug-certificate-manager/package.json index 58c3ca1c10..5aadc6f0db 100644 --- a/libraries/debug-certificate-manager/package.json +++ b/libraries/debug-certificate-manager/package.json @@ -11,7 +11,8 @@ "directory": "libraries/debug-certificate-manager" }, "scripts": { - "build": "heft build --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "dependencies": { "@rushstack/node-core-library": "workspace:*", diff --git a/libraries/heft-config-file/package.json b/libraries/heft-config-file/package.json index d96cb8a867..b03df62c1e 100644 --- a/libraries/heft-config-file/package.json +++ b/libraries/heft-config-file/package.json @@ -15,8 +15,10 @@ "types": "dist/heft-config-file.d.ts", "license": "MIT", "scripts": { - "build": "heft test --clean", - "start": "heft test --clean --watch" + "build": "heft build --clean", + "start": "heft test --clean --watch", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "@rushstack/node-core-library": "workspace:*", diff --git a/libraries/load-themed-styles/package.json b/libraries/load-themed-styles/package.json index 2e5ace912e..65d4319cef 100644 --- a/libraries/load-themed-styles/package.json +++ b/libraries/load-themed-styles/package.json @@ -9,7 +9,8 @@ "directory": "libraries/load-themed-styles" }, "scripts": { - "build": "heft build --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "main": "lib/index.js", "module": "lib-es6/index.js", diff --git a/libraries/node-core-library/package.json b/libraries/node-core-library/package.json index 77949f2f76..3e63abaa39 100644 --- a/libraries/node-core-library/package.json +++ b/libraries/node-core-library/package.json @@ -11,7 +11,9 @@ "directory": "libraries/node-core-library" }, "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "@types/node": "12.20.24", diff --git a/libraries/package-deps-hash/package.json b/libraries/package-deps-hash/package.json index 0b7d8d8fc8..1fcb0f1c76 100644 --- a/libraries/package-deps-hash/package.json +++ b/libraries/package-deps-hash/package.json @@ -11,7 +11,9 @@ "directory": "libraries/package-deps-hash" }, "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/eslint-config": "workspace:*", diff --git a/libraries/rig-package/package.json b/libraries/rig-package/package.json index 36139fdac4..9b65d0577c 100644 --- a/libraries/rig-package/package.json +++ b/libraries/rig-package/package.json @@ -11,7 +11,9 @@ "directory": "libraries/rig-package" }, "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "resolve": "~1.17.0", diff --git a/libraries/rush-sdk/package.json b/libraries/rush-sdk/package.json index 23441cd3ca..358e1a3643 100644 --- a/libraries/rush-sdk/package.json +++ b/libraries/rush-sdk/package.json @@ -11,7 +11,9 @@ "main": "lib/index.js", "typings": "dist/rush-lib.d.ts", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "license": "MIT", "dependencies": { diff --git a/libraries/rushell/package.json b/libraries/rushell/package.json index 9a2477fad0..79af08d4f9 100644 --- a/libraries/rushell/package.json +++ b/libraries/rushell/package.json @@ -10,8 +10,10 @@ "main": "lib/index.js", "typings": "dist/rushell.d.ts", "scripts": { - "build": "heft test --clean", - "start": "heft test --watch" + "build": "heft build --clean", + "start": "heft test --watch", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "license": "MIT", "dependencies": { diff --git a/libraries/stream-collator/package.json b/libraries/stream-collator/package.json index a4dd1f3a9c..7b956ab51a 100644 --- a/libraries/stream-collator/package.json +++ b/libraries/stream-collator/package.json @@ -10,7 +10,9 @@ "main": "lib/index.js", "typings": "dist/stream-collator.d.ts", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "license": "MIT", "dependencies": { diff --git a/libraries/terminal/package.json b/libraries/terminal/package.json index 6f1ad7e014..cadc300103 100644 --- a/libraries/terminal/package.json +++ b/libraries/terminal/package.json @@ -11,7 +11,9 @@ "directory": "libraries/terminal" }, "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "@rushstack/node-core-library": "workspace:*", diff --git a/libraries/tree-pattern/package.json b/libraries/tree-pattern/package.json index b664578bd1..06804ad8d2 100644 --- a/libraries/tree-pattern/package.json +++ b/libraries/tree-pattern/package.json @@ -11,7 +11,9 @@ "directory": "libraries/tree-pattern" }, "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "devDependencies": { "@rushstack/eslint-config": "2.5.1", diff --git a/libraries/ts-command-line/package.json b/libraries/ts-command-line/package.json index b1ca9d2593..6c88e8e828 100644 --- a/libraries/ts-command-line/package.json +++ b/libraries/ts-command-line/package.json @@ -10,7 +10,9 @@ "main": "lib/index.js", "typings": "dist/ts-command-line.d.ts", "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "license": "MIT", "dependencies": { diff --git a/libraries/typings-generator/package.json b/libraries/typings-generator/package.json index 4871d0e60d..ddefc6f173 100644 --- a/libraries/typings-generator/package.json +++ b/libraries/typings-generator/package.json @@ -16,7 +16,8 @@ "directory": "libraries/typings-generator" }, "scripts": { - "build": "heft build --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "dependencies": { "@rushstack/node-core-library": "workspace:*", diff --git a/repo-scripts/doc-plugin-rush-stack/package.json b/repo-scripts/doc-plugin-rush-stack/package.json index 7072082c6f..e6fcea8e77 100644 --- a/repo-scripts/doc-plugin-rush-stack/package.json +++ b/repo-scripts/doc-plugin-rush-stack/package.json @@ -7,7 +7,8 @@ "typings": "lib/index.d.ts", "license": "MIT", "scripts": { - "build": "heft build --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "dependencies": { "@microsoft/api-documenter": "workspace:*", diff --git a/repo-scripts/generate-api-docs/package.json b/repo-scripts/generate-api-docs/package.json index fb639b8286..4ee77ab819 100644 --- a/repo-scripts/generate-api-docs/package.json +++ b/repo-scripts/generate-api-docs/package.json @@ -5,7 +5,8 @@ "description": "Used to generate API docs for the rushstack.io website", "license": "MIT", "scripts": { - "build": "" + "build": "", + "_phase:build": "" }, "devDependencies": { "@microsoft/api-documenter": "workspace:*", diff --git a/repo-scripts/repo-toolbox/package.json b/repo-scripts/repo-toolbox/package.json index 45e7213cb6..ef2faf548f 100644 --- a/repo-scripts/repo-toolbox/package.json +++ b/repo-scripts/repo-toolbox/package.json @@ -6,7 +6,8 @@ "license": "MIT", "scripts": { "build": "heft build --clean", - "readme": "node ./lib/start.js readme" + "readme": "node ./lib/start.js readme", + "_phase:build": "heft build --clean" }, "dependencies": { "@microsoft/rush-lib": "workspace:*", diff --git a/rigs/heft-node-rig/package.json b/rigs/heft-node-rig/package.json index 63f5ca01be..ee20e4ba97 100644 --- a/rigs/heft-node-rig/package.json +++ b/rigs/heft-node-rig/package.json @@ -4,7 +4,8 @@ "description": "A rig package for Node.js projects that build using Heft", "license": "MIT", "scripts": { - "build": "" + "build": "", + "_phase:build": "" }, "repository": { "type": "git", diff --git a/rigs/heft-web-rig/package.json b/rigs/heft-web-rig/package.json index fbc7ba48ed..134e0f764e 100644 --- a/rigs/heft-web-rig/package.json +++ b/rigs/heft-web-rig/package.json @@ -4,7 +4,8 @@ "description": "A rig package for web browser projects that build using Heft", "license": "MIT", "scripts": { - "build": "" + "build": "", + "_phase:build": "" }, "repository": { "type": "git", diff --git a/rush-plugins/rush-amazon-s3-build-cache-plugin/package.json b/rush-plugins/rush-amazon-s3-build-cache-plugin/package.json index 0c2fb03858..2c0b1c27b1 100644 --- a/rush-plugins/rush-amazon-s3-build-cache-plugin/package.json +++ b/rush-plugins/rush-amazon-s3-build-cache-plugin/package.json @@ -11,8 +11,10 @@ "types": "lib/index.d.ts", "license": "MIT", "scripts": { - "build": "heft test --clean", - "start": "heft test --clean --watch" + "build": "heft build --clean", + "start": "heft test --clean --watch", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "@rushstack/node-core-library": "workspace:*", diff --git a/rush-plugins/rush-azure-storage-build-cache-plugin/package.json b/rush-plugins/rush-azure-storage-build-cache-plugin/package.json index 08324b3a45..e87856f121 100644 --- a/rush-plugins/rush-azure-storage-build-cache-plugin/package.json +++ b/rush-plugins/rush-azure-storage-build-cache-plugin/package.json @@ -11,8 +11,10 @@ "types": "lib/index.d.ts", "license": "MIT", "scripts": { - "build": "heft test --clean", - "start": "heft test --clean --watch" + "build": "heft build --clean", + "start": "heft test --clean --watch", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "@azure/identity": "~1.0.0", diff --git a/rush.json b/rush.json index 41646ceb4b..2aeea9b069 100644 --- a/rush.json +++ b/rush.json @@ -285,7 +285,7 @@ * your PR branch, and in this situation "rush change" will also automatically invoke "git fetch" * to retrieve the latest activity for the remote master branch. */ - "url": "https://github.com/microsoft/rushstack.git" + "urls": ["https://github.com/microsoft/rushstack.git"] /** * The default branch name. This tells "rush change" which remote branch to compare against. @@ -440,7 +440,6 @@ // */ // // "versionPolicyName": "" // }, - // // "apps" folder (alphabetical order) { diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json index 36ad15c57a..5e4b3837b5 100644 --- a/webpack/loader-load-themed-styles/package.json +++ b/webpack/loader-load-themed-styles/package.json @@ -11,7 +11,9 @@ "directory": "webpack/loader-load-themed-styles" }, "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "@microsoft/load-themed-styles": "workspace:*", diff --git a/webpack/loader-raw-script/package.json b/webpack/loader-raw-script/package.json index 05b73e09c1..8187f5b847 100644 --- a/webpack/loader-raw-script/package.json +++ b/webpack/loader-raw-script/package.json @@ -11,7 +11,9 @@ "directory": "webpack/loader-raw-script" }, "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "dependencies": { "loader-utils": "~1.1.0" diff --git a/webpack/localization-plugin/package.json b/webpack/localization-plugin/package.json index 2954f1c2e0..8c5896c809 100644 --- a/webpack/localization-plugin/package.json +++ b/webpack/localization-plugin/package.json @@ -11,7 +11,8 @@ "directory": "webpack/localization-plugin" }, "scripts": { - "build": "heft build --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "peerDependencies": { "@rushstack/set-webpack-public-path-plugin": "^3.3.13", diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json index ed47cd8775..fa4862049d 100644 --- a/webpack/module-minifier-plugin/package.json +++ b/webpack/module-minifier-plugin/package.json @@ -14,7 +14,9 @@ "node": ">=10.17.1" }, "scripts": { - "build": "heft test --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean", + "_phase:test": "heft test --no-build" }, "peerDependencies": { "@types/webpack": "*", diff --git a/webpack/set-webpack-public-path-plugin/package.json b/webpack/set-webpack-public-path-plugin/package.json index cdaf3b33be..2bec27f703 100644 --- a/webpack/set-webpack-public-path-plugin/package.json +++ b/webpack/set-webpack-public-path-plugin/package.json @@ -11,7 +11,8 @@ "directory": "webpack/set-webpack-public-path-plugin" }, "scripts": { - "build": "heft build --clean" + "build": "heft build --clean", + "_phase:build": "heft build --clean" }, "peerDependencies": { "@types/webpack": "^4.39.8",