dependabot-npm_and_yarn 0.91.7 → 0.91.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d63eaa13116bd80361972c7136f92fd4b4ce515a81306ebdbd15b06ea71dd5
-  data.tar.gz: c81255d9a3b3a8719b63430ab03672a5dd49639974d39908c1273e74108b16b8
+  metadata.gz: e52c2ff14ce646e2afecc7fd74fdff1811dd39be8d7f05aa5de845c47787f55a
+  data.tar.gz: ab411f03f47b7b67adb234663f64be101b35dbe3bc7028b47a3fba8844a0684d
 SHA512:
-  metadata.gz: af94a9ced33ddd7613d1aecccd5ccd1bca861465cb8b1f833b05406e6748d55fa9538b43a5a85125f63457af68297304fad06f2f52be86ca2ea84858c915fb85
-  data.tar.gz: 1ccd91b20fc6f5ae5f158e00561ab4ef867d921d6186227b3471333af5df8d34d213e2fd9e3a5ec933d3971ca3571ce1ca3bf07fb4cbb5d02721fd6a9f1d2e9e
+  metadata.gz: d0985ef383a024efdecd4abc0ec7a361fa6738f7359dd03ca94048ccd66242bd6f16643921d8ceef8ff3eafadd5573777f6066d7536114839c91f429968be5f9
+  data.tar.gz: c5495ec121f4a4d01358b16015badfc929b0a8b47a07d28f79e508b12ef04f518c8d3203d57bbdaaf127fa843aa42f7550fdd67ae05b7489e3d59a1457f5fcc5

data/helpers/npm/package-lock.json

@@ -1480,9 +1480,9 @@
       }
     },
     "eslint": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.12.0.tgz",
-      "integrity": "sha512-LntwyPxtOHrsJdcSwyQKVtHofPHdv+4+mFwEe91r2V13vqpM8yLr7b1sW+Oo/yheOPkWYsYlYJCkzlFAt8KV7g==",
+      "version": "5.12.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.12.1.tgz",
+      "integrity": "sha512-54NV+JkTpTu0d8+UYSA8mMKAG4XAsaOrozA9rCW7tgneg1mevcL7wIotPC+fZ0SkWwdhNqoXoxnQCTBp7UvTsg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -1713,17 +1713,6 @@
         "chardet": "^0.7.0",
         "iconv-lite": "^0.4.24",
         "tmp": "^0.0.33"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        }
       }
     },
     "extglob": {
@@ -2715,6 +2704,15 @@
         "sshpk": "^1.7.0"
       }
     },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
     "ignore": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -8321,9 +8319,9 @@
       "dev": true
     },
     "table": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.1.1.tgz",
-      "integrity": "sha512-NUjapYb/qd4PeFW03HnAuOJ7OMcBkJlqeClWxeNlQ0lXGSb52oZXGzkO0/I0ARegQ2eUT1g2VDJH0eUxDRcHmw==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.2.1.tgz",
+      "integrity": "sha512-qmhNs2GEHNqY5fd2Mo+8N1r2sw/rvTAAvBZTaTx+Y7PHLypqyrxr1MdIu0pLw6Xvl/Gi4ONu/sdceP8vvUjkyA==",
       "dev": true,
       "requires": {
         "ajv": "^6.6.1",

data/helpers/npm/package.json

@@ -7,7 +7,7 @@
     "semver": "5.6.0"
   },
   "devDependencies": {
-    "eslint": "5.12.0",
+    "eslint": "5.12.1",
     "eslint-plugin-prettier": "3.0.1",
     "fs-extra": "7.0.1",
     "jest": "23.6.0",

data/helpers/npm/yarn.lock

@@ -1448,10 +1448,10 @@ eslint-visitor-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
   integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
 
-eslint@5.12.0:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.12.0.tgz#fab3b908f60c52671fb14e996a450b96c743c859"
-  integrity sha512-LntwyPxtOHrsJdcSwyQKVtHofPHdv+4+mFwEe91r2V13vqpM8yLr7b1sW+Oo/yheOPkWYsYlYJCkzlFAt8KV7g==
+eslint@5.12.1:
+  version "5.12.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.12.1.tgz#5ca9931fb9029d04e7be92b03ce3b58edfac7e3b"
+  integrity sha512-54NV+JkTpTu0d8+UYSA8mMKAG4XAsaOrozA9rCW7tgneg1mevcL7wIotPC+fZ0SkWwdhNqoXoxnQCTBp7UvTsg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.5.3"

data/lib/dependabot/npm_and_yarn/file_parser.rb

@@ -28,6 +28,7 @@ module Dependabot
         (?<repo>[a-z0-9_.-]+)
         (
           (?:\#semver:(?<semver>.+))|
+          (?:\#(?=[\^~=<>])(?<semver>.+))|
           (?:\#(?<ref>.+))
         )?$
       }ix.freeze

data/lib/dependabot/npm_and_yarn/file_updater/package_json_updater.rb

@@ -164,6 +164,21 @@ module Dependabot
             )
           end
 
+          if original_line.match?(/#[\^~=<>]|semver:/)
+            return update_git_semver_requirement(
+              original_line: original_line,
+              old_req: old_req,
+              new_req: new_req
+            )
+          end
+
+          original_line.gsub(
+            %(\##{old_req.dig(:source, :ref)}"),
+            %(\##{new_req.dig(:source, :ref)}")
+          )
+        end
+
+        def update_git_semver_requirement(original_line:, old_req:, new_req:)
           if original_line.include?("semver:")
             return original_line.gsub(
               %(semver:#{old_req.fetch(:requirement)}"),
@@ -171,9 +186,11 @@ module Dependabot
             )
           end
 
+          raise "Not a semver req!" unless original_line.match?(/#[\^~=<>]/)
+
           original_line.gsub(
-            %(\##{old_req.dig(:source, :ref)}"),
-            %(\##{new_req.dig(:source, :ref)}")
+            %(##{old_req.fetch(:requirement)}"),
+            %(##{new_req.fetch(:requirement)}")
           )
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-npm_and_yarn
 version: !ruby/object:Gem::Version
-  version: 0.91.7
+  version: 0.91.8
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.91.7
+        version: 0.91.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.91.7
+        version: 0.91.8
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement