fix(publish) Pass only the project scope to libnpmpublish (#1985)

Fixes #1968
lerna · Mar 22, 2019 · 4e3f8d8 · 4e3f8d8
1 parent 5001301
commit 4e3f8d8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/utils/npm-publish/__tests__/npm-publish.test.js b/utils/npm-publish/__tests__/npm-publish.test.js
@@ -32,7 +32,7 @@ describe("npm-publish", () => {
   const tarFilePath = "/tmp/test-1.10.100.tgz";
   const rootPath = path.normalize("/test");
   const pkg = new Package(
-    { name: "test", version: "1.10.100" },
+    { name: "@scope/test", version: "1.10.100" },
     path.join(rootPath, "npmPublish/test"),
     rootPath
   );
@@ -49,8 +49,8 @@ describe("npm-publish", () => {
       mockTarData,
       expect.figgyPudding({
         dryRun: false,
-        projectScope: "test",
         tag: "published-tag",
+        projectScope: "@scope",
       })
     );
   });
@@ -127,7 +127,7 @@ describe("npm-publish", () => {
 
   it("calls publish lifecycles", async () => {
     const aFiggyPudding = expect.figgyPudding({
-      projectScope: "test",
+      projectScope: "@scope",
     });
 
     await npmPublish(pkg, tarFilePath);

diff --git a/utils/npm-publish/npm-publish.js b/utils/npm-publish/npm-publish.js
@@ -7,6 +7,7 @@ const pify = require("pify");
 const readJSON = require("read-package-json");
 const figgyPudding = require("figgy-pudding");
 const runLifecycle = require("@lerna/run-lifecycle");
+const npa = require("npm-package-arg");
 
 module.exports = npmPublish;
 
@@ -30,8 +31,10 @@ const PublishConfig = figgyPudding(
 );
 
 function npmPublish(pkg, tarFilePath, _opts) {
+  const { scope } = npa(pkg.name);
+  // pass only the package scope to libnpmpublish
   const opts = PublishConfig(_opts, {
-    projectScope: pkg.name,
+    projectScope: scope,
   });
 
   opts.log.verbose("publish", pkg.name);

diff --git a/utils/npm-publish/package.json b/utils/npm-publish/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lerna/npm-publish",
-  "version": "3.13.0",
+  "version": "3.13.1",
   "description": "An internal Lerna tool",
   "keywords": [
     "lerna",
@@ -35,6 +35,7 @@
     "figgy-pudding": "^3.5.1",
     "fs-extra": "^7.0.0",
     "libnpmpublish": "^1.1.1",
+    "npm-package-arg": "^6.1.0",
     "npmlog": "^4.1.2",
     "pify": "^3.0.0",
     "read-package-json": "^2.0.13"