@lerna-lite/core 1.17.0 → 2.0.0-alpha.2
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/child-process.d.ts +9 -9
- package/dist/child-process.js +26 -42
- package/dist/child-process.js.map +1 -1
- package/dist/command.d.ts +3 -3
- package/dist/command.js +57 -69
- package/dist/command.js.map +1 -1
- package/dist/constants.js +1 -4
- package/dist/constants.js.map +1 -1
- package/dist/index.d.ts +10 -10
- package/dist/index.js +10 -13
- package/dist/index.js.map +1 -1
- package/dist/models/command-options.d.ts +78 -80
- package/dist/models/command-options.js +1 -2
- package/dist/models/index.d.ts +2 -2
- package/dist/models/index.js +2 -5
- package/dist/models/index.js.map +1 -1
- package/dist/models/interfaces.d.ts +2 -4
- package/dist/models/interfaces.js +1 -2
- package/dist/package-graph/index.d.ts +2 -2
- package/dist/package-graph/index.js +2 -5
- package/dist/package-graph/index.js.map +1 -1
- package/dist/package-graph/lib/cyclic-package-graph-node.d.ts +1 -1
- package/dist/package-graph/lib/cyclic-package-graph-node.js +2 -5
- package/dist/package-graph/lib/cyclic-package-graph-node.js.map +1 -1
- package/dist/package-graph/lib/index.d.ts +3 -3
- package/dist/package-graph/lib/index.js +3 -6
- package/dist/package-graph/lib/index.js.map +1 -1
- package/dist/package-graph/lib/package-graph-node.d.ts +1 -1
- package/dist/package-graph/lib/package-graph-node.js +6 -12
- package/dist/package-graph/lib/package-graph-node.js.map +1 -1
- package/dist/package-graph/lib/report-cycles.js +5 -10
- package/dist/package-graph/lib/report-cycles.js.map +1 -1
- package/dist/package-graph/package-graph.d.ts +2 -19
- package/dist/package-graph/package-graph.js +10 -64
- package/dist/package-graph/package-graph.js.map +1 -1
- package/dist/package.d.ts +2 -3
- package/dist/package.js +34 -47
- package/dist/package.js.map +1 -1
- package/dist/project/index.d.ts +2 -2
- package/dist/project/index.js +2 -5
- package/dist/project/index.js.map +1 -1
- package/dist/project/lib/apply-extends.js +12 -17
- package/dist/project/lib/apply-extends.js.map +1 -1
- package/dist/project/lib/index.d.ts +3 -3
- package/dist/project/lib/index.js +3 -6
- package/dist/project/lib/index.js.map +1 -1
- package/dist/project/lib/make-file-finder.d.ts +1 -1
- package/dist/project/lib/make-file-finder.js +12 -19
- package/dist/project/lib/make-file-finder.js.map +1 -1
- package/dist/project/lib/shallow-extend.js +1 -5
- package/dist/project/lib/shallow-extend.js.map +1 -1
- package/dist/project/project.d.ts +2 -2
- package/dist/project/project.js +71 -69
- package/dist/project/project.js.map +1 -1
- package/dist/prompt.js +14 -21
- package/dist/prompt.js.map +1 -1
- package/dist/utils/check-working-tree.d.ts +1 -1
- package/dist/utils/check-working-tree.js +11 -18
- package/dist/utils/check-working-tree.js.map +1 -1
- package/dist/utils/clean-stack.js +1 -5
- package/dist/utils/clean-stack.js.map +1 -1
- package/dist/utils/collect-uncommitted.js +10 -16
- package/dist/utils/collect-uncommitted.js.map +1 -1
- package/dist/utils/collect-updates/collect-updates.d.ts +4 -4
- package/dist/utils/collect-updates/collect-updates.js +21 -26
- package/dist/utils/collect-updates/collect-updates.js.map +1 -1
- package/dist/utils/collect-updates/index.d.ts +2 -2
- package/dist/utils/collect-updates/index.js +2 -5
- package/dist/utils/collect-updates/index.js.map +1 -1
- package/dist/utils/collect-updates/lib/collect-dependents.js +1 -5
- package/dist/utils/collect-updates/lib/collect-dependents.js.map +1 -1
- package/dist/utils/collect-updates/lib/collect-packages.d.ts +1 -1
- package/dist/utils/collect-updates/lib/collect-packages.js +3 -7
- package/dist/utils/collect-updates/lib/collect-packages.js.map +1 -1
- package/dist/utils/collect-updates/lib/get-packages-for-option.js +1 -5
- package/dist/utils/collect-updates/lib/get-packages-for-option.js.map +1 -1
- package/dist/utils/collect-updates/lib/has-tags.d.ts +1 -1
- package/dist/utils/collect-updates/lib/has-tags.js +9 -14
- package/dist/utils/collect-updates/lib/has-tags.js.map +1 -1
- package/dist/utils/collect-updates/lib/index.d.ts +5 -5
- package/dist/utils/collect-updates/lib/index.js +5 -8
- package/dist/utils/collect-updates/lib/index.js.map +1 -1
- package/dist/utils/collect-updates/lib/make-diff-predicate.d.ts +1 -1
- package/dist/utils/collect-updates/lib/make-diff-predicate.js +19 -26
- package/dist/utils/collect-updates/lib/make-diff-predicate.js.map +1 -1
- package/dist/utils/conf.js +27 -32
- package/dist/utils/conf.js.map +1 -1
- package/dist/utils/defaults.d.ts +3 -1
- package/dist/utils/defaults.js +17 -20
- package/dist/utils/defaults.js.map +1 -1
- package/dist/utils/describe-ref.d.ts +1 -1
- package/dist/utils/describe-ref.js +12 -17
- package/dist/utils/describe-ref.js.map +1 -1
- package/dist/utils/env-replace.js +2 -7
- package/dist/utils/env-replace.js.map +1 -1
- package/dist/utils/find-prefix.js +9 -15
- package/dist/utils/find-prefix.js.map +1 -1
- package/dist/utils/index.d.ts +22 -22
- package/dist/utils/index.js +22 -26
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/log-package-error.js +8 -13
- package/dist/utils/log-package-error.js.map +1 -1
- package/dist/utils/nerf-dart.js +4 -9
- package/dist/utils/nerf-dart.js.map +1 -1
- package/dist/utils/npm-conf.d.ts +2 -2
- package/dist/utils/npm-conf.js +12 -19
- package/dist/utils/npm-conf.js.map +1 -1
- package/dist/utils/object-utils.js +8 -15
- package/dist/utils/object-utils.js.map +1 -1
- package/dist/utils/output.js +4 -9
- package/dist/utils/output.js.map +1 -1
- package/dist/utils/parse-field.js +9 -14
- package/dist/utils/parse-field.js.map +1 -1
- package/dist/utils/prerelease-id-from-version.js +3 -8
- package/dist/utils/prerelease-id-from-version.js.map +1 -1
- package/dist/utils/pulse-till-done.js +3 -8
- package/dist/utils/pulse-till-done.js.map +1 -1
- package/dist/utils/query-graph.d.ts +4 -4
- package/dist/utils/query-graph.js +3 -7
- package/dist/utils/query-graph.js.map +1 -1
- package/dist/utils/run-lifecycle.d.ts +2 -2
- package/dist/utils/run-lifecycle.js +12 -19
- package/dist/utils/run-lifecycle.js.map +1 -1
- package/dist/utils/run-topologically.d.ts +2 -2
- package/dist/utils/run-topologically.js +5 -10
- package/dist/utils/run-topologically.js.map +1 -1
- package/dist/utils/string-utils.js +1 -5
- package/dist/utils/string-utils.js.map +1 -1
- package/dist/utils/types.d.ts +3 -3
- package/dist/utils/types.js +16 -20
- package/dist/utils/types.js.map +1 -1
- package/dist/utils/warn-if-hanging.js +5 -10
- package/dist/utils/warn-if-hanging.js.map +1 -1
- package/dist/utils/write-log-file.js +9 -14
- package/dist/utils/write-log-file.js.map +1 -1
- package/dist/validation-error.js +4 -9
- package/dist/validation-error.js.map +1 -1
- package/package.json +36 -20
- package/dist/utils/collect-updates/__helpers__/build-graph.d.ts +0 -3
- package/dist/utils/collect-updates/__helpers__/build-graph.js +0 -75
- package/dist/utils/collect-updates/__helpers__/build-graph.js.map +0 -1
|
@@ -1,16 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const npm_package_arg_1 = tslib_1.__importDefault(require("npm-package-arg"));
|
|
6
|
-
const lib_1 = require("./lib");
|
|
7
|
-
const validation_error_1 = require("../validation-error");
|
|
1
|
+
import npa from 'npm-package-arg';
|
|
2
|
+
import { CyclicPackageGraphNode, PackageGraphNode, reportCycles } from './lib/index.js';
|
|
3
|
+
import { ValidationError } from '../validation-error.js';
|
|
8
4
|
/**
|
|
9
5
|
* A graph of packages in the current project.
|
|
10
6
|
*
|
|
11
7
|
* @extends {Map<string, PackageGraphNode>}
|
|
12
8
|
*/
|
|
13
|
-
class PackageGraph extends Map {
|
|
9
|
+
export class PackageGraph extends Map {
|
|
14
10
|
/**
|
|
15
11
|
* @param {Package[]} packages - An array of Packages to build the graph out of.
|
|
16
12
|
* @param {'allDependencies' | 'allPlusPeerDependencies' | 'dependencies'} [graphType]
|
|
@@ -23,7 +19,7 @@ class PackageGraph extends Map {
|
|
|
23
19
|
if (localDependencies === true || localDependencies === 'forceLocal') {
|
|
24
20
|
localDependencies = 'force'; // eslint-disable-line
|
|
25
21
|
}
|
|
26
|
-
super(packages.map((pkg) =>
|
|
22
|
+
super(packages.map((pkg) => [pkg?.name ?? '', new PackageGraphNode(pkg)]));
|
|
27
23
|
if (packages.length !== this.size) {
|
|
28
24
|
// weed out the duplicates
|
|
29
25
|
const seen = new Map();
|
|
@@ -37,7 +33,7 @@ class PackageGraph extends Map {
|
|
|
37
33
|
}
|
|
38
34
|
for (const [name, locations] of seen) {
|
|
39
35
|
if (locations.length > 1) {
|
|
40
|
-
throw new
|
|
36
|
+
throw new ValidationError('ENAME', [`Package name "${name}" used in multiple packages:`, ...locations].join('\n\t'));
|
|
41
37
|
}
|
|
42
38
|
}
|
|
43
39
|
}
|
|
@@ -63,12 +59,12 @@ class PackageGraph extends Map {
|
|
|
63
59
|
// example with `1.5.0`, ws:* => "1.5.0", ws:^ => "^1.5.0", ws:~ => "~1.5.0", ws:^1.5.0 => "^1.5.0"
|
|
64
60
|
if (spec === '*' || spec === '^' || spec === '~') {
|
|
65
61
|
const depPkg = packages.find((pkg) => pkg.name === depName);
|
|
66
|
-
const version = depPkg
|
|
62
|
+
const version = depPkg?.version;
|
|
67
63
|
const specTarget = spec === '*' ? '' : spec;
|
|
68
64
|
spec = depPkg ? `${specTarget}${version}` : '';
|
|
69
65
|
}
|
|
70
66
|
}
|
|
71
|
-
const resolved =
|
|
67
|
+
const resolved = npa.resolve(depName, spec, currentNode.location);
|
|
72
68
|
resolved.workspaceSpec = fullWorkspaceSpec;
|
|
73
69
|
if (!depNode) {
|
|
74
70
|
// it's an external dependency, store the resolution and bail
|
|
@@ -138,45 +134,6 @@ class PackageGraph extends Map {
|
|
|
138
134
|
// actual Package instances, not PackageGraphNodes
|
|
139
135
|
return result.map((node) => node.pkg);
|
|
140
136
|
}
|
|
141
|
-
/**
|
|
142
|
-
* Return a tuple of cycle paths and nodes.
|
|
143
|
-
*
|
|
144
|
-
* @deprecated Use collapseCycles instead.
|
|
145
|
-
*
|
|
146
|
-
* @param {boolean} rejectCycles Whether or not to reject cycles
|
|
147
|
-
* @returns {[Set<string[]>, Set<PackageGraphNode>]}
|
|
148
|
-
*/
|
|
149
|
-
partitionCycles(rejectCycles) {
|
|
150
|
-
const cyclePaths = new Set();
|
|
151
|
-
const cycleNodes = new Set();
|
|
152
|
-
this.forEach((currentNode, currentName) => {
|
|
153
|
-
const seen = new Set();
|
|
154
|
-
const visits = (walk) => (dependentNode, dependentName, siblingDependents) => {
|
|
155
|
-
const step = walk.concat(dependentName);
|
|
156
|
-
if (seen.has(dependentNode)) {
|
|
157
|
-
return;
|
|
158
|
-
}
|
|
159
|
-
seen.add(dependentNode);
|
|
160
|
-
if (dependentNode === currentNode) {
|
|
161
|
-
// a direct cycle
|
|
162
|
-
cycleNodes.add(currentNode);
|
|
163
|
-
cyclePaths.add(step);
|
|
164
|
-
return;
|
|
165
|
-
}
|
|
166
|
-
if (siblingDependents.has(currentName)) {
|
|
167
|
-
// a transitive cycle
|
|
168
|
-
const cycleDependentName = Array.from(dependentNode.localDependencies.keys()).find((key) => currentNode.localDependents.has(key));
|
|
169
|
-
const pathToCycle = step.slice().reverse().concat(cycleDependentName);
|
|
170
|
-
cycleNodes.add(dependentNode);
|
|
171
|
-
cyclePaths.add(pathToCycle);
|
|
172
|
-
}
|
|
173
|
-
dependentNode.localDependents.forEach(visits(step));
|
|
174
|
-
};
|
|
175
|
-
currentNode.localDependents.forEach(visits([currentName]));
|
|
176
|
-
});
|
|
177
|
-
(0, lib_1.reportCycles)(Array.from(cyclePaths, (cycle) => cycle.join(' -> ')), rejectCycles);
|
|
178
|
-
return [cyclePaths, cycleNodes];
|
|
179
|
-
}
|
|
180
137
|
/**
|
|
181
138
|
* Returns the cycles of this graph. If two cycles share some elements, they will
|
|
182
139
|
* be returned as a single cycle.
|
|
@@ -205,7 +162,7 @@ class PackageGraph extends Map {
|
|
|
205
162
|
}
|
|
206
163
|
alreadyVisited.add(identifier);
|
|
207
164
|
if (topLevelDependent === baseNode || (topLevelDependent.isCycle && topLevelDependent.has(baseNode.name))) {
|
|
208
|
-
const cycle = new
|
|
165
|
+
const cycle = new CyclicPackageGraphNode();
|
|
209
166
|
walkStack.forEach((nodeInCycle) => {
|
|
210
167
|
nodeToCycle.set(nodeInCycle, cycle);
|
|
211
168
|
cycle.insert(nodeInCycle);
|
|
@@ -228,19 +185,9 @@ class PackageGraph extends Map {
|
|
|
228
185
|
}
|
|
229
186
|
this.forEach((currentNode) => visitWithStack(currentNode));
|
|
230
187
|
cycles.forEach((collapsedNode) => visitWithStack(collapsedNode));
|
|
231
|
-
|
|
188
|
+
reportCycles(cyclePaths, rejectCycles);
|
|
232
189
|
return cycles;
|
|
233
190
|
}
|
|
234
|
-
/**
|
|
235
|
-
* Remove cycle nodes.
|
|
236
|
-
*
|
|
237
|
-
* @deprecated Spread set into prune() instead.
|
|
238
|
-
*
|
|
239
|
-
* @param {Set<PackageGraphNode>} cycleNodes
|
|
240
|
-
*/
|
|
241
|
-
pruneCycleNodes(cycleNodes) {
|
|
242
|
-
return this.prune(...cycleNodes);
|
|
243
|
-
}
|
|
244
191
|
/**
|
|
245
192
|
* Remove all candidate nodes.
|
|
246
193
|
* @param {PackageGraphNode[]} candidates
|
|
@@ -266,5 +213,4 @@ class PackageGraph extends Map {
|
|
|
266
213
|
});
|
|
267
214
|
}
|
|
268
215
|
}
|
|
269
|
-
exports.PackageGraph = PackageGraph;
|
|
270
216
|
//# sourceMappingURL=package-graph.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-graph.js","sourceRoot":"","sources":["../../src/package-graph/package-graph.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package-graph.js","sourceRoot":"","sources":["../../src/package-graph/package-graph.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAElC,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAExF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;;GAIG;AACH,MAAM,OAAO,YAAa,SAAQ,GAA6B;IAC7D;;;;;;OAMG;IACH,YACE,QAAmB,EACnB,YAA4E,iBAAiB,EAC7F,oBAA4E,MAAM;QAElF,6BAA6B;QAC7B,IAAI,iBAAiB,KAAK,IAAI,IAAI,iBAAiB,KAAK,YAAY,EAAE;YACpE,iBAAiB,GAAG,OAAO,CAAC,CAAC,sBAAsB;SACpD;QAED,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAY,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,IAAI,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpF,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,EAAE;YACjC,0BAA0B;YAC1B,MAAM,IAAI,GAAqB,IAAI,GAAG,EAAE,CAAC;YAEzC,KAAK,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,QAAQ,EAAE;gBACzC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC/B;qBAAM;oBACL,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;iBAC5B;aACF;YAED,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,EAAE;gBACpC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACxB,MAAM,IAAI,eAAe,CAAC,OAAO,EAAE,CAAC,iBAAiB,IAAI,8BAA8B,EAAE,GAAG,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;iBACtH;aACF;SACF;QAED,IAAI,CAAC,OAAO,CAAC,CAAC,WAA6B,EAAE,WAAmB,EAAE,EAAE;YAClE,MAAM,iBAAiB,GACrB,SAAS,KAAK,cAAc;gBAC1B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,GAAG,CAAC,oBAAoB,EAAE,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC;gBACvF,CAAC,CAAC,MAAM,CAAC,MAAM,CACX,EAAE,EACF,WAAW,CAAC,GAAG,CAAC,eAAe,EAC/B,WAAW,CAAC,GAAG,CAAC,oBAAoB,EACpC,SAAS,KAAK,yBAAyB,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAC/E,WAAW,CAAC,GAAG,CAAC,YAAY,CAC7B,CAAC;YAER,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACjD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAClC,uFAAuF;gBACvF,uFAAuF;gBACvF,mDAAmD;gBACnD,IAAI,IAAI,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAEjE,qEAAqE;gBACrE,iBAAiB;gBACjB,MAAM,eAAe,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAEjD,IAAI,iBAAqC,CAAC;gBAC1C,IAAI,eAAe,EAAE;oBACnB,iBAAiB,GAAG,IAAI,CAAC;oBACzB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;oBAEvC,sEAAsE;oBACtE,0EAA0E;oBAC1E,mGAAmG;oBACnG,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE;wBAChD,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;wBAC5D,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,CAAC;wBAChC,MAAM,UAAU,GAAG,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;wBAC5C,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAChD;iBACF;gBAED,MAAM,QAAQ,GAAqB,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;gBACpF,QAAQ,CAAC,aAAa,GAAG,iBAAiB,CAAC;gBAE3C,IAAI,CAAC,OAAO,EAAE;oBACZ,6DAA6D;oBAC7D,OAAO,WAAW,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;iBAChE;gBAED,IACE,eAAe;oBACf,iBAAiB,KAAK,OAAO;oBAC7B,QAAQ,CAAC,SAAS,KAAK,OAAO,CAAC,QAAQ;oBACvC,CAAC,iBAAiB,KAAK,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,EACjE;oBACA,qEAAqE;oBACrE,WAAW,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;oBACrD,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;iBACvD;qBAAM;oBACL,4CAA4C;oBAC5C,WAAW,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;iBACzD;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,gBAA2B;QACzC,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;IAChE,CAAC;IAED;;;;;;OAMG;IACH,aAAa,CAAC,gBAA2B;QACvC,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;;;OAOG;IACH,UAAU,CAAC,WAAsB,EAAE,QAAiD;QAClF,2EAA2E;QAC3E,MAAM,MAAM,GAAG,IAAI,GAAG,CAAmB,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAqB,CAAC,CAAC,CAAC;QAE5G,oDAAoD;QACpD,MAAM,MAAM,GAA4B,EAAE,CAAC;QAE3C,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YAC7B,2CAA2C;YAC3C,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAEzB,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;gBAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAElC,IAAI,OAAO,IAAI,OAAO,KAAK,WAAW,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;oBAC9D,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;iBACrB;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,kDAAkD;QAClD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;OAMG;IACH,cAAc,CAAC,YAAsB;QACnC,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,MAAM,WAAW,GAAG,IAAI,GAAG,EAA4C,CAAC;QACxE,MAAM,MAAM,GAAG,IAAI,GAAG,EAA0B,CAAC;QACjD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;QACzC,MAAM,SAAS,GAAqD,EAAE,CAAC;QAEvE,SAAS,MAAM,CAAC,QAAQ,EAAE,aAAa;YACrC,IAAI,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBAC7B,OAAO;aACR;YAED,IAAI,iBAAiB,GAAG,aAAa,CAAC;YACtC,OAAO,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;gBACzC,iBAAiB,GAAG,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;aACxD;YAED,iGAAiG;YACjG,MAAM,UAAU,GAAG,GAAG,QAAQ,CAAC,IAAI,IAAI,iBAAiB,CAAC,IAAI,EAAE,CAAC;YAChE,IAAI,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBAClC,OAAO;aACR;YACD,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAE/B,IAAI,iBAAiB,KAAK,QAAQ,IAAI,CAAC,iBAAiB,CAAC,OAAO,IAAI,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE;gBACzG,MAAM,KAAK,GAAQ,IAAI,sBAAsB,EAAE,CAAC;gBAEhD,SAAS,CAAC,OAAO,CAAC,CAAC,WAAsD,EAAE,EAAE;oBAC3E,WAAW,CAAC,GAAG,CAAC,WAA+B,EAAE,KAAK,CAAC,CAAC;oBACxD,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;oBAC1B,MAAM,CAAC,MAAM,CAAC,WAAqC,CAAC,CAAC;gBACvD,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAClB,aAAa;gBACb,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAElC,OAAO;aACR;YAED,IAAI,SAAS,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE;gBAC/C,gDAAgD;gBAChD,cAAc,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;aAC7C;QACH,CAAC;QAED,SAAS,cAAc,CAAC,QAAQ,EAAE,WAAW,GAAG,QAAQ;YACtD,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC5B,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;YACjE,SAAS,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;QAEjE,YAAY,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEvC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,GAAG,UAA8B;QACrC,IAAI,UAAU,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,EAAE;YACnC,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;SACrB;QAED,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,aAA+B;QACpC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAsB,EAAE,EAAE;YACtC,qCAAqC;YACrC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAElD,sCAAsC;YACtC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
package/dist/package.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CommandType, NpaResolveResult, RawManifest } from './models';
|
|
1
|
+
import { CommandType, NpaResolveResult, RawManifest } from './models/index.js';
|
|
2
2
|
/**
|
|
3
3
|
* Lerna's internal representation of a local package, with
|
|
4
4
|
* many values resolved directly from the original JSON.
|
|
@@ -100,10 +100,9 @@ export declare class Package {
|
|
|
100
100
|
* @param {Object} resolved npa metadata
|
|
101
101
|
* @param {String} depVersion semver
|
|
102
102
|
* @param {String} savePrefix npm_config_save_prefix
|
|
103
|
-
* @param {Boolean} [workspaceStrictMatch] - are we using `workspace:` protocol strict match?
|
|
104
103
|
* @param {String} [updatedByCommand] - which command called this update?
|
|
105
104
|
*/
|
|
106
|
-
updateLocalDependency(resolved: NpaResolveResult, depVersion: string, savePrefix: string, allowPeerDependenciesUpdate?: boolean,
|
|
105
|
+
updateLocalDependency(resolved: NpaResolveResult, depVersion: string, savePrefix: string, allowPeerDependenciesUpdate?: boolean, updatedByCommand?: CommandType): void;
|
|
107
106
|
/**
|
|
108
107
|
* Retrieve the dependencies collection which contain the dependency name provided, we'll search in all type of dependencies/devDependencies/...
|
|
109
108
|
* @param {String} depName - dependency name
|
package/dist/package.js
CHANGED
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const npm_package_arg_1 = tslib_1.__importDefault(require("npm-package-arg"));
|
|
7
|
-
const npmlog_1 = tslib_1.__importDefault(require("npmlog"));
|
|
8
|
-
const path_1 = tslib_1.__importDefault(require("path"));
|
|
9
|
-
const write_pkg_1 = tslib_1.__importDefault(require("write-pkg"));
|
|
1
|
+
import { loadJsonFile, loadJsonFileSync } from 'load-json-file';
|
|
2
|
+
import npa from 'npm-package-arg';
|
|
3
|
+
import npmlog from 'npmlog';
|
|
4
|
+
import { basename, dirname, join, resolve as pathResolve, relative } from 'node:path';
|
|
5
|
+
import { writePackage } from 'write-pkg';
|
|
10
6
|
// symbol used to 'hide' internal state
|
|
11
7
|
const PKG = Symbol('pkg');
|
|
12
8
|
// private fields
|
|
@@ -25,7 +21,7 @@ function binSafeName({ name, scope }) {
|
|
|
25
21
|
function shallowCopy(json) {
|
|
26
22
|
return Object.keys(json).reduce((obj, key) => {
|
|
27
23
|
const val = json[key];
|
|
28
|
-
/*
|
|
24
|
+
/* c8 ignore next 2 */
|
|
29
25
|
if (Array.isArray(val)) {
|
|
30
26
|
obj[key] = val.slice();
|
|
31
27
|
}
|
|
@@ -42,7 +38,7 @@ function shallowCopy(json) {
|
|
|
42
38
|
* Lerna's internal representation of a local package, with
|
|
43
39
|
* many values resolved directly from the original JSON.
|
|
44
40
|
*/
|
|
45
|
-
class Package {
|
|
41
|
+
export class Package {
|
|
46
42
|
/**
|
|
47
43
|
* Create a Package instance from parameters, possibly reusing existing instance.
|
|
48
44
|
* @param {string|Package|RawManifest} ref A path to a package.json file, Package instance, or JSON object
|
|
@@ -51,8 +47,8 @@ class Package {
|
|
|
51
47
|
*/
|
|
52
48
|
static lazy(ref, dir = '.') {
|
|
53
49
|
if (typeof ref === 'string') {
|
|
54
|
-
const location =
|
|
55
|
-
const manifest =
|
|
50
|
+
const location = pathResolve(basename(ref) === 'package.json' ? dirname(ref) : ref);
|
|
51
|
+
const manifest = loadJsonFileSync(join(location, 'package.json'));
|
|
56
52
|
return new Package(manifest, location);
|
|
57
53
|
}
|
|
58
54
|
// don't use instanceof because it fails across nested module boundaries
|
|
@@ -68,13 +64,12 @@ class Package {
|
|
|
68
64
|
* @param {string} [rootPath]
|
|
69
65
|
*/
|
|
70
66
|
constructor(pkg, location, rootPath = location) {
|
|
71
|
-
var _a, _b;
|
|
72
67
|
this._id = '';
|
|
73
68
|
this.licensePath = '';
|
|
74
69
|
this.localDependencies = new Map();
|
|
75
70
|
// npa will throw an error if the name is invalid
|
|
76
|
-
const resolved =
|
|
77
|
-
this.name =
|
|
71
|
+
const resolved = npa.resolve(pkg?.name ?? '', `file:${relative(rootPath, location)}`, rootPath);
|
|
72
|
+
this.name = pkg?.name ?? '';
|
|
78
73
|
this[PKG] = pkg;
|
|
79
74
|
// omit raw pkg from default util.inspect() output, but preserve internal mutability
|
|
80
75
|
Object.defineProperty(this, PKG, { enumerable: false, writable: true });
|
|
@@ -106,17 +101,17 @@ class Package {
|
|
|
106
101
|
: Object.assign({}, pkg.bin);
|
|
107
102
|
}
|
|
108
103
|
get binLocation() {
|
|
109
|
-
return
|
|
104
|
+
return join(this.location, 'node_modules', '.bin');
|
|
110
105
|
}
|
|
111
106
|
/** alias to pkg getter (to avoid calling duplicate prop like `node.pkg.pkg` in which node is PackageGraphNode) */
|
|
112
107
|
get manifest() {
|
|
113
108
|
return this[PKG];
|
|
114
109
|
}
|
|
115
110
|
get manifestLocation() {
|
|
116
|
-
return
|
|
111
|
+
return join(this.location, 'package.json');
|
|
117
112
|
}
|
|
118
113
|
get nodeModulesLocation() {
|
|
119
|
-
return
|
|
114
|
+
return join(this.location, 'node_modules');
|
|
120
115
|
}
|
|
121
116
|
// eslint-disable-next-line class-methods-use-this
|
|
122
117
|
get __isLernaPackage() {
|
|
@@ -143,13 +138,13 @@ class Package {
|
|
|
143
138
|
}
|
|
144
139
|
// if provided by pkg.publishConfig.directory value
|
|
145
140
|
if (this[PKG].publishConfig && this[PKG].publishConfig.directory) {
|
|
146
|
-
return
|
|
141
|
+
return join(this.location, this[PKG].publishConfig.directory);
|
|
147
142
|
}
|
|
148
143
|
// default to package root
|
|
149
144
|
return this.location;
|
|
150
145
|
}
|
|
151
146
|
set contents(subDirectory) {
|
|
152
|
-
this[_contents] =
|
|
147
|
+
this[_contents] = join(this.location, subDirectory);
|
|
153
148
|
}
|
|
154
149
|
// 'live' collections
|
|
155
150
|
get dependencies() {
|
|
@@ -198,7 +193,7 @@ class Package {
|
|
|
198
193
|
* Refresh internal state from disk (e.g., changed by external lifecycles)
|
|
199
194
|
*/
|
|
200
195
|
refresh() {
|
|
201
|
-
return (
|
|
196
|
+
return loadJsonFile(this.manifestLocation).then((pkg) => {
|
|
202
197
|
this[PKG] = pkg;
|
|
203
198
|
return this;
|
|
204
199
|
});
|
|
@@ -208,7 +203,7 @@ class Package {
|
|
|
208
203
|
* @returns {Promise} resolves when write finished
|
|
209
204
|
*/
|
|
210
205
|
serialize() {
|
|
211
|
-
return (
|
|
206
|
+
return writePackage(this.manifestLocation, this[PKG]).then(() => this);
|
|
212
207
|
}
|
|
213
208
|
/**
|
|
214
209
|
* Mutate given dependency (could be local/external) spec according to type
|
|
@@ -216,22 +211,19 @@ class Package {
|
|
|
216
211
|
* @param {Object} resolved npa metadata
|
|
217
212
|
*/
|
|
218
213
|
removeDependencyWorkspaceProtocolPrefix(pkgName, resolved) {
|
|
219
|
-
var _a, _b;
|
|
220
214
|
const depName = resolved.name;
|
|
221
|
-
const workspaceSpec =
|
|
215
|
+
const workspaceSpec = resolved?.workspaceSpec ?? '';
|
|
222
216
|
const localDependencies = this.retrievePackageDependencies(depName);
|
|
223
217
|
const inspectDependencies = [localDependencies];
|
|
224
218
|
// package could be found in both a local dependencies and peerDependencies, so we need to include it when found
|
|
225
|
-
if (
|
|
219
|
+
if (this.peerDependencies?.[depName]) {
|
|
226
220
|
inspectDependencies.push(this.peerDependencies);
|
|
227
221
|
}
|
|
228
222
|
for (const depCollection of inspectDependencies) {
|
|
229
|
-
if (depCollection &&
|
|
230
|
-
(resolved.registry || resolved.type === 'directory') &&
|
|
231
|
-
/^(workspace:)+(.*)$/.test(workspaceSpec)) {
|
|
223
|
+
if (depCollection && (resolved.registry || resolved.type === 'directory') && /^(workspace:)+(.*)$/.test(workspaceSpec)) {
|
|
232
224
|
if (workspaceSpec) {
|
|
233
225
|
if (resolved.fetchSpec === 'latest' || resolved.fetchSpec === '') {
|
|
234
|
-
|
|
226
|
+
npmlog.error(`publish`, [
|
|
235
227
|
`Your package named "${pkgName}" has external dependencies not handled by Lerna-Lite and without workspace version suffix, `,
|
|
236
228
|
`we recommend using defined versions with workspace protocol. `,
|
|
237
229
|
`Your dependency is currently being published with "${depName}": "${resolved.fetchSpec}".`,
|
|
@@ -247,16 +239,14 @@ class Package {
|
|
|
247
239
|
* @param {Object} resolved npa metadata
|
|
248
240
|
* @param {String} depVersion semver
|
|
249
241
|
* @param {String} savePrefix npm_config_save_prefix
|
|
250
|
-
* @param {Boolean} [workspaceStrictMatch] - are we using `workspace:` protocol strict match?
|
|
251
242
|
* @param {String} [updatedByCommand] - which command called this update?
|
|
252
243
|
*/
|
|
253
|
-
updateLocalDependency(resolved, depVersion, savePrefix, allowPeerDependenciesUpdate = false,
|
|
254
|
-
var _a, _b;
|
|
244
|
+
updateLocalDependency(resolved, depVersion, savePrefix, allowPeerDependenciesUpdate = false, updatedByCommand) {
|
|
255
245
|
const depName = resolved.name;
|
|
256
246
|
const localDependencies = this.retrievePackageDependencies(depName);
|
|
257
247
|
const updatingDependencies = [localDependencies];
|
|
258
248
|
// when we have peer dependencies, we might need to perform certain things
|
|
259
|
-
if (
|
|
249
|
+
if (this.peerDependencies?.[depName]) {
|
|
260
250
|
// when user allows peer bump and is a regular semver version, we'll push it to the array of dependencies to potentially bump
|
|
261
251
|
// however we won't when the semver has a range with operator, ie this would bump ("^2.0.0") but these would not (">=2.0.0" or "workspace:<2.0.0" or "workspace:*")
|
|
262
252
|
// prettier-ignore
|
|
@@ -275,29 +265,27 @@ class Package {
|
|
|
275
265
|
depCollection[depName] = `${savePrefix}${depVersion}`;
|
|
276
266
|
// when using explicit `workspace:` protocol
|
|
277
267
|
if (resolved.workspaceSpec) {
|
|
278
|
-
const workspaceSpec =
|
|
268
|
+
const workspaceSpec = resolved?.workspaceSpec ?? '';
|
|
279
269
|
const [_, _wsTxt, operatorPrefix, rangePrefix, semver] = workspaceSpec.match(/^(workspace:)?([<>=]{0,2})?([*|~|^])?(.*)$/) || [];
|
|
280
270
|
if (operatorPrefix) {
|
|
281
271
|
// package with range operator should never be bumped, we'll use same version range but without prefix "workspace:>=1.2.3" will assign ">=1.2.3"
|
|
282
272
|
depCollection[depName] = `${operatorPrefix}${rangePrefix || ''}${semver}`;
|
|
283
273
|
}
|
|
284
|
-
else
|
|
274
|
+
else {
|
|
285
275
|
// with workspace in strict mode we might have empty range prefix like "workspace:1.2.3"
|
|
286
276
|
depCollection[depName] = `${rangePrefix || ''}${depVersion}`;
|
|
287
277
|
}
|
|
288
278
|
if (updatedByCommand === 'publish') {
|
|
289
279
|
// when publishing, workspace protocol will be transformed to semver range
|
|
290
280
|
// e.g.: considering version is `1.2.3` and we have `workspace:*` it will be converted to "^1.2.3" or to "1.2.3" with strict match range enabled
|
|
291
|
-
if (
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
depCollection[depName] = `^${depVersion}`; // (^) minor range, "^1.5.0"
|
|
300
|
-
}
|
|
281
|
+
if (workspaceSpec === 'workspace:*') {
|
|
282
|
+
depCollection[depName] = depVersion; // (*) exact range, "1.5.0"
|
|
283
|
+
}
|
|
284
|
+
else if (workspaceSpec === 'workspace:~') {
|
|
285
|
+
depCollection[depName] = `~${depVersion}`; // (~) patch range, "~1.5.0"
|
|
286
|
+
}
|
|
287
|
+
else if (workspaceSpec === 'workspace:^') {
|
|
288
|
+
depCollection[depName] = `^${depVersion}`; // (^) minor range, "^1.5.0"
|
|
301
289
|
}
|
|
302
290
|
// anything else will fall under what Lerna previously found to be the version,
|
|
303
291
|
// typically by this line: depCollection[depName] = `${savePrefix}${depVersion}`;
|
|
@@ -349,5 +337,4 @@ class Package {
|
|
|
349
337
|
return depCollection;
|
|
350
338
|
}
|
|
351
339
|
}
|
|
352
|
-
exports.Package = Package;
|
|
353
340
|
//# sourceMappingURL=package.js.map
|
package/dist/package.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":"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"}
|
package/dist/project/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export * from './project';
|
|
2
|
-
export * from './lib';
|
|
1
|
+
export * from './project.js';
|
|
2
|
+
export * from './lib/index.js';
|
package/dist/project/index.js
CHANGED
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./project"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./lib"), exports);
|
|
1
|
+
export * from './project.js';
|
|
2
|
+
export * from './lib/index.js';
|
|
6
3
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/project/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/project/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC"}
|
|
@@ -1,37 +1,32 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
|
-
const resolve_from_1 = tslib_1.__importDefault(require("resolve-from"));
|
|
8
|
-
const shallow_extend_1 = require("./shallow-extend");
|
|
9
|
-
const validation_error_1 = require("../../validation-error");
|
|
1
|
+
import { readJsonSync } from 'fs-extra/esm';
|
|
2
|
+
import { dirname } from 'node:path';
|
|
3
|
+
import resolveFrom from 'resolve-from';
|
|
4
|
+
import { shallowExtend } from './shallow-extend.js';
|
|
5
|
+
import { ValidationError } from '../../validation-error.js';
|
|
10
6
|
/**
|
|
11
7
|
* @param {{ [key: string]: unknown }} config
|
|
12
8
|
* @param {string} cwd
|
|
13
9
|
* @param {Set<string>} seen
|
|
14
10
|
*/
|
|
15
|
-
function applyExtends(config, cwd, seen = new Set()) {
|
|
11
|
+
export function applyExtends(config, cwd, seen = new Set()) {
|
|
16
12
|
let defaultConfig = {};
|
|
17
13
|
if ('extends' in config) {
|
|
18
14
|
let pathToDefault;
|
|
19
15
|
try {
|
|
20
|
-
pathToDefault = (
|
|
16
|
+
pathToDefault = resolveFrom(cwd, config.extends);
|
|
21
17
|
}
|
|
22
18
|
catch (err) {
|
|
23
|
-
throw new
|
|
19
|
+
throw new ValidationError('ERESOLVED', 'Config .extends must be locally-resolvable', err);
|
|
24
20
|
}
|
|
25
21
|
if (seen.has(pathToDefault)) {
|
|
26
|
-
throw new
|
|
22
|
+
throw new ValidationError('ECIRCULAR', 'Config .extends cannot be circular', seen);
|
|
27
23
|
}
|
|
28
24
|
seen.add(pathToDefault);
|
|
29
|
-
defaultConfig =
|
|
25
|
+
defaultConfig = readJsonSync(pathToDefault, { throws: false });
|
|
30
26
|
delete config.extends; // eslint-disable-line no-param-reassign
|
|
31
27
|
// deprecateConfig(defaultConfig, pathToDefault);
|
|
32
|
-
defaultConfig = applyExtends(defaultConfig,
|
|
28
|
+
defaultConfig = applyExtends(defaultConfig, dirname(pathToDefault), seen);
|
|
33
29
|
}
|
|
34
|
-
return
|
|
30
|
+
return shallowExtend(config, defaultConfig);
|
|
35
31
|
}
|
|
36
|
-
exports.applyExtends = applyExtends;
|
|
37
32
|
//# sourceMappingURL=apply-extends.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-extends.js","sourceRoot":"","sources":["../../../src/project/lib/apply-extends.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apply-extends.js","sourceRoot":"","sources":["../../../src/project/lib/apply-extends.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,WAAW,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,MAA8B,EAAE,GAAW,EAAE,OAAO,IAAI,GAAG,EAAU;IAChG,IAAI,aAAa,GAAG,EAAE,CAAC;IAEvB,IAAI,SAAS,IAAI,MAAM,EAAE;QACvB,IAAI,aAAa,CAAC;QAElB,IAAI;YACF,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;SAClD;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,IAAI,eAAe,CAAC,WAAW,EAAE,4CAA4C,EAAE,GAAG,CAAC,CAAC;SAC3F;QAED,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;YAC3B,MAAM,IAAI,eAAe,CAAC,WAAW,EAAE,oCAAoC,EAAE,IAAW,CAAC,CAAC;SAC3F;QAED,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAExB,aAAa,GAAG,YAAY,CAAC,aAAa,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/D,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,wCAAwC;QAE/D,iDAAiD;QAEjD,aAAa,GAAG,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,CAAC;KAC3E;IAED,OAAO,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAC9C,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from './apply-extends';
|
|
2
|
-
export * from './make-file-finder';
|
|
3
|
-
export * from './shallow-extend';
|
|
1
|
+
export * from './apply-extends.js';
|
|
2
|
+
export * from './make-file-finder.js';
|
|
3
|
+
export * from './shallow-extend.js';
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
tslib_1.__exportStar(require("./apply-extends"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./make-file-finder"), exports);
|
|
6
|
-
tslib_1.__exportStar(require("./shallow-extend"), exports);
|
|
1
|
+
export * from './apply-extends.js';
|
|
2
|
+
export * from './make-file-finder.js';
|
|
3
|
+
export * from './shallow-extend.js';
|
|
7
4
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/project/lib/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/project/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { GlobbyOptions } from 'globby';
|
|
1
|
+
import { Options as GlobbyOptions } from 'globby';
|
|
2
2
|
export declare function makeFileFinder(rootPath: string, packageConfigs: string[]): (fileName: string, fileMapper: any, customGlobOpts?: any) => Promise<any>;
|
|
3
3
|
export declare function makeSyncFileFinder(rootPath: string, packageConfigs: string[]): (fileName: string, fileMapper: (value: string, index: number, array: string[]) => any, customGlobOpts?: GlobbyOptions) => string[];
|