Merge branch 'main' into heft-next-merge

apps/api-documenter/CHANGELOG.json

@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/api-documenter",
   "entries": [
+    {
+      "version": "7.21.7",
+      "tag": "@microsoft/api-documenter_v7.21.7",
+      "date": "Tue, 04 Apr 2023 22:36:28 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.12.6`"
+          }
+        ]
+      }
+    },
     {
       "version": "7.21.6",
       "tag": "@microsoft/api-documenter_v7.21.6",

apps/api-documenter/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log - @microsoft/api-documenter
 
-This log was last generated on Sat, 18 Mar 2023 00:20:56 GMT and should not be manually modified.
+This log was last generated on Tue, 04 Apr 2023 22:36:28 GMT and should not be manually modified.
+
+## 7.21.7
+Tue, 04 Apr 2023 22:36:28 GMT
+
+_Version update only_
 
 ## 7.21.6
 Sat, 18 Mar 2023 00:20:56 GMT

apps/api-documenter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-documenter",
-  "version": "7.21.6",
+  "version": "7.21.7",
   "description": "Read JSON files from api-extractor, generate documentation pages",
   "repository": {
     "type": "git",

apps/lockfile-explorer/CHANGELOG.json

@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/lockfile-explorer",
   "entries": [
+    {
+      "version": "1.0.10",
+      "tag": "@rushstack/lockfile-explorer_v1.0.10",
+      "date": "Tue, 04 Apr 2023 22:36:28 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.12.6`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.9",
       "tag": "@rushstack/lockfile-explorer_v1.0.9",

apps/lockfile-explorer/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log - @rushstack/lockfile-explorer
 
-This log was last generated on Sat, 18 Mar 2023 00:20:56 GMT and should not be manually modified.
+This log was last generated on Tue, 04 Apr 2023 22:36:28 GMT and should not be manually modified.
+
+## 1.0.10
+Tue, 04 Apr 2023 22:36:28 GMT
+
+_Version update only_
 
 ## 1.0.9
 Sat, 18 Mar 2023 00:20:56 GMT

apps/lockfile-explorer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/lockfile-explorer",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Rush Lockfile Explorer: The UI for solving version conflicts quickly in a large monorepo",
   "keywords": [
     "conflict",

apps/rundown/CHANGELOG.json

@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/rundown",
   "entries": [
+    {
+      "version": "1.0.244",
+      "tag": "@rushstack/rundown_v1.0.244",
+      "date": "Tue, 04 Apr 2023 22:36:28 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.12.6`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.243",
       "tag": "@rushstack/rundown_v1.0.243",

apps/rundown/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log - @rushstack/rundown
 
-This log was last generated on Sat, 18 Mar 2023 00:20:56 GMT and should not be manually modified.
+This log was last generated on Tue, 04 Apr 2023 22:36:28 GMT and should not be manually modified.
+
+## 1.0.244
+Tue, 04 Apr 2023 22:36:28 GMT
+
+_Version update only_
 
 ## 1.0.243
 Sat, 18 Mar 2023 00:20:56 GMT

apps/rundown/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/rundown",
-  "version": "1.0.243",
+  "version": "1.0.244",
   "description": "Detect load time regressions by running an app, tracing require() calls, and generating a deterministic report",
   "repository": {
     "type": "git",

apps/rush/CHANGELOG.json

@@ -1,6 +1,33 @@
 {
   "name": "@microsoft/rush",
   "entries": [
+    {
+      "version": "5.97.0",
+      "tag": "@microsoft/rush_v5.97.0",
+      "date": "Wed, 05 Apr 2023 21:46:37 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "Convert the `EnvironmentVariableNames` from an enum to a const so that its values can be referred to by type."
+          }
+        ]
+      }
+    },
+    {
+      "version": "5.96.0",
+      "tag": "@microsoft/rush_v5.96.0",
+      "date": "Fri, 31 Mar 2023 00:27:51 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "Fix an issue where rush-sdk sometimes failed to load if the globally installed Rush version was older than rushVersion in rush.json (GitHub #4039)"
+          },
+          {
+            "comment": "Modify the scheduling behavior of phased commands to schedule only the expressly enumerated phases in all selected projects, adding additional phases only where needed to satisfy dependencies."
+          }
+        ]
+      }
+    },
     {
       "version": "5.95.0",
       "tag": "@microsoft/rush_v5.95.0",

apps/rush/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Change Log - @microsoft/rush
 
-This log was last generated on Fri, 24 Mar 2023 08:53:43 GMT and should not be manually modified.
+This log was last generated on Wed, 05 Apr 2023 21:46:37 GMT and should not be manually modified.
+
+## 5.97.0
+Wed, 05 Apr 2023 21:46:37 GMT
+
+### Updates
+
+- Convert the `EnvironmentVariableNames` from an enum to a const so that its values can be referred to by type.
+
+## 5.96.0
+Fri, 31 Mar 2023 00:27:51 GMT
+
+### Updates
+
+- Fix an issue where rush-sdk sometimes failed to load if the globally installed Rush version was older than rushVersion in rush.json (GitHub #4039)
+- Modify the scheduling behavior of phased commands to schedule only the expressly enumerated phases in all selected projects, adding additional phases only where needed to satisfy dependencies.
 
 ## 5.95.0
 Fri, 24 Mar 2023 08:53:43 GMT

apps/rush/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/rush",
-  "version": "5.95.0",
+  "version": "5.97.0",
   "description": "A professional solution for consolidating all your JavaScript projects in one Git repo",
   "keywords": [
     "install",

apps/trace-import/CHANGELOG.json

@@ -1,6 +1,18 @@
 {
   "name": "@rushstack/trace-import",
   "entries": [
+    {
+      "version": "0.1.13",
+      "tag": "@rushstack/trace-import_v0.1.13",
+      "date": "Tue, 04 Apr 2023 22:36:28 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.12.6`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.1.12",
       "tag": "@rushstack/trace-import_v0.1.12",

apps/trace-import/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log - @rushstack/trace-import
 
-This log was last generated on Sat, 18 Mar 2023 00:20:56 GMT and should not be manually modified.
+This log was last generated on Tue, 04 Apr 2023 22:36:28 GMT and should not be manually modified.
+
+## 0.1.13
+Tue, 04 Apr 2023 22:36:28 GMT
+
+_Version update only_
 
 ## 0.1.12
 Sat, 18 Mar 2023 00:20:56 GMT

apps/trace-import/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rushstack/trace-import",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "CLI tool for understanding how require() and \"import\" statements get resolved",
   "repository": {
     "type": "git",

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.75.0"
+    "webpack": "~5.78.0"
   }
 }

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.75.0"
+    "webpack": "~5.78.0"
   }
 }

build-tests/heft-jest-reporters-test/package.json

@@ -10,8 +10,8 @@
     "_phase:test": "heft run --only test -- --clean"
   },
   "devDependencies": {
-    "@jest/reporters": "~29.3.1",
-    "@jest/types": "29.3.1",
+    "@jest/reporters": "~29.5.0",
+    "@jest/types": "29.5.0",
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft": "workspace:*",
     "@rushstack/heft-jest-plugin": "workspace:*",

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.75.0"
+    "webpack": "~5.78.0"
   }
 }

common/changes/@microsoft/rush/aruniverse-respect_ensureConsistentVersions_2023-04-13-22-13.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "`rush version` will now respect the `ensureConsistentVersions` field in `rush.json`",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}

common/changes/@microsoft/rush/main_2023-04-07-20-22.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Bump webpack to 5.78.0",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}

common/changes/@microsoft/rush/rush-watch-perf_2023-03-30-00-47.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Fix file watching on Windows in the presence of Git's fsmonitor by not watching the .git folder.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}

common/config/rush/version-policies.json

@@ -102,7 +102,7 @@
   {
     "policyName": "rush",
     "definitionName": "lockStepVersion",
-    "version": "5.95.0",
+    "version": "5.97.0",
     "nextBump": "minor",
     "mainProject": "@microsoft/rush"
   }

common/reviews/api/rush-lib.api.md

@@ -166,26 +166,26 @@ export class EnvironmentConfiguration {
 }
 
 // @beta
-export enum EnvironmentVariableNames {
-    RUSH_ABSOLUTE_SYMLINKS = "RUSH_ABSOLUTE_SYMLINKS",
-    RUSH_ALLOW_UNSUPPORTED_NODEJS = "RUSH_ALLOW_UNSUPPORTED_NODEJS",
-    RUSH_ALLOW_WARNINGS_IN_SUCCESSFUL_BUILD = "RUSH_ALLOW_WARNINGS_IN_SUCCESSFUL_BUILD",
-    RUSH_BUILD_CACHE_CREDENTIAL = "RUSH_BUILD_CACHE_CREDENTIAL",
-    RUSH_BUILD_CACHE_ENABLED = "RUSH_BUILD_CACHE_ENABLED",
-    RUSH_BUILD_CACHE_WRITE_ALLOWED = "RUSH_BUILD_CACHE_WRITE_ALLOWED",
-    RUSH_DEPLOY_TARGET_FOLDER = "RUSH_DEPLOY_TARGET_FOLDER",
-    RUSH_GIT_BINARY_PATH = "RUSH_GIT_BINARY_PATH",
-    RUSH_GLOBAL_FOLDER = "RUSH_GLOBAL_FOLDER",
-    RUSH_INVOKED_FOLDER = "RUSH_INVOKED_FOLDER",
-    RUSH_LIB_PATH = "_RUSH_LIB_PATH",
-    RUSH_PARALLELISM = "RUSH_PARALLELISM",
-    RUSH_PNPM_STORE_PATH = "RUSH_PNPM_STORE_PATH",
-    RUSH_PNPM_VERIFY_STORE_INTEGRITY = "RUSH_PNPM_VERIFY_STORE_INTEGRITY",
-    RUSH_PREVIEW_VERSION = "RUSH_PREVIEW_VERSION",
-    RUSH_TAR_BINARY_PATH = "RUSH_TAR_BINARY_PATH",
-    RUSH_TEMP_FOLDER = "RUSH_TEMP_FOLDER",
-    RUSH_VARIANT = "RUSH_VARIANT"
-}
+export const EnvironmentVariableNames: {
+    readonly RUSH_TEMP_FOLDER: "RUSH_TEMP_FOLDER";
+    readonly RUSH_PREVIEW_VERSION: "RUSH_PREVIEW_VERSION";
+    readonly RUSH_ALLOW_UNSUPPORTED_NODEJS: "RUSH_ALLOW_UNSUPPORTED_NODEJS";
+    readonly RUSH_ALLOW_WARNINGS_IN_SUCCESSFUL_BUILD: "RUSH_ALLOW_WARNINGS_IN_SUCCESSFUL_BUILD";
+    readonly RUSH_VARIANT: "RUSH_VARIANT";
+    readonly RUSH_PARALLELISM: "RUSH_PARALLELISM";
+    readonly RUSH_ABSOLUTE_SYMLINKS: "RUSH_ABSOLUTE_SYMLINKS";
+    readonly RUSH_PNPM_STORE_PATH: "RUSH_PNPM_STORE_PATH";
+    readonly RUSH_PNPM_VERIFY_STORE_INTEGRITY: "RUSH_PNPM_VERIFY_STORE_INTEGRITY";
+    readonly RUSH_DEPLOY_TARGET_FOLDER: "RUSH_DEPLOY_TARGET_FOLDER";
+    readonly RUSH_GLOBAL_FOLDER: "RUSH_GLOBAL_FOLDER";
+    readonly RUSH_BUILD_CACHE_CREDENTIAL: "RUSH_BUILD_CACHE_CREDENTIAL";
+    readonly RUSH_BUILD_CACHE_ENABLED: "RUSH_BUILD_CACHE_ENABLED";
+    readonly RUSH_BUILD_CACHE_WRITE_ALLOWED: "RUSH_BUILD_CACHE_WRITE_ALLOWED";
+    readonly RUSH_GIT_BINARY_PATH: "RUSH_GIT_BINARY_PATH";
+    readonly RUSH_TAR_BINARY_PATH: "RUSH_TAR_BINARY_PATH";
+    readonly RUSH_LIB_PATH: "_RUSH_LIB_PATH";
+    readonly RUSH_INVOKED_FOLDER: "RUSH_INVOKED_FOLDER";
+};
 
 // @beta
 export enum Event {