dependabot-npm_and_yarn 0.129.1 → 0.130.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (28) hide show
  1. checksums.yaml +4 -4
  2. data/helpers/lib/{npm → npm6}/conflicting-dependency-parser.js +0 -0
  3. data/helpers/lib/{npm → npm6}/helpers.js +0 -0
  4. data/helpers/lib/{npm → npm6}/index.js +0 -0
  5. data/helpers/lib/{npm → npm6}/peer-dependency-checker.js +2 -2
  6. data/helpers/lib/{npm → npm6}/remove-dependencies-from-lockfile.js +0 -0
  7. data/helpers/lib/{npm → npm6}/subdependency-updater.js +2 -2
  8. data/helpers/lib/{npm → npm6}/updater.js +2 -2
  9. data/helpers/package.json +4 -4
  10. data/helpers/test/{npm → npm6}/conflicting-dependency-parser.test.js +1 -1
  11. data/helpers/test/{npm → npm6}/fixtures/conflicting-dependency-parser/deeply-nested/package-lock.json +0 -0
  12. data/helpers/test/{npm → npm6}/fixtures/conflicting-dependency-parser/deeply-nested/package.json +0 -0
  13. data/helpers/test/{npm → npm6}/fixtures/conflicting-dependency-parser/nested/package-lock.json +0 -0
  14. data/helpers/test/{npm → npm6}/fixtures/conflicting-dependency-parser/nested/package.json +0 -0
  15. data/helpers/test/{npm → npm6}/fixtures/conflicting-dependency-parser/simple/package-lock.json +0 -0
  16. data/helpers/test/{npm → npm6}/fixtures/conflicting-dependency-parser/simple/package.json +0 -0
  17. data/helpers/test/{npm → npm6}/fixtures/updater/original/package-lock.json +0 -0
  18. data/helpers/test/{npm → npm6}/fixtures/updater/original/package.json +0 -0
  19. data/helpers/test/{npm → npm6}/fixtures/updater/updated/package-lock.json +0 -0
  20. data/helpers/test/{npm → npm6}/helpers.js +0 -0
  21. data/helpers/test/{npm → npm6}/updater.test.js +1 -1
  22. data/helpers/yarn.lock +44 -51
  23. data/lib/dependabot/npm_and_yarn/file_parser.rb +3 -1
  24. data/lib/dependabot/npm_and_yarn/file_updater/npm_lockfile_updater.rb +2 -2
  25. data/lib/dependabot/npm_and_yarn/update_checker/conflicting_dependency_resolver.rb +1 -1
  26. data/lib/dependabot/npm_and_yarn/update_checker/subdependency_version_resolver.rb +1 -1
  27. data/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb +1 -1
  28. metadata +27 -27
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cd956e50a1b8e1abab39379ded16eefa8112c660cb74056c56488de90a32df3e
4
- data.tar.gz: 83abb82e74fb8da4a9ca1289bdaeddacbf241765cd2039f152b88183120b758a
3
+ metadata.gz: 868aa266ae8253249dc3cbd04e818abf9d35920c208d950bd75e820e4f7a547f
4
+ data.tar.gz: b5969cbacc732eea97073c433ea5e4e17030e1841e61397945a2dadd72b5b2ab
5
5
  SHA512:
6
- metadata.gz: a59db940f12a1647ea2cc7d34a61e87ab10de9dc88601f3c72cf47e9a4ad6f109d91c5422132f0ab939b214b20fa65a103e98430868a904d9246d065c3db5c17
7
- data.tar.gz: c04a01204dd21f372789c373b533b4f084a245162444a742a1dc07fd8d78a7abd8f23632d64275de286202e3b6276b8e858c3dd020b10fbc1088cfdb043cde1c
6
+ metadata.gz: 55395ff8544ef418bf1c30dfad27089859ece04b0641b86e3386514e48dab3497b309c143adf6777c300348e0248d8cbbe2bfd124377edebf235a90cb75aec31
7
+ data.tar.gz: 3f623a88d5c4d8e97efae41052177f1242b825539bb99e81a8a2aa0cfb785716640cce6381e3182cc16240112be98c62364f2d7bebe1329e809c81b748913665
File without changes
File without changes
@@ -10,8 +10,8 @@
10
10
  * - successful completion, or an error if there are peer dependency warnings
