From 434decbb2c1750b1322aea129bfcce55f74542d9 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Thu, 6 Jan 2022 19:11:55 -0800 Subject: [PATCH 1/9] Add _phase:build configurations to rush-project in rigs. --- .../profiles/default/config/rush-project.json | 9 ++++++++- .../profiles/library/config/rush-project.json | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/rigs/heft-node-rig/profiles/default/config/rush-project.json b/rigs/heft-node-rig/profiles/default/config/rush-project.json index a89bd445596..06758bcd397 100644 --- a/rigs/heft-node-rig/profiles/default/config/rush-project.json +++ b/rigs/heft-node-rig/profiles/default/config/rush-project.json @@ -1,3 +1,10 @@ { - "projectOutputFolderNames": ["dist", "lib", "temp"] + "projectOutputFolderNames": ["dist", "lib", "temp"], + + "phaseOptions": [ + { + "phaseName": "_phase:build", + "projectOutputFolderNames": ["dist", "lib", "temp"] + } + ] } diff --git a/rigs/heft-web-rig/profiles/library/config/rush-project.json b/rigs/heft-web-rig/profiles/library/config/rush-project.json index e63d6d0b41d..0d24600eece 100644 --- a/rigs/heft-web-rig/profiles/library/config/rush-project.json +++ b/rigs/heft-web-rig/profiles/library/config/rush-project.json @@ -1,3 +1,10 @@ { - "projectOutputFolderNames": ["dist", "lib", "lib-commonjs", "temp"] + "projectOutputFolderNames": ["dist", "lib", "lib-commonjs", "temp"], + + "phaseOptions": [ + { + "phaseName": "_phase:build", + "projectOutputFolderNames": ["dist", "lib", "lib-commonjs", "temp"] + } + ] } From 58bdbc8e8c2bf3e5e56c9c97422c8216a3073c41 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Thu, 6 Jan 2022 19:13:54 -0800 Subject: [PATCH 2/9] Rush change. --- .../heft-node-rig/phasify-rigs_2022-01-07-03-12.json | 10 ++++++++++ .../heft-web-rig/phasify-rigs_2022-01-07-03-12.json | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 common/changes/@rushstack/heft-node-rig/phasify-rigs_2022-01-07-03-12.json create mode 100644 common/changes/@rushstack/heft-web-rig/phasify-rigs_2022-01-07-03-12.json diff --git a/common/changes/@rushstack/heft-node-rig/phasify-rigs_2022-01-07-03-12.json b/common/changes/@rushstack/heft-node-rig/phasify-rigs_2022-01-07-03-12.json new file mode 100644 index 00000000000..f3c63b02312 --- /dev/null +++ b/common/changes/@rushstack/heft-node-rig/phasify-rigs_2022-01-07-03-12.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/heft-node-rig", + "comment": "Add a \"_phase:build\" cache configuration to config/rush-project.json.", + "type": "minor" + } + ], + "packageName": "@rushstack/heft-node-rig" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-web-rig/phasify-rigs_2022-01-07-03-12.json b/common/changes/@rushstack/heft-web-rig/phasify-rigs_2022-01-07-03-12.json new file mode 100644 index 00000000000..ca6077ad75e --- /dev/null +++ b/common/changes/@rushstack/heft-web-rig/phasify-rigs_2022-01-07-03-12.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/heft-web-rig", + "comment": "Add a \"_phase:build\" cache configuration to config/rush-project.json.", + "type": "minor" + } + ], + "packageName": "@rushstack/heft-web-rig" +} \ No newline at end of file From 9e2f537b51cba1d5252020562d060d1fa866ae62 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Mon, 17 Jan 2022 13:17:12 -0800 Subject: [PATCH 3/9] Update rush-project.json to follow new schema. --- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../eslint-7-test/config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 33 +++++++++---------- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../heft-sass-test/config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- eslint/eslint-config/config/rush-project.json | 7 +++- .../heft-jest-plugin/config/rush-project.json | 7 +++- .../config/rush-project.json | 7 +++- .../profiles/default/config/rush-project.json | 12 ++++--- .../profiles/library/config/rush-project.json | 12 ++++--- 44 files changed, 275 insertions(+), 69 deletions(-) diff --git a/build-tests-samples/heft-node-basic-tutorial/config/rush-project.json b/build-tests-samples/heft-node-basic-tutorial/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests-samples/heft-node-basic-tutorial/config/rush-project.json +++ b/build-tests-samples/heft-node-basic-tutorial/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests-samples/heft-node-jest-tutorial/config/rush-project.json b/build-tests-samples/heft-node-jest-tutorial/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests-samples/heft-node-jest-tutorial/config/rush-project.json +++ b/build-tests-samples/heft-node-jest-tutorial/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests-samples/heft-storybook-react-tutorial/config/rush-project.json b/build-tests-samples/heft-storybook-react-tutorial/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests-samples/heft-storybook-react-tutorial/config/rush-project.json +++ b/build-tests-samples/heft-storybook-react-tutorial/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests-samples/heft-webpack-basic-tutorial/config/rush-project.json b/build-tests-samples/heft-webpack-basic-tutorial/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests-samples/heft-webpack-basic-tutorial/config/rush-project.json +++ b/build-tests-samples/heft-webpack-basic-tutorial/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests-samples/packlets-tutorial/config/rush-project.json b/build-tests-samples/packlets-tutorial/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests-samples/packlets-tutorial/config/rush-project.json +++ b/build-tests-samples/packlets-tutorial/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/api-documenter-test/config/rush-project.json b/build-tests/api-documenter-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/api-documenter-test/config/rush-project.json +++ b/build-tests/api-documenter-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/api-extractor-lib1-test/config/rush-project.json b/build-tests/api-extractor-lib1-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/api-extractor-lib1-test/config/rush-project.json +++ b/build-tests/api-extractor-lib1-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/api-extractor-lib2-test/config/rush-project.json b/build-tests/api-extractor-lib2-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/api-extractor-lib2-test/config/rush-project.json +++ b/build-tests/api-extractor-lib2-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/api-extractor-lib3-test/config/rush-project.json b/build-tests/api-extractor-lib3-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/api-extractor-lib3-test/config/rush-project.json +++ b/build-tests/api-extractor-lib3-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/api-extractor-scenarios/config/rush-project.json b/build-tests/api-extractor-scenarios/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/api-extractor-scenarios/config/rush-project.json +++ b/build-tests/api-extractor-scenarios/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/api-extractor-test-01/config/rush-project.json b/build-tests/api-extractor-test-01/config/rush-project.json index fba291db2b2..317ec878bc3 100644 --- a/build-tests/api-extractor-test-01/config/rush-project.json +++ b/build-tests/api-extractor-test-01/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib"] + } + ] } diff --git a/build-tests/api-extractor-test-02/config/rush-project.json b/build-tests/api-extractor-test-02/config/rush-project.json index fba291db2b2..317ec878bc3 100644 --- a/build-tests/api-extractor-test-02/config/rush-project.json +++ b/build-tests/api-extractor-test-02/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib"] + } + ] } diff --git a/build-tests/api-extractor-test-03/config/rush-project.json b/build-tests/api-extractor-test-03/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/api-extractor-test-03/config/rush-project.json +++ b/build-tests/api-extractor-test-03/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/api-extractor-test-04/config/rush-project.json b/build-tests/api-extractor-test-04/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/api-extractor-test-04/config/rush-project.json +++ b/build-tests/api-extractor-test-04/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/eslint-7-test/config/rush-project.json b/build-tests/eslint-7-test/config/rush-project.json index fba291db2b2..317ec878bc3 100644 --- a/build-tests/eslint-7-test/config/rush-project.json +++ b/build-tests/eslint-7-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib"] + } + ] } diff --git a/build-tests/heft-action-plugin-test/config/rush-project.json b/build-tests/heft-action-plugin-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-action-plugin-test/config/rush-project.json +++ b/build-tests/heft-action-plugin-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/heft-action-plugin/config/rush-project.json b/build-tests/heft-action-plugin/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-action-plugin/config/rush-project.json +++ b/build-tests/heft-action-plugin/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/heft-copy-files-test/config/rush-project.json b/build-tests/heft-copy-files-test/config/rush-project.json index 764ac188e5e..358d65d92c6 100644 --- a/build-tests/heft-copy-files-test/config/rush-project.json +++ b/build-tests/heft-copy-files-test/config/rush-project.json @@ -1,21 +1,18 @@ { - "projectOutputFolderNames": [ - "out-all", - - "out-all-except-for-images", - - "out-all-linked", - - "out-images-flattened", - - "out-images1", - - "out-images2", - - "out-images3", - - "out-images4", - - "out-images5" + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": [ + "out-all", + "out-all-except-for-images", + "out-all-linked", + "out-images-flattened", + "out-images1", + "out-images2", + "out-images3", + "out-images4", + "out-images5" + ] + } ] } diff --git a/build-tests/heft-example-plugin-01/config/rush-project.json b/build-tests/heft-example-plugin-01/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-example-plugin-01/config/rush-project.json +++ b/build-tests/heft-example-plugin-01/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/heft-example-plugin-02/config/rush-project.json b/build-tests/heft-example-plugin-02/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-example-plugin-02/config/rush-project.json +++ b/build-tests/heft-example-plugin-02/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/heft-fastify-test/config/rush-project.json b/build-tests/heft-fastify-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-fastify-test/config/rush-project.json +++ b/build-tests/heft-fastify-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/heft-jest-reporters-test/config/rush-project.json b/build-tests/heft-jest-reporters-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-jest-reporters-test/config/rush-project.json +++ b/build-tests/heft-jest-reporters-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/heft-minimal-rig-test/config/rush-project.json b/build-tests/heft-minimal-rig-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-minimal-rig-test/config/rush-project.json +++ b/build-tests/heft-minimal-rig-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/heft-minimal-rig-usage-test/config/rush-project.json b/build-tests/heft-minimal-rig-usage-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-minimal-rig-usage-test/config/rush-project.json +++ b/build-tests/heft-minimal-rig-usage-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/heft-node-everything-esm-module-test/config/rush-project.json b/build-tests/heft-node-everything-esm-module-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-node-everything-esm-module-test/config/rush-project.json +++ b/build-tests/heft-node-everything-esm-module-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/heft-node-everything-test/config/rush-project.json b/build-tests/heft-node-everything-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-node-everything-test/config/rush-project.json +++ b/build-tests/heft-node-everything-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/heft-parameter-plugin-test/config/rush-project.json b/build-tests/heft-parameter-plugin-test/config/rush-project.json index fba291db2b2..317ec878bc3 100644 --- a/build-tests/heft-parameter-plugin-test/config/rush-project.json +++ b/build-tests/heft-parameter-plugin-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib"] + } + ] } diff --git a/build-tests/heft-parameter-plugin/config/rush-project.json b/build-tests/heft-parameter-plugin/config/rush-project.json index fba291db2b2..317ec878bc3 100644 --- a/build-tests/heft-parameter-plugin/config/rush-project.json +++ b/build-tests/heft-parameter-plugin/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib"] + } + ] } diff --git a/build-tests/heft-sass-test/config/rush-project.json b/build-tests/heft-sass-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-sass-test/config/rush-project.json +++ b/build-tests/heft-sass-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/heft-typescript-composite-test/config/rush-project.json b/build-tests/heft-typescript-composite-test/config/rush-project.json index fba291db2b2..317ec878bc3 100644 --- a/build-tests/heft-typescript-composite-test/config/rush-project.json +++ b/build-tests/heft-typescript-composite-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib"] + } + ] } diff --git a/build-tests/heft-webpack4-everything-test/config/rush-project.json b/build-tests/heft-webpack4-everything-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-webpack4-everything-test/config/rush-project.json +++ b/build-tests/heft-webpack4-everything-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/heft-webpack5-everything-test/config/rush-project.json b/build-tests/heft-webpack5-everything-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/heft-webpack5-everything-test/config/rush-project.json +++ b/build-tests/heft-webpack5-everything-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/install-test-workspace/workspace/typescript-newest-test/config/rush-project.json b/build-tests/install-test-workspace/workspace/typescript-newest-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/install-test-workspace/workspace/typescript-newest-test/config/rush-project.json +++ b/build-tests/install-test-workspace/workspace/typescript-newest-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/install-test-workspace/workspace/typescript-v3-test/config/rush-project.json b/build-tests/install-test-workspace/workspace/typescript-v3-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/install-test-workspace/workspace/typescript-v3-test/config/rush-project.json +++ b/build-tests/install-test-workspace/workspace/typescript-v3-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/localization-plugin-test-01/config/rush-project.json b/build-tests/localization-plugin-test-01/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/localization-plugin-test-01/config/rush-project.json +++ b/build-tests/localization-plugin-test-01/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/localization-plugin-test-02/config/rush-project.json b/build-tests/localization-plugin-test-02/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/localization-plugin-test-02/config/rush-project.json +++ b/build-tests/localization-plugin-test-02/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/localization-plugin-test-03/config/rush-project.json b/build-tests/localization-plugin-test-03/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/localization-plugin-test-03/config/rush-project.json +++ b/build-tests/localization-plugin-test-03/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/build-tests/set-webpack-public-path-plugin-webpack4-test/config/rush-project.json b/build-tests/set-webpack-public-path-plugin-webpack4-test/config/rush-project.json index 8ebb250208b..c861eda9bd6 100644 --- a/build-tests/set-webpack-public-path-plugin-webpack4-test/config/rush-project.json +++ b/build-tests/set-webpack-public-path-plugin-webpack4-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist-dev", "dist-prod"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist-dev", "dist-prod"] + } + ] } diff --git a/build-tests/ts-command-line-test/config/rush-project.json b/build-tests/ts-command-line-test/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/build-tests/ts-command-line-test/config/rush-project.json +++ b/build-tests/ts-command-line-test/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/eslint/eslint-config/config/rush-project.json b/eslint/eslint-config/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/eslint/eslint-config/config/rush-project.json +++ b/eslint/eslint-config/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/heft-plugins/heft-jest-plugin/config/rush-project.json b/heft-plugins/heft-jest-plugin/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/heft-plugins/heft-jest-plugin/config/rush-project.json +++ b/heft-plugins/heft-jest-plugin/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/repo-scripts/generate-api-docs/config/rush-project.json b/repo-scripts/generate-api-docs/config/rush-project.json index 61e414685c1..247dc17187a 100644 --- a/repo-scripts/generate-api-docs/config/rush-project.json +++ b/repo-scripts/generate-api-docs/config/rush-project.json @@ -1,3 +1,8 @@ { - "projectOutputFolderNames": ["lib", "dist"] + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "dist"] + } + ] } diff --git a/rigs/heft-node-rig/profiles/default/config/rush-project.json b/rigs/heft-node-rig/profiles/default/config/rush-project.json index 06758bcd397..9b9649b9eeb 100644 --- a/rigs/heft-node-rig/profiles/default/config/rush-project.json +++ b/rigs/heft-node-rig/profiles/default/config/rush-project.json @@ -1,10 +1,12 @@ { - "projectOutputFolderNames": ["dist", "lib", "temp"], - - "phaseOptions": [ + "operationSettings": [ { - "phaseName": "_phase:build", - "projectOutputFolderNames": ["dist", "lib", "temp"] + "operationName": "_phase:build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + }, + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] } ] } diff --git a/rigs/heft-web-rig/profiles/library/config/rush-project.json b/rigs/heft-web-rig/profiles/library/config/rush-project.json index 0d24600eece..bce265a4f3f 100644 --- a/rigs/heft-web-rig/profiles/library/config/rush-project.json +++ b/rigs/heft-web-rig/profiles/library/config/rush-project.json @@ -1,10 +1,12 @@ { - "projectOutputFolderNames": ["dist", "lib", "lib-commonjs", "temp"], - - "phaseOptions": [ + "operationSettings": [ { - "phaseName": "_phase:build", - "projectOutputFolderNames": ["dist", "lib", "lib-commonjs", "temp"] + "operationName": "_phase:build", + "outputFolderNames": ["dist", "lib", "lib-commonjs", "temp"] + }, + { + "operationName": "build", + "outputFolderNames": ["dist", "lib", "lib-commonjs", "temp"] } ] } From 7ec3cabb5efd7e0b0b33d210c6c80c08ec3aadde Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Mon, 17 Jan 2022 13:19:02 -0800 Subject: [PATCH 4/9] TEMPORARY - Update rush-project.json files in projects with cyclic dependencies on @rushstack/heft-node-rig --- apps/api-extractor-model/config/rush-project.json | 8 ++++++++ apps/api-extractor/config/rush-project.json | 8 ++++++++ apps/heft/config/rush-project.json | 8 ++++++++ eslint/eslint-patch/config/rush-project.json | 8 ++++++++ eslint/eslint-plugin-packlets/config/rush-project.json | 8 ++++++++ eslint/eslint-plugin-security/config/rush-project.json | 8 ++++++++ eslint/eslint-plugin/config/rush-project.json | 8 ++++++++ libraries/heft-config-file/config/rush-project.json | 8 ++++++++ libraries/node-core-library/config/rush-project.json | 8 ++++++++ libraries/rig-package/config/rush-project.json | 8 ++++++++ libraries/tree-pattern/config/rush-project.json | 8 ++++++++ libraries/ts-command-line/config/rush-project.json | 8 ++++++++ 12 files changed, 96 insertions(+) create mode 100644 apps/api-extractor-model/config/rush-project.json create mode 100644 apps/api-extractor/config/rush-project.json create mode 100644 apps/heft/config/rush-project.json create mode 100644 eslint/eslint-patch/config/rush-project.json create mode 100644 eslint/eslint-plugin-packlets/config/rush-project.json create mode 100644 eslint/eslint-plugin-security/config/rush-project.json create mode 100644 eslint/eslint-plugin/config/rush-project.json create mode 100644 libraries/heft-config-file/config/rush-project.json create mode 100644 libraries/node-core-library/config/rush-project.json create mode 100644 libraries/rig-package/config/rush-project.json create mode 100644 libraries/tree-pattern/config/rush-project.json create mode 100644 libraries/ts-command-line/config/rush-project.json diff --git a/apps/api-extractor-model/config/rush-project.json b/apps/api-extractor-model/config/rush-project.json new file mode 100644 index 00000000000..78286e7880a --- /dev/null +++ b/apps/api-extractor-model/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + } + ] +} diff --git a/apps/api-extractor/config/rush-project.json b/apps/api-extractor/config/rush-project.json new file mode 100644 index 00000000000..78286e7880a --- /dev/null +++ b/apps/api-extractor/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + } + ] +} diff --git a/apps/heft/config/rush-project.json b/apps/heft/config/rush-project.json new file mode 100644 index 00000000000..78286e7880a --- /dev/null +++ b/apps/heft/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + } + ] +} diff --git a/eslint/eslint-patch/config/rush-project.json b/eslint/eslint-patch/config/rush-project.json new file mode 100644 index 00000000000..78286e7880a --- /dev/null +++ b/eslint/eslint-patch/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + } + ] +} diff --git a/eslint/eslint-plugin-packlets/config/rush-project.json b/eslint/eslint-plugin-packlets/config/rush-project.json new file mode 100644 index 00000000000..78286e7880a --- /dev/null +++ b/eslint/eslint-plugin-packlets/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + } + ] +} diff --git a/eslint/eslint-plugin-security/config/rush-project.json b/eslint/eslint-plugin-security/config/rush-project.json new file mode 100644 index 00000000000..78286e7880a --- /dev/null +++ b/eslint/eslint-plugin-security/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + } + ] +} diff --git a/eslint/eslint-plugin/config/rush-project.json b/eslint/eslint-plugin/config/rush-project.json new file mode 100644 index 00000000000..78286e7880a --- /dev/null +++ b/eslint/eslint-plugin/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + } + ] +} diff --git a/libraries/heft-config-file/config/rush-project.json b/libraries/heft-config-file/config/rush-project.json new file mode 100644 index 00000000000..78286e7880a --- /dev/null +++ b/libraries/heft-config-file/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + } + ] +} diff --git a/libraries/node-core-library/config/rush-project.json b/libraries/node-core-library/config/rush-project.json new file mode 100644 index 00000000000..78286e7880a --- /dev/null +++ b/libraries/node-core-library/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + } + ] +} diff --git a/libraries/rig-package/config/rush-project.json b/libraries/rig-package/config/rush-project.json new file mode 100644 index 00000000000..78286e7880a --- /dev/null +++ b/libraries/rig-package/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + } + ] +} diff --git a/libraries/tree-pattern/config/rush-project.json b/libraries/tree-pattern/config/rush-project.json new file mode 100644 index 00000000000..78286e7880a --- /dev/null +++ b/libraries/tree-pattern/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + } + ] +} diff --git a/libraries/ts-command-line/config/rush-project.json b/libraries/ts-command-line/config/rush-project.json new file mode 100644 index 00000000000..78286e7880a --- /dev/null +++ b/libraries/ts-command-line/config/rush-project.json @@ -0,0 +1,8 @@ +{ + "operationSettings": [ + { + "operationName": "build", + "outputFolderNames": ["lib", "lib-commonjs", "temp"] + } + ] +} From b6341db8d282ea77f2799c3076bb0fafa1001259 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Tue, 18 Jan 2022 11:46:23 -0800 Subject: [PATCH 5/9] Update Rush to 5.60.0-rc.0 --- rush.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rush.json b/rush.json index 180c4ff9cd3..d9b98828854 100644 --- a/rush.json +++ b/rush.json @@ -16,7 +16,7 @@ * path segment in the "$schema" field for all your Rush config files. This will ensure * correct error-underlining and tab-completion for editors such as VS Code. */ - "rushVersion": "5.57.1", + "rushVersion": "5.60.0-rc.0", /** * The next field selects which package manager should be installed and determines its version. From a73ac3c67517d8392ef100b285a788783aa94df1 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Tue, 18 Jan 2022 11:49:21 -0800 Subject: [PATCH 6/9] Rush change. --- .../phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../api-extractor/phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../eslint-config/phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../eslint-patch/phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../eslint-plugin/phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../heft-node-rig/phasify-rigs_2022-01-07-03-12.json | 4 ++-- .../heft-web-rig/phasify-rigs_2022-01-07-03-12.json | 4 ++-- .../@rushstack/heft/phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../rig-package/phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../tree-pattern/phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ .../ts-command-line/phasify-rigs_2022-01-18-19-49.json | 10 ++++++++++ 16 files changed, 144 insertions(+), 4 deletions(-) create mode 100644 common/changes/@microsoft/api-extractor-model/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@microsoft/api-extractor/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@rushstack/eslint-config/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@rushstack/eslint-patch/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@rushstack/eslint-plugin-packlets/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@rushstack/eslint-plugin-security/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@rushstack/eslint-plugin/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@rushstack/heft-config-file/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@rushstack/heft-jest-plugin/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@rushstack/heft/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@rushstack/node-core-library/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@rushstack/rig-package/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@rushstack/tree-pattern/phasify-rigs_2022-01-18-19-49.json create mode 100644 common/changes/@rushstack/ts-command-line/phasify-rigs_2022-01-18-19-49.json diff --git a/common/changes/@microsoft/api-extractor-model/phasify-rigs_2022-01-18-19-49.json b/common/changes/@microsoft/api-extractor-model/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..52e967a8e74 --- /dev/null +++ b/common/changes/@microsoft/api-extractor-model/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/api-extractor-model", + "comment": "", + "type": "none" + } + ], + "packageName": "@microsoft/api-extractor-model" +} \ No newline at end of file diff --git a/common/changes/@microsoft/api-extractor/phasify-rigs_2022-01-18-19-49.json b/common/changes/@microsoft/api-extractor/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..752ad7dd46f --- /dev/null +++ b/common/changes/@microsoft/api-extractor/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/api-extractor", + "comment": "", + "type": "none" + } + ], + "packageName": "@microsoft/api-extractor" +} \ No newline at end of file diff --git a/common/changes/@rushstack/eslint-config/phasify-rigs_2022-01-18-19-49.json b/common/changes/@rushstack/eslint-config/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..c9d880304a5 --- /dev/null +++ b/common/changes/@rushstack/eslint-config/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/eslint-config", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/eslint-config" +} \ No newline at end of file diff --git a/common/changes/@rushstack/eslint-patch/phasify-rigs_2022-01-18-19-49.json b/common/changes/@rushstack/eslint-patch/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..ceefa44d69e --- /dev/null +++ b/common/changes/@rushstack/eslint-patch/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/eslint-patch", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/eslint-patch" +} \ No newline at end of file diff --git a/common/changes/@rushstack/eslint-plugin-packlets/phasify-rigs_2022-01-18-19-49.json b/common/changes/@rushstack/eslint-plugin-packlets/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..ff918c1ad1d --- /dev/null +++ b/common/changes/@rushstack/eslint-plugin-packlets/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/eslint-plugin-packlets", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/eslint-plugin-packlets" +} \ No newline at end of file diff --git a/common/changes/@rushstack/eslint-plugin-security/phasify-rigs_2022-01-18-19-49.json b/common/changes/@rushstack/eslint-plugin-security/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..a4477ef1a61 --- /dev/null +++ b/common/changes/@rushstack/eslint-plugin-security/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/eslint-plugin-security", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/eslint-plugin-security" +} \ No newline at end of file diff --git a/common/changes/@rushstack/eslint-plugin/phasify-rigs_2022-01-18-19-49.json b/common/changes/@rushstack/eslint-plugin/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..dcf93469653 --- /dev/null +++ b/common/changes/@rushstack/eslint-plugin/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/eslint-plugin", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/eslint-plugin" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-config-file/phasify-rigs_2022-01-18-19-49.json b/common/changes/@rushstack/heft-config-file/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..9b24a4fdcca --- /dev/null +++ b/common/changes/@rushstack/heft-config-file/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/heft-config-file", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/heft-config-file" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-jest-plugin/phasify-rigs_2022-01-18-19-49.json b/common/changes/@rushstack/heft-jest-plugin/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..8453696f39b --- /dev/null +++ b/common/changes/@rushstack/heft-jest-plugin/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/heft-jest-plugin", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/heft-jest-plugin" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-node-rig/phasify-rigs_2022-01-07-03-12.json b/common/changes/@rushstack/heft-node-rig/phasify-rigs_2022-01-07-03-12.json index f3c63b02312..95a2268c701 100644 --- a/common/changes/@rushstack/heft-node-rig/phasify-rigs_2022-01-07-03-12.json +++ b/common/changes/@rushstack/heft-node-rig/phasify-rigs_2022-01-07-03-12.json @@ -2,9 +2,9 @@ "changes": [ { "packageName": "@rushstack/heft-node-rig", - "comment": "Add a \"_phase:build\" cache configuration to config/rush-project.json.", + "comment": "Update the `rush-project.json` file to follow the new schema and configure the \"build\" command output folders for the \"_phase:build\" phase.", "type": "minor" } ], "packageName": "@rushstack/heft-node-rig" -} \ No newline at end of file +} diff --git a/common/changes/@rushstack/heft-web-rig/phasify-rigs_2022-01-07-03-12.json b/common/changes/@rushstack/heft-web-rig/phasify-rigs_2022-01-07-03-12.json index ca6077ad75e..a59025f8cce 100644 --- a/common/changes/@rushstack/heft-web-rig/phasify-rigs_2022-01-07-03-12.json +++ b/common/changes/@rushstack/heft-web-rig/phasify-rigs_2022-01-07-03-12.json @@ -2,9 +2,9 @@ "changes": [ { "packageName": "@rushstack/heft-web-rig", - "comment": "Add a \"_phase:build\" cache configuration to config/rush-project.json.", + "comment": "Update the `rush-project.json` file to follow the new schema and configure the \"build\" command output folders for the \"_phase:build\" phase.", "type": "minor" } ], "packageName": "@rushstack/heft-web-rig" -} \ No newline at end of file +} diff --git a/common/changes/@rushstack/heft/phasify-rigs_2022-01-18-19-49.json b/common/changes/@rushstack/heft/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..4da3f257a2d --- /dev/null +++ b/common/changes/@rushstack/heft/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/heft", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/heft" +} \ No newline at end of file diff --git a/common/changes/@rushstack/node-core-library/phasify-rigs_2022-01-18-19-49.json b/common/changes/@rushstack/node-core-library/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..d702845598d --- /dev/null +++ b/common/changes/@rushstack/node-core-library/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/node-core-library", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/node-core-library" +} \ No newline at end of file diff --git a/common/changes/@rushstack/rig-package/phasify-rigs_2022-01-18-19-49.json b/common/changes/@rushstack/rig-package/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..1c1df562afb --- /dev/null +++ b/common/changes/@rushstack/rig-package/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/rig-package", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/rig-package" +} \ No newline at end of file diff --git a/common/changes/@rushstack/tree-pattern/phasify-rigs_2022-01-18-19-49.json b/common/changes/@rushstack/tree-pattern/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..120c33a1f7e --- /dev/null +++ b/common/changes/@rushstack/tree-pattern/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/tree-pattern", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/tree-pattern" +} \ No newline at end of file diff --git a/common/changes/@rushstack/ts-command-line/phasify-rigs_2022-01-18-19-49.json b/common/changes/@rushstack/ts-command-line/phasify-rigs_2022-01-18-19-49.json new file mode 100644 index 00000000000..a03064b455f --- /dev/null +++ b/common/changes/@rushstack/ts-command-line/phasify-rigs_2022-01-18-19-49.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/ts-command-line", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/ts-command-line" +} \ No newline at end of file From d70cc2fef5d10fc3f72010a649f8e8424e408166 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Tue, 18 Jan 2022 17:47:17 -0800 Subject: [PATCH 7/9] Update Rush to 5.60.0-rc.1 --- rush.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rush.json b/rush.json index d9b98828854..afad96e5e58 100644 --- a/rush.json +++ b/rush.json @@ -16,7 +16,7 @@ * path segment in the "$schema" field for all your Rush config files. This will ensure * correct error-underlining and tab-completion for editors such as VS Code. */ - "rushVersion": "5.60.0-rc.0", + "rushVersion": "5.60.0-rc.1", /** * The next field selects which package manager should be installed and determines its version. From 3023a7e6eac4a0c1b2625ac162c1c34505e05e70 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Tue, 18 Jan 2022 18:15:57 -0800 Subject: [PATCH 8/9] Re-enable build with local rush. --- .../config/azure-pipelines/templates/build.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/common/config/azure-pipelines/templates/build.yaml b/common/config/azure-pipelines/templates/build.yaml index 113510854da..2019c0016cc 100644 --- a/common/config/azure-pipelines/templates/build.yaml +++ b/common/config/azure-pipelines/templates/build.yaml @@ -16,14 +16,13 @@ steps: displayName: 'Rush Rebuild (install-run-rush)' env: # Prevent time-based browserslist update warning - # See https://github.com/microsoft/rushstack/issues/2981 + # See https://github.com/microsoft/rushstack/issues/2981 + BROWSERSLIST_IGNORE_OLD_DATA: 1 + - script: 'node apps/rush-lib/lib/start.js build --verbose --production' + displayName: 'Rush Build (rush-lib)' + env: + # Prevent time-based browserslist update warning + # See https://github.com/microsoft/rushstack/issues/2981 BROWSERSLIST_IGNORE_OLD_DATA: 1 -# Re-enable after the schema changes to rush-project.json are published and pulled in -# - script: 'node apps/rush-lib/lib/start.js build --verbose --production' -# displayName: 'Rush Build (rush-lib)' -# env: -# # Prevent time-based browserslist update warning -# # See https://github.com/microsoft/rushstack/issues/2981 -# BROWSERSLIST_IGNORE_OLD_DATA: 1 - script: 'node repo-scripts/repo-toolbox/lib/start.js readme --verify' displayName: 'Ensure repo README is up-to-date' From 16705a1a1b8fe618467463c86883ef5fdd32cda9 Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Tue, 18 Jan 2022 17:59:35 -0800 Subject: [PATCH 9/9] TEMPORARY - Remove validation steps that are failing because the Rush version in rush.json is ahead of the version in Rush's package.json --- .../config/azure-pipelines/templates/build.yaml | 17 +++++++++-------- common/config/rush/pnpm-lock.yaml | 8 -------- common/config/rush/repo-state.json | 2 +- rush.json | 12 ++++++------ 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/common/config/azure-pipelines/templates/build.yaml b/common/config/azure-pipelines/templates/build.yaml index 2019c0016cc..cbac4b97459 100644 --- a/common/config/azure-pipelines/templates/build.yaml +++ b/common/config/azure-pipelines/templates/build.yaml @@ -18,11 +18,12 @@ steps: # Prevent time-based browserslist update warning # See https://github.com/microsoft/rushstack/issues/2981 BROWSERSLIST_IGNORE_OLD_DATA: 1 - - script: 'node apps/rush-lib/lib/start.js build --verbose --production' - displayName: 'Rush Build (rush-lib)' - env: - # Prevent time-based browserslist update warning - # See https://github.com/microsoft/rushstack/issues/2981 - BROWSERSLIST_IGNORE_OLD_DATA: 1 - - script: 'node repo-scripts/repo-toolbox/lib/start.js readme --verify' - displayName: 'Ensure repo README is up-to-date' + # TEMPORARY - Put these back once Rush is published and updated in rush.json + # - script: 'node apps/rush-lib/lib/start.js build --verbose --production' + # displayName: 'Rush Build (rush-lib)' + # env: + # # Prevent time-based browserslist update warning + # # See https://github.com/microsoft/rushstack/issues/2981 + # BROWSERSLIST_IGNORE_OLD_DATA: 1 + # - script: 'node repo-scripts/repo-toolbox/lib/start.js readme --verify' + # displayName: 'Ensure repo README is up-to-date' diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 684bde5b5b2..a228ecd54c3 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1036,14 +1036,6 @@ importers: tslint-microsoft-contrib: 6.2.0_tslint@5.20.1+typescript@4.5.2 typescript: 4.5.2 - ../../build-tests/install-test-workspace: - specifiers: - '@microsoft/rush-lib': workspace:* - '@rushstack/node-core-library': workspace:* - devDependencies: - '@microsoft/rush-lib': link:../../apps/rush-lib - '@rushstack/node-core-library': link:../../libraries/node-core-library - ../../build-tests/localization-plugin-test-01: specifiers: '@rushstack/localization-plugin': workspace:* diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json index 58296ca417b..89435939292 100644 --- a/common/config/rush/repo-state.json +++ b/common/config/rush/repo-state.json @@ -1,5 +1,5 @@ // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush. { - "pnpmShrinkwrapHash": "f12214a1ca307d5f3529088a4a4f0ff66db0f03d", + "pnpmShrinkwrapHash": "c20c0967f9e8c9f41c244a45666d68e7d651beae", "preferredVersionsHash": "87aab8e8f0a6545cb9d0ea30194ba68279d285a8" } diff --git a/rush.json b/rush.json index afad96e5e58..bcfc81878b7 100644 --- a/rush.json +++ b/rush.json @@ -747,12 +747,12 @@ "shouldPublish": false }, - { - "packageName": "install-test-workspace", - "projectFolder": "build-tests/install-test-workspace", - "reviewCategory": "tests", - "shouldPublish": false - }, + // { + // "packageName": "install-test-workspace", + // "projectFolder": "build-tests/install-test-workspace", + // "reviewCategory": "tests", + // "shouldPublish": false + // }, { "packageName": "localization-plugin-test-01", "projectFolder": "build-tests/localization-plugin-test-01",