Skip to content

Commit

Permalink
fix(deps): Explicit libnpmpublish ^1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
evocateur committed Feb 4, 2019
1 parent 2695a90 commit a506d96
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion commands/publish/index.js
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/lerna-publish-error.test.js
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions utils/npm-publish/__tests__/npm-publish.test.js
Expand Up @@ -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");

Expand All @@ -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();

Expand Down
4 changes: 2 additions & 2 deletions utils/npm-publish/npm-publish.js
Expand Up @@ -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");
Expand Down Expand Up @@ -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 &&
Expand Down
1 change: 1 addition & 0 deletions utils/npm-publish/package.json
Expand Up @@ -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"
}
Expand Down

0 comments on commit a506d96

Please sign in to comment.