fix(deps): Consume forked npm libs

This helps improve `pnpm` support, making `lerna` installable without gross hacks. * `libnpmaccess` -> `@evocateur/libnpmaccess` * `libnpmpublish` -> `@evocateur/libnpmpublish` * `npm-registry-fetch` -> `@evocateur/npm-registry-fetch` * `pacote` -> `@evocateur/pacote`
lerna · Jun 9, 2019 · bdd4fa1 · bdd4fa1
1 parent 4974b78
commit bdd4fa1
Show file tree

Hide file tree

Showing 20 changed files with 142 additions and 140 deletions.
diff --git a/commands/add/index.js b/commands/add/index.js
@@ -4,7 +4,7 @@ const dedent = require("dedent");
 const npa = require("npm-package-arg");
 const pMap = require("p-map");
 const path = require("path");
-const getManifest = require("pacote/manifest");
+const getManifest = require("@evocateur/pacote/manifest");
 const semver = require("semver");
 
 const Command = require("@lerna/command");

diff --git a/commands/add/package.json b/commands/add/package.json
@@ -33,6 +33,7 @@
     "test": "echo \"Run tests from root\" && exit 1"
   },
   "dependencies": {
+    "@evocateur/pacote": "^9.6.0",
     "@lerna/bootstrap": "file:../bootstrap",
     "@lerna/command": "file:../../core/command",
     "@lerna/filter-options": "file:../../core/filter-options",
@@ -41,7 +42,6 @@
     "dedent": "^0.7.0",
     "npm-package-arg": "^6.1.0",
     "p-map": "^1.2.0",
-    "pacote": "^9.5.0",
     "semver": "^5.5.0"
   }
 }
diff --git a/commands/create/__tests__/create-command.test.js b/commands/create/__tests__/create-command.test.js
@@ -1,14 +1,14 @@
 "use strict";
 
-jest.mock("pacote/manifest");
+jest.mock("@evocateur/pacote/manifest");
 
 const fs = require("fs-extra");
 const path = require("path");
 const execa = require("execa");
 const slash = require("slash");
 
 // mocked modules
-const getManifest = require("pacote/manifest");
+const getManifest = require("@evocateur/pacote/manifest");
 
 // helpers
 const initFixture = require("@lerna-test/init-fixture")(__dirname);

diff --git a/commands/create/index.js b/commands/create/index.js
@@ -7,7 +7,7 @@ const { URL } = require("whatwg-url");
 const camelCase = require("camelcase");
 const dedent = require("dedent");
 const initPackageJson = require("pify")(require("init-package-json"));
-const getManifest = require("pacote/manifest");
+const getManifest = require("@evocateur/pacote/manifest");
 const npa = require("npm-package-arg");
 const pReduce = require("p-reduce");
 const slash = require("slash");