11
11
  */
12
12
 
13
- const npm = require("npm");
14
- const installer = require("npm/lib/install");
13
+ const npm = require("npm6");
14
+ const installer = require("npm6/lib/install");
15
15
  const { muteStderr, runAsync } = require("./helpers.js");
16
16
 
17
17
  function installArgsWithVersion(depName, desiredVersion, reqs) {
@@ -1,7 +1,7 @@
1
1
  const fs = require("fs");
2
2
  const path = require("path");
3
- const npm = require("npm");
4
- const installer = require("npm/lib/install");
3
+ const npm = require("npm6");
4
+ const installer = require("npm6/lib/install");
5
5
  const detectIndent = require("detect-indent");
6
6
  const removeDependenciesFromLockfile = require("./remove-dependencies-from-lockfile");
7
7
 
@@ -16,8 +16,8 @@
16
16
  */
17
17
  const fs = require("fs");
18
18
  const path = require("path");
19
- const npm = require("npm");
20
- const installer = require("npm/lib/install");
19
+ const npm = require("npm6");
20
+ const installer = require("npm6/lib/install");
21
21
  const detectIndent = require("detect-indent");
22
22
  const { muteStderr, runAsync } = require("./helpers.js");
23
23
 
@@ -10,14 +10,14 @@
10
10
  },
11
11
  "dependencies": {
12
12
  "@dependabot/yarn-lib": "^1.21.1",
13
- "@npmcli/arborist": "^2.0.2",
13
+ "@npmcli/arborist": "^2.0.3",
14
14
  "detect-indent": "^6.0.0",
15
- "npm": "6.14.10",
15
+ "npm6": "npm:npm@6.14.11",
16
16
  "semver": "^7.3.4"
17
17
  },
18
18
  "devDependencies": {
19
- "eslint": "^7.16.0",
20
- "eslint-plugin-prettier": "^3.3.0",
19
+ "eslint": "^7.17.0",
20
+ "eslint-plugin-prettier": "^3.3.1",
21
21
  "jest": "^26.6.3",
22
22
  "prettier": "^2.2.1",
23
23
  "rimraf": "^3.0.2"
@@ -4,7 +4,7 @@ const fs = require("fs");
4
4
  const rimraf = require("rimraf");
5
5
  const {
6
6
  findConflictingDependencies,
7
- } = require("../../lib/npm/conflicting-dependency-parser");
7
+ } = require("../../lib/npm6/conflicting-dependency-parser");
8
8
  const helpers = require("./helpers");
9
9
 
