Merge main and resolve conflicts (lodash version bump, repo-state hashes)

Copilot · iclanton · Copilot · commit ea95f043d994 · 2026-02-06T19:58:05.000Z
Co-authored-by: iclanton &lt;5010588+iclanton@users.noreply.github.com&gt;
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,24 +1,22 @@
-.github/CODEOWNERS @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-common/autoinstallers/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-common/config/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+.github/CODEOWNERS @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+common/autoinstallers/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+common/config/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
 
-common/reviews/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+common/reviews/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
 
-apps/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-build-tests/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-build-tests-samples/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-build-tests-subspace/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-eslint/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-heft-plugins/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-libraries/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-repo-scripts/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-rigs/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-rush-plugins/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-vscode-extensions/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-webpack/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha @TheLarkInn
-rush.json @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-.gitattributes @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-.gitignore @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-README.md @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
-
-libraries/load-themed-styles/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha @dzearing
+apps/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+build-tests/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+build-tests-samples/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+build-tests-subspace/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+eslint/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+heft-plugins/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+libraries/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+repo-scripts/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+rigs/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+rush-plugins/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+vscode-extensions/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+webpack/**/* @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha @TheLarkInn
+rush.json @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+.gitattributes @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+.gitignore @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
+README.md @iclanton @octogonz @apostolisms @dmichon-msft @jxanthony @bmiddha
diff --git a/apps/api-extractor/package.json b/apps/api-extractor/package.json
@@ -45,7 +45,7 @@
     "@rushstack/terminal": "workspace:*",
     "@rushstack/ts-command-line": "workspace:*",
     "diff": "~8.0.2",
-    "lodash": "~4.17.15",
+    "lodash": "~4.17.23",
     "minimatch": "10.1.2",
     "resolve": "~1.22.1",
     "semver": "~7.5.4",
@@ -54,7 +54,7 @@
   },
   "devDependencies": {
     "@rushstack/heft": "1.1.7",
-    "@types/lodash": "4.14.116",
+    "@types/lodash": "4.17.23",
     "@types/resolve": "1.20.2",
     "@types/semver": "7.5.0",
     "decoupled-local-node-rig": "workspace:*",
diff --git a/build-tests/localization-plugin-test-02/package.json b/build-tests/localization-plugin-test-02/package.json
@@ -15,12 +15,12 @@
     "@rushstack/set-webpack-public-path-plugin": "^4.1.16",
     "@rushstack/webpack4-localization-plugin": "workspace:*",
     "@rushstack/webpack4-module-minifier-plugin": "workspace:*",
-    "@types/lodash": "4.14.116",
+    "@types/lodash": "4.17.23",
     "@types/webpack-env": "1.18.8",
     "eslint": "~9.37.0",
     "html-webpack-plugin": "~4.5.2",
     "local-node-rig": "workspace:*",
-    "lodash": "~4.17.15",
+    "lodash": "~4.17.23",
     "webpack": "~4.47.0",
     "webpack-bundle-analyzer": "~4.5.0",
     "webpack-dev-server": "~4.9.3"
diff --git a/common/changes/@microsoft/api-extractor/lodash-upgrade_2026-02-05-00-00.json b/common/changes/@microsoft/api-extractor/lodash-upgrade_2026-02-05-00-00.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "comment": "Upgrade `lodash` dependency from `~4.17.15` to `~4.17.23`.",
+      "type": "patch",
+      "packageName": "@microsoft/api-extractor"
+    }
+  ],
+  "packageName": "@microsoft/api-extractor"
+}
diff --git a/common/changes/@rushstack/heft-jest-plugin/lodash-upgrade_2026-02-05-00-00.json b/common/changes/@rushstack/heft-jest-plugin/lodash-upgrade_2026-02-05-00-00.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "comment": "Upgrade `lodash` dependency from `~4.17.15` to `~4.17.23`.",
+      "type": "patch",
+      "packageName": "@rushstack/heft-jest-plugin"
+    }
+  ],
+  "packageName": "@rushstack/heft-jest-plugin"
+}
diff --git a/common/changes/@rushstack/npm-check-fork/lodash-upgrade_2026-02-05-00-00.json b/common/changes/@rushstack/npm-check-fork/lodash-upgrade_2026-02-05-00-00.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "comment": "Upgrade `lodash` dependency from `~4.17.15` to `~4.17.23`.",
+      "type": "patch",
+      "packageName": "@rushstack/npm-check-fork"
+    }
+  ],
+  "packageName": "@rushstack/npm-check-fork"
+}
diff --git a/common/config/subspaces/build-tests-subspace/repo-state.json b/common/config/subspaces/build-tests-subspace/repo-state.json
@@ -2,5 +2,5 @@
 {
   "pnpmShrinkwrapHash": "1e9f75e9c3cbb717750b20d630f5dcb0d6a3c22f",
   "preferredVersionsHash": "550b4cee0bef4e97db6c6aad726df5149d20e7d9",
-  "packageJsonInjectedDependenciesHash": "6ed64a490bddd0488d913538d3165d52ecc76935"
+  "packageJsonInjectedDependenciesHash": "967312c4f0a6711811537dc847f5cdcfe761170d"
 }
