dependabot-npm_and_yarn 0.141.1 → 0.143.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c005c01399dd0a911b6db78644779e3bcbad49297703dc6103d05f8e99b4cfd
-  data.tar.gz: ce861a4173a462ce834736e1d38d426b8db235d5907e4b812084276d3252a6a6
+  metadata.gz: a2fb01840787fe50d5b15880a5ca1d552c47d58118998b7bdc9322f2ba02bd30
+  data.tar.gz: 2350133d2114b6c29ac986b742e59a58122940e1282217268f53112069c6a558
 SHA512:
-  metadata.gz: 5f9304069c2f1c9ceec760438f2a3757522fd34f9fe716f289b3d4bc993006405e650ef111a62f314298ff2e1b06b17ff8d062675f820512da117db6856a3a00
-  data.tar.gz: c06e6d401a35507e70c15710927b3287c5c2800d23046fae167bf3435137dccf57b75dfb79bda048a5a4988b2f3b53fcee6eda2636a1012996b1ecbb43a6e938
+  metadata.gz: d87f229c82c4a82b014ac000736f8cce64da3d17b0b8cd23aa43f9d57dbd5643811ced3c61b51fe970ad899103b485faf14adfdc91095c78c03d333ba0b141aa
+  data.tar.gz: bcf1f36b481528cd2a5ab280e9bd3e6a80dff8bdb4fec4b14049897bfbaa55e5a27e8cb65de73dc7fd156cc77f1ec99e20a4bd0899ca3bd7a2c13fd6c2d114bb

data/helpers/package-lock.json

@@ -17,7 +17,7 @@
       },
       "devDependencies": {
         "eslint": "^7.24.0",
-        "eslint-config-prettier": "^8.1.0",
+        "eslint-config-prettier": "^8.2.0",
         "jest": "^26.6.3",
         "prettier": "^2.2.1",
         "rimraf": "^3.0.2"
@@ -3510,9 +3510,9 @@
       }
     },
     "node_modules/eslint-config-prettier": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz",
-      "integrity": "sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.2.0.tgz",
+      "integrity": "sha512-dWV9EVeSo2qodOPi1iBYU/x6F6diHv8uujxbxr77xExs3zTAlNXvVZKiyLsQGNz7yPV2K49JY5WjPzNIuDc2Bw==",
       "dev": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
@@ -8195,7 +8195,239 @@
         "validate-npm-package-name",
         "which",
         "worker-farm",
