Remove unnecessary comments, address PRs, use major bump

cmalonzo · cmalonzo · commit 2e37045db482 · 2026-04-09T12:37:33.000-04:00
diff --git a/build-tests/api-extractor-test-05/dist/tsdoc-metadata.json b/build-tests/api-extractor-test-05/dist/tsdoc-metadata.json
@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.58.0"
+      "packageVersion": "7.58.1"
     }
   ]
 }
diff --git a/common/changes/@microsoft/api-documenter/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@microsoft/api-documenter/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@microsoft/api-documenter",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@microsoft/api-documenter"
-}
+}
diff --git a/common/changes/@microsoft/rush/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@microsoft/rush/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@microsoft/rush",
-      "comment": "Bump jest to 30.x, address changes",
+      "comment": "",
       "type": "none"
     }
   ],
   "packageName": "@microsoft/rush"
-}
+}
diff --git a/common/changes/@microsoft/webpack5-load-themed-styles-loader/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@microsoft/webpack5-load-themed-styles-loader/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@microsoft/webpack5-load-themed-styles-loader",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@microsoft/webpack5-load-themed-styles-loader"
-}
+}
diff --git a/common/changes/@rushstack/credential-cache/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/credential-cache/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/credential-cache",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/credential-cache"
-}
+}
diff --git a/common/changes/@rushstack/hashed-folder-copy-plugin/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/hashed-folder-copy-plugin/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/hashed-folder-copy-plugin",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/hashed-folder-copy-plugin"
-}
+}
diff --git a/common/changes/@rushstack/heft-jest-plugin/jest-environment-jsdom-30.3.0_2026-04-01-01-06.json b/common/changes/@rushstack/heft-jest-plugin/jest-environment-jsdom-30.3.0_2026-04-01-01-06.json
@@ -3,7 +3,7 @@
     {
       "packageName": "@rushstack/heft-jest-plugin",
       "comment": "Bump jest-environment-jsdom to 30.3.0 to address CVE GHSA-vpq2-c234-7xj6",
-      "type": "minor"
+      "type": "major"
     }
   ],
   "packageName": "@rushstack/heft-jest-plugin"
diff --git a/common/changes/@rushstack/heft-json-schema-typings-plugin/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/heft-json-schema-typings-plugin/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/heft-json-schema-typings-plugin",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/heft-json-schema-typings-plugin"
-}
+}
diff --git a/common/changes/@rushstack/localization-utilities/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/localization-utilities/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/localization-utilities",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/localization-utilities"
-}
+}
diff --git a/common/changes/@rushstack/lockfile-explorer/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/lockfile-explorer/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/lockfile-explorer",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/lockfile-explorer"
-}
+}
diff --git a/common/changes/@rushstack/module-minifier/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/module-minifier/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/module-minifier",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/module-minifier"
-}
+}
diff --git a/common/changes/@rushstack/package-deps-hash/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/package-deps-hash/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/package-deps-hash",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/package-deps-hash"
-}
+}
diff --git a/common/changes/@rushstack/package-extractor/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/package-extractor/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/package-extractor",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/package-extractor"
-}
+}
diff --git a/common/changes/@rushstack/typings-generator/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/typings-generator/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/typings-generator",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/typings-generator"
-}
+}
diff --git a/common/changes/@rushstack/webpack-preserve-dynamic-require-plugin/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/webpack-preserve-dynamic-require-plugin/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/webpack-preserve-dynamic-require-plugin",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/webpack-preserve-dynamic-require-plugin"
-}
+}
diff --git a/common/changes/@rushstack/webpack5-localization-plugin/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/webpack5-localization-plugin/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/webpack5-localization-plugin",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/webpack5-localization-plugin"
-}
+}
diff --git a/common/changes/@rushstack/webpack5-module-minifier-plugin/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/webpack5-module-minifier-plugin/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/webpack5-module-minifier-plugin",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/webpack5-module-minifier-plugin"
-}
+}
diff --git a/common/changes/@rushstack/zipsync/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json b/common/changes/@rushstack/zipsync/jest-environment-jsdom-30.3.0_2026-04-03-00-38.json
@@ -2,9 +2,9 @@
   "changes": [
     {
       "packageName": "@rushstack/zipsync",
-      "comment": "Bump jest to 30.x, address changes",
-      "type": "patch"
+      "comment": "",
+      "type": "none"
     }
   ],
   "packageName": "@rushstack/zipsync"