diff --git a/common/config/subspaces/default/pnpm-lock.yaml b/common/config/subspaces/default/pnpm-lock.yaml
diff --git a/common/config/subspaces/default/repo-state.json b/common/config/subspaces/default/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": "62d85699663f1abdbc74db5c321340552578e800",
+  "pnpmShrinkwrapHash": "96195f4d584aa5b8034ea035cef173ce0d6cd641",
   "preferredVersionsHash": "9ba05fe872434900a0b29c308a94015078f37c47"
 }
diff --git a/heft-plugins/heft-jest-plugin/package.json b/heft-plugins/heft-jest-plugin/package.json
@@ -25,13 +25,13 @@
     "jest-config": "~29.5.0",
     "jest-resolve": "~29.5.0",
     "jest-snapshot": "~29.5.0",
-    "lodash": "~4.17.15",
+    "lodash": "~4.17.23",
     "punycode": "~2.3.1"
   },
   "devDependencies": {
     "@jest/types": "29.5.0",
     "@rushstack/heft": "workspace:*",
-    "@types/lodash": "4.14.116",
+    "@types/lodash": "4.17.23",
     "@types/node": "20.17.19",
     "decoupled-local-node-rig": "workspace:*",
     "eslint": "~9.37.0",
diff --git a/libraries/npm-check-fork/package.json b/libraries/npm-check-fork/package.json
@@ -20,12 +20,12 @@
   "dependencies": {
     "@rushstack/node-core-library": "workspace:*",
     "giturl": "^2.0.0",
-    "lodash": "~4.17.15",
+    "lodash": "~4.17.23",
     "semver": "~7.5.4"
   },
   "devDependencies": {
     "@rushstack/heft": "workspace:*",
-    "@types/lodash": "4.14.116",
+    "@types/lodash": "4.17.23",
     "@types/semver": "7.5.0",
     "eslint": "~9.37.0",
     "local-node-rig": "workspace:*"
diff --git a/libraries/npm-check-fork/src/GetLatestFromRegistry.ts b/libraries/npm-check-fork/src/GetLatestFromRegistry.ts
@@ -49,7 +49,7 @@ export default async function getNpmInfo(packageName: string): Promise<INpmRegis
   const CRAZY_HIGH_SEMVER: string = '8000.0.0';
   const sortedVersions: string[] = _(rawData.versions)
     .keys()
-    .remove(_.partial(semver.gt, CRAZY_HIGH_SEMVER))
+    .remove((version: string) => semver.gt(CRAZY_HIGH_SEMVER, version))
     .sort(semver.compare)
     .valueOf();
 
diff --git a/libraries/npm-check-fork/src/tests/GetLatestFromRegistry.test.ts b/libraries/npm-check-fork/src/tests/GetLatestFromRegistry.test.ts
@@ -79,4 +79,31 @@ describe('getNpmInfo', () => {
     const result: INpmRegistryInfo = await getNpmInfo('test-package');
     expect(result).toHaveProperty('homepage', '');
   });
+
+  it('filters out versions exceeding CRAZY_HIGH_SEMVER threshold', async () => {
+    const mockData: INpmRegistryPackageResponse = {
+      name: 'test-package',
+      versions: {
+        '1.0.0': {
+          name: 'test-package',
+          version: '1.0.0'
+        },
+        '2.0.0': {
+          name: 'test-package',
+          version: '2.0.0'
+        },
+        '9000.0.0': {
+          name: 'test-package',
+          version: '9000.0.0'
+        }
+      },
+      'dist-tags': { latest: '2.0.0', next: '2.0.0' }
+    };
+    mockFetchPackageMetadataAsync.mockResolvedValue({ data: mockData });
+
+    const result: INpmRegistryInfo = await getNpmInfo('test-package');
+    // Versions exceeding 8000.0.0 should be filtered out
+    expect(result.versions).toEqual(['1.0.0', '2.0.0']);
+    expect(result.versions).not.toContain('9000.0.0');
+  });
 });

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`{`
`3`	`3`	`"pnpmShrinkwrapHash": "1e9f75e9c3cbb717750b20d630f5dcb0d6a3c22f",`
`4`	`4`	`"preferredVersionsHash": "550b4cee0bef4e97db6c6aad726df5149d20e7d9",`
`5`		`- "packageJsonInjectedDependenciesHash": "6ed64a490bddd0488d913538d3165d52ecc76935"`
	`5`	`+ "packageJsonInjectedDependenciesHash": "967312c4f0a6711811537dc847f5cdcfe761170d"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`// DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.`
`2`	`2`	`{`
`3`		`- "pnpmShrinkwrapHash": "62d85699663f1abdbc74db5c321340552578e800",`
	`3`	`+ "pnpmShrinkwrapHash": "96195f4d584aa5b8034ea035cef173ce0d6cd641",`
`4`	`4`	`"preferredVersionsHash": "9ba05fe872434900a0b29c308a94015078f37c47"`
`5`	`5`	`}`