@detergent-software/atk 9.2.0-dev.4 → 9.2.0-dev.6
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/CHANGELOG.md +29 -0
- package/README.md +10 -10
- package/build/command-manifest.json +18 -1
- package/build/commands/install.d.ts +2 -2
- package/build/commands/install.d.ts.map +1 -1
- package/build/commands/install.js +383 -39
- package/build/commands/install.js.map +1 -1
- package/build/commands/uninstall.d.ts +2 -2
- package/build/commands/uninstall.d.ts.map +1 -1
- package/build/commands/uninstall.js +35 -11
- package/build/commands/uninstall.js.map +1 -1
- package/build/commands/update.d.ts +3 -2
- package/build/commands/update.d.ts.map +1 -1
- package/build/commands/update.js +270 -74
- package/build/commands/update.js.map +1 -1
- package/build/hooks/useUninstallState.d.ts +22 -2
- package/build/hooks/useUninstallState.d.ts.map +1 -1
- package/build/hooks/useUninstallState.js +161 -16
- package/build/hooks/useUninstallState.js.map +1 -1
- package/build/lib/installer.js +3 -2
- package/build/lib/installer.js.map +1 -1
- package/build/lib/resolver.d.ts +35 -0
- package/build/lib/resolver.d.ts.map +1 -1
- package/build/lib/resolver.js +65 -21
- package/build/lib/resolver.js.map +1 -1
- package/build/lib/uninstaller.d.ts +51 -3
- package/build/lib/uninstaller.d.ts.map +1 -1
- package/build/lib/uninstaller.js +134 -39
- package/build/lib/uninstaller.js.map +1 -1
- package/build/lib/updater.d.ts +3 -2
- package/build/lib/updater.d.ts.map +1 -1
- package/build/lib/updater.js +16 -3
- package/build/lib/updater.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import type { Adapter } from '../lib/schemas/adapter.js';
|
|
2
2
|
import type { AssetType } from '../lib/schemas/index.js';
|
|
3
|
-
import type { BundleUninstallPlan, BundleUninstallResult, UninstallOptions, UninstallPlan, UninstallResult } from '../lib/uninstaller.js';
|
|
3
|
+
import type { AssetsUninstallPlan, BundleUninstallPlan, BundleUninstallResult, UninstallOptions, UninstallPlan, UninstallResult } from '../lib/uninstaller.js';
|
|
4
4
|
import { type LockfileEffect } from '../lib/asset-tools.js';
|
|
5
5
|
import { type ResolvedScope } from '../lib/scope.js';
|
|
6
|
+
/** A run of several named assets that hit per-asset errors is partial if it removed anything, else failed. */
|
|
7
|
+
export type AssetsResultOutcome = 'assets-failed' | 'assets-partial' | 'assets-success';
|
|
6
8
|
/** A bundle run that hit per-asset errors is partial if it removed anything, else failed. */
|
|
7
9
|
export type BundleResultOutcome = 'bundle-failed' | 'bundle-partial' | 'bundle-success';
|
|
8
10
|
/**
|
|
@@ -39,7 +41,7 @@ export type UninstallAction = {
|
|
|
39
41
|
type: 'LOAD_PROGRESS';
|
|
40
42
|
} | {
|
|
41
43
|
outcome: Extract<UninstallOutcome, {
|
|
42
|
-
outcome: 'success' | BundleResultOutcome;
|
|
44
|
+
outcome: 'success' | AssetsResultOutcome | BundleResultOutcome;
|
|
43
45
|
}>;
|
|
44
46
|
type: 'EXECUTE_DONE';
|
|
45
47
|
} | {
|
|
@@ -56,6 +58,8 @@ export type UninstallAction = {
|
|
|
56
58
|
export interface UninstallFlags {
|
|
57
59
|
cascade: boolean;
|
|
58
60
|
dryRun: boolean;
|
|
61
|
+
/** Names after the first: the assets uninstall together, as one set. */
|
|
62
|
+
more?: string[];
|
|
59
63
|
name: string;
|
|
60
64
|
org?: string;
|
|
61
65
|
projectRoot?: string;
|
|
@@ -80,12 +84,23 @@ export type UninstallOutcome = {
|
|
|
80
84
|
plan: UninstallPlan;
|
|
81
85
|
tools: RemovalTool[];
|
|
82
86
|
toolScope?: UninstallOptions['toolScope'];
|
|
87
|
+
} | {
|
|
88
|
+
lockfileEffects?: LockfileEffect[];
|
|
89
|
+
outcome: 'assets-confirming';
|
|
90
|
+
plan: AssetsUninstallPlan;
|
|
91
|
+
tools: RemovalTool[];
|
|
92
|
+
toolScope?: UninstallOptions['toolScope'];
|
|
83
93
|
} | {
|
|
84
94
|
lockfileEffects?: LockfileEffect[];
|
|
85
95
|
outcome: 'bundle-confirming';
|
|
86
96
|
plan: BundleUninstallPlan;
|
|
87
97
|
tools: RemovalTool[];
|
|
88
98
|
toolScope?: UninstallOptions['toolScope'];
|
|
99
|
+
} | {
|
|
100
|
+
lockfileEffects?: LockfileEffect[];
|
|
101
|
+
outcome: 'dry-run-assets';
|
|
102
|
+
plan: AssetsUninstallPlan;
|
|
103
|
+
tools: string[];
|
|
89
104
|
} | {
|
|
90
105
|
lockfileEffects?: LockfileEffect[];
|
|
91
106
|
outcome: 'dry-run-bundle';
|
|
@@ -107,6 +122,11 @@ export type UninstallOutcome = {
|
|
|
107
122
|
} | {
|
|
108
123
|
outcome: 'success';
|
|
109
124
|
toolResults: ToolUninstallSuccess[];
|
|
125
|
+
} | {
|
|
126
|
+
outcome: AssetsResultOutcome;
|
|
127
|
+
plan: AssetsUninstallPlan;
|
|
128
|
+
result: BundleUninstallResult;
|
|
129
|
+
tools: string[];
|
|
110
130
|
} | {
|
|
111
131
|
outcome: BundleResultOutcome;
|
|
112
132
|
plan: BundleUninstallPlan;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useUninstallState.d.ts","sourceRoot":"","sources":["../../src/hooks/useUninstallState.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACrB,gBAAgB,EAChB,aAAa,EACb,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAA2B,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"useUninstallState.d.ts","sourceRoot":"","sources":["../../src/hooks/useUninstallState.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,12 @@ import { useEffect, useReducer, useRef } from 'react';
|
|
|
2
2
|
import { describeLockfileEffects } from '../lib/asset-tools.js';
|
|
3
3
|
import { loadConfig } from '../lib/config.js';
|
|
4
4
|
import { errorGuidance, errorMessage } from '../lib/errors.js';
|
|
5
|
-
import { findInstalledAssetWithFallback, LOCKFILE_LOCKED_MESSAGE, LockfileLockedError, readLockfile, withLockfileLock, } from '../lib/lockfile.js';
|
|
6
|
-
import { parseBundleSpec, resolveActiveOrg } from '../lib/org.js';
|
|
5
|
+
import { findInstalledAssetWithFallback, identityKey, LOCKFILE_LOCKED_MESSAGE, LockfileLockedError, readLockfile, withLockfileLock, } from '../lib/lockfile.js';
|
|
6
|
+
import { formatOrgName, parseBundleSpec, resolveActiveOrg } from '../lib/org.js';
|
|
7
7
|
import { fetchRegistry, findBundle } from '../lib/registry.js';
|
|
8
|
-
import { resolveScope } from '../lib/scope.js';
|
|
8
|
+
import { resolveScope, scopeLabel } from '../lib/scope.js';
|
|
9
9
|
import { resolveTools } from '../lib/tool-resolver.js';
|
|
10
|
-
import { adaptersWithCopies, executeBundleUninstall, planBundleUninstall, planUninstall, uninstallAsset, UninstallerError, } from '../lib/uninstaller.js';
|
|
10
|
+
import { adaptersWithCopies, bundleMembersOf, executeBundleUninstall, planAssetsUninstall, planBundleUninstall, planSetUninstall, planUninstall, uninstallAsset, UninstallerError, } from '../lib/uninstaller.js';
|
|
11
11
|
// ---------------------------------------------------------------------------
|
|
12
12
|
// Initial state factory
|
|
13
13
|
// ---------------------------------------------------------------------------
|
|
@@ -69,14 +69,19 @@ export function uninstallReducer(state, action) {
|
|
|
69
69
|
// Determine the next phase based on the outcome variant
|
|
70
70
|
switch (outcome.outcome) {
|
|
71
71
|
// Confirmation needed
|
|
72
|
+
case 'assets-confirming':
|
|
72
73
|
case 'bundle-confirming':
|
|
73
74
|
case 'confirming':
|
|
74
75
|
return { ...state, outcome, phase: 'confirming' };
|
|
75
76
|
// Terminal outcomes — go straight to done
|
|
77
|
+
case 'assets-failed':
|
|
78
|
+
case 'assets-partial':
|
|
79
|
+
case 'assets-success':
|
|
76
80
|
case 'bundle-failed':
|
|
77
81
|
case 'bundle-not-installed':
|
|
78
82
|
case 'bundle-partial':
|
|
79
83
|
case 'bundle-success':
|
|
84
|
+
case 'dry-run-assets':
|
|
80
85
|
case 'dry-run-bundle':
|
|
81
86
|
// falls through
|
|
82
87
|
case 'dry-run-single':
|
|
@@ -114,7 +119,7 @@ export function useUninstallState(flags) {
|
|
|
114
119
|
hasLoadedRef.current = true;
|
|
115
120
|
let cancelled = false;
|
|
116
121
|
const load = async () => {
|
|
117
|
-
const { cascade, dryRun, name: rawName, org: cliOrg, projectRoot, refresh, tool, type, user, yes } = state.flags;
|
|
122
|
+
const { cascade, dryRun, more = [], name: rawName, org: cliOrg, projectRoot, refresh, tool, type, user, yes, } = state.flags;
|
|
118
123
|
const where = await resolveScope({ projectRoot, user });
|
|
119
124
|
const { root: projectDir, scope } = where;
|
|
120
125
|
if (!cancelled)
|
|
@@ -151,6 +156,110 @@ export function useUninstallState(flags) {
|
|
|
151
156
|
const registry = await fetchRegistry({ force: refresh });
|
|
152
157
|
if (cancelled)
|
|
153
158
|
return;
|
|
159
|
+
if (more.length > 0) {
|
|
160
|
+
if (type) {
|
|
161
|
+
throw new UninstallerError('--type picks the type of one name, so it works with one asset only. Uninstall that asset on its own.');
|
|
162
|
+
}
|
|
163
|
+
const specs = [rawName, ...more];
|
|
164
|
+
dispatch({ message: 'Planning removal...', type: 'LOAD_PROGRESS' });
|
|
165
|
+
const lockfile = await readLockfile(projectDir);
|
|
166
|
+
if (cancelled)
|
|
167
|
+
return;
|
|
168
|
+
// A bundle among the names takes its members by the bundle's rules, judged over the whole set.
|
|
169
|
+
const bundles = new Map();
|
|
170
|
+
const targets = new Map();
|
|
171
|
+
const missing = [];
|
|
172
|
+
for (const spec of specs) {
|
|
173
|
+
const parsed = parseBundleSpec(spec);
|
|
174
|
+
const bundle = findBundle(registry, parsed.org ? parsed.name : spec, parsed.org);
|
|
175
|
+
if (bundle) {
|
|
176
|
+
if (bundleMembersOf(lockfile, bundle.name, bundle.org).length === 0)
|
|
177
|
+
missing.push(spec);
|
|
178
|
+
else {
|
|
179
|
+
bundles.set(formatOrgName(bundle.org, bundle.name), {
|
|
180
|
+
name: bundle.name,
|
|
181
|
+
...(bundle.org ? { org: bundle.org } : {}),
|
|
182
|
+
version: bundle.version,
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
const org = resolveActiveOrg(parsed.org ?? cliOrg, lockfile.org, config.org);
|
|
188
|
+
// A name installed as more than one type is uninstalled on its own with --type, so its
|
|
189
|
+
// command names it alone.
|
|
190
|
+
const installed = findUninstallTarget(lockfile, parsed.org ? parsed.name : spec, org, {
|
|
191
|
+
...state.flags,
|
|
192
|
+
more: [],
|
|
193
|
+
name: spec,
|
|
194
|
+
});
|
|
195
|
+
if (installed)
|
|
196
|
+
targets.set(identityKey(installed), installed);
|
|
197
|
+
else
|
|
198
|
+
missing.push(spec);
|
|
199
|
+
}
|
|
200
|
+
if (missing.length > 0) {
|
|
201
|
+
throw new UninstallerError(`${missing.join(', ')} ${missing.length === 1 ? 'is' : 'are'} not installed in ${scopeLabel(where)}, so nothing was uninstalled.`);
|
|
202
|
+
}
|
|
203
|
+
const planned = bundles.size > 0
|
|
204
|
+
? planSetUninstall(lockfile, { bundles: [...bundles.values()], targets: [...targets.values()] }, removingTools)
|
|
205
|
+
: planAssetsUninstall(lockfile, [...targets.values()], removingTools);
|
|
206
|
+
const plan = cascade ? planned : { ...planned, orphansToRemove: [] };
|
|
207
|
+
const removed = [...plan.assetsToRemove, ...plan.orphansToRemove];
|
|
208
|
+
const removalTools = await removalToolsFor(removed, lockfile);
|
|
209
|
+
if (dryRun) {
|
|
210
|
+
dispatch({
|
|
211
|
+
outcome: {
|
|
212
|
+
lockfileEffects: effectsFor(removed),
|
|
213
|
+
outcome: 'dry-run-assets',
|
|
214
|
+
plan,
|
|
215
|
+
tools: removalTools.map((t) => t.tool),
|
|
216
|
+
},
|
|
217
|
+
type: 'LOAD_DONE',
|
|
218
|
+
});
|
|
219
|
+
return;
|
|
220
|
+
}
|
|
221
|
+
// As for one name: ask only when an asset outside the set depends on one of them, and always
|
|
222
|
+
// with a bundle among them, as a bundle alone asks.
|
|
223
|
+
if ((plan.dependents.length > 0 || bundles.size > 0) && !yes) {
|
|
224
|
+
if (!process.stdin.isTTY) {
|
|
225
|
+
dispatch({
|
|
226
|
+
command: skipPromptCommand(state.flags),
|
|
227
|
+
message: CONFIRMATION_REQUIRED_MESSAGE,
|
|
228
|
+
type: 'ERROR',
|
|
229
|
+
});
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
232
|
+
dispatch({
|
|
233
|
+
outcome: {
|
|
234
|
+
lockfileEffects: effectsFor(removed),
|
|
235
|
+
outcome: 'assets-confirming',
|
|
236
|
+
plan,
|
|
237
|
+
tools: removalTools,
|
|
238
|
+
toolScope,
|
|
239
|
+
},
|
|
240
|
+
type: 'LOAD_DONE',
|
|
241
|
+
});
|
|
242
|
+
return;
|
|
243
|
+
}
|
|
244
|
+
dispatch({ message: 'Removing assets...', type: 'LOAD_PROGRESS' });
|
|
245
|
+
const result = await executeSet(plan, removalTools, {
|
|
246
|
+
cascade,
|
|
247
|
+
onProgress: (message) => {
|
|
248
|
+
if (!cancelled)
|
|
249
|
+
dispatch({ message, type: 'LOAD_PROGRESS' });
|
|
250
|
+
},
|
|
251
|
+
projectDir,
|
|
252
|
+
scope,
|
|
253
|
+
toolScope,
|
|
254
|
+
});
|
|
255
|
+
if (cancelled)
|
|
256
|
+
return;
|
|
257
|
+
dispatch({
|
|
258
|
+
outcome: { outcome: assetsResultOutcome(result), plan, result, tools: removalTools.map((t) => t.tool) },
|
|
259
|
+
type: 'LOAD_DONE',
|
|
260
|
+
});
|
|
261
|
+
return;
|
|
262
|
+
}
|
|
154
263
|
// Bundle identity is (name, org) with exact matching — `@org/name` never
|
|
155
264
|
// resolves to a same-named global bundle and vice versa. `--type` names an asset.
|
|
156
265
|
const bundle = type ? undefined : findBundle(registry, name, inlineOrg);
|
|
@@ -187,15 +296,12 @@ export function useUninstallState(flags) {
|
|
|
187
296
|
dispatch({ message: 'Removing bundle assets...', type: 'LOAD_PROGRESS' });
|
|
188
297
|
// Bundle uninstall drops each lockfile entry in a single pass, so every configured
|
|
189
298
|
// tool's files and config registrations are cleaned in that same pass.
|
|
190
|
-
const result = await
|
|
191
|
-
adapter: bundleTools[0].adapter,
|
|
192
|
-
additionalAdapters: bundleTools.slice(1).map((t) => t.adapter),
|
|
299
|
+
const result = await executeSet(plan, bundleTools, {
|
|
193
300
|
cascade,
|
|
194
301
|
onProgress: (message) => {
|
|
195
302
|
if (!cancelled)
|
|
196
303
|
dispatch({ message, type: 'LOAD_PROGRESS' });
|
|
197
304
|
},
|
|
198
|
-
placedByAtkTools: copiesOnlyTools(bundleTools),
|
|
199
305
|
projectDir,
|
|
200
306
|
scope,
|
|
201
307
|
toolScope,
|
|
@@ -346,15 +452,12 @@ export function useUninstallState(flags) {
|
|
|
346
452
|
const { plan, tools, toolScope } = outcome;
|
|
347
453
|
try {
|
|
348
454
|
// Clean every configured tool in the single pass that drops the lockfile entries
|
|
349
|
-
const result = await
|
|
350
|
-
adapter: tools[0].adapter,
|
|
351
|
-
additionalAdapters: tools.slice(1).map((t) => t.adapter),
|
|
455
|
+
const result = await executeSet(plan, tools, {
|
|
352
456
|
cascade,
|
|
353
457
|
onProgress: (message) => {
|
|
354
458
|
if (!cancelled)
|
|
355
459
|
dispatch({ message, type: 'EXECUTE_PROGRESS' });
|
|
356
460
|
},
|
|
357
|
-
placedByAtkTools: copiesOnlyTools(tools),
|
|
358
461
|
projectDir,
|
|
359
462
|
scope,
|
|
360
463
|
toolScope,
|
|
@@ -373,6 +476,34 @@ export function useUninstallState(flags) {
|
|
|
373
476
|
}
|
|
374
477
|
return;
|
|
375
478
|
}
|
|
479
|
+
// Several named assets, confirmed: the plan's set in one pass, as a bundle's
|
|
480
|
+
if (outcome.outcome === 'assets-confirming') {
|
|
481
|
+
const { plan, tools, toolScope } = outcome;
|
|
482
|
+
try {
|
|
483
|
+
const result = await executeSet(plan, tools, {
|
|
484
|
+
cascade,
|
|
485
|
+
onProgress: (message) => {
|
|
486
|
+
if (!cancelled)
|
|
487
|
+
dispatch({ message, type: 'EXECUTE_PROGRESS' });
|
|
488
|
+
},
|
|
489
|
+
projectDir,
|
|
490
|
+
scope,
|
|
491
|
+
toolScope,
|
|
492
|
+
});
|
|
493
|
+
if (cancelled)
|
|
494
|
+
return;
|
|
495
|
+
dispatch({
|
|
496
|
+
outcome: { outcome: assetsResultOutcome(result), plan, result, tools: tools.map((t) => t.tool) },
|
|
497
|
+
type: 'EXECUTE_DONE',
|
|
498
|
+
});
|
|
499
|
+
}
|
|
500
|
+
catch (err) {
|
|
501
|
+
if (cancelled)
|
|
502
|
+
return;
|
|
503
|
+
dispatch({ ...failure(err), type: 'EXECUTE_ERROR' });
|
|
504
|
+
}
|
|
505
|
+
return;
|
|
506
|
+
}
|
|
376
507
|
// Handle single-asset confirmation execution for all tools
|
|
377
508
|
if (outcome.outcome === 'confirming') {
|
|
378
509
|
const { org, plan: confirmedPlan, tools, toolScope } = outcome;
|
|
@@ -435,6 +566,11 @@ async function loadConfiguredAdapters(projectDir) {
|
|
|
435
566
|
}
|
|
436
567
|
}
|
|
437
568
|
const CONFIRMATION_REQUIRED_MESSAGE = 'Confirmation required but stdin is not interactive. Use --yes (-y) to skip the prompt.';
|
|
569
|
+
function assetsResultOutcome(result) {
|
|
570
|
+
if (result.errors.length === 0)
|
|
571
|
+
return 'assets-success';
|
|
572
|
+
return result.removedAssets.length + result.removedOrphans.length > 0 ? 'assets-partial' : 'assets-failed';
|
|
573
|
+
}
|
|
438
574
|
function bundleResultOutcome(result) {
|
|
439
575
|
if (result.errors.length === 0)
|
|
440
576
|
return 'bundle-success';
|
|
@@ -444,6 +580,15 @@ function bundleResultOutcome(result) {
|
|
|
444
580
|
function copiesOnlyTools(tools) {
|
|
445
581
|
return tools.filter((t) => t.copiesOnly).map((t) => t.tool);
|
|
446
582
|
}
|
|
583
|
+
/** A bundle's plan, or several named assets', removed for every tool in one pass with one lockfile write. */
|
|
584
|
+
function executeSet(plan, tools, options) {
|
|
585
|
+
return executeBundleUninstall(plan, {
|
|
586
|
+
...options,
|
|
587
|
+
adapter: tools[0].adapter,
|
|
588
|
+
additionalAdapters: tools.slice(1).map((t) => t.adapter),
|
|
589
|
+
placedByAtkTools: copiesOnlyTools(tools),
|
|
590
|
+
});
|
|
591
|
+
}
|
|
447
592
|
/** A failed run's message and guidance; a held lockfile gets the shared lock message. */
|
|
448
593
|
function failure(err) {
|
|
449
594
|
return {
|
|
@@ -473,11 +618,11 @@ function skipPromptCommand(flags) {
|
|
|
473
618
|
return uninstallCommand(flags, '--yes');
|
|
474
619
|
}
|
|
475
620
|
/** `atk uninstall` with the run's flags, followed by `extra`. */
|
|
476
|
-
function uninstallCommand({ cascade, name, org, projectRoot, tool, type, user }, ...extra) {
|
|
477
|
-
const spec = org && !
|
|
621
|
+
function uninstallCommand({ cascade, more = [], name, org, projectRoot, tool, type, user }, ...extra) {
|
|
622
|
+
const spec = (n) => (org && !n.startsWith('@') ? `@${org}/${n}` : n);
|
|
478
623
|
return [
|
|
479
624
|
'atk uninstall',
|
|
480
|
-
spec,
|
|
625
|
+
...[name, ...more].map(spec),
|
|
481
626
|
...(type ? ['--type', type] : []),
|
|
482
627
|
...(tool ? ['--tool', tool] : []),
|
|
483
628
|
...(cascade ? [] : ['--no-cascade']),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useUninstallState.js","sourceRoot":"","sources":["../../src/hooks/useUninstallState.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"useUninstallState.js","sourceRoot":"","sources":["../../src/hooks/useUninstallState.ts"],"names":[],"mappings":"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"}
|
package/build/lib/installer.js
CHANGED
|
@@ -963,8 +963,9 @@ async function installAsset(entry, options, managedPaths, managedEntries, owners
|
|
|
963
963
|
: previousEntry?.version === entry.version
|
|
964
964
|
? previousEntry.pinnedVersion
|
|
965
965
|
: undefined;
|
|
966
|
-
// `--adopt` takes in the bundle's members, never the dependencies an earlier install brought.
|
|
967
|
-
|
|
966
|
+
// `--adopt` takes in the bundle's members, never the dependencies an earlier install brought. A
|
|
967
|
+
// plan that mixes bundles with other targets gives each entry its own origin.
|
|
968
|
+
const bundleOrigin = bundleOriginFor(previousEntry, entry.bundleOrigin ?? options.bundleOrigin, !!options.adopt && entry.reason === 'direct');
|
|
968
969
|
// Where this tool's user config directory is, so its copy is found there once the directory moves.
|
|
969
970
|
const userConfigDirs = recordUserConfigDir(previousEntry?.userConfigDirs, adapter);
|
|
970
971
|
// Update lockfile — use resolved version and per-version dependency data
|