@mouryaamit/nx-polystack 1.7.2 → 1.8.4
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/README.md +15 -14
- package/dist/bin/cli.js +6 -1
- package/dist/bin/cli.js.map +1 -1
- package/dist/src/cli/commands/adopt-compare.d.ts +14 -0
- package/dist/src/cli/commands/adopt-compare.js +165 -0
- package/dist/src/cli/commands/adopt-compare.js.map +1 -0
- package/dist/src/cli/commands/adopt.d.ts +4 -1
- package/dist/src/cli/commands/adopt.js +9 -1
- package/dist/src/cli/commands/adopt.js.map +1 -1
- package/dist/src/cli/commands/update.js +8 -0
- package/dist/src/cli/commands/update.js.map +1 -1
- package/dist/src/cli/commands/upgrade.d.ts +11 -0
- package/dist/src/cli/commands/upgrade.js +257 -4
- package/dist/src/cli/commands/upgrade.js.map +1 -1
- package/dist/src/cli/help.js +23 -2
- package/dist/src/cli/help.js.map +1 -1
- package/dist/src/cli/launcher.js +6 -19
- package/dist/src/cli/launcher.js.map +1 -1
- package/dist/src/generators/adopt/generator.d.ts +9 -0
- package/dist/src/generators/adopt/generator.js +157 -5
- package/dist/src/generators/adopt/generator.js.map +1 -1
- package/dist/src/generators/adopt/old-scripts.d.ts +24 -0
- package/dist/src/generators/adopt/old-scripts.js +155 -0
- package/dist/src/generators/adopt/old-scripts.js.map +1 -0
- package/dist/src/generators/adopt/schema.json +5 -0
- package/dist/src/lib/adopt/compare.d.ts +14 -0
- package/dist/src/lib/adopt/compare.js +179 -0
- package/dist/src/lib/adopt/compare.js.map +1 -0
- package/dist/src/lib/upgrade/nx-migrate.d.ts +46 -0
- package/dist/src/lib/upgrade/nx-migrate.js +166 -0
- package/dist/src/lib/upgrade/nx-migrate.js.map +1 -0
- package/dist/src/lib/utils/devkit-pin.d.ts +15 -0
- package/dist/src/lib/utils/devkit-pin.js +61 -0
- package/dist/src/lib/utils/devkit-pin.js.map +1 -0
- package/dist/src/lib/utils/json-layout.js +23 -10
- package/dist/src/lib/utils/json-layout.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.runUpgrade = exports.stepPlan = exports.repairHttpClientModule = exports.pinNode = exports.pinCapacitor = exports.capacitorApps = exports.buildPackageSpecs = exports.workspaceAngularMajor = exports.declared = void 0;
|
|
3
|
+
exports.runUpgradeNx = exports.nxStepPlan = exports.workspaceNxMajor = exports.runUpgrade = exports.stepPlan = exports.repairHttpClientModule = exports.pinNode = exports.pinCapacitor = exports.capacitorApps = exports.buildPackageSpecs = exports.workspaceAngularMajor = exports.declared = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
const fs = tslib_1.__importStar(require("fs"));
|
|
7
7
|
const path = tslib_1.__importStar(require("path"));
|
|
8
|
+
const nx_migrate_1 = require("../../lib/upgrade/nx-migrate");
|
|
8
9
|
const pins_1 = require("../../lib/upgrade/pins");
|
|
10
|
+
const devkit_pin_1 = require("../../lib/utils/devkit-pin");
|
|
11
|
+
const json_layout_1 = require("../../lib/utils/json-layout");
|
|
9
12
|
const args_1 = require("../args");
|
|
10
13
|
const context_1 = require("../context");
|
|
11
14
|
const exec_1 = require("../exec");
|
|
@@ -26,6 +29,10 @@ const defaultDeps = {
|
|
|
26
29
|
throw new Error(`"${cmd} ${args.join(' ')}" exited with code ${r.status ?? `signal ${r.signal}`}`);
|
|
27
30
|
}
|
|
28
31
|
},
|
|
32
|
+
capture(cmd, args, cwd) {
|
|
33
|
+
const r = (0, child_process_1.spawnSync)(cmd, args, { cwd, encoding: 'utf8', shell: useShell(cmd) });
|
|
34
|
+
return r.status === 0 ? r.stdout : '';
|
|
35
|
+
},
|
|
29
36
|
gitStatus: exec_1.gitStatus,
|
|
30
37
|
nodeMajor: () => Number(process.versions.node.split('.')[0]),
|
|
31
38
|
interactive: (0, prompt_1.isInteractive)(),
|
|
@@ -243,6 +250,59 @@ function repairHttpClientModule(root) {
|
|
|
243
250
|
return changed;
|
|
244
251
|
}
|
|
245
252
|
exports.repairHttpClientModule = repairHttpClientModule;
|
|
253
|
+
/**
|
|
254
|
+
* nx migrate with the CLI that works: the newest Nx CLI it downloads checks provenance (which older
|
|
255
|
+
* releases fail) and can fail to look versions up; the workspace's own Nx then runs it.
|
|
256
|
+
*/
|
|
257
|
+
function nxMigrate(root, args, deps, say, attempts) {
|
|
258
|
+
let last;
|
|
259
|
+
for (const [i, env] of attempts.entries()) {
|
|
260
|
+
try {
|
|
261
|
+
deps.exec('npx', ['nx', 'migrate', ...args, '--interactive=false'], root, env);
|
|
262
|
+
return;
|
|
263
|
+
}
|
|
264
|
+
catch (e) {
|
|
265
|
+
last = e;
|
|
266
|
+
if (i < attempts.length - 1) {
|
|
267
|
+
say(`nx migrate failed (${last.message}); retrying with ${Object.entries(attempts[i + 1] ?? {})
|
|
268
|
+
.map(([k, v]) => `${k}=${v}`)
|
|
269
|
+
.join(' ')}`);
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
throw last;
|
|
274
|
+
}
|
|
275
|
+
/** @nx/devkit pinned to `nx` when the workspace declares it otherwise; true when changed. */
|
|
276
|
+
function pinDeclaredDevkit(root, nx) {
|
|
277
|
+
const file = path.join(root, 'package.json');
|
|
278
|
+
const pkg = readJsonFile(file);
|
|
279
|
+
const spec = declared(pkg, '@nx/devkit');
|
|
280
|
+
if (spec === undefined || spec === nx)
|
|
281
|
+
return false;
|
|
282
|
+
writeJsonFile(file, (0, devkit_pin_1.withDevkitPin)(pkg, nx));
|
|
283
|
+
return true;
|
|
284
|
+
}
|
|
285
|
+
/**
|
|
286
|
+
* After a step: the JSON files keep their own layout (only values changed), Markdown and binary
|
|
287
|
+
* files nx migrate text-replaced are put back.
|
|
288
|
+
*/
|
|
289
|
+
function tidyAfterMigrate(root, snapshot, deps, say) {
|
|
290
|
+
const jsonc = (0, json_layout_1.loadJsonc)(root);
|
|
291
|
+
if (jsonc) {
|
|
292
|
+
const kept = (0, json_layout_1.restoreJsonLayouts)(root, snapshot, jsonc);
|
|
293
|
+
if (kept.length > 0)
|
|
294
|
+
say(`kept the layout of ${kept.length} JSON file(s); only values changed`);
|
|
295
|
+
}
|
|
296
|
+
const changed = (deps.capture?.('git', ['diff', '--name-only'], root) ?? '')
|
|
297
|
+
.split('\n')
|
|
298
|
+
.map((l) => l.trim())
|
|
299
|
+
.filter(Boolean);
|
|
300
|
+
const revert = changed.filter((f) => (0, nx_migrate_1.isRevertable)(root, f));
|
|
301
|
+
if (revert.length > 0) {
|
|
302
|
+
deps.exec('git', ['checkout', '--', ...revert], root);
|
|
303
|
+
say(`put back what nx migrate rewrote in Markdown and binary files: ${revert.join(', ')}`);
|
|
304
|
+
}
|
|
305
|
+
}
|
|
246
306
|
/** What one step does, in order (the dry-run plan and the log headings). */
|
|
247
307
|
function stepPlan(from, to, root) {
|
|
248
308
|
const pins = pins_1.ANGULAR_PINS[to];
|
|
@@ -286,16 +346,32 @@ function runStep(o, deps) {
|
|
|
286
346
|
npx(['nx', 'migrate', '--run-migrations', '--if-exists']);
|
|
287
347
|
fs.rmSync(path.join(root, 'migrations.json'), { force: true });
|
|
288
348
|
};
|
|
349
|
+
const snapshot = (0, json_layout_1.snapshotJsonConfigs)(root);
|
|
350
|
+
const attempts = [
|
|
351
|
+
undefined,
|
|
352
|
+
{ NX_SKIP_PROVENANCE_CHECK: 'true' },
|
|
353
|
+
{ NX_MIGRATE_USE_LOCAL: 'true' },
|
|
354
|
+
];
|
|
355
|
+
const afterMigrate = () => {
|
|
356
|
+
const file = path.join(root, 'package.json');
|
|
357
|
+
const pkg = readJsonFile(file);
|
|
358
|
+
if ((0, nx_migrate_1.fixVersionPrefixes)(pkg).length > 0)
|
|
359
|
+
writeJsonFile(file, pkg);
|
|
360
|
+
const nx = (declared(readJsonFile(file), 'nx') ?? '').replace(/^[\^~=]/, '');
|
|
361
|
+
if (/^\d+\.\d+\.\d+$/.test(nx) && pinDeclaredDevkit(root, nx))
|
|
362
|
+
say(`@nx/devkit pinned to ${nx}`);
|
|
363
|
+
};
|
|
289
364
|
if (pinNode(root, pins.node))
|
|
290
365
|
say(`engines.node and .nvmrc set to Node ${pins.node}`);
|
|
291
366
|
if (to === 16 && pins.nx === pins_1.ANGULAR_PINS[o.from].nx) {
|
|
292
367
|
say(`nx migrate @angular/core@${pins.angular}`);
|
|
293
|
-
|
|
368
|
+
nxMigrate(root, [`@angular/core@${pins.angular}`], deps, say, attempts);
|
|
294
369
|
}
|
|
295
370
|
else {
|
|
296
371
|
say(`nx migrate ${pins.nx}`);
|
|
297
|
-
|
|
372
|
+
nxMigrate(root, [pins.nx], deps, say, attempts);
|
|
298
373
|
}
|
|
374
|
+
afterMigrate();
|
|
299
375
|
say('npm install');
|
|
300
376
|
npm(['install']);
|
|
301
377
|
runMigrations();
|
|
@@ -352,6 +428,7 @@ function runStep(o, deps) {
|
|
|
352
428
|
npx(['cap', 'migrate', '--noprompt'], app, { CI: '1' });
|
|
353
429
|
}
|
|
354
430
|
}
|
|
431
|
+
tidyAfterMigrate(root, snapshot, deps, say);
|
|
355
432
|
if (o.check) {
|
|
356
433
|
say('check: nx run-many -t build lint');
|
|
357
434
|
npx(['nx', 'run-many', '-t', 'build', 'lint']);
|
|
@@ -365,8 +442,10 @@ function runStep(o, deps) {
|
|
|
365
442
|
/** pstack upgrade angular [--to=N] [--yes] [--skip-check] [--no-commit] [--dry-run] */
|
|
366
443
|
async function runUpgrade(ctx, deps = defaultDeps) {
|
|
367
444
|
const what = ctx.positionals[0];
|
|
445
|
+
if (what === 'nx')
|
|
446
|
+
return runUpgradeNx(ctx, deps);
|
|
368
447
|
if (what !== 'angular') {
|
|
369
|
-
throw new types_1.CliError(`pstack upgrade takes what to upgrade: "pstack upgrade angular"${what ? ` (got "${what}")` : ''}.`);
|
|
448
|
+
throw new types_1.CliError(`pstack upgrade takes what to upgrade: "pstack upgrade angular" or "pstack upgrade nx"${what ? ` (got "${what}")` : ''}.`);
|
|
370
449
|
}
|
|
371
450
|
const root = (0, context_1.findWorkspaceRoot)(ctx.cwd);
|
|
372
451
|
if (!root || !fs.existsSync(path.join(root, 'package.json'))) {
|
|
@@ -444,4 +523,178 @@ async function runUpgrade(ctx, deps = defaultDeps) {
|
|
|
444
523
|
return 0;
|
|
445
524
|
}
|
|
446
525
|
exports.runUpgrade = runUpgrade;
|
|
526
|
+
const PLUGIN = '@mouryaamit/nx-polystack';
|
|
527
|
+
/** Where the plugin is declared, so `upgrade nx` can take it out and put it back. */
|
|
528
|
+
function pluginPin(pkg) {
|
|
529
|
+
for (const field of ['dependencies', 'devDependencies']) {
|
|
530
|
+
const deps = pkg[field];
|
|
531
|
+
if (isObject(deps) && typeof deps[PLUGIN] === 'string') {
|
|
532
|
+
return { field, spec: deps[PLUGIN] };
|
|
533
|
+
}
|
|
534
|
+
}
|
|
535
|
+
return undefined;
|
|
536
|
+
}
|
|
537
|
+
/** The workspace's Nx major: installed nx, else the declared one. */
|
|
538
|
+
function workspaceNxMajor(root) {
|
|
539
|
+
const pkg = readJsonFile(path.join(root, 'package.json'));
|
|
540
|
+
return (0, pins_1.majorOfSpec)((0, nx_migrate_1.versionOf)(root, pkg, 'nx'));
|
|
541
|
+
}
|
|
542
|
+
exports.workspaceNxMajor = workspaceNxMajor;
|
|
543
|
+
/** What one Nx step does (dry-run plan and log headings). */
|
|
544
|
+
function nxStepPlan(to, last, plugin) {
|
|
545
|
+
const lines = [
|
|
546
|
+
`nx migrate ${nx_migrate_1.NX_HOPS[to]} (Angular and its packages stay where they are)`,
|
|
547
|
+
'npm install, then the migrations nx migrate wrote (Angular ones left out)',
|
|
548
|
+
'JSON files keep their layout; Markdown and binary files nx migrate rewrote are put back',
|
|
549
|
+
];
|
|
550
|
+
if (last) {
|
|
551
|
+
lines.push(plugin
|
|
552
|
+
? `nx-polystack back in package.json, @nx/devkit pinned to ${nx_migrate_1.NX_HOPS[to]}`
|
|
553
|
+
: `@nx/devkit pinned to ${nx_migrate_1.NX_HOPS[to]} when declared`);
|
|
554
|
+
}
|
|
555
|
+
return lines;
|
|
556
|
+
}
|
|
557
|
+
exports.nxStepPlan = nxStepPlan;
|
|
558
|
+
function runNxStep(o, deps) {
|
|
559
|
+
const { root, to } = o;
|
|
560
|
+
const version = nx_migrate_1.NX_HOPS[to];
|
|
561
|
+
const say = (line) => deps.log(`\n▶ Nx ${to}: ${line}`);
|
|
562
|
+
const pkgFile = path.join(root, 'package.json');
|
|
563
|
+
const snapshot = (0, json_layout_1.snapshotJsonConfigs)(root);
|
|
564
|
+
const before = readJsonFile(pkgFile);
|
|
565
|
+
say(`nx migrate ${version}`);
|
|
566
|
+
nxMigrate(root, [version], deps, say, [
|
|
567
|
+
{ NX_SKIP_PROVENANCE_CHECK: 'true' },
|
|
568
|
+
{ NX_MIGRATE_USE_LOCAL: 'true' },
|
|
569
|
+
]);
|
|
570
|
+
const after = readJsonFile(pkgFile);
|
|
571
|
+
const kept = (0, nx_migrate_1.keepAngularPackages)(before, after);
|
|
572
|
+
if (o.last) {
|
|
573
|
+
if (o.plugin) {
|
|
574
|
+
const deps2 = isObject(after[o.plugin.field]) ? after[o.plugin.field] : {};
|
|
575
|
+
after[o.plugin.field] = { ...deps2, [PLUGIN]: o.plugin.spec };
|
|
576
|
+
}
|
|
577
|
+
const pinned = (0, devkit_pin_1.withDevkitPin)(after, version);
|
|
578
|
+
if (o.plugin || declared(after, '@nx/devkit') !== undefined)
|
|
579
|
+
Object.assign(after, pinned);
|
|
580
|
+
}
|
|
581
|
+
writeJsonFile(pkgFile, after);
|
|
582
|
+
if (kept.length > 0)
|
|
583
|
+
say(`kept Angular's packages where they were: ${kept.join(', ')}`);
|
|
584
|
+
const keptVersion = (name) => (0, nx_migrate_1.versionOf)(root, before, name);
|
|
585
|
+
const dropped = (0, nx_migrate_1.filterMigrations)(path.join(root, 'migrations.json'), keptVersion, (0, nx_migrate_1.loadSemver)(root));
|
|
586
|
+
if (dropped.length > 0)
|
|
587
|
+
say(`left out the Angular migrations: ${dropped.join(', ')}`);
|
|
588
|
+
say('npm install');
|
|
589
|
+
deps.exec('npm', ['install'], root);
|
|
590
|
+
if (fs.existsSync(path.join(root, 'migrations.json'))) {
|
|
591
|
+
say('running migrations.json');
|
|
592
|
+
deps.exec('npx', ['nx', 'migrate', '--run-migrations', '--if-exists'], root);
|
|
593
|
+
fs.rmSync(path.join(root, 'migrations.json'), { force: true });
|
|
594
|
+
}
|
|
595
|
+
tidyAfterMigrate(root, snapshot, deps, say);
|
|
596
|
+
if (o.check) {
|
|
597
|
+
say('check: nx run-many -t build');
|
|
598
|
+
deps.exec('npx', ['nx', 'run-many', '-t', 'build'], root);
|
|
599
|
+
}
|
|
600
|
+
if (o.commit) {
|
|
601
|
+
say('commit');
|
|
602
|
+
deps.exec('git', ['add', '-A'], root);
|
|
603
|
+
deps.exec('git', ['commit', '-m', `chore: upgrade to Nx ${version} (pstack upgrade nx)`], root);
|
|
604
|
+
}
|
|
605
|
+
}
|
|
606
|
+
/**
|
|
607
|
+
* pstack upgrade nx [--to=16|17] [--skip-check] [--no-commit] [--dry-run]: moves an Nx 15 or 16
|
|
608
|
+
* workspace to Nx 17 (where the plugin loads), one major per commit, Angular unchanged.
|
|
609
|
+
*/
|
|
610
|
+
async function runUpgradeNx(ctx, deps = defaultDeps) {
|
|
611
|
+
const root = (0, context_1.findWorkspaceRoot)(ctx.cwd);
|
|
612
|
+
if (!root || !fs.existsSync(path.join(root, 'package.json'))) {
|
|
613
|
+
throw new types_1.CliError('run "pstack upgrade nx" inside an Nx workspace (nx.json, package.json).');
|
|
614
|
+
}
|
|
615
|
+
const current = workspaceNxMajor(root);
|
|
616
|
+
if (current === undefined)
|
|
617
|
+
throw new types_1.CliError('this workspace has no nx in package.json.');
|
|
618
|
+
if (current >= nx_migrate_1.NX_HOP_MAX) {
|
|
619
|
+
deps.log(`The workspace is on Nx ${current}; nx-polystack loads on it. Later Nx versions come with ` +
|
|
620
|
+
'the Angular majors: pstack upgrade angular.');
|
|
621
|
+
return 0;
|
|
622
|
+
}
|
|
623
|
+
if (current < nx_migrate_1.NX_HOP_MIN) {
|
|
624
|
+
throw new types_1.CliError(`the workspace is on Nx ${current}; pstack upgrade nx starts from Nx ${nx_migrate_1.NX_HOP_MIN}. ` +
|
|
625
|
+
`Move it to Nx ${nx_migrate_1.NX_HOP_MIN} with nx migrate first.`);
|
|
626
|
+
}
|
|
627
|
+
const angular = workspaceAngularMajor(root);
|
|
628
|
+
if (angular !== undefined && angular < pins_1.MIN_ANGULAR) {
|
|
629
|
+
throw new types_1.CliError(`the workspace is on Angular ${angular}; Nx ${nx_migrate_1.NX_HOP_MAX} needs Angular ${pins_1.MIN_ANGULAR} or later.`);
|
|
630
|
+
}
|
|
631
|
+
const toFlag = (0, args_1.flagString)(ctx.flags, 'to');
|
|
632
|
+
if (ctx.flags['to'] === true)
|
|
633
|
+
throw new types_1.CliError('--to needs a major, e.g. --to=17');
|
|
634
|
+
let target = toFlag === undefined ? nx_migrate_1.NX_HOP_MAX : Number(toFlag);
|
|
635
|
+
if (!Number.isInteger(target) || target <= current || target > nx_migrate_1.NX_HOP_MAX) {
|
|
636
|
+
throw new types_1.CliError(`--to must be an Nx major from ${current + 1} to ${nx_migrate_1.NX_HOP_MAX} (got "${toFlag}").`);
|
|
637
|
+
}
|
|
638
|
+
const check = !(0, args_1.flagBoolean)(ctx.flags, 'skipCheck');
|
|
639
|
+
const commit = !(0, args_1.flagBoolean)(ctx.flags, 'noCommit');
|
|
640
|
+
const plugin = pluginPin(readJsonFile(path.join(root, 'package.json')));
|
|
641
|
+
if (!commit && target > current + 1) {
|
|
642
|
+
if (plugin) {
|
|
643
|
+
throw new types_1.CliError('--no-commit runs one step, but nx-polystack has to come out of package.json until the ' +
|
|
644
|
+
`last one (Nx ${nx_migrate_1.NX_HOP_MAX}); run without --no-commit (each step is its own commit).`);
|
|
645
|
+
}
|
|
646
|
+
deps.log(`--no-commit: only the Nx ${current + 1} step runs; commit it, then run again.`);
|
|
647
|
+
target = current + 1;
|
|
648
|
+
}
|
|
649
|
+
if (plugin) {
|
|
650
|
+
deps.log(`\nnx-polystack (${plugin.spec}) needs Nx ${nx_migrate_1.NX_HOP_MAX}: it comes out of package.json for the ` +
|
|
651
|
+
'steps and goes back after the last one.');
|
|
652
|
+
}
|
|
653
|
+
for (let to = current + 1; to <= target; to++) {
|
|
654
|
+
deps.log(`\nNx ${to - 1} → ${to}:`);
|
|
655
|
+
for (const line of nxStepPlan(to, to === target, !!plugin))
|
|
656
|
+
deps.log(` - ${line}`);
|
|
657
|
+
if (check)
|
|
658
|
+
deps.log(' - check: nx run-many -t build');
|
|
659
|
+
if (commit)
|
|
660
|
+
deps.log(' - one commit for the step');
|
|
661
|
+
}
|
|
662
|
+
if (ctx.dryRun) {
|
|
663
|
+
deps.log('\nDry run: nothing was changed.');
|
|
664
|
+
return 0;
|
|
665
|
+
}
|
|
666
|
+
const status = deps.gitStatus(root);
|
|
667
|
+
if (status === null) {
|
|
668
|
+
throw new types_1.CliError('pstack upgrade nx needs a git repository (each step is one commit).');
|
|
669
|
+
}
|
|
670
|
+
if (status.trim() !== '') {
|
|
671
|
+
throw new types_1.CliError('commit or stash your changes first; each upgrade step is its own commit.');
|
|
672
|
+
}
|
|
673
|
+
if (deps.nodeMajor() < 18) {
|
|
674
|
+
throw new types_1.CliError(`Nx ${nx_migrate_1.NX_HOP_MAX} needs Node 18 or later; this is Node ${deps.nodeMajor()}.`);
|
|
675
|
+
}
|
|
676
|
+
if (plugin) {
|
|
677
|
+
// The plugin's peers (nx and @nx/devkit 17+) make every npm install of an older Nx fail.
|
|
678
|
+
const file = path.join(root, 'package.json');
|
|
679
|
+
const text = fs.readFileSync(file, 'utf8');
|
|
680
|
+
const pkg = readJsonFile(file);
|
|
681
|
+
delete pkg[plugin.field][PLUGIN];
|
|
682
|
+
const jsonc = (0, json_layout_1.loadJsonc)(root);
|
|
683
|
+
const after = JSON.stringify(pkg, null, 2);
|
|
684
|
+
fs.writeFileSync(file, (jsonc && (0, json_layout_1.keepJsonLayout)(jsonc, text, after)) || `${after}\n`);
|
|
685
|
+
}
|
|
686
|
+
for (let to = current + 1; to <= target; to++) {
|
|
687
|
+
runNxStep({ root, to, last: to === nx_migrate_1.NX_HOP_MAX, plugin, check, commit }, deps);
|
|
688
|
+
deps.log(`\n✔ Nx ${nx_migrate_1.NX_HOPS[to]} done.`);
|
|
689
|
+
}
|
|
690
|
+
if (plugin && target < nx_migrate_1.NX_HOP_MAX) {
|
|
691
|
+
deps.log(`\nnx-polystack stays out of package.json until the workspace is on Nx ${nx_migrate_1.NX_HOP_MAX}; ` +
|
|
692
|
+
`add it back with: npm i -D ${PLUGIN}@${plugin.spec} @nx/devkit@${nx_migrate_1.NX_HOPS[nx_migrate_1.NX_HOP_MAX]}`);
|
|
693
|
+
}
|
|
694
|
+
if (plugin && target === nx_migrate_1.NX_HOP_MAX) {
|
|
695
|
+
deps.log(`\nnx-polystack ${plugin.spec} is back; "pstack update" moves it to the newest release.`);
|
|
696
|
+
}
|
|
697
|
+
return 0;
|
|
698
|
+
}
|
|
699
|
+
exports.runUpgradeNx = runUpgradeNx;
|
|
447
700
|
//# sourceMappingURL=upgrade.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../../../src/cli/commands/upgrade.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../../../src/cli/commands/upgrade.ts"],"names":[],"mappings":"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"}
|
package/dist/src/cli/help.js
CHANGED
|
@@ -15,6 +15,8 @@ COMMANDS
|
|
|
15
15
|
update Upgrade this workspace's nx-polystack version and run its migrations
|
|
16
16
|
upgrade upgrade angular: move the workspace to the next Angular major (Nx, TypeScript,
|
|
17
17
|
build and lint packages, Ionic, Capacitor, Node), one commit per step
|
|
18
|
+
upgrade nx: move an Nx 15 or 16 workspace to Nx 17 (where the plugin loads), one
|
|
19
|
+
major per commit, Angular unchanged
|
|
18
20
|
preset Bootstrap a workspace root skeleton in the current directory
|
|
19
21
|
app Scaffold a new application into an existing workspace
|
|
20
22
|
lib Scaffold a shared library (ts, angular, ionic, flutter, assets, styles,
|
|
@@ -87,6 +89,15 @@ OPTIONS — upgrade angular
|
|
|
87
89
|
--dry-run Print the steps; change nothing
|
|
88
90
|
Needs a clean git tree and the Node major of the step (Node 22 for Angular 21).
|
|
89
91
|
|
|
92
|
+
OPTIONS — upgrade nx
|
|
93
|
+
--to=<major> 16 or 17 (default 17); one nx migrate per major
|
|
94
|
+
--skip-check Skip "nx run-many -t build" after each step
|
|
95
|
+
--no-commit Leave the step uncommitted (one step only)
|
|
96
|
+
--dry-run Print the steps; change nothing
|
|
97
|
+
Keeps Angular and its packages where they are, the JSON files' layout, and Markdown and binary
|
|
98
|
+
files; nx-polystack comes out of package.json for the steps and goes back with @nx/devkit
|
|
99
|
+
pinned to the new Nx. Needs a clean git tree.
|
|
100
|
+
|
|
90
101
|
OPTIONS — app
|
|
91
102
|
--type=<type> App type: angular | ionic | flutter (required)
|
|
92
103
|
--name=<name> Application name (required)
|
|
@@ -203,9 +214,16 @@ OPTIONS — migrate
|
|
|
203
214
|
|
|
204
215
|
OPTIONS — adopt
|
|
205
216
|
--app=<a,b> Only these apps (default: every Angular app without a release target)
|
|
206
|
-
--no-scripts Leave the build:<app>:<env> npm scripts as they are
|
|
217
|
+
--no-scripts Leave the build:<app>:<env> and build:all:<env> npm scripts as they are
|
|
218
|
+
--remove-old-scripts Delete the old build scripts nothing uses any more (also on its own,
|
|
219
|
+
after an earlier adopt)
|
|
220
|
+
--compare With --app=<app>: build it with the old script at --base (a temporary
|
|
221
|
+
git worktree) and with its release target, for each env, and compare
|
|
222
|
+
--env=<a,b> --compare: only these envs (default: every release configuration)
|
|
223
|
+
--base=<commit> --compare: the commit before adopt (default HEAD when adopt is not
|
|
224
|
+
committed yet)
|
|
207
225
|
--dry-run Show the changes without writing them
|
|
208
|
-
Writes docs/migrations/adopt.md
|
|
226
|
+
Writes docs/migrations/adopt.md; --compare writes dist/pstack-compare/<app>/report.md.
|
|
209
227
|
|
|
210
228
|
OPTIONS — infra
|
|
211
229
|
--with=<parts> docs | ci | quality | upgrades, comma-separated, or all | none
|
|
@@ -332,6 +350,9 @@ EXAMPLES
|
|
|
332
350
|
pstack update 0.3.0 --dry-run
|
|
333
351
|
pstack upgrade angular --dry-run
|
|
334
352
|
pstack upgrade angular --to=18
|
|
353
|
+
pstack upgrade nx --dry-run
|
|
354
|
+
pstack adopt --compare --app=portal --base=HEAD~1
|
|
355
|
+
pstack adopt --remove-old-scripts --dry-run
|
|
335
356
|
`.trimStart();
|
|
336
357
|
}
|
|
337
358
|
exports.helpText = helpText;
|
package/dist/src/cli/help.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cli/help.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,yCAAkD;AAElD,SAAgB,QAAQ,CAAC,OAAe;IACtC,OAAO;yCACgC,OAAO
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cli/help.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,yCAAkD;AAElD,SAAgB,QAAQ,CAAC,OAAe;IACtC,OAAO;yCACgC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAuS5C,IAAA,8BAAa,GAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,mDAAmD,CAAC,CAAC,CAAC,EAC5F;IACE,IAAA,+BAAoB,EAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqDhC,CAAC,SAAS,EAAE,CAAC;AACd,CAAC;AAjWD,4BAiWC"}
|
package/dist/src/cli/launcher.js
CHANGED
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
const fs = tslib_1.__importStar(require("fs"));
|
|
7
7
|
const path = tslib_1.__importStar(require("path"));
|
|
8
|
+
const devkit_pin_1 = require("../lib/utils/devkit-pin");
|
|
8
9
|
const types_1 = require("./types");
|
|
9
10
|
const versions_1 = require("./versions");
|
|
10
11
|
/** Commands the global CLI always runs itself. */
|
|
@@ -54,6 +55,7 @@ exports.MIN_LOCAL_FLAG_VERSION = {
|
|
|
54
55
|
lib: { dir: '0.19.0' },
|
|
55
56
|
csp: { import: '0.38.0', nonceSource: '1.2.5', env: '1.5.5' },
|
|
56
57
|
infra: { lintStaged: '0.36.0' },
|
|
58
|
+
adopt: { compare: '1.8.0', removeOldScripts: '1.8.0' },
|
|
57
59
|
migrate: {
|
|
58
60
|
rollback: '0.13.0',
|
|
59
61
|
config: '0.14.0',
|
|
@@ -179,16 +181,6 @@ exports.upgradeHint = upgradeHint;
|
|
|
179
181
|
exports.NX_MAJORS = { min: 17, max: 22 };
|
|
180
182
|
/** Commands that need the workspace on a supported Nx with a matching @nx/devkit. */
|
|
181
183
|
const NEEDS_SUPPORTED_NX = new Set([...exports.WORKSPACE_COMMANDS, 'update'].filter((c) => c !== 'upgrade'));
|
|
182
|
-
function installedVersion(wsRoot, pkg) {
|
|
183
|
-
try {
|
|
184
|
-
const file = path.join(wsRoot, 'node_modules', ...pkg.split('/'), 'package.json');
|
|
185
|
-
const version = JSON.parse(fs.readFileSync(file, 'utf8')).version;
|
|
186
|
-
return typeof version === 'string' ? version.replace(/^v/, '') : undefined;
|
|
187
|
-
}
|
|
188
|
-
catch {
|
|
189
|
-
return undefined;
|
|
190
|
-
}
|
|
191
|
-
}
|
|
192
184
|
const majorOf = (v) => Number(/^(\d+)\./.exec(v)?.[1] ?? NaN);
|
|
193
185
|
/**
|
|
194
186
|
* Why `command` cannot run in this workspace, or null: an Nx outside 17–22 (the plugin does not
|
|
@@ -199,26 +191,21 @@ const majorOf = (v) => Number(/^(\d+)\./.exec(v)?.[1] ?? NaN);
|
|
|
199
191
|
function workspaceNxProblem(command, wsRoot) {
|
|
200
192
|
if (!NEEDS_SUPPORTED_NX.has(command))
|
|
201
193
|
return null;
|
|
202
|
-
const nx = installedVersion(wsRoot, 'nx');
|
|
194
|
+
const nx = (0, devkit_pin_1.installedVersion)(wsRoot, 'nx');
|
|
203
195
|
if (!nx)
|
|
204
196
|
return null;
|
|
205
197
|
const major = majorOf(nx);
|
|
206
198
|
if (Number.isNaN(major))
|
|
207
199
|
return null;
|
|
208
200
|
if (major < exports.NX_MAJORS.min) {
|
|
209
|
-
const steps = major < 16
|
|
210
|
-
? 'NX_SKIP_PROVENANCE_CHECK=true npx nx migrate 16.9.1 --interactive, then ' +
|
|
211
|
-
'NX_MIGRATE_USE_LOCAL=true npx nx migrate 17.0.6 --interactive'
|
|
212
|
-
: 'NX_MIGRATE_USE_LOCAL=true npx nx migrate 17.0.6 --interactive';
|
|
213
201
|
return (`this workspace is on Nx ${nx}; nx-polystack needs Nx ${exports.NX_MAJORS.min}-${exports.NX_MAJORS.max}. ` +
|
|
214
|
-
|
|
215
|
-
'npx nx migrate --run-migrations). Take any @mouryaamit/nx-polystack entry out of ' +
|
|
216
|
-
'package.json before that, and review the diff: nx migrate reformats the JSON it touches.');
|
|
202
|
+
'Move it first with: pstack upgrade nx (one commit per Nx major, Angular unchanged).');
|
|
217
203
|
}
|
|
218
204
|
if (major > exports.NX_MAJORS.max) {
|
|
219
205
|
return `this workspace is on Nx ${nx}; nx-polystack supports Nx ${exports.NX_MAJORS.min}-${exports.NX_MAJORS.max}.`;
|
|
220
206
|
}
|
|
221
|
-
|
|
207
|
+
// pstack update installs @nx/devkit of the workspace's Nx itself.
|
|
208
|
+
const devkit = command === 'update' ? undefined : (0, devkit_pin_1.installedVersion)(wsRoot, '@nx/devkit');
|
|
222
209
|
if (devkit && majorOf(devkit) !== major) {
|
|
223
210
|
return (`@nx/devkit ${devkit} does not match nx ${nx}. Pin it to the workspace's Nx: ` +
|
|
224
211
|
`npm i -D @nx/devkit@${nx}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../../src/cli/launcher.ts"],"names":[],"mappings":";;;;AAAA,iDAA0C;AAC1C,+CAAyB;AACzB,mDAA6B;
|
|
1
|
+
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../../src/cli/launcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,11 @@ export interface AdoptGeneratorSchema {
|
|
|
4
4
|
projects?: string[];
|
|
5
5
|
/** Point the apps' build:<app>:<env> npm scripts at the release target (default true). */
|
|
6
6
|
scripts?: boolean;
|
|
7
|
+
/**
|
|
8
|
+
* Delete the old build pipeline scripts nothing uses any more (after the apps are adopted;
|
|
9
|
+
* also on its own, in a workspace adopted earlier).
|
|
10
|
+
*/
|
|
11
|
+
removeOldScripts?: boolean;
|
|
7
12
|
}
|
|
8
13
|
export declare const ADOPT_REPORT = "docs/migrations/adopt.md";
|
|
9
14
|
export interface AdoptResult {
|
|
@@ -11,6 +16,10 @@ export interface AdoptResult {
|
|
|
11
16
|
skipped: string[];
|
|
12
17
|
notes: string[];
|
|
13
18
|
scripts: Record<string, string>;
|
|
19
|
+
/** Old pipeline scripts deleted (removeOldScripts). */
|
|
20
|
+
removed: string[];
|
|
21
|
+
/** Scripts under tools/ nothing starts, outside the old pipeline (left in place). */
|
|
22
|
+
unreferenced: string[];
|
|
14
23
|
}
|
|
15
24
|
/** Angular apps of the workspace that build without the plugin: build target, no release target. */
|
|
16
25
|
export declare function adoptCandidates(tree: Tree): {
|