Merge branch 'main' into heft-rc-merge-main

spring6225 · Apr 25, 2023 · 6bca801 · 6bca801
2 parents 3e8bb93 + 54cb235
commit 6bca801
Show file tree

Hide file tree

Showing 89 changed files with 1,370 additions and 2,174 deletions.
diff --git a/README.md b/README.md
@@ -85,7 +85,8 @@ These GitHub repositories provide supplementary resources for Rush Stack:
 | [/rigs/heft-web-rig](./rigs/heft-web-rig/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Fheft-web-rig.svg)](https://badge.fury.io/js/%40rushstack%2Fheft-web-rig) | [changelog](./rigs/heft-web-rig/CHANGELOG.md) | [@rushstack/heft-web-rig](https://www.npmjs.com/package/@rushstack/heft-web-rig) |
 | [/rush-plugins/rush-amazon-s3-build-cache-plugin](./rush-plugins/rush-amazon-s3-build-cache-plugin/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-amazon-s3-build-cache-plugin.svg)](https://badge.fury.io/js/%40rushstack%2Frush-amazon-s3-build-cache-plugin) | | [@rushstack/rush-amazon-s3-build-cache-plugin](https://www.npmjs.com/package/@rushstack/rush-amazon-s3-build-cache-plugin) |
 | [/rush-plugins/rush-azure-storage-build-cache-plugin](./rush-plugins/rush-azure-storage-build-cache-plugin/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-azure-storage-build-cache-plugin.svg)](https://badge.fury.io/js/%40rushstack%2Frush-azure-storage-build-cache-plugin) | | [@rushstack/rush-azure-storage-build-cache-plugin](https://www.npmjs.com/package/@rushstack/rush-azure-storage-build-cache-plugin) |
-| [/rush-plugins/rush-serve-plugin](./rush-plugins/rush-serve-plugin/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-serve-plugin.svg)](https://badge.fury.io/js/%40rushstack%2Frush-serve-plugin) | [changelog](./rush-plugins/rush-serve-plugin/CHANGELOG.md) | [@rushstack/rush-serve-plugin](https://www.npmjs.com/package/@rushstack/rush-serve-plugin) |
+| [/rush-plugins/rush-http-build-cache-plugin](./rush-plugins/rush-http-build-cache-plugin/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-http-build-cache-plugin.svg)](https://badge.fury.io/js/%40rushstack%2Frush-http-build-cache-plugin) | | [@rushstack/rush-http-build-cache-plugin](https://www.npmjs.com/package/@rushstack/rush-http-build-cache-plugin) |
+| [/rush-plugins/rush-serve-plugin](./rush-plugins/rush-serve-plugin/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Frush-serve-plugin.svg)](https://badge.fury.io/js/%40rushstack%2Frush-serve-plugin) | | [@rushstack/rush-serve-plugin](https://www.npmjs.com/package/@rushstack/rush-serve-plugin) |
 | [/webpack/hashed-folder-copy-plugin](./webpack/hashed-folder-copy-plugin/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Fhashed-folder-copy-plugin.svg)](https://badge.fury.io/js/%40rushstack%2Fhashed-folder-copy-plugin) | [changelog](./webpack/hashed-folder-copy-plugin/CHANGELOG.md) | [@rushstack/hashed-folder-copy-plugin](https://www.npmjs.com/package/@rushstack/hashed-folder-copy-plugin) |
 | [/webpack/loader-load-themed-styles](./webpack/loader-load-themed-styles/) | [![npm version](https://badge.fury.io/js/%40microsoft%2Floader-load-themed-styles.svg)](https://badge.fury.io/js/%40microsoft%2Floader-load-themed-styles) | [changelog](./webpack/loader-load-themed-styles/CHANGELOG.md) | [@microsoft/loader-load-themed-styles](https://www.npmjs.com/package/@microsoft/loader-load-themed-styles) |
 | [/webpack/loader-raw-script](./webpack/loader-raw-script/) | [![npm version](https://badge.fury.io/js/%40rushstack%2Floader-raw-script.svg)](https://badge.fury.io/js/%40rushstack%2Floader-raw-script) | [changelog](./webpack/loader-raw-script/CHANGELOG.md) | [@rushstack/loader-raw-script](https://www.npmjs.com/package/@rushstack/loader-raw-script) |

diff --git a/apps/rush/CHANGELOG.json b/apps/rush/CHANGELOG.json
@@ -1,6 +1,24 @@
 {
   "name": "@microsoft/rush",
   "entries": [
+    {
+      "version": "5.97.1",
+      "tag": "@microsoft/rush_v5.97.1",
+      "date": "Tue, 18 Apr 2023 16:39:03 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "`rush version` will now respect the `ensureConsistentVersions` field in `rush.json`"
+          },
+          {
+            "comment": "Bump webpack to 5.78.0"
+          },
+          {
+            "comment": "Fix file watching on Windows in the presence of Git's fsmonitor by not watching the .git folder."
+          }
+        ]
+      }
+    },
     {
       "version": "5.97.0",
       "tag": "@microsoft/rush_v5.97.0",

diff --git a/apps/rush/CHANGELOG.md b/apps/rush/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Change Log - @microsoft/rush
 
-This log was last generated on Wed, 05 Apr 2023 21:46:37 GMT and should not be manually modified.
+This log was last generated on Tue, 18 Apr 2023 16:39:03 GMT and should not be manually modified.
+
+## 5.97.1
+Tue, 18 Apr 2023 16:39:03 GMT
+
+### Updates
+
+- `rush version` will now respect the `ensureConsistentVersions` field in `rush.json`
+- Bump webpack to 5.78.0
+- Fix file watching on Windows in the presence of Git's fsmonitor by not watching the .git folder.
 
 ## 5.97.0
 Wed, 05 Apr 2023 21:46:37 GMT

diff --git a/apps/rush/package.json b/apps/rush/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush",
-  "version": "5.97.0",
+  "version": "5.97.1",
   "description": "A professional solution for consolidating all your JavaScript projects in one Git repo",
   "keywords": [
     "install",
@@ -47,6 +47,7 @@
     "@rushstack/heft-node-rig": "workspace:*",
     "@rushstack/rush-amazon-s3-build-cache-plugin": "workspace:*",
     "@rushstack/rush-azure-storage-build-cache-plugin": "workspace:*",
+    "@rushstack/rush-http-build-cache-plugin": "workspace:*",
     "@types/heft-jest": "1.0.1",
     "@types/node": "14.18.36",
     "@types/semver": "7.3.5"

diff --git a/apps/rush/src/start-dev.ts b/apps/rush/src/start-dev.ts
@@ -27,6 +27,7 @@ function includePlugin(pluginName: string, pluginPackageName?: string): void {
 
 includePlugin('rush-amazon-s3-build-cache-plugin');
 includePlugin('rush-azure-storage-build-cache-plugin');
+includePlugin('rush-http-build-cache-plugin');
 // Including this here so that developers can reuse it without installing the plugin a second time
 includePlugin('rush-azure-interactive-auth-plugin', '@rushstack/rush-azure-storage-build-cache-plugin');
 

diff --git a/build-tests-samples/heft-webpack-basic-tutorial/package.json b/build-tests-samples/heft-webpack-basic-tutorial/package.json
@@ -31,6 +31,6 @@
     "source-map-loader": "~3.0.1",
     "style-loader": "~3.3.1",
     "typescript": "~4.8.4",
-    "webpack": "~5.78.0"
+    "webpack": "~5.80.0"
   }
 }
diff --git a/build-tests/hashed-folder-copy-plugin-webpack5-test/package.json b/build-tests/hashed-folder-copy-plugin-webpack5-test/package.json
@@ -18,6 +18,6 @@
     "html-webpack-plugin": "~4.5.2",
     "typescript": "~4.8.4",
     "webpack-bundle-analyzer": "~4.5.0",
-    "webpack": "~5.78.0"
+    "webpack": "~5.80.0"
   }
 }
diff --git a/build-tests/heft-webpack5-everything-test/package.json b/build-tests/heft-webpack5-everything-test/package.json
@@ -26,6 +26,6 @@
     "tslint": "~5.20.1",
     "tslint-microsoft-contrib": "~6.2.0",
     "typescript": "~4.8.4",
-    "webpack": "~5.78.0"
+    "webpack": "~5.80.0"
   }
 }
diff --git a/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml b/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml
diff --git a/...eConsistentVersions_2023-04-13-22-13.json → .../enelson-http-cache_2023-02-15-13-36.json b/...eConsistentVersions_2023-04-13-22-13.json → .../enelson-http-cache_2023-02-15-13-36.json
@@ -2,7 +2,7 @@
   "changes": [
     {
       "packageName": "@microsoft/rush",
-      "comment": "`rush version` will now respect the `ensureConsistentVersions` field in `rush.json`",
+      "comment": "Add built-in plugin rush-http-build-cache-plugin",
       "type": "none"
     }
   ],

diff --git a/common/changes/@microsoft/rush/fix-look-by-path_2023-04-25-09-41.json b/common/changes/@microsoft/rush/fix-look-by-path_2023-04-25-09-41.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Fix an issue where the last character in a project's path is ignored when determining which files contribute to the project's cache ID.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}
diff --git a/common/changes/@microsoft/rush/main_2023-04-19-18-11.json b/common/changes/@microsoft/rush/main_2023-04-19-18-11.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Update webpack to v5.80.0",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}
diff --git a/...microsoft/rush/main_2023-04-07-20-22.json → ...-fix-version-policy_2023-04-22-19-38.json b/...microsoft/rush/main_2023-04-07-20-22.json → ...-fix-version-policy_2023-04-22-19-38.json
@@ -2,7 +2,7 @@
   "changes": [
     {
       "packageName": "@microsoft/rush",
-      "comment": "Bump webpack to 5.78.0",
+      "comment": "",
       "type": "none"
     }
   ],