-}
+}
diff --git a/heft-plugins/heft-jest-plugin/src/JestRealPathPatch.ts b/heft-plugins/heft-jest-plugin/src/JestRealPathPatch.ts
@@ -4,6 +4,7 @@
 import * as path from 'node:path';
 
 import { RealNodeModulePathResolver } from '@rushstack/node-core-library/lib/RealNodeModulePath';
+import type { IPackageJson } from '@rushstack/node-core-library';
 
 const jestResolvePackageFolder: string = path.dirname(require.resolve('jest-resolve/package.json'));
 
@@ -27,8 +28,8 @@ const customTryRealpath = (input: string): string => {
   return input;
 };
 
-const jestUtilPackageJson: { version: string } = require(path.join(jestUtilPackageFolder, 'package.json'));
-const jestUtilMajorVersion: number = parseInt(jestUtilPackageJson.version.split('.')[0], 10);
+const jestUtilPackageJson: IPackageJson = require(path.join(`${jestUtilPackageFolder}/package.json`));
+const jestUtilMajorVersion: number = parseInt(jestUtilPackageJson.version, 10);
 
 if (jestUtilMajorVersion >= 30) {
   // jest-util 30+: everything is bundled in index.js.
@@ -48,7 +49,7 @@ if (jestUtilMajorVersion >= 30) {
   require.cache[jestUtilIndexPath]!.exports = patchedExports;
 } else {
   // jest-util < 30: tryRealpath is a standalone module; replace its default export.
-  const jestUtilTryRealpathPath: string = path.resolve(jestUtilPackageFolder, './build/tryRealpath.js');
+  const jestUtilTryRealpathPath: string = `${jestUtilPackageFolder}/build/tryRealpath.js`;
   const tryRealpathModule: {
     default: (filePath: string) => string;
   } = require(jestUtilTryRealpathPath);
diff --git a/heft-plugins/heft-jest-plugin/src/patches/jestWorkerPatch.ts b/heft-plugins/heft-jest-plugin/src/patches/jestWorkerPatch.ts
@@ -6,7 +6,7 @@
 import * as path from 'node:path';
 import { createRequire } from 'node:module';
 
-import { Import, FileSystem } from '@rushstack/node-core-library';
+import { Import, FileSystem, type IPackageJson } from '@rushstack/node-core-library';
 
 // This patch is a fix for a problem where Jest reports this error spuriously on a machine that is under heavy load:
 //
@@ -66,23 +66,29 @@ function applyPatch(): void {
     // jest-worker 30.x switched to a webpack-bundled single-file architecture.
     // For 29.x and earlier, patch build/base/BaseWorkerPool.js directly.
     // For 30.x and later, patch build/index.js (the webpack bundle).
-    const jestWorkerPackageJson: { version: string } = require(path.join(jestWorkerFolder, 'package.json'));
-    const jestWorkerMajorVersion: number = parseInt(jestWorkerPackageJson.version.split('.')[0], 10);
+    const jestWorkerPackageJson: IPackageJson = require(`${jestWorkerFolder}/package.json`);
+    const jestWorkerMajorVersion: number = parseInt(jestWorkerPackageJson.version, 10);
     const isBundled: boolean = jestWorkerMajorVersion >= 30;
 
     const targetPath: string = isBundled
-      ? path.join(jestWorkerFolder, 'build/index.js')
-      : path.join(jestWorkerFolder, 'build/base/BaseWorkerPool.js');
+      ? `${jestWorkerFolder}/build/index.js`
+      : `${jestWorkerFolder}/build/base/BaseWorkerPool.js`;
 
-    if (!FileSystem.exists(targetPath)) {
-      throw new Error(
-        `The ${path.basename(targetPath)} file was not found in the expected location:\n` + targetPath
-      );
+    // Load the original file contents
+    let originalFileContent: string;
+    try {
+      originalFileContent = FileSystem.readFile(targetPath);
+    } catch (e) {
+      if (FileSystem.isNotExistError(e)) {
+        throw new Error(
+          `The ${path.basename(targetPath)} file was not found in the expected location:\n` + targetPath
+        );
+      } else {
+        throw e;
+      }
     }
-
     // Load the module
     const targetModule: IBaseWorkerPoolModule = require(targetPath);
-
     // Obtain the metadata for the module
     let targetModuleMetadata: NodeModule | undefined = undefined;
     for (const childModule of module.children) {
@@ -94,14 +100,10 @@ function applyPatch(): void {
         targetModuleMetadata = childModule;
       }
     }
-
     if (!targetModuleMetadata) {
       throw new Error(`Failed to detect the Node.js module metadata for ${path.basename(targetPath)}`);
     }
 
-    // Load the original file contents
-    const originalFileContent: string = FileSystem.readFile(targetPath);
-
     // Apply the patch.  We will replace this:
     //
     //    const FORCE_EXIT_DELAY = 500;

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"toolPackages": [`
`6`	`6`	`{`
`7`	`7`	`"packageName": "@microsoft/api-extractor",`
`8`		`- "packageVersion": "7.58.0"`
	`8`	`+ "packageVersion": "7.58.1"`
`9`	`9`	`}`
`10`	`10`	`]`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`"changes": [`
`3`	`3`	`{`
`4`	`4`	`"packageName": "@microsoft/api-documenter",`
`5`		`- "comment": "Bump jest to 30.x, address changes",`
`6`		`- "type": "patch"`
	`5`	`+ "comment": "",`
	`6`	`+ "type": "none"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"packageName": "@microsoft/api-documenter"`
`10`		`-}`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`"changes": [`
`3`	`3`	`{`
`4`	`4`	`"packageName": "@microsoft/rush",`
`5`		`- "comment": "Bump jest to 30.x, address changes",`
	`5`	`+ "comment": "",`
`6`	`6`	`"type": "none"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"packageName": "@microsoft/rush"`
`10`		`-}`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`"changes": [`
`3`	`3`	`{`
`4`	`4`	`"packageName": "@microsoft/webpack5-load-themed-styles-loader",`
`5`		`- "comment": "Bump jest to 30.x, address changes",`
`6`		`- "type": "patch"`
	`5`	`+ "comment": "",`
	`6`	`+ "type": "none"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"packageName": "@microsoft/webpack5-load-themed-styles-loader"`
`10`		`-}`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`"changes": [`
`3`	`3`	`{`
`4`	`4`	`"packageName": "@rushstack/credential-cache",`
`5`		`- "comment": "Bump jest to 30.x, address changes",`
`6`		`- "type": "patch"`
	`5`	`+ "comment": "",`
	`6`	`+ "type": "none"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"packageName": "@rushstack/credential-cache"`
`10`		`-}`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`"changes": [`
`3`	`3`	`{`
`4`	`4`	`"packageName": "@rushstack/hashed-folder-copy-plugin",`
`5`		`- "comment": "Bump jest to 30.x, address changes",`
`6`		`- "type": "patch"`
	`5`	`+ "comment": "",`
	`6`	`+ "type": "none"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"packageName": "@rushstack/hashed-folder-copy-plugin"`
`10`		`-}`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`{`
`4`	`4`	`"packageName": "@rushstack/heft-jest-plugin",`
`5`	`5`	`"comment": "Bump jest-environment-jsdom to 30.3.0 to address CVE GHSA-vpq2-c234-7xj6",`
`6`		`- "type": "minor"`
	`6`	`+ "type": "major"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"packageName": "@rushstack/heft-jest-plugin"`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`"changes": [`
`3`	`3`	`{`
`4`	`4`	`"packageName": "@rushstack/heft-json-schema-typings-plugin",`
`5`		`- "comment": "Bump jest to 30.x, address changes",`
`6`		`- "type": "patch"`
	`5`	`+ "comment": "",`
	`6`	`+ "type": "none"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"packageName": "@rushstack/heft-json-schema-typings-plugin"`
`10`		`-}`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`"changes": [`
`3`	`3`	`{`
`4`	`4`	`"packageName": "@rushstack/localization-utilities",`
`5`		`- "comment": "Bump jest to 30.x, address changes",`
`6`		`- "type": "patch"`
	`5`	`+ "comment": "",`
	`6`	`+ "type": "none"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"packageName": "@rushstack/localization-utilities"`
`10`		`-}`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`"changes": [`
`3`	`3`	`{`
`4`	`4`	`"packageName": "@rushstack/lockfile-explorer",`
`5`		`- "comment": "Bump jest to 30.x, address changes",`
`6`		`- "type": "patch"`
	`5`	`+ "comment": "",`
	`6`	`+ "type": "none"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"packageName": "@rushstack/lockfile-explorer"`
`10`		`-}`
	`10`	`+}`