From f39a428cbdb33b6d6cb49832c0e582c67cebc7bb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 16 Sep 2025 21:13:18 +0000 Subject: [PATCH 1/3] Initial plan From 95986e9193e153adeb54067a1809af1a1a337fd4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 16 Sep 2025 21:28:44 +0000 Subject: [PATCH 2/3] Replace uuid package with Node.js built-in crypto.randomUUID Co-authored-by: bmiddha <5100938+bmiddha@users.noreply.github.com> --- .../subspaces/build-tests-subspace/repo-state.json | 2 +- common/config/subspaces/default/pnpm-lock.yaml | 10 ---------- common/config/subspaces/default/repo-state.json | 2 +- libraries/rush-lib/package.json | 4 +--- libraries/rush-lib/src/api/CobuildConfiguration.ts | 4 ++-- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/common/config/subspaces/build-tests-subspace/repo-state.json b/common/config/subspaces/build-tests-subspace/repo-state.json index df8d3168341..c0a266ac12c 100644 --- 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": "f89693a88037554bf0c35db4f2295ef771cd2a71", "preferredVersionsHash": "550b4cee0bef4e97db6c6aad726df5149d20e7d9", - "packageJsonInjectedDependenciesHash": "364e001eac655a92be31ddb4bbf0d8b291d1e9cc" + "packageJsonInjectedDependenciesHash": "2fad9cbc4726f383da294e793c5b891d8775fca6" } diff --git a/common/config/subspaces/default/pnpm-lock.yaml b/common/config/subspaces/default/pnpm-lock.yaml index b19882175df..3818f460807 100644 --- a/common/config/subspaces/default/pnpm-lock.yaml +++ b/common/config/subspaces/default/pnpm-lock.yaml @@ -3668,9 +3668,6 @@ importers: true-case-path: specifier: ~2.2.1 version: 2.2.1 - uuid: - specifier: ~8.3.2 - version: 8.3.2 devDependencies: '@pnpm/lockfile.types': specifier: ~1.0.3 @@ -3720,9 +3717,6 @@ importers: '@types/tar': specifier: 6.1.6 version: 6.1.6 - '@types/uuid': - specifier: ~8.3.4 - version: 8.3.4 '@types/webpack-env': specifier: 1.18.8 version: 1.18.8 @@ -14190,10 +14184,6 @@ packages: resolution: {integrity: sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==} dev: false - /@types/uuid@8.3.4: - resolution: {integrity: sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==} - dev: true - /@types/vscode@1.103.0: resolution: {integrity: sha512-o4hanZAQdNfsKecexq9L3eHICd0AAvdbLk6hA60UzGXbGH/q8b/9xv2RgR7vV3ZcHuyKVq7b37IGd/+gM4Tu+Q==} dev: true diff --git a/common/config/subspaces/default/repo-state.json b/common/config/subspaces/default/repo-state.json index 3c852d397ea..f13a9c6c431 100644 --- 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": "43e8674ca74b9c3f20cf12f03de5ce2968017331", + "pnpmShrinkwrapHash": "3749a69d1b0594a63c7a5ad6628f2897dbc3247c", "preferredVersionsHash": "61cd419c533464b580f653eb5f5a7e27fe7055ca" } diff --git a/libraries/rush-lib/package.json b/libraries/rush-lib/package.json index 1c5090d7350..0ce5842b6a6 100644 --- a/libraries/rush-lib/package.json +++ b/libraries/rush-lib/package.json @@ -65,8 +65,7 @@ "strict-uri-encode": "~2.0.0", "tapable": "2.2.1", "tar": "~6.2.1", - "true-case-path": "~2.2.1", - "uuid": "~8.3.2" + "true-case-path": "~2.2.1" }, "devDependencies": { "@pnpm/lockfile.types": "~1.0.3", @@ -87,7 +86,6 @@ "@types/ssri": "~7.1.0", "@types/strict-uri-encode": "2.0.0", "@types/tar": "6.1.6", - "@types/uuid": "~8.3.4", "@types/webpack-env": "1.18.8", "webpack": "~5.98.0" }, diff --git a/libraries/rush-lib/src/api/CobuildConfiguration.ts b/libraries/rush-lib/src/api/CobuildConfiguration.ts index 0f169a2966a..8e7da0a6ec6 100644 --- a/libraries/rush-lib/src/api/CobuildConfiguration.ts +++ b/libraries/rush-lib/src/api/CobuildConfiguration.ts @@ -3,7 +3,7 @@ import { FileSystem, JsonFile, JsonSchema } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; -import { v4 as uuidv4 } from 'uuid'; +import { randomUUID } from 'node:crypto'; import { EnvironmentConfiguration } from './EnvironmentConfiguration'; import type { CobuildLockProviderFactory, RushSession } from '../pluginFramework/RushSession'; @@ -84,7 +84,7 @@ export class CobuildConfiguration { this.cobuildContextId = EnvironmentConfiguration.cobuildContextId; this.cobuildFeatureEnabled = this.cobuildContextId ? cobuildJson.cobuildFeatureEnabled : false; - this.cobuildRunnerId = EnvironmentConfiguration.cobuildRunnerId || uuidv4(); + this.cobuildRunnerId = EnvironmentConfiguration.cobuildRunnerId || randomUUID(); this.cobuildLeafProjectLogOnlyAllowed = EnvironmentConfiguration.cobuildLeafProjectLogOnlyAllowed ?? false; this.cobuildWithoutCacheAllowed = From 0f93668713461de81b1b39d2fa77fd8a9373e865 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 16 Sep 2025 21:58:42 +0000 Subject: [PATCH 3/3] Add rush change file for uuid package replacement Co-authored-by: bmiddha <5100938+bmiddha@users.noreply.github.com> --- ...-8acb-4963-a955-6ee097ae90bc_2025-09-16-21-58.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@microsoft/rush/copilot-fix-7b47235e-8acb-4963-a955-6ee097ae90bc_2025-09-16-21-58.json diff --git a/common/changes/@microsoft/rush/copilot-fix-7b47235e-8acb-4963-a955-6ee097ae90bc_2025-09-16-21-58.json b/common/changes/@microsoft/rush/copilot-fix-7b47235e-8acb-4963-a955-6ee097ae90bc_2025-09-16-21-58.json new file mode 100644 index 00000000000..8b220b0dc7a --- /dev/null +++ b/common/changes/@microsoft/rush/copilot-fix-7b47235e-8acb-4963-a955-6ee097ae90bc_2025-09-16-21-58.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "Replace uuid package dependency with Node.js built-in crypto.randomUUID", + "type": "none", + "packageName": "@microsoft/rush" + } + ], + "packageName": "@microsoft/rush", + "email": "198982749+Copilot@users.noreply.github.com" +} \ No newline at end of file