diff --git a/...ush/rush-watch-perf_2023-03-30-00-47.json → ...version-performance_2023-04-20-20-57.json b/...ush/rush-watch-perf_2023-03-30-00-47.json → ...version-performance_2023-04-20-20-57.json
@@ -2,7 +2,7 @@
   "changes": [
     {
       "packageName": "@microsoft/rush",
-      "comment": "Fix file watching on Windows in the presence of Git's fsmonitor by not watching the .git folder.",
+      "comment": "Improve performance of 'rush version' when using 'workspace:' protocol.",
       "type": "none"
     }
   ],

diff --git a/common/changes/@microsoft/rush/rush-version-workspace-perf_2023-04-20-22-52.json b/common/changes/@microsoft/rush/rush-version-workspace-perf_2023-04-20-22-52.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Fix a performance bug in `rush version` when using `workspace:` protocol.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}
diff --git a/common/config/rush/nonbrowser-approved-packages.json b/common/config/rush/nonbrowser-approved-packages.json
@@ -198,6 +198,10 @@
       "name": "@rushstack/rush-azure-storage-build-cache-plugin",
       "allowedCategories": [ "libraries" ]
     },
+    {
+      "name": "@rushstack/rush-http-build-cache-plugin",
+      "allowedCategories": [ "libraries" ]
+    },
     {
       "name": "@rushstack/rush-sdk",
       "allowedCategories": [ "libraries", "tests" ]

diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -102,8 +102,8 @@
   {
     "policyName": "rush",
     "definitionName": "lockStepVersion",
-    "version": "5.97.0",
-    "nextBump": "minor",
+    "version": "5.97.1",
+    "nextBump": "patch",
     "mainProject": "@microsoft/rush"
   }
 ]