-        "write-file-atomic"
+        "write-file-atomic",
+        "agent-base",
+        "agentkeepalive",
+        "ansi-align",
+        "ansi-regex",
+        "ansi-styles",
+        "are-we-there-yet",
+        "asap",
+        "asn1",
+        "assert-plus",
+        "asynckit",
+        "aws-sign2",
+        "aws4",
+        "balanced-match",
+        "bcrypt-pbkdf",
+        "boxen",
+        "brace-expansion",
+        "buffer-from",
+        "builtins",
+        "byline",
+        "camelcase",
+        "capture-stack-trace",
+        "caseless",
+        "chalk",
+        "cidr-regex",
+        "cli-boxes",
+        "cliui",
+        "clone",
+        "code-point-at",
+        "color-convert",
+        "color-name",
+        "colors",
+        "combined-stream",
+        "concat-map",
+        "concat-stream",
+        "configstore",
+        "console-control-strings",
+        "copy-concurrently",
+        "core-util-is",
+        "create-error-class",
+        "cross-spawn",
+        "crypto-random-string",
+        "cyclist",
+        "dashdash",
+        "debug",
+        "decamelize",
+        "decode-uri-component",
+        "deep-extend",
+        "defaults",
+        "define-properties",
+        "delayed-stream",
+        "delegates",
+        "dot-prop",
+        "dotenv",
+        "duplexer3",
+        "duplexify",
+        "ecc-jsbn",
+        "emoji-regex",
+        "encoding",
+        "end-of-stream",
+        "env-paths",
+        "err-code",
+        "errno",
+        "es-abstract",
+        "es-to-primitive",
+        "es6-promise",
+        "es6-promisify",
+        "escape-string-regexp",
+        "execa",
+        "extend",
+        "extsprintf",
+        "fast-json-stable-stringify",
+        "flush-write-stream",
+        "forever-agent",
+        "form-data",
+        "from2",
+        "fs-minipass",
+        "fs.realpath",
+        "function-bind",
+        "gauge",
+        "genfun",
+        "get-caller-file",
+        "get-stream",
+        "getpass",
+        "global-dirs",
+        "got",
+        "har-schema",
+        "har-validator",
+        "has",
+        "has-flag",
+        "has-symbols",
+        "http-cache-semantics",
+        "http-proxy-agent",
+        "http-signature",
+        "https-proxy-agent",
+        "humanize-ms",
+        "iconv-lite",
+        "ignore-walk",
+        "import-lazy",
+        "ip",
+        "ip-regex",
+        "is-callable",
+        "is-ci",
+        "is-date-object",
+        "is-fullwidth-code-point",
+        "is-installed-globally",
+        "is-npm",
+        "is-obj",
+        "is-path-inside",
+        "is-redirect",
+        "is-regex",
+        "is-retry-allowed",
+        "is-stream",
+        "is-symbol",
+        "is-typedarray",
+        "isarray",
+        "isexe",
+        "isstream",
+        "jsbn",
+        "json-schema",
+        "json-stringify-safe",
+        "jsonparse",
+        "jsprim",
+        "latest-version",
+        "libnpmconfig",
+        "libnpmpublish",
+        "lodash._createset",
+        "lodash._root",
+        "lowercase-keys",
+        "make-dir",
+        "make-fetch-happen",
+        "mime-db",
+        "mime-types",
+        "minimatch",
+        "minimist",
+        "minizlib",
+        "ms",
+        "mute-stream",
+        "node-fetch-npm",
+        "npm-bundled",
+        "npm-logical-tree",
+        "npm-normalize-package-bin",
+        "npm-run-path",
+        "number-is-nan",
+        "oauth-sign",
+        "object-assign",
+        "object-keys",
+        "object.getownpropertydescriptors",
+        "os-homedir",
+        "os-tmpdir",
+        "p-finally",
+        "package-json",
+        "parallel-transform",
+        "path-exists",
+        "path-is-absolute",
+        "path-key",
+        "path-parse",
+        "performance-now",
+        "pify",
+        "prepend-http",
+        "process-nextick-args",
+        "promise-retry",
+        "promzard",
+        "proto-list",
+        "protoduck",
+        "prr",
+        "pseudomap",
+        "psl",
+        "pump",
+        "pumpify",
+        "punycode",
+        "qs",
+        "rc",
+        "registry-auth-token",
+        "registry-url",
+        "require-directory",
+        "require-main-filename",
+        "resolve-from",
+        "run-queue",
+        "safer-buffer",
+        "semver-diff",
+        "set-blocking",
+        "shebang-command",
+        "shebang-regex",
+        "signal-exit",
+        "smart-buffer",
+        "socks",
+        "socks-proxy-agent",
+        "spdx-correct",
+        "spdx-exceptions",
+        "spdx-expression-parse",
+        "spdx-license-ids",
+        "split-on-first",
+        "sshpk",
+        "stream-each",
+        "stream-iterate",
+        "stream-shift",
+        "strict-uri-encode",
+        "string_decoder",
+        "string-width",
+        "strip-ansi",
+        "strip-eof",
+        "strip-json-comments",
+        "supports-color",
+        "term-size",
+        "through",
+        "through2",
+        "timed-out",
+        "tough-cookie",
+        "tunnel-agent",
+        "tweetnacl",
+        "typedarray",
+        "unique-slug",
+        "unique-string",
+        "unzip-response",
+        "uri-js",
+        "url-parse-lax",
+        "util-deprecate",
+        "util-extend",
+        "util-promisify",
+        "verror",
+        "wcwidth",
+        "which-module",
+        "wide-align",
+        "widest-line",
+        "wrap-ansi",
+        "wrappy",
+        "xdg-basedir",
+        "xtend",
+        "y18n",
+        "yallist",
+        "yargs",
+        "yargs-parser"
       ],
       "dependencies": {
         "abbrev": "~1.1.1",
@@ -18794,9 +19026,9 @@
       }
     },
     "eslint-config-prettier": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz",
-      "integrity": "sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.2.0.tgz",
+      "integrity": "sha512-dWV9EVeSo2qodOPi1iBYU/x6F6diHv8uujxbxr77xExs3zTAlNXvVZKiyLsQGNz7yPV2K49JY5WjPzNIuDc2Bw==",
       "dev": true,
       "requires": {}
     },

data/helpers/package.json

@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "eslint": "^7.24.0",
-    "eslint-config-prettier": "^8.1.0",
+    "eslint-config-prettier": "^8.2.0",
     "jest": "^26.6.3",
     "prettier": "^2.2.1",
     "rimraf": "^3.0.2"

data/lib/dependabot/npm_and_yarn/file_parser.rb

