dependabot-npm_and_yarn 0.190.1 → 0.191.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e71518c6b7d019932082e6ca55a5c323362fb55834e90cdf5ea71dc827095d
-  data.tar.gz: 2fc41215a1d9272dafc6c289bc5baa499b53ec91f927c2ac2a6dc1a7579c665d
+  metadata.gz: 4eb3662e89f982d144ebf3e38cb01ca906e118bc7ce30560d2f6e0a232ee78f9
+  data.tar.gz: db2e8228c13906e995d9ca33cf47bc2ab51460ec86e7bc1c9abcb355b7cff028
 SHA512:
-  metadata.gz: 81683a57bd5c0796682b769bd107c51c76fdb75a984af53484d4faa612d2dc7f8a7e767115df1780234067719ad693cc08492bbf0ead0e911289277cabf58399
-  data.tar.gz: 3f3201bdff681d127be04df52071d10bf2795667954da36f37868c87657760e99daf5e0eb41294a3b623c3d165997327a952afb444653bcb9b4c4b3ce42d8107
+  metadata.gz: 0d28c930cfc67555520a4583b5e23db882af3a015c3e1df2b23c626744c8f0a73c2d9c65d7a3b6af4f01be239f8539cd27db05fd32f11ae41d3fdc3528292145
+  data.tar.gz: 1a584c124824f2f6a4a69384ecf984f471ee547d845301dbcfe3f79d5257c223a7d871ee83b04f6a263d23274e472bbe8a6ed7f7c68b64206cffb554d250d7f2

data/lib/dependabot/npm_and_yarn/file_fetcher.rb

@@ -3,7 +3,9 @@
 require "json"
 require "dependabot/file_fetchers"
 require "dependabot/file_fetchers/base"
+require "dependabot/npm_and_yarn/helpers"
 require "dependabot/npm_and_yarn/file_parser"
+require "dependabot/npm_and_yarn/file_parser/lockfile_parser"
 
 module Dependabot
   module NpmAndYarn
@@ -43,10 +45,25 @@ module Dependabot
         fetched_files += workspace_package_jsons
         fetched_files += lerna_packages
         fetched_files += path_dependencies(fetched_files)
+        instrument_package_manager_version
 
         fetched_files.uniq
       end
 
+      def instrument_package_manager_version
+        package_managers = {}
+
+        package_managers["npm"] =  Helpers.npm_version_numeric(package_lock.content) if package_lock
+        package_managers["yarn"] = 1 if yarn_lock
+        package_managers["shrinkwrap"] = 1 if shrinkwrap
+
+        Dependabot.instrument(
+          Notifications::FILE_PARSER_PACKAGE_MANAGER_VERSION_PARSED,
+          ecosystem: "npm",
+          package_managers: package_managers
+        )
+      end
+
       def package_json
         @package_json ||= fetch_file_from_host("package.json")
       end

data/lib/dependabot/npm_and_yarn/helpers.rb

@@ -4,12 +4,16 @@ module Dependabot
   module NpmAndYarn
     module Helpers
       def self.npm_version(lockfile_content)
-        return "npm8" unless lockfile_content
-        return "npm8" if JSON.parse(lockfile_content)["lockfileVersion"] >= 2
+        "npm#{npm_version_numeric(lockfile_content)}"
+      end
+
+      def self.npm_version_numeric(lockfile_content)
+        return 8 unless lockfile_content
+        return 8 if JSON.parse(lockfile_content)["lockfileVersion"] >= 2
 
-        "npm6"
+        6
       rescue JSON::ParserError
-        "npm6"
+        6
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-npm_and_yarn
 version: !ruby/object:Gem::Version
-  version: 0.190.1
+  version: 0.191.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-07 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.190.1
+        version: 0.191.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.190.1
+        version: 0.191.0
 - !ruby/object:Gem::Dependency
   name: debase
   requirement: !ruby/object:Gem::Requirement