snyk-nodejs-lockfile-parser 2.6.0 → 2.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.js +14 -1
- package/dist/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.js.map +1 -1
- package/dist/dep-graph-builders/pnpm/parse-project.js +5 -2
- package/dist/dep-graph-builders/pnpm/parse-project.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.js +8 -2
- package/dist/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.js.map +1 -1
- package/dist/dep-graph-builders/yarn-lock-v2/utils.js +47 -6
- package/dist/dep-graph-builders/yarn-lock-v2/utils.js.map +1 -1
- package/dist/parsers/index.js +12 -4
- package/dist/parsers/index.js.map +1 -1
- package/dist/parsers/yarn2-lock-parser.js +3 -0
- package/dist/parsers/yarn2-lock-parser.js.map +1 -1
- package/package.json +2 -2
|
@@ -64,8 +64,21 @@ class LockfileV6Parser extends lockfile_parser_1.PnpmLockfileParser {
|
|
|
64
64
|
}
|
|
65
65
|
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
66
66
|
normaliseImporters(rawPnpmLock) {
|
|
67
|
+
var _a;
|
|
67
68
|
if (!('importers' in rawPnpmLock)) {
|
|
68
|
-
|
|
69
|
+
// Some pnpm versions embed the root importer as '.' inside the
|
|
70
|
+
// top-level dependencies map instead of using an importers section.
|
|
71
|
+
// Synthesize an importers entry so the workspace machinery can handle it.
|
|
72
|
+
const dotEntry = (_a = rawPnpmLock.dependencies) === null || _a === void 0 ? void 0 : _a['.'];
|
|
73
|
+
if (dotEntry &&
|
|
74
|
+
typeof dotEntry === 'object' &&
|
|
75
|
+
'dependencies' in dotEntry) {
|
|
76
|
+
rawPnpmLock.importers = { '.': dotEntry };
|
|
77
|
+
delete rawPnpmLock.dependencies['.'];
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
return {};
|
|
81
|
+
}
|
|
69
82
|
}
|
|
70
83
|
const rawImporters = rawPnpmLock.importers;
|
|
71
84
|
return Object.entries(rawImporters).reduce(
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfile-v6.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.ts"],"names":[],"mappings":";;;AAEA,uDAAuD;AAEvD,MAAa,gBAAiB,SAAQ,oCAAkB;IAGtD,YAAmB,WAAgB,EAAE,aAAiC;QACpE,KAAK,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;IACvC,CAAC;IAEM,YAAY,CAAC,OAAe;QACjC,qDAAqD;QACrD,uCAAuC;QACvC,OAAO,GAAG,gBAAgB,CAAC,uBAAuB,CAAC,OAAO,CAAC;YACzD,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAEzB,iGAAiG;QACjG,iCAAiC;QACjC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,+EAA+E;YAC/E,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;gBACpB,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;YAChD,OAAO;gBACL,IAAI;gBACJ,OAAO;aACR,CAAC;QACJ,CAAC;QAED,wEAAwE;QACxE,2CAA2C;QAC3C,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3C,OAAO;YACL,IAAI;YACJ,OAAO;SACR,CAAC;IACJ,CAAC;IAEM,qBAAqB,CAC1B,YAAoD,EACpD,KAAc,EACd,YAAqB;QAErB,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CACxC,CAAC,QAAkB,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACtC,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CACnC,IAAI,EACJ,OAAO,CAAC,OAAO,EACf,KAAK,EACL,YAAY,CACb,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,GAAG;gBACf,IAAI;gBACJ,OAAO;gBACP,KAAK;aACN,CAAC;YACF,OAAO,QAAQ,CAAC;QAClB,CAAC,EACD,EAAE,CACH,CAAC;IACJ,CAAC;IAEM,qBAAqB,CAC1B,YAAoD,EACpD,KAAc,EACd,YAAqB;QAErB,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CACxC,CAAC,QAAgC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACpD,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CACnC,IAAI,EACJ,OAAO,CAAC,OAAO,EACf,KAAK,EACL,YAAY,CACb,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;YACzB,OAAO,QAAQ,CAAC;QAClB,CAAC,EACD,EAAE,CACH,CAAC;IACJ,CAAC;IAED,iGAAiG;IACjG,wEAAwE;IACjE,4BAA4B,CAAC,cAAsB;QACxD,OAAO,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;IAEM,MAAM,CAAC,uBAAuB,CAAC,cAAsB;QAC1D,OAAO,cAAc,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;IACnC,CAAC;IAED,6EAA6E;IACtE,kBAAkB,CAAC,WAAgB
|
|
1
|
+
{"version":3,"file":"lockfile-v6.js","sourceRoot":"","sources":["../../../../lib/dep-graph-builders/pnpm/lockfile-parser/lockfile-v6.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,15 @@ const util_1 = require("../util");
|
|
|
5
5
|
const build_dep_graph_pnpm_1 = require("./build-dep-graph-pnpm");
|
|
6
6
|
const index_1 = require("./lockfile-parser/index");
|
|
7
7
|
const parsePnpmProject = async (pkgJsonContent, pnpmLockContent, options, lockfileVersion) => {
|
|
8
|
+
var _a;
|
|
8
9
|
const { includeDevDeps, includePeerDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, showNpmScope, } = options;
|
|
9
10
|
let importer = '';
|
|
10
11
|
const pkgJson = (0, util_1.parsePkgJson)(pkgJsonContent);
|
|
11
12
|
const lockFileParser = (0, index_1.getPnpmLockfileParser)(pnpmLockContent, lockfileVersion);
|
|
12
|
-
// Lockfile V9 simple project has the root importer
|
|
13
|
-
|
|
13
|
+
// Lockfile V9 simple project has the root importer.
|
|
14
|
+
// Some V6 lockfiles also embed the root importer as '.' inside the
|
|
15
|
+
// top-level dependencies map (normaliseImporters moves it to importers).
|
|
16
|
+
if ((_a = lockFileParser.rawPnpmLock.importers) === null || _a === void 0 ? void 0 : _a['.']) {
|
|
14
17
|
importer = '.';
|
|
15
18
|
lockFileParser.workspaceArgs = {
|
|
16
19
|
projectsVersionMap: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-project.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-project.ts"],"names":[],"mappings":";;;AAAA,kCAAuC;AAEvC,iEAA2D;AAE3D,mDAAgE;AAGzD,MAAM,gBAAgB,GAAG,KAAK,EACnC,cAAsB,EACtB,eAAmC,EACnC,OAAgC,EAChC,eAAqC,EAClB,EAAE
|
|
1
|
+
{"version":3,"file":"parse-project.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/pnpm/parse-project.ts"],"names":[],"mappings":";;;AAAA,kCAAuC;AAEvC,iEAA2D;AAE3D,mDAAgE;AAGzD,MAAM,gBAAgB,GAAG,KAAK,EACnC,cAAsB,EACtB,eAAmC,EACnC,OAAgC,EAChC,eAAqC,EAClB,EAAE;;IACrB,MAAM,EACJ,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,uBAAuB,EACvB,YAAY,GACb,GAAG,OAAO,CAAC;IACZ,IAAI,QAAQ,GAAG,EAAE,CAAC;IAElB,MAAM,OAAO,GAAoB,IAAA,mBAAY,EAAC,cAAc,CAAC,CAAC;IAE9D,MAAM,cAAc,GAAG,IAAA,6BAAqB,EAC1C,eAAe,EACf,eAAe,CAChB,CAAC;IAEF,oDAAoD;IACpD,mEAAmE;IACnE,yEAAyE;IACzE,IAAI,MAAA,cAAc,CAAC,WAAW,CAAC,SAAS,0CAAG,GAAG,CAAC,EAAE,CAAC;QAChD,QAAQ,GAAG,GAAG,CAAC;QACf,cAAc,CAAC,aAAa,GAAG;YAC7B,kBAAkB,EAAE;gBAClB,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE;aACtD;YACD,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAAiB,EACtC,cAAc,EACd,OAAO,EACP;QACE,cAAc;QACd,eAAe;QACf,eAAe;QACf,mBAAmB;QACnB,uBAAuB;QACvB,YAAY;KACb,EACD,QAAQ,CACT,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAnDW,QAAA,gBAAgB,oBAmD3B"}
|
|
@@ -57,7 +57,10 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOu
|
|
|
57
57
|
if (localVisited.has(childNode.id)) {
|
|
58
58
|
if (pruneWithinTopLevel) {
|
|
59
59
|
const prunedId = `${childNode.id}:pruned`;
|
|
60
|
-
depGraphBuilder.addPkgNode({
|
|
60
|
+
depGraphBuilder.addPkgNode({
|
|
61
|
+
name: childNode.alias ? childNode.alias.aliasName : childNode.name,
|
|
62
|
+
version: childNode.version,
|
|
63
|
+
}, prunedId, {
|
|
61
64
|
labels: Object.assign(Object.assign(Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (showNpmScope && { 'npm:scope': node.isDev ? 'dev' : 'prod' })), { pruned: 'true' }), (node.missingLockFileEntry && {
|
|
62
65
|
missingLockFileEntry: 'true',
|
|
63
66
|
})), (childNode.alias && {
|
|
@@ -71,7 +74,10 @@ const dfsVisit = async (depGraphBuilder, node, extractedYarnLockV2Pkgs, strictOu
|
|
|
71
74
|
}
|
|
72
75
|
continue;
|
|
73
76
|
}
|
|
74
|
-
depGraphBuilder.addPkgNode({
|
|
77
|
+
depGraphBuilder.addPkgNode({
|
|
78
|
+
name: childNode.alias ? childNode.alias.aliasName : childNode.name,
|
|
79
|
+
version: childNode.version,
|
|
80
|
+
}, childNode.id, {
|
|
75
81
|
labels: Object.assign(Object.assign(Object.assign({ scope: node.isDev ? 'dev' : 'prod' }, (showNpmScope && { 'npm:scope': node.isDev ? 'dev' : 'prod' })), (node.missingLockFileEntry && {
|
|
76
82
|
missingLockFileEntry: 'true',
|
|
77
83
|
})), (childNode.alias && {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-depgraph-simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"build-depgraph-simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/build-depgraph-simple.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,6 +86,43 @@ const getYarnLockV2ChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOpt
|
|
|
86
86
|
if (resolutions[scopedKey]) {
|
|
87
87
|
return resolutions[scopedKey];
|
|
88
88
|
}
|
|
89
|
+
// Check for scoped + versioned resolution (e.g., "parentPkg@npm:version/depName")
|
|
90
|
+
// These have the format: parentPackageName@versionOrProtocol/dependencyName
|
|
91
|
+
// The dep name suffix could be scoped (e.g., "@scope/dep"), so we check
|
|
92
|
+
// if the key ends with `/${name}` to correctly split parent from dep.
|
|
93
|
+
const suffix = `/${name}`;
|
|
94
|
+
for (const resKey in resolutions) {
|
|
95
|
+
if (Object.prototype.hasOwnProperty.call(resolutions, resKey)) {
|
|
96
|
+
if (!resKey.endsWith(suffix))
|
|
97
|
+
continue;
|
|
98
|
+
const parentPart = resKey.substring(0, resKey.length - suffix.length);
|
|
99
|
+
// Skip if parentPart is just a plain name (handled by simple scoped check above)
|
|
100
|
+
if (!parentPart.includes('@') || parentPart === parentNode.name) {
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
try {
|
|
104
|
+
const descriptor = core_1.structUtils.parseDescriptor(parentPart);
|
|
105
|
+
const parentPkgName = core_1.structUtils.stringifyIdent(descriptor);
|
|
106
|
+
if (parentPkgName !== parentNode.name)
|
|
107
|
+
continue;
|
|
108
|
+
// If the resolution key includes a version/range for the parent,
|
|
109
|
+
// verify the parent's resolved version satisfies it
|
|
110
|
+
if (descriptor.range && descriptor.range !== 'unknown') {
|
|
111
|
+
const rangeWithoutProtocol = descriptor.range.replace(/^[a-z]+:/, '');
|
|
112
|
+
if (parentNode.version !== rangeWithoutProtocol &&
|
|
113
|
+
!(semver.valid(parentNode.version) &&
|
|
114
|
+
semver.validRange(rangeWithoutProtocol) &&
|
|
115
|
+
semver.satisfies(parentNode.version, rangeWithoutProtocol))) {
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
return resolutions[resKey];
|
|
120
|
+
}
|
|
121
|
+
catch (e) {
|
|
122
|
+
debug(`Error parsing scoped-versioned resolution key(${resKey}): ${e}`);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
}
|
|
89
126
|
// Check for resolutions matching "packageName@versionOrRangeToOverride"
|
|
90
127
|
for (const resKey in resolutions) {
|
|
91
128
|
if (Object.prototype.hasOwnProperty.call(resolutions, resKey)) {
|
|
@@ -123,20 +160,24 @@ const getYarnLockV2ChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOpt
|
|
|
123
160
|
return ''; // No resolution applies
|
|
124
161
|
})();
|
|
125
162
|
if (resolvedVersionFromResolution) {
|
|
126
|
-
|
|
163
|
+
// Decode URL-encoded characters in resolution values (e.g., npm%3A -> npm:)
|
|
164
|
+
// to match the keys extracted from yarn.lock
|
|
165
|
+
const decodedResolution = decodeURIComponent(resolvedVersionFromResolution);
|
|
166
|
+
const childNodeKeyFromResolution = `${name}@${decodedResolution}`;
|
|
127
167
|
if (!pkgs[childNodeKeyFromResolution]) {
|
|
128
|
-
if (strictOutOfSync && !/^file:/.test(
|
|
168
|
+
if (strictOutOfSync && !/^file:/.test(decodedResolution)) {
|
|
129
169
|
throw new errors_1.OutOfSyncError(childNodeKeyFromResolution, parsers_1.LockfileType.yarn2);
|
|
130
170
|
}
|
|
131
171
|
else {
|
|
132
|
-
return Object.assign({ id: childNodeKeyFromResolution, name: depInfo.alias ? depInfo.alias.aliasTargetDepName : name, version:
|
|
172
|
+
return Object.assign({ id: childNodeKeyFromResolution, name: depInfo.alias ? depInfo.alias.aliasTargetDepName : name, version: decodedResolution, dependencies: {}, isDev: depInfo.isDev, missingLockFileEntry: true }, (depInfo.alias
|
|
133
173
|
? {
|
|
134
|
-
alias: Object.assign(Object.assign({}, depInfo.alias), { version:
|
|
174
|
+
alias: Object.assign(Object.assign({}, depInfo.alias), { version: decodedResolution }),
|
|
135
175
|
}
|
|
136
176
|
: {}));
|
|
137
177
|
}
|
|
138
178
|
}
|
|
139
|
-
const
|
|
179
|
+
const pkgData = pkgs[childNodeKeyFromResolution];
|
|
180
|
+
const { version: versionFromResolution, dependencies, optionalDependencies, } = pkgData;
|
|
140
181
|
const formattedDependencies = (0, util_1.getGraphDependencies)(dependencies || {}, {
|
|
141
182
|
isDev: depInfo.isDev,
|
|
142
183
|
});
|
|
@@ -146,7 +187,7 @@ const getYarnLockV2ChildNode = (name, depInfo, pkgs, strictOutOfSync, includeOpt
|
|
|
146
187
|
isOptional: true,
|
|
147
188
|
})
|
|
148
189
|
: {};
|
|
149
|
-
return Object.assign({ id:
|
|
190
|
+
return Object.assign({ id: `${name}@${versionFromResolution}`, name: depInfo.alias ? depInfo.alias.aliasTargetDepName : name, version: versionFromResolution, dependencies: Object.assign(Object.assign({}, formattedOptionalDependencies), formattedDependencies), isDev: depInfo.isDev }, (depInfo.alias
|
|
150
191
|
? { alias: Object.assign(Object.assign({}, depInfo.alias), { version: versionFromResolution }) }
|
|
151
192
|
: {}));
|
|
152
193
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/parsers/index.js
CHANGED
|
@@ -54,10 +54,18 @@ function getTopLevelDeps({ targetFile, includeDev, includePeerDeps = false, appl
|
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
if (applyYarn2Resolutions && targetFile.resolutions) {
|
|
57
|
-
const resMap = new Map(Object.entries(targetFile.resolutions).map(([resName, resVersion]) =>
|
|
58
|
-
resName.replace(`${targetFile.name}/`, '')
|
|
59
|
-
|
|
60
|
-
|
|
57
|
+
const resMap = new Map(Object.entries(targetFile.resolutions).map(([resName, resVersion]) => {
|
|
58
|
+
let key = resName.replace(`${targetFile.name}/`, '');
|
|
59
|
+
// Patch resolution keys use the format "name@npm:range" (e.g. "papaparse@npm:^5.3.0").
|
|
60
|
+
// Extract the bare package name so it can be matched against dep.name.
|
|
61
|
+
// The [^/] guard avoids matching scoped resolutions that target a sub-dependency
|
|
62
|
+
// (e.g. "debug@npm:4.3.2/ms"), which are handled separately in findResolutions.
|
|
63
|
+
const npmPrefixMatch = key.match(/^(.+)@npm:[^/]+$/);
|
|
64
|
+
if (npmPrefixMatch) {
|
|
65
|
+
key = npmPrefixMatch[1];
|
|
66
|
+
}
|
|
67
|
+
return [key, resVersion];
|
|
68
|
+
}));
|
|
61
69
|
dependencies = dependencies.map((dep) => resMap.has(dep.name) ? Object.assign(Object.assign({}, dep), { version: resMap.get(dep.name) }) : dep);
|
|
62
70
|
}
|
|
63
71
|
return dependencies;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/parsers/index.ts"],"names":[],"mappings":";;;AAoHA,8CAQC;AAED,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/parsers/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,6 +51,9 @@ class Yarn2LockParser extends lock_parser_base_1.LockParserBase {
|
|
|
51
51
|
const depMap = {};
|
|
52
52
|
const dependencies = lockfile.dependencies || {};
|
|
53
53
|
for (const [depName, dep] of Object.entries(yarnLockfile.object)) {
|
|
54
|
+
if (depName.endsWith('@workspace:.')) {
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
54
57
|
const subDependencies = Object.entries(Object.assign(Object.assign({}, (dep.dependencies || {})), (dep.optionalDependencies || {}))).map(([key, ver]) => findResolutions(dependencies, depName, key, resolutions) ||
|
|
55
58
|
`${key}@${ver}`);
|
|
56
59
|
depMap[depName] = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn2-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/yarn2-lock-parser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"yarn2-lock-parser.js","sourceRoot":"","sources":["../../lib/parsers/yarn2-lock-parser.ts"],"names":[],"mappings":"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"}
|