@@ -252,10 +252,9 @@ module Dependabot
 
         return unless resolved_url
         return unless resolved_url.start_with?("http")
-        return if CENTRAL_REGISTRIES.any? { |u| resolved_url.start_with?(u) }
         return if resolved_url.match?(/(?<!pkg\.)github/)
 
-        private_registry_source_for(resolved_url, name)
+        registry_source_for(resolved_url, name)
       end
 
       def requirement_for(requirement)
@@ -287,7 +286,7 @@ module Dependabot
         }
       end
 
-      def private_registry_source_for(resolved_url, name)
+      def registry_source_for(resolved_url, name)
         url =
           if resolved_url.include?("/~/")
             # Gemfury format
@@ -305,7 +304,7 @@ module Dependabot
           else resolved_url.split("/")[0..2].join("/")
           end
 
-        { type: "private_registry", url: url }
+        { type: "registry", url: url }
       end
 
       def url_for_relevant_cred(resolved_url)

data/lib/dependabot/npm_and_yarn/metadata_finder.rb

@@ -39,7 +39,7 @@ module Dependabot
 
         case source_type
         when "git" then find_source_from_git_url
-        when "private_registry" then find_source_from_registry
+        when "registry" then find_source_from_registry
         else raise "Unexpected source type: #{source_type}"
         end
       end

data/lib/dependabot/npm_and_yarn/requirement.rb

@@ -45,9 +45,9 @@ module Dependabot
       end
 
       def initialize(*requirements)
-        requirements = requirements.flatten.flat_map do |req_string|
-          convert_js_constraint_to_ruby_constraint(req_string)
-        end
+        requirements = requirements.flatten.
+                       flat_map { |req_string| req_string.split(",").map(&:strip) }.
+                       flat_map { |req_string| convert_js_constraint_to_ruby_constraint(req_string) }
 
         super(requirements)
       end

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

@@ -106,7 +106,7 @@ module Dependabot
 
         def filter_ignored_versions(versions_array)
           filtered = versions_array.reject do |v, _|
-            ignore_reqs.any? { |r| r.satisfied_by?(v) }
+            ignore_requirements.any? { |r| r.satisfied_by?(v) }
           end
 
           raise AllVersionsIgnored if @raise_on_ignored && filtered.empty? && versions_array.any?
@@ -201,7 +201,7 @@ module Dependabot
           return false if related_to_current_pre?(ver) ^ ver.prerelease?
           return false if current_version_greater_than?(ver)
           return false if current_requirement_greater_than?(ver)
-          return false if ignore_reqs.any? { |r| r.satisfied_by?(ver) }
+          return false if ignore_requirements.any? { |r| r.satisfied_by?(ver) }
           return false if yanked?(ver)
 
           true
@@ -388,8 +388,8 @@ module Dependabot
           )
         end
 
-        def ignore_reqs
-          ignored_versions.map { |req| requirement_class.new(req.split(",")) }
+        def ignore_requirements
+          ignored_versions.flat_map { |req| requirement_class.requirements_array(req) }
         end
 
         def version_class

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

@@ -62,8 +62,8 @@ module Dependabot
 
         def registry_url
           protocol =
-            if private_registry_source_url
-              private_registry_source_url.split("://").first
+            if registry_source_url
+              registry_source_url.split("://").first
             else
               "https"
             end
@@ -92,10 +92,10 @@ module Dependabot
         end
 
         def locked_registry
-          return unless private_registry_source_url
+          return unless registry_source_url
 
           lockfile_registry =
-            private_registry_source_url.
+            registry_source_url.
             gsub("https://", "").
             gsub("http://", "")
           detailed_registry =
@@ -210,7 +210,7 @@ module Dependabot
           dependency.name.gsub("/", "%2F")
         end
 
-        def private_registry_source_url
+        def registry_source_url
           sources = dependency.requirements.
                     map { |r| r.fetch(:source) }.uniq.compact
 
@@ -218,8 +218,8 @@ module Dependabot
           # it's unclear how we should proceed
           raise "Multiple sources! #{sources.join(', ')}" if sources.map { |s| [s[:type], s[:url]] }.uniq.count > 1
 
-          # Otherwise we just take the URL of the first private registry
-          sources.find { |s| s[:type] == "private_registry" }&.fetch(:url)
+          # Otherwise we just take the URL of the first registry
+          sources.find { |s| s[:type] == "registry" }&.fetch(:url)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-npm_and_yarn
 version: !ruby/object:Gem::Version
-  version: 0.141.1
+  version: 0.143.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-04-23 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.141.1
+        version: 0.143.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.141.1
+        version: 0.143.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.0
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: JS support for dependabot