Merge pull request #3229 from dependabot/feelepxyz/fix-flaky-npm6-spec

dependabot · Mar 4, 2021 · f3239df · f3239df
2 parents 1374df6 + e695105
commit f3239df
Show file tree

Hide file tree

Showing 6 changed files with 10,239 additions and 5,979 deletions.
diff --git a/npm_and_yarn/helpers/lib/npm6/peer-dependency-checker.js b/npm_and_yarn/helpers/lib/npm6/peer-dependency-checker.js
@@ -10,8 +10,8 @@
  *  - successful completion, or an error if there are peer dependency warnings
  */
 
-const npm = require("npm6");
-const installer = require("npm6/lib/install");
+const npm = require("npm");
+const installer = require("npm/lib/install");
 const { muteStderr, runAsync } = require("./helpers.js");
 
 function installArgsWithVersion(depName, desiredVersion, reqs) {

diff --git a/npm_and_yarn/helpers/lib/npm6/subdependency-updater.js b/npm_and_yarn/helpers/lib/npm6/subdependency-updater.js
@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
-const npm = require("npm6");
-const installer = require("npm6/lib/install");
+const npm = require("npm");
+const installer = require("npm/lib/install");
 const detectIndent = require("detect-indent");
 const removeDependenciesFromLockfile = require("./remove-dependencies-from-lockfile");
 

diff --git a/npm_and_yarn/helpers/lib/npm6/updater.js b/npm_and_yarn/helpers/lib/npm6/updater.js
@@ -16,8 +16,8 @@
  */
 const fs = require("fs");
 const path = require("path");
-const npm = require("npm6");
-const installer = require("npm6/lib/install");
+const npm = require("npm");
+const installer = require("npm/lib/install");
 const detectIndent = require("detect-indent");
 const { muteStderr, runAsync } = require("./helpers.js");