dependabot-npm_and_yarn 0.98.75 → 0.98.76
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/helpers/lib/npm/updater.js +13 -10
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bfe4a3f1a0743da92777a885e0c65f2d6e6e27e7be4ca3e2e3fbce661f89b215
|
|
4
|
+
data.tar.gz: 9f6aea2a14067be0f171843e87e7fc3fb8aa4050400d70cfe34eab6c4245176a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3a0415d0f2496a92a9529765ec694b194ca9ef53660275bf73cd78853023e279864ceb56bfb06f37b8f3f6cc720da13371f810cb46aa5d031fdba4502f8f4ba6
|
|
7
|
+
data.tar.gz: 6ada099e2b1273dea2a27be61fabddf665649f2d4e2133e97835ca55e6e98b7e539e9d630256f63a4a0de3efe31f0c55dcef60ac32e894cf2ad0dd7215a36e03
|
data/helpers/lib/npm/updater.js
CHANGED
|
@@ -74,17 +74,11 @@ async function updateDependencyFiles(directory, dependencies, lockfileName) {
|
|
|
74
74
|
// This is horrible, but works.
|
|
75
75
|
const unmute = muteStderr();
|
|
76
76
|
try {
|
|
77
|
+
// Fix already present git sub-dependency with invalid "from" and "requires"
|
|
78
|
+
updateLockfileWithValidGitUrls(path.join(directory, lockfileName));
|
|
77
79
|
await runAsync(initialInstaller, initialInstaller.run, []);
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
const updatedIntermediaryLockfile = removeInvalidGitUrls(
|
|
81
|
-
intermediaryLockfile
|
|
82
|
-
);
|
|
83
|
-
fs.writeFileSync(
|
|
84
|
-
path.join(directory, lockfileName),
|
|
85
|
-
JSON.stringify(updatedIntermediaryLockfile, null, 2)
|
|
86
|
-
);
|
|
87
|
-
|
|
80
|
+
// Fix npm5 lockfiles where invalid "from" is introduced after first install
|
|
81
|
+
updateLockfileWithValidGitUrls(path.join(directory, lockfileName));
|
|
88
82
|
await runAsync(cleanupInstaller, cleanupInstaller.run, []);
|
|
89
83
|
} finally {
|
|
90
84
|
unmute();
|
|
@@ -95,6 +89,15 @@ async function updateDependencyFiles(directory, dependencies, lockfileName) {
|
|
|
95
89
|
return { [lockfileName]: updatedLockfile };
|
|
96
90
|
}
|
|
97
91
|
|
|
92
|
+
function updateLockfileWithValidGitUrls(lockfilePath) {
|
|
93
|
+
const lockfile = fs.readFileSync(lockfilePath).toString();
|
|
94
|
+
const updatedLockfileObject = removeInvalidGitUrls(JSON.parse(lockfile));
|
|
95
|
+
fs.writeFileSync(
|
|
96
|
+
lockfilePath,
|
|
97
|
+
JSON.stringify(updatedLockfileObject, null, 2)
|
|
98
|
+
);
|
|
99
|
+
}
|
|
100
|
+
|
|
98
101
|
function flattenAllDependencies(manifest) {
|
|
99
102
|
return Object.assign(
|
|
100
103
|
{},
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dependabot-npm_and_yarn
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.98.
|
|
4
|
+
version: 0.98.76
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dependabot
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - '='
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 0.98.
|
|
19
|
+
version: 0.98.76
|
|
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.98.
|
|
26
|
+
version: 0.98.76
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: byebug
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|