dependabot-npm_and_yarn 0.131.1 → 0.133.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (26) hide show
  1. checksums.yaml +4 -4
  2. data/helpers/lib/npm6/updater.js +1 -0
  3. data/helpers/lib/npm7/index.js +5 -0
  4. data/helpers/lib/npm7/peer-dependency-checker.js +77 -0
  5. data/helpers/package.json +1 -1
  6. data/helpers/test/npm7/conflicting-dependency-parser.test.js +67 -0
  7. data/helpers/test/npm7/fixtures/conflicting-dependency-parser/deeply-nested/package-lock.json +1291 -0
  8. data/helpers/test/npm7/fixtures/conflicting-dependency-parser/deeply-nested/package.json +14 -0
  9. data/helpers/test/npm7/fixtures/conflicting-dependency-parser/nested/package-lock.json +411 -0
  10. data/helpers/test/npm7/fixtures/conflicting-dependency-parser/nested/package.json +14 -0
  11. data/helpers/test/npm7/fixtures/conflicting-dependency-parser/simple/package-lock.json +64 -0
  12. data/helpers/test/npm7/fixtures/conflicting-dependency-parser/simple/package.json +14 -0
  13. data/helpers/test/npm7/fixtures/peer-dependency-checker/peer_dependency/package-lock.json +290 -0
  14. data/helpers/test/npm7/fixtures/peer-dependency-checker/peer_dependency/package.json +23 -0
  15. data/helpers/test/npm7/fixtures/peer-dependency-checker/peer_dependency_multiple/package-lock.json +965 -0
  16. data/helpers/test/npm7/fixtures/peer-dependency-checker/peer_dependency_multiple/package.json +10 -0
  17. data/helpers/test/npm7/helpers.js +21 -0
  18. data/helpers/test/npm7/peer-dependency-checker.test.js +107 -0
  19. data/helpers/yarn.lock +1258 -1271
  20. data/lib/dependabot/npm_and_yarn/dependency_files_filterer.rb +3 -3
  21. data/lib/dependabot/npm_and_yarn/file_parser/lockfile_parser.rb +40 -16
  22. data/lib/dependabot/npm_and_yarn/file_updater.rb +9 -19
  23. data/lib/dependabot/npm_and_yarn/file_updater/npm_lockfile_updater.rb +409 -167
  24. data/lib/dependabot/npm_and_yarn/update_checker/subdependency_version_resolver.rb +1 -2
  25. data/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb +1 -2
  26. metadata +19 -4
@@ -113,11 +113,10 @@ module Dependabot
113
113
  SharedHelpers.with_git_configured(credentials: credentials) do
114
114
  Dir.chdir(path) do
115
115
  npm_version = Dependabot::NpmAndYarn::Helpers.npm_version(lockfile_content)
116
- Dependabot.logger.info(npm_version)
117
116
 
118
117
  SharedHelpers.run_helper_subprocess(
119
118
  command: NativeHelpers.helper_path,
120
- function: "npm6:updateSubdependency",
119
+ function: "#{npm_version}:updateSubdependency",
121
120
  args: [Dir.pwd, lockfile_name, [dependency.to_h]]
122
121
  )
123
122
  end
@@ -420,11 +420,10 @@ module Dependabot
420
420
  f.name == [path, "package-lock.json"].join("/").sub(%r{\A.?\/}, "")
421
421
  end
422
422
  npm_version = Dependabot::NpmAndYarn::Helpers.npm_version(package_lock&.content)
423
- Dependabot.logger.info(npm_version)
424
423
 
425
424
  SharedHelpers.run_helper_subprocess(
426
425
  command: NativeHelpers.helper_path,
427
- function: "npm6:checkPeerDependencies",
426
+ function: "#{npm_version}:checkPeerDependencies",
428
427
  args: [
429
428
  Dir.pwd,
430
429
  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.131.1
4
+ version: 0.133.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dependabot
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-02-05 00:00:00.000000000 Z
11
+ date: 2021-02-10 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.131.1
19
+ version: 0.133.1
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.131.1
26
+ version: 0.133.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: byebug
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -183,6 +183,8 @@ files:
183
183
  - helpers/lib/npm6/remove-dependencies-from-lockfile.js
184
184
  - helpers/lib/npm6/subdependency-updater.js
185
185
  - helpers/lib/npm6/updater.js
186
+ - helpers/lib/npm7/index.js
187
+ - helpers/lib/npm7/peer-dependency-checker.js
186
188
  - helpers/lib/yarn/conflicting-dependency-parser.js
187
189
  - helpers/lib/yarn/fix-duplicates.js
188
190
  - helpers/lib/yarn/helpers.js
@@ -206,6 +208,19 @@ files:
206
208
  - helpers/test/npm6/fixtures/updater/updated/package-lock.json
207
209
  - helpers/test/npm6/helpers.js
208
210
  - helpers/test/npm6/updater.test.js
211
+ - helpers/test/npm7/conflicting-dependency-parser.test.js
212
+ - helpers/test/npm7/fixtures/conflicting-dependency-parser/deeply-nested/package-lock.json
213
+ - helpers/test/npm7/fixtures/conflicting-dependency-parser/deeply-nested/package.json
214
+ - helpers/test/npm7/fixtures/conflicting-dependency-parser/nested/package-lock.json
215
+ - helpers/test/npm7/fixtures/conflicting-dependency-parser/nested/package.json
216
+ - helpers/test/npm7/fixtures/conflicting-dependency-parser/simple/package-lock.json
217
+ - helpers/test/npm7/fixtures/conflicting-dependency-parser/simple/package.json
218
+ - helpers/test/npm7/fixtures/peer-dependency-checker/peer_dependency/package-lock.json
219
+ - helpers/test/npm7/fixtures/peer-dependency-checker/peer_dependency/package.json
220
+ - helpers/test/npm7/fixtures/peer-dependency-checker/peer_dependency_multiple/package-lock.json
221
+ - helpers/test/npm7/fixtures/peer-dependency-checker/peer_dependency_multiple/package.json
222
+ - helpers/test/npm7/helpers.js
223
+ - helpers/test/npm7/peer-dependency-checker.test.js
209
224
  - helpers/test/yarn/conflicting-dependency-parser.test.js
210
225
  - helpers/test/yarn/fixtures/conflicting-dependency-parser/deeply-nested/package.json
211
226
  - helpers/test/yarn/fixtures/conflicting-dependency-parser/deeply-nested/yarn.lock