@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
package/README.md
CHANGED
|
@@ -83,20 +83,21 @@ Known breakpoints when upgrading:
|
|
|
83
83
|
|
|
84
84
|
## Commands
|
|
85
85
|
|
|
86
|
-
| Command | What it does
|
|
87
|
-
| ---------------------------------------- |
|
|
88
|
-
| `pstack new <dir>` | Create a workspace (installs dependencies, initialises git)
|
|
89
|
-
| `pstack update` | Upgrade the workspace's plugin and run its migrations
|
|
90
|
-
| `pstack upgrade angular` | Move the workspace to the next Angular major (one commit per step)
|
|
91
|
-
| `pstack
|
|
92
|
-
| `pstack
|
|
93
|
-
| `pstack
|
|
94
|
-
| `pstack
|
|
95
|
-
| `pstack
|
|
96
|
-
| `pstack
|
|
97
|
-
| `pstack
|
|
98
|
-
| `pstack
|
|
99
|
-
| `pstack
|
|
86
|
+
| Command | What it does |
|
|
87
|
+
| ---------------------------------------- | ------------------------------------------------------------------------------------------ |
|
|
88
|
+
| `pstack new <dir>` | Create a workspace (installs dependencies, initialises git) |
|
|
89
|
+
| `pstack update` | Upgrade the workspace's plugin and run its migrations |
|
|
90
|
+
| `pstack upgrade angular` | Move the workspace to the next Angular major (one commit per step) |
|
|
91
|
+
| `pstack upgrade nx` | Move an Nx 15 or 16 workspace to Nx 17 (Angular unchanged) |
|
|
92
|
+
| `pstack app` / `pstack lib` | Add an application or a shared library |
|
|
93
|
+
| `pstack env` | Add an environment to some or all apps |
|
|
94
|
+
| `pstack migrate` | Copy an existing project into the workspace (the source is never modified) |
|
|
95
|
+
| `pstack adopt` | Move apps that build with the repo's own scripts to the release target, compare the builds |
|
|
96
|
+
| `pstack build` | Build every app (or some) for one environment |
|
|
97
|
+
| `pstack csp` | Edit an app's CSP allowlist and write its server config |
|
|
98
|
+
| `pstack hardening` / `pstack encryption` | Show or change release hardening and env encryption |
|
|
99
|
+
| `pstack infra` | Add repo docs, CI gates, quality checks and the upgrade workflow |
|
|
100
|
+
| `pstack llm` | Refresh the AI assistant context files |
|
|
100
101
|
|
|
101
102
|
Run `pstack --help` for every option. The full guide is the **[user manual](USER-MANUAL.md)**.
|
|
102
103
|
|
package/dist/bin/cli.js
CHANGED
|
@@ -33,7 +33,12 @@ async function main(argv) {
|
|
|
33
33
|
console.error(`\nError: ${nxProblem}`);
|
|
34
34
|
return 1;
|
|
35
35
|
}
|
|
36
|
-
|
|
36
|
+
// upgrade nx runs before the workspace's plugin can load (Nx 15/16): the global CLI runs it.
|
|
37
|
+
const runHere = command === 'upgrade' && positionals[0] === 'nx';
|
|
38
|
+
if (!runHere &&
|
|
39
|
+
local &&
|
|
40
|
+
wsRoot &&
|
|
41
|
+
(0, launcher_1.shouldDelegate)({ command, flags, env: process.env, selfRoot, local })) {
|
|
37
42
|
try {
|
|
38
43
|
(0, launcher_1.assertLocalSupports)(command, local.version, flags);
|
|
39
44
|
}
|
package/dist/bin/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../bin/cli.ts"],"names":[],"mappings":";AAAA,wEAAwE;;;AAExE,mDAA6B;AAE7B,0CAAyD;AACzD,kDAA+C;AAC/C,gDAK4B;AAC5B,0CAA2C;AAC3C,kDAQ6B;AAC7B,4CAA4D;AAE5D,KAAK,UAAU,IAAI,CAAC,IAAc;IAChC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,IAAA,yBAAe,EAAC,SAAS,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5E,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,MAAM,GAAG,IAAA,2BAAiB,EAAC,GAAG,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,IAAA,4BAAkB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzD,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE;QAClC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACzB,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,KAAK,WAAW,EAAE;YACrE,OAAO,CAAC,GAAG,CAAC,qBAAqB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SACnD;QACD,OAAO,CAAC,CAAC;KACV;IAED,IAAI,CAAC,OAAO,IAAI,OAAO,KAAK,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE;QACjE,OAAO,CAAC,GAAG,CAAC,IAAA,eAAQ,EAAC,WAAW,CAAC,CAAC,CAAC;QACnC,OAAO,CAAC,CAAC;KACV;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAA,6BAAkB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACtE,IAAI,SAAS,EAAE;QACb,OAAO,CAAC,KAAK,CAAC,YAAY,SAAS,EAAE,CAAC,CAAC;QACvC,OAAO,CAAC,CAAC;KACV;IAED,IAAI,KAAK,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../bin/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { CommandContext } from '../types';
|
|
2
|
+
export interface CompareDeps {
|
|
3
|
+
/** Run a command with inherited stdio; throws on a non-zero exit. */
|
|
4
|
+
exec(cmd: string, args: string[], cwd: string, env?: Record<string, string>): void;
|
|
5
|
+
/** Run a command and return its stdout, or null when it fails. */
|
|
6
|
+
capture(cmd: string, args: string[], cwd: string): string | null;
|
|
7
|
+
log(line: string): void;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* pstack adopt --compare --app=<app> [--env=dev,uat,prod] [--base=<commit>]: builds the app with
|
|
11
|
+
* the workspace's own script at <commit> (in a temporary git worktree) and with its release
|
|
12
|
+
* target, for each env, and compares the two outputs.
|
|
13
|
+
*/
|
|
14
|
+
export declare function runAdoptCompare(ctx: CommandContext, deps?: CompareDeps): Promise<number>;
|
|
@@ -0,0 +1,165 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runAdoptCompare = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const child_process_1 = require("child_process");
|
|
6
|
+
const fs = tslib_1.__importStar(require("fs"));
|
|
7
|
+
const os = tslib_1.__importStar(require("os"));
|
|
8
|
+
const path = tslib_1.__importStar(require("path"));
|
|
9
|
+
const compare_1 = require("../../lib/adopt/compare");
|
|
10
|
+
const args_1 = require("../args");
|
|
11
|
+
const types_1 = require("../types");
|
|
12
|
+
const app_1 = require("./app");
|
|
13
|
+
const useShell = (cmd) => process.platform === 'win32' && (cmd === 'npm' || cmd === 'npx');
|
|
14
|
+
const defaultDeps = {
|
|
15
|
+
exec(cmd, args, cwd, env) {
|
|
16
|
+
const r = (0, child_process_1.spawnSync)(cmd, args, {
|
|
17
|
+
cwd,
|
|
18
|
+
stdio: 'inherit',
|
|
19
|
+
shell: useShell(cmd),
|
|
20
|
+
env: env ? { ...process.env, ...env } : process.env,
|
|
21
|
+
});
|
|
22
|
+
if (r.error)
|
|
23
|
+
throw r.error;
|
|
24
|
+
if (r.status !== 0)
|
|
25
|
+
throw new Error(`"${cmd} ${args.join(' ')}" exited with code ${r.status}`);
|
|
26
|
+
},
|
|
27
|
+
capture(cmd, args, cwd) {
|
|
28
|
+
const r = (0, child_process_1.spawnSync)(cmd, args, { cwd, encoding: 'utf8' });
|
|
29
|
+
return r.status === 0 ? r.stdout : null;
|
|
30
|
+
},
|
|
31
|
+
log: (line) => console.log(line),
|
|
32
|
+
};
|
|
33
|
+
function readJson(file) {
|
|
34
|
+
return JSON.parse(fs.readFileSync(file, 'utf8'));
|
|
35
|
+
}
|
|
36
|
+
/** The app's project.json under a workspace root (apps/<app> or any project.json naming it). */
|
|
37
|
+
function projectJson(root, app) {
|
|
38
|
+
const direct = path.join(root, 'apps', app, 'project.json');
|
|
39
|
+
if (fs.existsSync(direct))
|
|
40
|
+
return readJson(direct);
|
|
41
|
+
const walk = (dir, depth) => {
|
|
42
|
+
if (depth > 4)
|
|
43
|
+
return null;
|
|
44
|
+
for (const e of fs.readdirSync(dir, { withFileTypes: true })) {
|
|
45
|
+
if (!e.isDirectory() || e.name === 'node_modules' || e.name.startsWith('.'))
|
|
46
|
+
continue;
|
|
47
|
+
const pj = path.join(dir, e.name, 'project.json');
|
|
48
|
+
if (fs.existsSync(pj)) {
|
|
49
|
+
const json = readJson(pj);
|
|
50
|
+
if (json['name'] === app)
|
|
51
|
+
return json;
|
|
52
|
+
}
|
|
53
|
+
const found = walk(path.join(dir, e.name), depth + 1);
|
|
54
|
+
if (found)
|
|
55
|
+
return found;
|
|
56
|
+
}
|
|
57
|
+
return null;
|
|
58
|
+
};
|
|
59
|
+
return walk(root, 0);
|
|
60
|
+
}
|
|
61
|
+
function outputPath(pj, target, app) {
|
|
62
|
+
const targets = (pj?.['targets'] ?? {});
|
|
63
|
+
const options = (targets[target]?.['options'] ?? {});
|
|
64
|
+
return typeof options['outputPath'] === 'string'
|
|
65
|
+
? options['outputPath']
|
|
66
|
+
: `dist/apps/${app}`;
|
|
67
|
+
}
|
|
68
|
+
function copyDir(from, to) {
|
|
69
|
+
fs.rmSync(to, { recursive: true, force: true });
|
|
70
|
+
fs.mkdirSync(path.dirname(to), { recursive: true });
|
|
71
|
+
fs.cpSync(from, to, { recursive: true });
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* pstack adopt --compare --app=<app> [--env=dev,uat,prod] [--base=<commit>]: builds the app with
|
|
75
|
+
* the workspace's own script at <commit> (in a temporary git worktree) and with its release
|
|
76
|
+
* target, for each env, and compares the two outputs.
|
|
77
|
+
*/
|
|
78
|
+
async function runAdoptCompare(ctx, deps = defaultDeps) {
|
|
79
|
+
const root = (0, app_1.requireWorkspace)(ctx.cwd, 'adopt');
|
|
80
|
+
const app = (0, args_1.flagString)(ctx.flags, 'app');
|
|
81
|
+
if (!app || app.includes(',')) {
|
|
82
|
+
throw new types_1.CliError('--compare builds one app: pass --app=<app>.');
|
|
83
|
+
}
|
|
84
|
+
const pj = projectJson(root, app);
|
|
85
|
+
const release = (pj?.['targets'] ?? {})['release'];
|
|
86
|
+
if (!release) {
|
|
87
|
+
throw new types_1.CliError(`${app} has no release target yet; run pstack adopt first.`);
|
|
88
|
+
}
|
|
89
|
+
const configs = Object.keys((release['configurations'] ?? {}));
|
|
90
|
+
const envFlag = (0, args_1.flagString)(ctx.flags, 'env');
|
|
91
|
+
const envs = envFlag
|
|
92
|
+
? envFlag
|
|
93
|
+
.split(',')
|
|
94
|
+
.map((e) => e.trim())
|
|
95
|
+
.filter(Boolean)
|
|
96
|
+
: configs;
|
|
97
|
+
const unknown = envs.filter((e) => !configs.includes(e));
|
|
98
|
+
if (unknown.length > 0) {
|
|
99
|
+
throw new types_1.CliError(`${app}:release has no ${unknown.join(', ')} configuration (has ${configs.join(', ')}).`);
|
|
100
|
+
}
|
|
101
|
+
const status = deps.capture('git', ['status', '--porcelain'], root);
|
|
102
|
+
if (status === null)
|
|
103
|
+
throw new types_1.CliError('--compare needs a git repository.');
|
|
104
|
+
let base = (0, args_1.flagString)(ctx.flags, 'base');
|
|
105
|
+
if (!base) {
|
|
106
|
+
if (status.trim() === '') {
|
|
107
|
+
throw new types_1.CliError('pass --base=<commit before adopt> (the working tree is clean, so adopt is committed).');
|
|
108
|
+
}
|
|
109
|
+
base = 'HEAD';
|
|
110
|
+
}
|
|
111
|
+
if (deps.capture('git', ['rev-parse', '--verify', `${base}^{commit}`], root) === null) {
|
|
112
|
+
throw new types_1.CliError(`--base: no commit "${base}".`);
|
|
113
|
+
}
|
|
114
|
+
const worktree = fs.mkdtempSync(path.join(os.tmpdir(), `pstack-compare-${app}-`));
|
|
115
|
+
fs.rmSync(worktree, { recursive: true, force: true });
|
|
116
|
+
const out = path.join(root, 'dist', 'pstack-compare', app);
|
|
117
|
+
const env = { NX_DAEMON: 'false', NX_SKIP_NX_CACHE: 'true' };
|
|
118
|
+
const byEnv = {};
|
|
119
|
+
deps.log(`Old build: ${app} at ${base}, in a temporary worktree (${worktree}).`);
|
|
120
|
+
deps.exec('git', ['worktree', 'add', '--detach', worktree, base], root);
|
|
121
|
+
try {
|
|
122
|
+
fs.symlinkSync(path.join(root, 'node_modules'), path.join(worktree, 'node_modules'), 'junction');
|
|
123
|
+
const oldPkg = readJson(path.join(worktree, 'package.json'));
|
|
124
|
+
const oldScripts = (oldPkg['scripts'] ?? {});
|
|
125
|
+
const oldOut = outputPath(projectJson(worktree, app), 'build', app);
|
|
126
|
+
const newOut = outputPath(pj, 'release', app);
|
|
127
|
+
for (const e of envs) {
|
|
128
|
+
const script = `build:${app}:${e}`;
|
|
129
|
+
if (!oldScripts[script]) {
|
|
130
|
+
throw new types_1.CliError(`${base} has no "${script}" npm script to build the old way.`);
|
|
131
|
+
}
|
|
132
|
+
deps.log(`\n▶ ${e}: old build (npm run ${script} at ${base})`);
|
|
133
|
+
deps.exec('npm', ['run', script], worktree, env);
|
|
134
|
+
copyDir(path.join(worktree, oldOut), path.join(out, e, 'old'));
|
|
135
|
+
deps.log(`\n▶ ${e}: new build (nx run ${app}:release:${e})`);
|
|
136
|
+
deps.exec('npx', ['nx', 'run', `${app}:release:${e}`], root, env);
|
|
137
|
+
copyDir(path.join(root, newOut), path.join(out, e, 'new'));
|
|
138
|
+
byEnv[e] = (0, compare_1.compareBuilds)(path.join(out, e, 'old'), path.join(out, e, 'new'));
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
finally {
|
|
142
|
+
try {
|
|
143
|
+
deps.exec('git', ['worktree', 'remove', '--force', worktree], root);
|
|
144
|
+
}
|
|
145
|
+
catch {
|
|
146
|
+
deps.log(`Remove the worktree by hand: git worktree remove --force ${worktree}`);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
const reportFile = path.join(out, 'report.md');
|
|
150
|
+
fs.writeFileSync(reportFile, (0, compare_1.renderReport)(app, base, byEnv));
|
|
151
|
+
let differs = 0;
|
|
152
|
+
for (const [e, checks] of Object.entries(byEnv)) {
|
|
153
|
+
deps.log(`\n${e}:`);
|
|
154
|
+
for (const c of checks) {
|
|
155
|
+
if (c.status === 'differs')
|
|
156
|
+
differs++;
|
|
157
|
+
deps.log(` ${c.status === 'differs' ? '✖' : c.status === 'same' ? '✔' : 'ℹ'} ${c.name}: ${c.detail}`);
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
deps.log(`\n${differs === 0 ? 'No differences that matter.' : `${differs} check(s) differ.`} ` +
|
|
161
|
+
`Report: ${path.relative(root, reportFile)}; builds under ${path.relative(root, out)}/<env>/{old,new}.`);
|
|
162
|
+
return differs === 0 ? 0 : 1;
|
|
163
|
+
}
|
|
164
|
+
exports.runAdoptCompare = runAdoptCompare;
|
|
165
|
+
//# sourceMappingURL=adopt-compare.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adopt-compare.js","sourceRoot":"","sources":["../../../../src/cli/commands/adopt-compare.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
1
|
import { CommandContext } from '../types';
|
|
2
|
-
/**
|
|
2
|
+
/**
|
|
3
|
+
* pstack adopt [--app=a,b] [--no-scripts] [--remove-old-scripts]: Angular apps on their own build
|
|
4
|
+
* scripts → release target. pstack adopt --compare --app=<app>: old build vs release target.
|
|
5
|
+
*/
|
|
3
6
|
export declare function runAdopt(ctx: CommandContext): Promise<number>;
|
|
@@ -28,8 +28,15 @@ const args_1 = require("../args");
|
|
|
28
28
|
const run_tree_1 = require("../run-tree");
|
|
29
29
|
const types_1 = require("../types");
|
|
30
30
|
const app_1 = require("./app");
|
|
31
|
-
/**
|
|
31
|
+
/**
|
|
32
|
+
* pstack adopt [--app=a,b] [--no-scripts] [--remove-old-scripts]: Angular apps on their own build
|
|
33
|
+
* scripts → release target. pstack adopt --compare --app=<app>: old build vs release target.
|
|
34
|
+
*/
|
|
32
35
|
async function runAdopt(ctx) {
|
|
36
|
+
if ((0, args_1.flagBoolean)(ctx.flags, 'compare')) {
|
|
37
|
+
const { runAdoptCompare } = await Promise.resolve().then(() => __importStar(require('./adopt-compare')));
|
|
38
|
+
return runAdoptCompare(ctx);
|
|
39
|
+
}
|
|
33
40
|
if (ctx.flags['app'] === true)
|
|
34
41
|
throw new types_1.CliError('--app needs a value (e.g. --app=portal,admin).');
|
|
35
42
|
const projects = (0, args_1.flagString)(ctx.flags, 'app')
|
|
@@ -42,6 +49,7 @@ async function runAdopt(ctx) {
|
|
|
42
49
|
await (0, run_tree_1.runInTree)(root, ctx, (tree) => adoptGenerator(tree, {
|
|
43
50
|
projects,
|
|
44
51
|
scripts: ctx.flags['scripts'] === false ? false : ctx.flags['noScripts'] !== true,
|
|
52
|
+
removeOldScripts: (0, args_1.flagBoolean)(ctx.flags, 'removeOldScripts'),
|
|
45
53
|
}));
|
|
46
54
|
}
|
|
47
55
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adopt.js","sourceRoot":"","sources":["../../../../src/cli/commands/adopt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"adopt.js","sourceRoot":"","sources":["../../../../src/cli/commands/adopt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAAkD;AAClD,0CAAwC;AACxC,oCAAoD;AAEpD,+BAAyC;AAEzC;;;GAGG;AACI,KAAK,UAAU,QAAQ,CAAC,GAAmB;IAChD,IAAI,IAAA,kBAAW,EAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE;QACrC,MAAM,EAAE,eAAe,EAAE,GAAG,wDAAa,iBAAiB,GAAC,CAAC;QAC5D,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;KAC7B;IACD,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI;QAC3B,MAAM,IAAI,gBAAQ,CAAC,gDAAgD,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,IAAA,iBAAU,EAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC;QAC3C,EAAE,KAAK,CAAC,GAAG,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,MAAM,IAAI,GAAG,IAAA,sBAAgB,EAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,wDAAa,kCAAkC,GAAC,CAAC;IACrF,IAAI;QACF,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAClC,cAAc,CAAC,IAAI,EAAE;YACnB,QAAQ;YACR,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI;YACjF,gBAAgB,EAAE,IAAA,kBAAW,EAAC,GAAG,CAAC,KAAK,EAAE,kBAAkB,CAAC;SAC7D,CAAC,CACH,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,GAAG,YAAY,gBAAQ;YAAE,MAAM,GAAG,CAAC;QACvC,MAAM,IAAI,gBAAQ,CAAE,GAAa,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;KACpE;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AA1BD,4BA0BC"}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const fs = tslib_1.__importStar(require("fs"));
|
|
6
6
|
const path = tslib_1.__importStar(require("path"));
|
|
7
7
|
const json_layout_1 = require("../../lib/utils/json-layout");
|
|
8
|
+
const devkit_pin_1 = require("../../lib/utils/devkit-pin");
|
|
8
9
|
const args_1 = require("../args");
|
|
9
10
|
const context_1 = require("../context");
|
|
10
11
|
const exec_1 = require("../exec");
|
|
@@ -95,13 +96,20 @@ async function runUpdate(ctx, deps = defaultDeps) {
|
|
|
95
96
|
fs.rmSync(lockPath, { force: true });
|
|
96
97
|
};
|
|
97
98
|
// An explicit install: a plain "npm install" after editing a git-tag spec does not refetch.
|
|
99
|
+
// @nx/devkit of the workspace's Nx in the same install: left to npm, the plugin's devkit peer
|
|
100
|
+
// resolves to the newest Nx and the install fails (ERESOLVE) on an older workspace.
|
|
101
|
+
const devkit = (0, devkit_pin_1.devkitPinFor)(JSON.parse(pkgText.replace(/^\uFEFF/, '')), (0, devkit_pin_1.installedVersion)(root, 'nx'));
|
|
98
102
|
try {
|
|
99
103
|
deps.exec('npm', [
|
|
100
104
|
'install',
|
|
101
105
|
`${versions_1.PLUGIN_NAME}@${(0, versions_1.formatPluginSpec)(target.to)}`,
|
|
106
|
+
...(devkit ? [`@nx/devkit@${devkit}`] : []),
|
|
102
107
|
pin.field === 'dependencies' ? '--save-prod' : '--save-dev',
|
|
103
108
|
...(0, versions_1.pinInstallFlags)(),
|
|
109
|
+
...(devkit && !(0, versions_1.pinInstallFlags)().includes('--save-exact') ? ['--save-exact'] : []),
|
|
104
110
|
], root);
|
|
111
|
+
if (devkit)
|
|
112
|
+
console.log(`@nx/devkit pinned to ${devkit} (the workspace's Nx).`);
|
|
105
113
|
}
|
|
106
114
|
catch (err) {
|
|
107
115
|
restore();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/cli/commands/update.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/cli/commands/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,8 @@ import { CommandContext } from '../types';
|
|
|
13
13
|
export interface UpgradeDeps {
|
|
14
14
|
/** Run a command with inherited stdio; throws on a non-zero exit. */
|
|
15
15
|
exec(cmd: string, args: string[], cwd: string, env?: Record<string, string>): void;
|
|
16
|
+
/** Run a command and return its stdout ('' when it fails). */
|
|
17
|
+
capture?(cmd: string, args: string[], cwd: string): string;
|
|
16
18
|
/** Porcelain status text, or null when not a git repo. */
|
|
17
19
|
gitStatus(cwd: string): string | null;
|
|
18
20
|
/** Major version of the Node running pstack. */
|
|
@@ -48,4 +50,13 @@ export declare function repairHttpClientModule(root: string): string[];
|
|
|
48
50
|
export declare function stepPlan(from: number, to: number, root: string): string[];
|
|
49
51
|
/** pstack upgrade angular [--to=N] [--yes] [--skip-check] [--no-commit] [--dry-run] */
|
|
50
52
|
export declare function runUpgrade(ctx: CommandContext, deps?: UpgradeDeps): Promise<number>;
|
|
53
|
+
/** The workspace's Nx major: installed nx, else the declared one. */
|
|
54
|
+
export declare function workspaceNxMajor(root: string): number | undefined;
|
|
55
|
+
/** What one Nx step does (dry-run plan and log headings). */
|
|
56
|
+
export declare function nxStepPlan(to: number, last: boolean, plugin: boolean): string[];
|
|
57
|
+
/**
|
|
58
|
+
* pstack upgrade nx [--to=16|17] [--skip-check] [--no-commit] [--dry-run]: moves an Nx 15 or 16
|
|
59
|
+
* workspace to Nx 17 (where the plugin loads), one major per commit, Angular unchanged.
|
|
60
|
+
*/
|
|
61
|
+
export declare function runUpgradeNx(ctx: CommandContext, deps?: UpgradeDeps): Promise<number>;
|
|
51
62
|
export {};
|