10
10
  describe("findConflictingDependencies", () => {
File without changes
@@ -2,7 +2,7 @@ const path = require("path");
2
2
  const os = require("os");
3
3
  const fs = require("fs");
4
4
  const rimraf = require("rimraf");
5
- const { updateDependencyFiles } = require("../../lib/npm/updater");
5
+ const { updateDependencyFiles } = require("../../lib/npm6/updater");
6
6
  const helpers = require("./helpers");
7
7
 
8
8
  describe("updater", () => {
@@ -543,10 +543,10 @@
543
543
  "@types/yargs" "^15.0.0"
544
544
  chalk "^4.0.0"
545
545
 
546
- "@npmcli/arborist@^2.0.2":
547
- version "2.0.2"
548
- resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.0.2.tgz#4b119e842f59fb150be81c36d01807270ba81a75"
549
- integrity sha512-QMMUSeGW6u9/T8zH0zCGSRtOqCMmv8LnRNjZFX+zv4u1dauIx5iJ4i8e7EJbvXkKEZyGjK8sJ45NIoF+umMgIQ==
546
+ "@npmcli/arborist@^2.0.3":
547
+ version "2.0.3"
548
+ resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.0.3.tgz#d11f85c6609f542588bb946d0223b57c9a968650"
549
+ integrity sha512-iqahzDZaqdUyAHLG1SIG9jrbkLtT5xNbKX1ppAnx7mKx1u+BXYjkxi5ohewLAfyERH6IpODPAiRVc8c3kxA5jQ==
550
550
  dependencies:
551
551
  "@npmcli/installed-package-contents" "^1.0.5"
552
552
  "@npmcli/map-workspaces" "^1.0.1"
@@ -564,13 +564,14 @@
564
564
  npm-install-checks "^4.0.0"
565
565
  npm-package-arg "^8.1.0"
566
566
  npm-pick-manifest "^6.1.0"
567
- pacote "^11.1.13"
567
+ pacote "^11.1.14"
568
568
  parse-conflict-json "^1.1.1"
569
569
  promise-all-reject-late "^1.0.0"
570
570
  promise-call-limit "^1.0.1"
571
571
  read-package-json-fast "^1.2.1"
572
572
  readdir-scoped-modules "^1.1.0"
573
573
  semver "^7.3.4"
574
+ tar "^6.1.0"
574
575
  treeverse "^1.0.4"
575
576
  walk-up-path "^1.0.0"
576
577
 
@@ -2227,10 +2228,10 @@ escodegen@^1.14.1:
2227
2228
  optionalDependencies:
2228
2229
  source-map "~0.6.1"
2229
2230
 
2230
- eslint-plugin-prettier@^3.3.0:
2231
- version "3.3.0"
2232
- resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.0.tgz#61e295349a65688ffac0b7808ef0a8244bdd8d40"
2233
- integrity sha512-tMTwO8iUWlSRZIwS9k7/E4vrTsfvsrcM5p1eftyuqWH25nKsz/o6/54I7jwQ/3zobISyC7wMy9ZsFwgTxOcOpQ==
2231
+ eslint-plugin-prettier@^3.3.1:
2232
+ version "3.3.1"
2233
+ resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7"
2234
+ integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==
2234
2235
  dependencies:
2235
2236
  prettier-linter-helpers "^1.0.0"
2236
2237
 
@@ -2259,10 +2260,10 @@ eslint-visitor-keys@^2.0.0:
2259
2260
  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
2260
2261
  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
2261
2262
 
2262
- eslint@^7.16.0:
2263
- version "7.16.0"
2264
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.16.0.tgz#a761605bf9a7b32d24bb7cde59aeb0fd76f06092"
2265
- integrity sha512-iVWPS785RuDA4dWuhhgXTNrGxHHK3a8HLSMBgbbU59ruJDubUraXN8N5rn7kb8tG6sjg74eE0RA3YWT51eusEw==
2263
+ eslint@^7.17.0:
2264
+ version "7.17.0"
2265
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0"
2266
+ integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ==
2266
2267
  dependencies:
2267
2268
  "@babel/code-frame" "^7.0.0"
2268
2269
  "@eslint/eslintrc" "^0.2.2"
@@ -2904,7 +2905,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.2
2904
2905
 
2905
2906
  growly@^1.3.0:
2906
2907
  version "1.3.0"
2907
- resolved "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
2908
+ resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
2908
2909
  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
2909
2910
 
2910
2911
  gunzip-maybe@^1.4.0:
@@ -3198,10 +3199,10 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1,
3198
3199
  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
3199
3200
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
3200
3201
 
3201
- ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
3202
- version "1.3.7"
3203
- resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
3204
- integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
3202
+ ini@^1.3.4, ini@^1.3.5, ini@^1.3.8, ini@~1.3.0:
3203
+ version "1.3.8"
3204
+ resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
3205
+ integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
3205
3206
 
3206
3207
  init-package-json@^1.10.3:
3207
3208
  version "1.10.3"
@@ -3371,7 +3372,7 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
3371
3372
 
3372
3373
  is-docker@^2.0.0:
3373
3374
  version "2.1.1"
3374
- resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
3375
+ resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
3375
3376
  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
3376
3377
 
3377
3378
  is-dotfile@^1.0.0:
@@ -3586,7 +3587,7 @@ is-windows@^1.0.0, is-windows@^1.0.2:
3586
3587
 
3587
3588
  is-wsl@^2.2.0:
3588
3589
  version "2.2.0"
3589
- resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
3590
+ resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
3590
3591
  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
3591
3592
  dependencies:
3592
3593
  is-docker "^2.0.0"
@@ -3603,7 +3604,7 @@ isarray@1.0.0, isarray@~1.0.0:
3603
3604
 
3604
3605
  isexe@^2.0.0:
3605
3606
  version "2.0.0"
3606
- resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
3607
+ resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
3607
3608
  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
3608
3609
 
3609
3610
  isobject@^2.0.0:
@@ -4999,9 +5000,9 @@ node-modules-regexp@^1.0.0:
4999
5000
  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
5000
5001
 
5001
5002
  node-notifier@^8.0.0:
5002
- version "8.0.0"
5003
- resolved "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620"
5004
- integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==
5003
+ version "8.0.1"
5004
+ resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1"
5005
+ integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==
5005
5006
  dependencies:
5006
5007
  growly "^1.3.0"
5007
5008
  is-wsl "^2.2.0"
@@ -5225,10 +5226,10 @@ npm-user-validate@^1.0.1:
5225
5226
  resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
5226
5227
  integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
5227
5228
 
5228
- npm@6.14.10:
5229
- version "6.14.10"
5230
- resolved "https://registry.yarnpkg.com/npm/-/npm-6.14.10.tgz#f45c8e4244294ba793770f2ab0e9ce2d0b93fd29"
5231
- integrity sha512-FT23Qy/JMA+qxEYReMOr1MY7642fKn8Onn+72LASPi872Owvmw0svm+/DXTHOC3yO9CheEO+EslyXEpdBdRtIA==
5229
+ "npm6@npm:npm@6.14.11":
5230
+ version "6.14.11"
5231
+ resolved "https://registry.npmjs.org/npm/-/npm-6.14.11.tgz#e0b5598d7b9a42d275e61d8bd28cd7eee0074a3b"
5232
+ integrity sha512-1Zh7LjuIoEhIyjkBflSSGzfjuPQwDlghNloppjruOH5bmj9midT9qcNT0tRUZRR04shU9ekrxNy9+UTBrqeBpQ==
5232
5233
  dependencies:
5233
5234
  JSONStream "^1.3.5"
5234
5235
  abbrev "~1.1.1"
@@ -5248,7 +5249,6 @@ npm@6.14.10:
5248
5249
  cmd-shim "^3.0.3"
5249
5250
  columnify "~1.5.4"
5250
5251
  config-chain "^1.1.12"
5251
- debuglog "*"
5252
5252
  detect-indent "~5.0.0"
5253
5253
  detect-newline "^2.1.0"
5254
5254
  dezalgo "~1.0.3"
@@ -5263,11 +5263,10 @@ npm@6.14.10:
5263
5263
  has-unicode "~2.0.1"
5264
5264
  hosted-git-info "^2.8.8"
5265
5265
  iferr "^1.0.2"
5266
- imurmurhash "*"
5267
5266
  infer-owner "^1.0.4"
5268
5267
  inflight "~1.0.6"
5269
5268
  inherits "^2.0.4"
5270
- ini "^1.3.5"
5269
+ ini "^1.3.8"
5271
5270
  init-package-json "^1.10.3"
5272
5271
  is-cidr "^3.0.0"
5273
5272
  json-parse-better-errors "^1.0.2"
@@ -5282,14 +5281,8 @@ npm@6.14.10:
5282
5281
  libnpx "^10.2.4"
5283
5282
  lock-verify "^2.1.0"
5284
5283
  lockfile "^1.0.4"
5285
- lodash._baseindexof "*"
5286
5284
  lodash._baseuniq "~4.6.0"
5287
- lodash._bindcallback "*"
5288
- lodash._cacheindexof "*"
5289
- lodash._createcache "*"
5290
- lodash._getnative "*"
5291
5285
  lodash.clonedeep "~4.5.0"
5292
- lodash.restparam "*"
5293
5286
  lodash.union "~4.6.0"
5294
5287
  lodash.uniq "~4.5.0"
5295
5288
  lodash.without "~4.4.0"
@@ -5605,10 +5598,10 @@ package-json@^4.0.0:
5605
5598
  registry-url "^3.0.3"
5606
5599
  semver "^5.1.0"
5607
5600
 
5608
- pacote@^11.1.11, pacote@^11.1.13:
5609
- version "11.1.13"
5610
- resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.1.13.tgz#7e85213693b0b4b1119c4026dc1b68c087641dc2"
5611
- integrity sha512-oJ7Bg7p3izrIMhZPHCCHmMHQl+xb+pKBXL5ZYeM2oCZrw6sBRSx7f8l7F+95V2qA0BP3c1cNaaBmUNkbo6Hn9w==
5601
+ pacote@^11.1.11, pacote@^11.1.14:
5602
+ version "11.1.14"
5603
+ resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.1.14.tgz#c60b9849ab05488d3f9ccd644c8a42543f2f36d6"
5604
+ integrity sha512-6c5OhQelaJFDfiw/Zd8MfGCvvFHurSdeGzufZMPvRFImdbNOYFciOINf3DtUNUaU3h98eCb749UyHDsgvL19+A==
5612
5605
  dependencies:
5613
5606
  "@npmcli/git" "^2.0.1"
5614
5607
  "@npmcli/installed-package-contents" "^1.0.5"
@@ -5628,7 +5621,7 @@ pacote@^11.1.11, pacote@^11.1.13:
5628
5621
  read-package-json-fast "^1.1.3"
5629
5622
  rimraf "^3.0.2"
5630
5623
  ssri "^8.0.0"
5631
- tar "^6.0.1"
5624
+ tar "^6.1.0"
5632
5625
 
5633
5626
  pacote@^9.1.0, pacote@^9.5.12, pacote@^9.5.3:
5634
5627
  version "9.5.12"
@@ -6555,7 +6548,7 @@ shebang-regex@^3.0.0:
6555
6548
 
6556
6549
  shellwords@^0.1.1:
6557
6550
  version "0.1.1"
6558
- resolved "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
6551
+ resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
6559
6552
  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
6560
6553
 
6561
6554
  signal-exit@^3.0.0, signal-exit@^3.0.2:
@@ -7058,10 +7051,10 @@ tar@^4.4.10, tar@^4.4.12, tar@^4.4.13:
7058
7051
  safe-buffer "^5.1.2"
7059
7052
  yallist "^3.0.3"
7060
7053
 
7061
- tar@^6.0.1, tar@^6.0.2:
7062
- version "6.0.5"
7063
- resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f"
7064
- integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==
7054
+ tar@^6.0.2, tar@^6.1.0:
7055
+ version "6.1.0"
7056
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
7057
+ integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
7065
7058
  dependencies:
7066
7059
  chownr "^2.0.0"
7067
7060
  fs-minipass "^2.0.0"
@@ -7409,9 +7402,9 @@ uuid@^3.0.1, uuid@^3.3.2, uuid@^3.3.3:
7409
7402
  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
7410
7403
 
7411
7404
  uuid@^8.3.0:
7412
- version "8.3.0"
7413
- resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
7414
- integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
7405
+ version "8.3.2"
7406
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
7407
+ integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
7415
7408
 
7416
7409
  v8-compile-cache@^2.0.0, v8-compile-cache@^2.0.3:
7417
7410
  version "2.1.1"
@@ -7529,7 +7522,7 @@ which@^1.2.9, which@^1.3.0, which@^1.3.1:
7529
7522
 
7530
7523
  which@^2.0.1, which@^2.0.2:
7531
7524
  version "2.0.2"
7532
- resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
7525
+ resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
7533
7526
  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
7534
7527
  dependencies:
7535
7528
  isexe "^2.0.0"
@@ -295,7 +295,9 @@ module Dependabot
295
295
  elsif resolved_url.include?("/#{name}/-/#{name}")
296
296
  # MyGet / Bintray format
297
297
  resolved_url.split("/#{name}/-/#{name}").first.
298
- gsub("dl.bintray.com//", "api.bintray.com/npm/")
298
+ gsub("dl.bintray.com//", "api.bintray.com/npm/").
299
+ # GitLab format
300
+ gsub(%r{\/projects\/\d+}, "")
299
301
  elsif resolved_url.include?("/#{name}/-/#{name.split('/').last}")
300
302
  # Sonatype Nexus / Artifactory JFrog format
301
303
  resolved_url.split("/#{name}/-/#{name.split('/').last}").first
@@ -150,7 +150,7 @@ module Dependabot
150
150
  top_level_dependency_updates:)
151
151
  SharedHelpers.run_helper_subprocess(
152
152
  command: NativeHelpers.helper_path,
153
- function: "npm:update",
153
+ function: "npm6:update",
154
154
  args: [
155
155
  Dir.pwd,
156
156
  lockfile_name,
@@ -162,7 +162,7 @@ module Dependabot
162
162
  def run_npm_subdependency_updater(lockfile_name:)
163
163
  SharedHelpers.run_helper_subprocess(
164
164
  command: NativeHelpers.helper_path,
165
- function: "npm:updateSubdependency",
165
+ function: "npm6:updateSubdependency",
166
166
  args: [Dir.pwd, lockfile_name, sub_dependencies.map(&:to_h)]
167
167
  )
168
168
  end
@@ -45,7 +45,7 @@ module Dependabot
45
45
  dependency_files_builder.shrinkwraps.any?
46
46
  SharedHelpers.run_helper_subprocess(
47
47
  command: NativeHelpers.helper_path,
48
- function: "npm:findConflictingDependencies",
48
+ function: "npm6:findConflictingDependencies",
49
49
  args: [Dir.pwd, dependency.name, target_version.to_s]
50
50
  )
51
51
  else
@@ -112,7 +112,7 @@ module Dependabot
112
112
  Dir.chdir(path) do
113
113
  SharedHelpers.run_helper_subprocess(
114
114
  command: NativeHelpers.helper_path,
115
- function: "npm:updateSubdependency",
115
+ function: "npm6:updateSubdependency",
116
116
  args: [Dir.pwd, lockfile_name, [dependency.to_h]]
117
117
  )
118
118
  end
@@ -415,7 +415,7 @@ module Dependabot
415
415
  Dir.chdir(path) do
416
416
  SharedHelpers.run_helper_subprocess(
417
417
  command: NativeHelpers.helper_path,
418
- function: "npm:checkPeerDependencies",
418
+ function: "npm6:checkPeerDependencies",
419
419
  args: [
420
420
  Dir.pwd,
421
421
  dependency.name,
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dependabot-npm_and_yarn
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.129.1
4
+ version: 0.130.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dependabot
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-12-21 00:00:00.000000000 Z
11
+ date: 2021-01-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.129.1
19
+ version: 0.130.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.129.1
26
+ version: 0.130.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: byebug
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.6.0
103
+ version: 1.8.0
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 1.6.0
110
+ version: 1.8.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: simplecov
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 0.20.0
117
+ version: 0.21.0
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 0.20.0
124
+ version: 0.21.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: simplecov-console
127
127
  requirement: !ruby/object:Gem::Requirement
@@ -174,13 +174,13 @@ files:
174
174
  - helpers/.eslintrc
175
175
  - helpers/README.md
176
176
  - helpers/build
177
- - helpers/lib/npm/conflicting-dependency-parser.js
178
- - helpers/lib/npm/helpers.js
179
- - helpers/lib/npm/index.js
180
- - helpers/lib/npm/peer-dependency-checker.js
181
- - helpers/lib/npm/remove-dependencies-from-lockfile.js
182
- - helpers/lib/npm/subdependency-updater.js
183
- - helpers/lib/npm/updater.js
177
+ - helpers/lib/npm6/conflicting-dependency-parser.js
178
+ - helpers/lib/npm6/helpers.js
179
+ - helpers/lib/npm6/index.js
180
+ - helpers/lib/npm6/peer-dependency-checker.js
181
+ - helpers/lib/npm6/remove-dependencies-from-lockfile.js
182
+ - helpers/lib/npm6/subdependency-updater.js
183
+ - helpers/lib/npm6/updater.js
184
184
  - helpers/lib/yarn/conflicting-dependency-parser.js
185
185
  - helpers/lib/yarn/fix-duplicates.js
186
186
  - helpers/lib/yarn/helpers.js
@@ -192,18 +192,18 @@ files:
192
192
  - helpers/lib/yarn/updater.js
193
193
  - helpers/package.json
194
194
  - helpers/run.js
195
- - helpers/test/npm/conflicting-dependency-parser.test.js
196
- - helpers/test/npm/fixtures/conflicting-dependency-parser/deeply-nested/package-lock.json
197
- - helpers/test/npm/fixtures/conflicting-dependency-parser/deeply-nested/package.json
198
- - helpers/test/npm/fixtures/conflicting-dependency-parser/nested/package-lock.json
199
- - helpers/test/npm/fixtures/conflicting-dependency-parser/nested/package.json
200
- - helpers/test/npm/fixtures/conflicting-dependency-parser/simple/package-lock.json
201
- - helpers/test/npm/fixtures/conflicting-dependency-parser/simple/package.json
202
- - helpers/test/npm/fixtures/updater/original/package-lock.json
203
- - helpers/test/npm/fixtures/updater/original/package.json
204
- - helpers/test/npm/fixtures/updater/updated/package-lock.json
205
- - helpers/test/npm/helpers.js
206
- - helpers/test/npm/updater.test.js
195
+ - helpers/test/npm6/conflicting-dependency-parser.test.js
196
+ - helpers/test/npm6/fixtures/conflicting-dependency-parser/deeply-nested/package-lock.json
197
+ - helpers/test/npm6/fixtures/conflicting-dependency-parser/deeply-nested/package.json
198
+ - helpers/test/npm6/fixtures/conflicting-dependency-parser/nested/package-lock.json
199
+ - helpers/test/npm6/fixtures/conflicting-dependency-parser/nested/package.json
200
+ - helpers/test/npm6/fixtures/conflicting-dependency-parser/simple/package-lock.json
201
+ - helpers/test/npm6/fixtures/conflicting-dependency-parser/simple/package.json
202
+ - helpers/test/npm6/fixtures/updater/original/package-lock.json
203
+ - helpers/test/npm6/fixtures/updater/original/package.json
204
+ - helpers/test/npm6/fixtures/updater/updated/package-lock.json
205
+ - helpers/test/npm6/helpers.js
206
+ - helpers/test/npm6/updater.test.js
207
207
  - helpers/test/yarn/conflicting-dependency-parser.test.js
208
208
  - helpers/test/yarn/fixtures/conflicting-dependency-parser/deeply-nested/package.json
209
209
  - helpers/test/yarn/fixtures/conflicting-dependency-parser/deeply-nested/yarn.lock