dependabot-npm_and_yarn 0.130.3 → 0.132.0

data/lib/dependabot/npm_and_yarn/update_checker/conflicting_dependency_resolver.rb

@@ -45,13 +45,9 @@ module Dependabot
             # parser doesn't deal with at the moment.
             if dependency_files_builder.package_locks.any? ||
                dependency_files_builder.shrinkwraps.any?
-              package_lock = dependency_files_builder.package_locks.find { |f| f.name == "package-lock.json" }
-              npm_version = Dependabot::NpmAndYarn::Helpers.npm_version(package_lock&.content)
-              Dependabot.logger.info(npm_version)
-
               SharedHelpers.run_helper_subprocess(
                 command: NativeHelpers.helper_path,
-                function: "npm6:findConflictingDependencies",
+                function: "npm:findConflictingDependencies",
                 args: [Dir.pwd, dependency.name, target_version.to_s]
               )
             else

data/lib/dependabot/npm_and_yarn/update_checker/subdependency_version_resolver.rb

@@ -113,11 +113,10 @@ module Dependabot
           SharedHelpers.with_git_configured(credentials: credentials) do
             Dir.chdir(path) do
               npm_version = Dependabot::NpmAndYarn::Helpers.npm_version(lockfile_content)
-              Dependabot.logger.info(npm_version)
 
               SharedHelpers.run_helper_subprocess(
                 command: NativeHelpers.helper_path,
-                function: "npm6:updateSubdependency",
+                function: "#{npm_version}:updateSubdependency",
                 args: [Dir.pwd, lockfile_name, [dependency.to_h]]
               )
             end

data/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb

@@ -420,11 +420,10 @@ module Dependabot
                 f.name == [path, "package-lock.json"].join("/").sub(%r{\A.?\/}, "")
               end
               npm_version = Dependabot::NpmAndYarn::Helpers.npm_version(package_lock&.content)
-              Dependabot.logger.info(npm_version)
 
               SharedHelpers.run_helper_subprocess(
                 command: NativeHelpers.helper_path,
-                function: "npm6:checkPeerDependencies",
+                function: "#{npm_version}:checkPeerDependencies",
                 args: [
                   Dir.pwd,
                   dependency.name,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-npm_and_yarn
 version: !ruby/object:Gem::Version
-  version: 0.130.3
+  version: 0.132.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.130.3
+        version: 0.132.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.130.3
+        version: 0.132.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -175,13 +175,16 @@ files:
 - helpers/README.md
 - helpers/build
 - helpers/jest.config.js
-- helpers/lib/npm6/conflicting-dependency-parser.js
+- helpers/lib/npm/conflicting-dependency-parser.js
+- helpers/lib/npm/index.js
 - helpers/lib/npm6/helpers.js
 - helpers/lib/npm6/index.js
 - helpers/lib/npm6/peer-dependency-checker.js
 - helpers/lib/npm6/remove-dependencies-from-lockfile.js
 - helpers/lib/npm6/subdependency-updater.js
 - helpers/lib/npm6/updater.js
+- helpers/lib/npm7/index.js
+- helpers/lib/npm7/peer-dependency-checker.js
 - helpers/lib/yarn/conflicting-dependency-parser.js
 - helpers/lib/yarn/fix-duplicates.js
 - helpers/lib/yarn/helpers.js
@@ -205,6 +208,19 @@ files:
 - helpers/test/npm6/fixtures/updater/updated/package-lock.json
 - helpers/test/npm6/helpers.js
 - helpers/test/npm6/updater.test.js
+- helpers/test/npm7/conflicting-dependency-parser.test.js
+- helpers/test/npm7/fixtures/conflicting-dependency-parser/deeply-nested/package-lock.json
+- helpers/test/npm7/fixtures/conflicting-dependency-parser/deeply-nested/package.json
+- helpers/test/npm7/fixtures/conflicting-dependency-parser/nested/package-lock.json
+- helpers/test/npm7/fixtures/conflicting-dependency-parser/nested/package.json
+- helpers/test/npm7/fixtures/conflicting-dependency-parser/simple/package-lock.json
+- helpers/test/npm7/fixtures/conflicting-dependency-parser/simple/package.json
+- helpers/test/npm7/fixtures/peer-dependency-checker/peer_dependency/package-lock.json
+- helpers/test/npm7/fixtures/peer-dependency-checker/peer_dependency/package.json
+- helpers/test/npm7/fixtures/peer-dependency-checker/peer_dependency_multiple/package-lock.json
+- helpers/test/npm7/fixtures/peer-dependency-checker/peer_dependency_multiple/package.json
+- helpers/test/npm7/helpers.js
+- helpers/test/npm7/peer-dependency-checker.test.js
 - helpers/test/yarn/conflicting-dependency-parser.test.js
 - helpers/test/yarn/fixtures/conflicting-dependency-parser/deeply-nested/package.json
 - helpers/test/yarn/fixtures/conflicting-dependency-parser/deeply-nested/yarn.lock
@@ -269,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.0
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: JS support for dependabot