diff --git a/heft-plugins/heft-dev-cert-plugin/CHANGELOG.json b/heft-plugins/heft-dev-cert-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft-dev-cert-plugin",
   "entries": [
+    {
+      "version": "0.2.24",
+      "tag": "@rushstack/heft-dev-cert-plugin_v0.2.24",
+      "date": "Thu, 20 Apr 2023 15:16:55 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Update webpack to v5.80.0"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.23",
       "tag": "@rushstack/heft-dev-cert-plugin_v0.2.23",

diff --git a/heft-plugins/heft-dev-cert-plugin/CHANGELOG.md b/heft-plugins/heft-dev-cert-plugin/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-dev-cert-plugin
 
-This log was last generated on Mon, 17 Apr 2023 15:21:31 GMT and should not be manually modified.
+This log was last generated on Thu, 20 Apr 2023 15:16:55 GMT and should not be manually modified.
+
+## 0.2.24
+Thu, 20 Apr 2023 15:16:55 GMT
+
+### Patches
+
+- Update webpack to v5.80.0
 
 ## 0.2.23
 Mon, 17 Apr 2023 15:21:31 GMT

diff --git a/heft-plugins/heft-dev-cert-plugin/package.json b/heft-plugins/heft-dev-cert-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-dev-cert-plugin",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "description": "A Heft plugin for generating and using local development certificates",
   "repository": {
     "type": "git",

diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.json b/heft-plugins/heft-webpack5-plugin/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
   "entries": [
+    {
+      "version": "0.6.5",
+      "tag": "@rushstack/heft-webpack5-plugin_v0.6.5",
+      "date": "Thu, 20 Apr 2023 15:16:55 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Update webpack to v5.80.0"
+          }
+        ]
+      }
+    },
     {
       "version": "0.6.4",
       "tag": "@rushstack/heft-webpack5-plugin_v0.6.4",

diff --git a/heft-plugins/heft-webpack5-plugin/CHANGELOG.md b/heft-plugins/heft-webpack5-plugin/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @rushstack/heft-webpack5-plugin
 
-This log was last generated on Tue, 11 Apr 2023 00:23:22 GMT and should not be manually modified.
+This log was last generated on Thu, 20 Apr 2023 15:16:55 GMT and should not be manually modified.
+
+## 0.6.5
+Thu, 20 Apr 2023 15:16:55 GMT
+
+### Patches
+
+- Update webpack to v5.80.0
 
 ## 0.6.4
 Tue, 11 Apr 2023 00:23:22 GMT

diff --git a/heft-plugins/heft-webpack5-plugin/package.json b/heft-plugins/heft-webpack5-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/heft-webpack5-plugin",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "Heft plugin for Webpack 5",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
   },
   "peerDependencies": {
     "@rushstack/heft": "^0.50.0",
-    "webpack": "~5.78.0"
+    "webpack": "~5.80.0"
   },
   "dependencies": {
     "@rushstack/debug-certificate-manager": "workspace:*",
@@ -35,6 +35,6 @@
     "@rushstack/heft-node-rig": "workspace:*",
     "@types/node": "14.18.36",
     "@types/watchpack": "2.4.0",
-    "webpack": "~5.78.0"
+    "webpack": "~5.80.0"
   }
 }
diff --git a/libraries/load-themed-styles/CHANGELOG.json b/libraries/load-themed-styles/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/load-themed-styles",
   "entries": [
+    {
+      "version": "2.0.35",
+      "tag": "@microsoft/load-themed-styles_v2.0.35",
+      "date": "Thu, 20 Apr 2023 15:16:55 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-web-rig\" to `0.14.11`"
+          }
+        ]
+      }
+    },
     {
       "version": "2.0.34",
       "tag": "@microsoft/load-themed-styles_v2.0.34",

diff --git a/libraries/load-themed-styles/CHANGELOG.md b/libraries/load-themed-styles/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @microsoft/load-themed-styles
 
-This log was last generated on Tue, 11 Apr 2023 00:23:22 GMT and should not be manually modified.
+This log was last generated on Thu, 20 Apr 2023 15:16:55 GMT and should not be manually modified.
+
+## 2.0.35
+Thu, 20 Apr 2023 15:16:55 GMT
+
+_Version update only_
 
 ## 2.0.34
 Tue, 11 Apr 2023 00:23:22 GMT

diff --git a/libraries/load-themed-styles/package.json b/libraries/load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/load-themed-styles",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "description": "Loads themed styles.",
   "license": "MIT",
   "repository": {