fix(publish): consider package-spec when inside workspace dir (#7738)

milaninfy · web-flow · commit 2404c7e991e1 · 2024-08-21T07:48:39.000-07:00
This PR fixes an issue where the `npm publish` command would fail when run from within a workspace directory with package-spec fixes: #7726
diff --git a/lib/commands/publish.js b/lib/commands/publish.js
@@ -46,7 +46,12 @@ class Publish extends BaseCommand {
     await this.#publish(args)
   }
 
-  async execWorkspaces () {
+  async execWorkspaces (args) {
+    const useWorkspaces = args.length === 0 || args.includes('.')
+    if (!useWorkspaces) {
+      log.warn('Ignoring workspaces for specified package(s)')
+      return this.exec(args)
+    }
     await this.setWorkspaces()
 
     for (const [name, workspace] of this.workspaces.entries()) {
diff --git a/tap-snapshots/test/lib/commands/publish.js.test.cjs b/tap-snapshots/test/lib/commands/publish.js.test.cjs
@@ -393,6 +393,10 @@ exports[`test/lib/commands/publish.js TAP workspaces all workspaces - some marke
 + workspace-a@1.2.3-a
 `
 
+exports[`test/lib/commands/publish.js TAP workspaces differet package spec > publish different package spec 1`] = `
++ pkg@1.2.3
+`
+
 exports[`test/lib/commands/publish.js TAP workspaces json > all workspaces in json 1`] = `
 {
   "workspace-a": {
diff --git a/test/lib/commands/publish.js b/test/lib/commands/publish.js
@@ -700,6 +700,48 @@ t.test('workspaces', t => {
     await npm.exec('publish', [])
     t.matchSnapshot(joinedOutput(), 'all workspaces in json')
   })
+
+  t.test('differet package spec', async t => {
+    const testDir = {
+      'package.json': JSON.stringify(
+        {
+          ...pkgJson,
+          workspaces: ['workspace-a'],
+        }, null, 2),
+      'workspace-a': {
+        'package.json': JSON.stringify({
+          name: 'workspace-a',
+          version: '1.2.3-a',
+        }),
+      },
+      'dir/pkg': {
+        'package.json': JSON.stringify({
+          name: 'pkg',
+          version: '1.2.3',
+        }),
+      },
+    }
+
+    const { npm, joinedOutput } = await loadMockNpm(t, {
+      config: {
+        ...auth,
+      },
+      prefixDir: testDir,
+      chdir: ({ prefix }) => path.resolve(prefix, './workspace-a'),
+    })
+    const registry = new MockRegistry({
+      tap: t,
+      registry: npm.config.get('registry'),
+      authorization: token,
+    })
+    registry.nock
+      .put('/pkg', body => {
+        return t.match(body, { name: 'pkg' })
+      }).reply(200, {})
+    await npm.exec('publish', ['../dir/pkg'])
+    t.matchSnapshot(joinedOutput(), 'publish different package spec')
+  })
+
   t.end()
 })
 

Original file line number	Diff line number	Diff line change
@@ -393,6 +393,10 @@ exports[`test/lib/commands/publish.js TAP workspaces all workspaces - some marke
`393`	`393`	`+ [email protected]`
`394`	`394`	`
`395`	`395`
	`396`	+exports[`test/lib/commands/publish.js TAP workspaces differet package spec > publish different package spec 1`] = `
	`397`	`++ [email protected]`
	`398`	+`
	`399`	`+`
`396`	`400`	exports[`test/lib/commands/publish.js TAP workspaces json > all workspaces in json 1`] = `
`397`	`401`	`{`
`398`	`402`	`"workspace-a": {`