diff --git a/commands/publish/index.js b/commands/publish/index.js index 9b1bdb5ed6..1929b34c1d 100644 --- a/commands/publish/index.js +++ b/commands/publish/index.js @@ -72,7 +72,7 @@ class PublishCommand extends Command { this.gitReset = this.options.gitReset !== false; this.verifyAccess = this.options.verifyAccess !== false; - // npmSession and user-agent are consumed by npm-registry-fetch (via libnpm/publish) + // npmSession and user-agent are consumed by npm-registry-fetch (via libnpmpublish) const npmSession = crypto.randomBytes(8).toString("hex"); const userAgent = `lerna/${this.options.lernaVersion}/node@${process.version}+${process.arch} (${ process.platform diff --git a/integration/lerna-publish-error.test.js b/integration/lerna-publish-error.test.js index 43fcbed936..f6ea70e573 100644 --- a/integration/lerna-publish-error.test.js +++ b/integration/lerna-publish-error.test.js @@ -7,7 +7,7 @@ const cloneFixture = require("@lerna-test/clone-fixture")( path.resolve(__dirname, "../commands/publish/__tests__") ); -test("lerna publish sets correct exit code when libnpm/publish fails", async () => { +test("lerna publish sets correct exit code when libnpmpublish fails", async () => { const { cwd } = await cloneFixture("normal"); try { diff --git a/package-lock.json b/package-lock.json index c3e89b3719..08c0efca54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -608,6 +608,7 @@ "figgy-pudding": "^3.5.1", "fs-extra": "^7.0.0", "libnpm": "^2.0.1", + "libnpmpublish": "^1.1.1", "pify": "^3.0.0", "read-package-json": "^2.0.13" } diff --git a/utils/npm-publish/__tests__/npm-publish.test.js b/utils/npm-publish/__tests__/npm-publish.test.js index c349118cfc..d39445548f 100644 --- a/utils/npm-publish/__tests__/npm-publish.test.js +++ b/utils/npm-publish/__tests__/npm-publish.test.js @@ -2,12 +2,12 @@ jest.mock("@lerna/run-lifecycle"); jest.mock("read-package-json"); -jest.mock("libnpm/publish"); +jest.mock("libnpmpublish"); jest.mock("fs-extra"); // mocked modules const fs = require("fs-extra"); -const publish = require("libnpm/publish"); +const { publish } = require("libnpmpublish"); const readJSON = require("read-package-json"); const runLifecycle = require("@lerna/run-lifecycle"); @@ -25,7 +25,7 @@ describe("npm-publish", () => { const mockManifest = { _normalized: true }; fs.readFile.mockName("fs.readFile").mockResolvedValue(mockTarData); - publish.mockName("libnpm/publish").mockResolvedValue(); + publish.mockName("libnpmpublish").mockResolvedValue(); readJSON.mockName("read-package-json").mockImplementation((file, cb) => cb(null, mockManifest)); runLifecycle.mockName("@lerna/run-lifecycle").mockResolvedValue(); diff --git a/utils/npm-publish/npm-publish.js b/utils/npm-publish/npm-publish.js index a29b515c52..2604411e34 100644 --- a/utils/npm-publish/npm-publish.js +++ b/utils/npm-publish/npm-publish.js @@ -2,7 +2,7 @@ const fs = require("fs-extra"); const log = require("libnpm/log"); -const publish = require("libnpm/publish"); +const { publish } = require("libnpmpublish"); const pify = require("pify"); const readJSON = require("read-package-json"); const figgyPudding = require("figgy-pudding"); @@ -42,7 +42,7 @@ function npmPublish(pkg, tarFilePath, _opts) { chain = chain.then(() => Promise.all([fs.readFile(tarFilePath), readJSONAsync(pkg.manifestLocation)])); chain = chain.then(([tarData, manifest]) => { // non-default tag needs to override publishConfig.tag, - // which is merged over opts.tag in libnpm/publish + // which is merged over opts.tag in libnpmpublish if ( opts.tag !== "latest" && manifest.publishConfig && diff --git a/utils/npm-publish/package.json b/utils/npm-publish/package.json index d4f2d9a8f8..772bf9c6ab 100644 --- a/utils/npm-publish/package.json +++ b/utils/npm-publish/package.json @@ -34,6 +34,7 @@ "figgy-pudding": "^3.5.1", "fs-extra": "^7.0.0", "libnpm": "^2.0.1", + "libnpmpublish": "^1.1.1", "pify": "^3.0.0", "read-package-json": "^2.0.13" }