feat: handle workspace protocol with any semver range specifier. fixes …

…pnpm#7578
EWhite613 · Feb 11, 2024 · bcdd4f5 · bcdd4f5
1 parent 25524bd
commit bcdd4f5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/.changeset/slimy-geese-knock.md b/.changeset/slimy-geese-knock.md
@@ -0,0 +1,5 @@
+---
+"@pnpm/exportable-manifest": minor
+---
+
+feat: handle workspace protocol with any semver range specifier. fixes #7578
diff --git a/pkg-manifest/exportable-manifest/src/index.ts b/pkg-manifest/exportable-manifest/src/index.ts
@@ -59,12 +59,13 @@ async function makePublishDependencies (
 }
 
 async function makePublishDependency (depName: string, depSpec: string, dir: string, modulesDir?: string) {
- if (!depSpec.startsWith('workspace:')) {
+ if (!depSpec.includes('workspace:')) {
  return depSpec
  }
 
- // Dependencies with bare "*", "^" and "~" versions
- const versionAliasSpecParts = /^workspace:(.*?)@?([\^~*])$/.exec(depSpec)
+ // Dependencies with bare "*", "^", "~",">=",">","<=",< versions
+ const workspaceSemverRegex = /workspace:(.*?)@?([\^~*]|>=|>|<=|<)/
+ const versionAliasSpecParts = workspaceSemverRegex.exec(depSpec)
  if (versionAliasSpecParts != null) {
  modulesDir = modulesDir ?? path.join(dir, 'node_modules')
  const { manifest } = await tryReadProjectManifest(path.join(modulesDir, depName))
@@ -80,10 +81,10 @@ async function makePublishDependency (depName: string, depSpec: string, dir: str
  if (depName !== manifest.name) {
  return `npm:${manifest.name!}@${semverRangeToken}${manifest.version}`
  }
- return `${semverRangeToken}${manifest.version}`
+ return depSpec.replace(workspaceSemverRegex, `${semverRangeToken}${manifest.version}`)
  }
- if (depSpec.startsWith('workspace:./') || depSpec.startsWith('workspace:../')) {
- const { manifest } = await tryReadProjectManifest(path.join(dir, depSpec.slice(10)))
+ if (depSpec.includes('workspace:./') || depSpec.includes('workspace:../')) {
+ const { manifest } = await tryReadProjectManifest(path.join(dir, depSpec.replace('workspace:', '')))
  if (!manifest?.name || !manifest?.version) {
  throw new PnpmError(
  'CANNOT_RESOLVE_WORKSPACE_PROTOCOL',
@@ -94,7 +95,7 @@ async function makePublishDependency (depName: string, depSpec: string, dir: str
  if (manifest.name === depName) return `${manifest.version}`
  return `npm:${manifest.name}@${manifest.version}`
  }
- depSpec = depSpec.slice(10)
+ depSpec = depSpec.replace('workspace:', '')
  if (depSpec.includes('@')) {
  return `npm:${depSpec}`
  }

diff --git a/pkg-manifest/exportable-manifest/test/index.test.ts b/pkg-manifest/exportable-manifest/test/index.test.ts
@@ -91,6 +91,10 @@ test('workspace deps are replaced', async () => {
  baz: 'workspace:baz@^',
  foo: 'workspace:*',
  },
+ peerDependencies: {
+ foo: 'workspace:>= || ^3.9.0',
+ baz: '^1.0.0 || workspace:baz@:>',
+ },
  }
 
  preparePackages([
@@ -123,5 +127,9 @@ test('workspace deps are replaced', async () => {
  baz: '^1.2.3',
  foo: '4.5.6',
  },
+ peerDependencies: {
+ baz: '^1.0.0 || >1.2.3',
+ foo: '>=4.5.6 || ^3.9.0',
+ },
  })
 })