diff --git a/commands/create/package.json b/commands/create/package.json
@@ -33,6 +33,7 @@
     "test": "echo \"Run tests from root\" && exit 1"
   },
   "dependencies": {
+    "@evocateur/pacote": "^9.6.0",
     "@lerna/child-process": "file:../../core/child-process",
     "@lerna/command": "file:../../core/command",
     "@lerna/npm-conf": "file:../../utils/npm-conf",
@@ -44,7 +45,6 @@
     "init-package-json": "^1.10.3",
     "npm-package-arg": "^6.1.0",
     "p-reduce": "^1.0.0",
-    "pacote": "^9.5.0",
     "pify": "^3.0.0",
     "semver": "^5.5.0",
     "slash": "^1.0.0",

diff --git a/commands/publish/__tests__/get-npm-username.test.js b/commands/publish/__tests__/get-npm-username.test.js
@@ -1,8 +1,8 @@
 "use strict";
 
-jest.mock("npm-registry-fetch");
+jest.mock("@evocateur/npm-registry-fetch");
 
-const fetch = require("npm-registry-fetch");
+const fetch = require("@evocateur/npm-registry-fetch");
 const loggingOutput = require("@lerna-test/logging-output");
 const getNpmUsername = require("../lib/get-npm-username");
 

diff --git a/commands/publish/__tests__/get-unpublished-packages.test.js b/commands/publish/__tests__/get-unpublished-packages.test.js
@@ -1,9 +1,9 @@
 "use strict";
 
-jest.mock("pacote/packument");
+jest.mock("@evocateur/pacote/packument");
 
 // mocked module(s)
-const getPackument = require("pacote/packument");
+const getPackument = require("@evocateur/pacote/packument");
 
 // helpers
 const PackageGraph = require("@lerna/package-graph");

diff --git a/commands/publish/__tests__/verify-npm-package-access.test.js b/commands/publish/__tests__/verify-npm-package-access.test.js
@@ -1,8 +1,8 @@
 "use strict";
 
-jest.mock("libnpmaccess");
+jest.mock("@evocateur/libnpmaccess");
 
-const access = require("libnpmaccess");
+const access = require("@evocateur/libnpmaccess");
 const { getPackages } = require("@lerna/project");
 const loggingOutput = require("@lerna-test/logging-output");
 const initFixture = require("@lerna-test/init-fixture")(__dirname);

diff --git a/commands/publish/lib/get-npm-username.js b/commands/publish/lib/get-npm-username.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const fetch = require("npm-registry-fetch");
+const fetch = require("@evocateur/npm-registry-fetch");
 const pulseTillDone = require("@lerna/pulse-till-done");
 const ValidationError = require("@lerna/validation-error");
 const FetchConfig = require("./fetch-config");

diff --git a/commands/publish/lib/get-unpublished-packages.js b/commands/publish/lib/get-unpublished-packages.js
@@ -2,7 +2,7 @@
 
 const log = require("npmlog");
 const pMap = require("p-map");
-const getPackument = require("pacote/packument");
+const getPackument = require("@evocateur/pacote/packument");
 
 module.exports = getUnpublishedPackages;
 

diff --git a/commands/publish/lib/verify-npm-package-access.js b/commands/publish/lib/verify-npm-package-access.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const access = require("libnpmaccess");
+const access = require("@evocateur/libnpmaccess");
 const pulseTillDone = require("@lerna/pulse-till-done");
 const ValidationError = require("@lerna/validation-error");
 const FetchConfig = require("./fetch-config");

diff --git a/commands/publish/package.json b/commands/publish/package.json
@@ -34,6 +34,9 @@
     "test": "echo \"Run tests from root\" && exit 1"
   },
   "dependencies": {
+    "@evocateur/libnpmaccess": "^3.1.0",
+    "@evocateur/npm-registry-fetch": "^3.9.1",
+    "@evocateur/pacote": "^9.6.0",
     "@lerna/check-working-tree": "file:../../utils/check-working-tree",
     "@lerna/child-process": "file:../../core/child-process",
     "@lerna/collect-updates": "file:../../utils/collect-updates",
@@ -54,14 +57,11 @@
     "@lerna/version": "file:../version",
     "figgy-pudding": "^3.5.1",
     "fs-extra": "^7.0.0",
-    "libnpmaccess": "^3.0.1",
     "npm-package-arg": "^6.1.0",
-    "npm-registry-fetch": "^3.9.0",
     "npmlog": "^4.1.2",
     "p-finally": "^1.0.0",
     "p-map": "^1.2.0",
     "p-pipe": "^1.2.0",
-    "pacote": "^9.5.0",
     "semver": "^5.5.0"
   }
 }
diff --git a/core/cli/__tests__/core-cli.test.js b/core/cli/__tests__/core-cli.test.js
@@ -164,7 +164,7 @@ describe("core-cli", () => {
     const spy = jest.spyOn(cli, "exit");
 
     cli.command("errname", "a string code", {}, async () => {
-      const err = new Error("npm-registry-fetch");
+      const err = new Error("kersplode");
       err.code = "E401";
       throw err;
     });
@@ -175,7 +175,7 @@ describe("core-cli", () => {
     expect(spy).toHaveBeenLastCalledWith(
       1,
       expect.objectContaining({
-        message: "npm-registry-fetch",
+        message: "kersplode",
       })
     );
   });