From ce892cbab3570cea121bd62513e7ff69a6e14cf8 Mon Sep 17 00:00:00 2001 From: Lincoln <778157949@qq.com> Date: Thu, 8 May 2025 12:29:35 +0000 Subject: [PATCH 1/2] fix: parse path --- .../rush/feat-add-cursor-rules_2025-05-08-12-27.json | 10 ++++++++++ libraries/rush-lib/src/utilities/HotlinkManager.ts | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 common/changes/@microsoft/rush/feat-add-cursor-rules_2025-05-08-12-27.json diff --git a/common/changes/@microsoft/rush/feat-add-cursor-rules_2025-05-08-12-27.json b/common/changes/@microsoft/rush/feat-add-cursor-rules_2025-05-08-12-27.json new file mode 100644 index 00000000000..83671cd5a63 --- /dev/null +++ b/common/changes/@microsoft/rush/feat-add-cursor-rules_2025-05-08-12-27.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/rush", + "comment": "Fix path parsing issue when running rush bridge-package", + "type": "none" + } + ], + "packageName": "@microsoft/rush" +} \ No newline at end of file diff --git a/libraries/rush-lib/src/utilities/HotlinkManager.ts b/libraries/rush-lib/src/utilities/HotlinkManager.ts index 643df7e6b7a..cae23f40619 100644 --- a/libraries/rush-lib/src/utilities/HotlinkManager.ts +++ b/libraries/rush-lib/src/utilities/HotlinkManager.ts @@ -196,9 +196,8 @@ export class HotlinkManager { ); const packageSourcePathSet: Set = new Set(); for (const dirName of subDirectories) { - const parsedDependency: DependencyPath = parse(dirName); - if (parsedDependency?.name === packageName) { - const packageSourcePath: string = `${consumerPackagePnpmDependenciesFolderPath}/${dirName}/${RushConstants.nodeModulesFolderName}/${packageName}`; + const packageSourcePath: string = `${consumerPackagePnpmDependenciesFolderPath}/${dirName}/${RushConstants.nodeModulesFolderName}/${packageName}`; + if (await FileSystem.existsAsync(packageSourcePath)) { const { version } = await JsonFile.loadAsync(`${packageSourcePath}/${FileConstants.PackageJson}`); if (semver.satisfies(version, versionRange)) { packageSourcePathSet.add(packageSourcePath); From e11475f9d1f311ffafe2a9e0b9ffff7e923de3ae Mon Sep 17 00:00:00 2001 From: Lincoln <778157949@qq.com> Date: Thu, 8 May 2025 12:45:10 +0000 Subject: [PATCH 2/2] fix: ci --- libraries/rush-lib/src/utilities/HotlinkManager.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/libraries/rush-lib/src/utilities/HotlinkManager.ts b/libraries/rush-lib/src/utilities/HotlinkManager.ts index cae23f40619..4018c37f8c1 100644 --- a/libraries/rush-lib/src/utilities/HotlinkManager.ts +++ b/libraries/rush-lib/src/utilities/HotlinkManager.ts @@ -13,10 +13,8 @@ import { type INodePackageJson, type IPackageJsonDependencyTable } from '@rushstack/node-core-library'; -import type { DependencyPath } from '@pnpm/dependency-path'; import { PackageExtractor } from '@rushstack/package-extractor'; import { pnpmSyncUpdateFileAsync, pnpmSyncCopyAsync, type ILogMessageCallbackOptions } from 'pnpm-sync-lib'; -import { parse } from '@pnpm/dependency-path'; import * as semver from 'semver'; import type { RushConfiguration } from '../api/RushConfiguration';