@mouryaamit/nx-polystack 1.21.1 → 1.23.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/USER-MANUAL.md +21 -0
- package/dist/src/cli/commands/index.js +1 -0
- package/dist/src/cli/commands/index.js.map +1 -1
- package/dist/src/cli/commands/remove.d.ts +46 -0
- package/dist/src/cli/commands/remove.js +409 -0
- package/dist/src/cli/commands/remove.js.map +1 -0
- package/dist/src/cli/commands/update.js +25 -9
- package/dist/src/cli/commands/update.js.map +1 -1
- package/dist/src/cli/commands/upgrade.d.ts +1 -0
- package/dist/src/cli/commands/upgrade.js +4 -4
- package/dist/src/cli/commands/upgrade.js.map +1 -1
- package/dist/src/cli/context.d.ts +13 -0
- package/dist/src/cli/context.js +44 -2
- package/dist/src/cli/context.js.map +1 -1
- package/dist/src/cli/help.js +12 -0
- package/dist/src/cli/help.js.map +1 -1
- package/dist/src/cli/install-source.d.ts +14 -2
- package/dist/src/cli/install-source.js +18 -3
- package/dist/src/cli/install-source.js.map +1 -1
- package/dist/src/cli/launcher.js +2 -0
- package/dist/src/cli/launcher.js.map +1 -1
- package/dist/src/cli/update-plan.d.ts +9 -1
- package/dist/src/cli/update-plan.js +20 -9
- package/dist/src/cli/update-plan.js.map +1 -1
- package/dist/src/cli/versions.d.ts +19 -7
- package/dist/src/cli/versions.js +43 -16
- package/dist/src/cli/versions.js.map +1 -1
- package/dist/src/generators/infra/generator.js +8 -0
- package/dist/src/generators/infra/generator.js.map +1 -1
- package/dist/src/migrations/plugin-repo-dev/plugin-repo-dev.js +2 -2
- package/dist/src/migrations/plugin-repo-dev/plugin-repo-dev.js.map +1 -1
- package/package.json +1 -1
package/USER-MANUAL.md
CHANGED
|
@@ -291,6 +291,27 @@ through to the migration step.
|
|
|
291
291
|
either `git checkout -- . && npm install` and then `pstack update` again, or, after fixing the cause, rerun only
|
|
292
292
|
the migrations with `npx pstack _migrate --from=<from> --to=<to>`.
|
|
293
293
|
|
|
294
|
+
**Installing from another git server (v1.23.0).** A team can keep its own copy of the published package on
|
|
295
|
+
an internal git server, one tag per version, and point pstack at it. In that copy's `package.json`:
|
|
296
|
+
|
|
297
|
+
```json
|
|
298
|
+
"pstack": { "installSource": "git+https://git.example.com/acme/nx-polystack.git#dist-v{version}" }
|
|
299
|
+
```
|
|
300
|
+
|
|
301
|
+
`{version}` appears once, in the `#` ref, and is replaced by the version: `pstack new` and `pstack update` pin
|
|
302
|
+
`git+https://git.example.com/acme/nx-polystack.git#dist-v1.23.0` and install it with
|
|
303
|
+
`npm install <package>@<that URL>` (no `--save-exact`); `pstack --help` shows
|
|
304
|
+
`npm i -g "<package>@<that URL>"` for the global CLI. The copy must be prebuilt, like the npm package (no
|
|
305
|
+
`prepare` script), because npm does not build git dependencies of a global install. npm uses the machine's git
|
|
306
|
+
credentials; nothing goes in the URL. `git+ssh://` and `git+file://` URLs work too.
|
|
307
|
+
|
|
308
|
+
The copy may also have its own package name (for example `@acme/nx-polystack`). A global CLI under the original
|
|
309
|
+
name finds it through the workspace's `dependencies`/`devDependencies` (an installed package with a `pstack` bin
|
|
310
|
+
and an install source it can read), hands workspace commands to it, and `pstack update` moves that package with
|
|
311
|
+
its own URL. A copy older than 1.23.0 still names npm as its install source; `pstack update` then keeps the git URL
|
|
312
|
+
the workspace pins it to, with the new version in the ref. The executor and generator names in `nx.json` and
|
|
313
|
+
`project.json` follow the package name.
|
|
314
|
+
|
|
294
315
|
**The 0.4.1 migration.** `add-lint-dependencies` adds the ESLint packages the root `.eslintrc.json` needs
|
|
295
316
|
(`eslint`, `@nx/eslint`, `@nx/eslint-plugin`, `@typescript-eslint/*`, `eslint-config-prettier`) when missing, and,
|
|
296
317
|
for Angular 15 workspaces, any missing build/lint package (`@angular-devkit/build-angular`, `@angular/compiler-cli`,
|
|
@@ -45,5 +45,6 @@ exports.COMMANDS = {
|
|
|
45
45
|
inspect: async (c) => (await Promise.resolve().then(() => __importStar(require('./inspect')))).runInspect(c),
|
|
46
46
|
assets: async (c) => (await Promise.resolve().then(() => __importStar(require('./assets')))).runAssets(c),
|
|
47
47
|
upgrade: async (c) => (await Promise.resolve().then(() => __importStar(require('./upgrade')))).runUpgrade(c),
|
|
48
|
+
remove: async (c) => (await Promise.resolve().then(() => __importStar(require('./remove')))).runRemove(c),
|
|
48
49
|
};
|
|
49
50
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/commands/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAIa,QAAA,QAAQ,GAAmC;IACtD,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,UAAU,GAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5D,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,OAAO,GAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,OAAO,GAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,OAAO,GAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,OAAO,GAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,OAAO,GAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,UAAU,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,cAAc,GAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;IACxE,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,aAAa,GAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;IACrE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,SAAS,GAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,WAAW,GAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/D,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,OAAO,GAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,UAAU,GAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5D,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,SAAS,GAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,oBAAoB,GAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACjF,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,UAAU,GAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5D,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,WAAW,GAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/D,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,SAAS,GAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,WAAW,GAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/D,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,UAAU,GAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5D,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,WAAW,GAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/commands/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { Tree } from '@nx/devkit';
|
|
2
|
+
import { CommandContext } from '../types';
|
|
3
|
+
import { UpgradeDeps } from './upgrade';
|
|
4
|
+
export interface RemovalApp {
|
|
5
|
+
name: string;
|
|
6
|
+
root: string;
|
|
7
|
+
/** Other folders that go with the app: <app>-e2e, environments/<envProject>, the report. */
|
|
8
|
+
extraDirs: string[];
|
|
9
|
+
files: string[];
|
|
10
|
+
/** tsconfig.base.json paths that point into the app. */
|
|
11
|
+
aliases: string[];
|
|
12
|
+
envProject: string;
|
|
13
|
+
/** dist folders (not in git). */
|
|
14
|
+
dist: string[];
|
|
15
|
+
}
|
|
16
|
+
export interface RemovalPlan {
|
|
17
|
+
apps: RemovalApp[];
|
|
18
|
+
/** npm scripts removed (name → command). */
|
|
19
|
+
scripts: Record<string, string>;
|
|
20
|
+
/** npm scripts that name an app and another project: kept, listed. */
|
|
21
|
+
sharedScripts: string[];
|
|
22
|
+
/** Runtime packages uninstalled, with why. */
|
|
23
|
+
packages: {
|
|
24
|
+
name: string;
|
|
25
|
+
why: string;
|
|
26
|
+
}[];
|
|
27
|
+
/** Runtime packages the apps use that stay, with why. */
|
|
28
|
+
keptPackages: {
|
|
29
|
+
name: string;
|
|
30
|
+
why: string;
|
|
31
|
+
}[];
|
|
32
|
+
/** Libraries only these apps import (kept). */
|
|
33
|
+
libsOnlyHere: string[];
|
|
34
|
+
/** Projects that depend on an app (refused without --force). */
|
|
35
|
+
dependents: string[];
|
|
36
|
+
/** Lines in CI files and README that name an app (not edited). */
|
|
37
|
+
mentions: string[];
|
|
38
|
+
}
|
|
39
|
+
/** Plans removing these apps; nothing is changed. */
|
|
40
|
+
export declare function planRemoval(root: string, names: string[]): RemovalPlan;
|
|
41
|
+
/** The plan as lines for the console. */
|
|
42
|
+
export declare function describePlan(plan: RemovalPlan): string[];
|
|
43
|
+
/** The plan's file changes on a tree (folders, tsconfig paths, npm scripts, nx.json keys). */
|
|
44
|
+
export declare function applyRemoval(tree: Tree, plan: RemovalPlan): void;
|
|
45
|
+
/** pstack remove --app=<a,b> [--dry-run] [--yes] [--force] */
|
|
46
|
+
export declare function runRemove(ctx: CommandContext, deps?: UpgradeDeps): Promise<number>;
|
|
@@ -0,0 +1,409 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runRemove = exports.applyRemoval = exports.describePlan = exports.planRemoval = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const fs = tslib_1.__importStar(require("fs"));
|
|
6
|
+
const path = tslib_1.__importStar(require("path"));
|
|
7
|
+
const llm_block_1 = require("../../lib/utils/llm-block");
|
|
8
|
+
const args_1 = require("../args");
|
|
9
|
+
const context_1 = require("../context");
|
|
10
|
+
const run_tree_1 = require("../run-tree");
|
|
11
|
+
const types_1 = require("../types");
|
|
12
|
+
const upgrade_1 = require("./upgrade");
|
|
13
|
+
const upgrade_standalone_1 = require("./upgrade-standalone");
|
|
14
|
+
const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
|
|
15
|
+
const esc = (s) => s.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
|
|
16
|
+
/** Runtime packages that are never uninstalled: frameworks, the plugin and its pipeline. */
|
|
17
|
+
const NEVER_REMOVE = [
|
|
18
|
+
/^@angular\//,
|
|
19
|
+
/^@angular-devkit\//,
|
|
20
|
+
/^@nx\//,
|
|
21
|
+
/^@nrwl\//,
|
|
22
|
+
/^nx$/,
|
|
23
|
+
/^typescript$/,
|
|
24
|
+
/^tslib$/,
|
|
25
|
+
/^rxjs$/,
|
|
26
|
+
/^zone\.js$/,
|
|
27
|
+
/^@ionic\/angular$/,
|
|
28
|
+
/^@ionic\/core$/,
|
|
29
|
+
/^ionicons$/,
|
|
30
|
+
/^@capacitor\/(core|cli)$/,
|
|
31
|
+
/^@mouryaamit\/nx-polystack$/,
|
|
32
|
+
/^crypto-js$/,
|
|
33
|
+
];
|
|
34
|
+
const TEXT = /\.(ts|tsx|js|mjs|cjs|json|scss|sass|css|less|html|ya?ml)$/;
|
|
35
|
+
const SKIP_DIRS = new Set(['node_modules', 'dist', 'tmp', 'coverage', '.git', '.nx', '.angular']);
|
|
36
|
+
/** Text files under `dir` (relative to root), skipping build output and the given folders. */
|
|
37
|
+
function textFiles(root, dir, skip) {
|
|
38
|
+
const out = [];
|
|
39
|
+
const walk = (rel) => {
|
|
40
|
+
const abs = path.join(root, rel);
|
|
41
|
+
if (!fs.existsSync(abs))
|
|
42
|
+
return;
|
|
43
|
+
for (const e of fs.readdirSync(abs, { withFileTypes: true })) {
|
|
44
|
+
const r = rel ? `${rel}/${e.name}` : e.name;
|
|
45
|
+
if (e.isDirectory()) {
|
|
46
|
+
if (SKIP_DIRS.has(e.name) || skip.has(r) || e.name === 'android' || e.name === 'ios')
|
|
47
|
+
continue;
|
|
48
|
+
walk(r);
|
|
49
|
+
}
|
|
50
|
+
else if (TEXT.test(e.name) && e.name !== 'package-lock.json') {
|
|
51
|
+
out.push(r);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
walk(dir);
|
|
56
|
+
return out;
|
|
57
|
+
}
|
|
58
|
+
const read = (root, rel) => {
|
|
59
|
+
try {
|
|
60
|
+
return fs.readFileSync(path.join(root, rel), 'utf8');
|
|
61
|
+
}
|
|
62
|
+
catch {
|
|
63
|
+
return '';
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
const readJson = (root, rel) => {
|
|
67
|
+
try {
|
|
68
|
+
const v = JSON.parse(read(root, rel));
|
|
69
|
+
return isObject(v) ? v : {};
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
return {};
|
|
73
|
+
}
|
|
74
|
+
};
|
|
75
|
+
/** Package names a file imports or names (import/require/export from, @import/@use, node_modules/). */
|
|
76
|
+
function packagesIn(text) {
|
|
77
|
+
const found = new Set();
|
|
78
|
+
const add = (spec) => {
|
|
79
|
+
if (spec.startsWith('.') || spec.startsWith('/') || spec.startsWith('@env/'))
|
|
80
|
+
return;
|
|
81
|
+
const parts = spec.replace(/^~/, '').split('/');
|
|
82
|
+
const name = parts[0].startsWith('@') ? parts.slice(0, 2).join('/') : parts[0];
|
|
83
|
+
if (/^(@[a-z0-9][\w.-]*\/)?[a-z0-9][\w.-]*$/i.test(name))
|
|
84
|
+
found.add(name);
|
|
85
|
+
};
|
|
86
|
+
for (const m of text.matchAll(/(?:\bfrom\s*|\bimport\s*\(?\s*|\brequire\s*\(\s*|@(?:import|use|forward)\s+)['"]([^'"]+)['"]/g)) {
|
|
87
|
+
add(m[1]);
|
|
88
|
+
}
|
|
89
|
+
for (const m of text.matchAll(/node_modules\/((?:@[\w.-]+\/)?[\w.-]+)/g))
|
|
90
|
+
add(m[1]);
|
|
91
|
+
return found;
|
|
92
|
+
}
|
|
93
|
+
/** Plans removing these apps; nothing is changed. */
|
|
94
|
+
function planRemoval(root, names) {
|
|
95
|
+
const projects = (0, upgrade_standalone_1.workspaceProjects)(root);
|
|
96
|
+
const unknown = names.filter((n) => !projects.some((p) => p.name === n));
|
|
97
|
+
if (unknown.length > 0) {
|
|
98
|
+
throw new types_1.CliError(`no app named ${unknown.map((n) => `"${n}"`).join(', ')}. Apps: ${projects
|
|
99
|
+
.filter((p) => p.app)
|
|
100
|
+
.map((p) => p.name)
|
|
101
|
+
.join(', ')}.`);
|
|
102
|
+
}
|
|
103
|
+
const libs = names.filter((n) => !projects.find((p) => p.name === n)?.app);
|
|
104
|
+
if (libs.length > 0) {
|
|
105
|
+
throw new types_1.CliError(`${libs.join(', ')}: not an app (pstack remove retires apps only).`);
|
|
106
|
+
}
|
|
107
|
+
const tsPaths = (() => {
|
|
108
|
+
const co = readJson(root, 'tsconfig.base.json')['compilerOptions'];
|
|
109
|
+
return isObject(co) && isObject(co['paths']) ? co['paths'] : {};
|
|
110
|
+
})();
|
|
111
|
+
const aliasesInto = (dir) => Object.entries(tsPaths)
|
|
112
|
+
.filter(([, t]) => Array.isArray(t) &&
|
|
113
|
+
t.some((x) => typeof x === 'string' && `${x.replace(/^\.\//, '')}/`.startsWith(`${dir}/`)))
|
|
114
|
+
.map(([alias]) => alias);
|
|
115
|
+
const releaseOf = (p) => {
|
|
116
|
+
const targets = readJson(root, `${p.root}/project.json`)['targets'];
|
|
117
|
+
if (!isObject(targets))
|
|
118
|
+
return undefined;
|
|
119
|
+
return Object.values(targets).find((t) => isObject(t) && t['executor'] === '@mouryaamit/nx-polystack:build');
|
|
120
|
+
};
|
|
121
|
+
const envProjectOf = (p) => {
|
|
122
|
+
const o = releaseOf(p)?.['options'];
|
|
123
|
+
return isObject(o) && typeof o['envProject'] === 'string' ? o['envProject'] : p.name;
|
|
124
|
+
};
|
|
125
|
+
const removed = projects.filter((p) => names.includes(p.name) || names.some((n) => p.name === `${n}-e2e`));
|
|
126
|
+
const removedRoots = new Set(removed.map((p) => p.root));
|
|
127
|
+
const kept = projects.filter((p) => !removedRoots.has(p.root));
|
|
128
|
+
const apps = names.map((name) => {
|
|
129
|
+
const p = projects.find((x) => x.name === name);
|
|
130
|
+
const envProject = envProjectOf(p);
|
|
131
|
+
const envShared = kept.some((k) => envProjectOf(k) === envProject && k.app);
|
|
132
|
+
const extraDirs = [
|
|
133
|
+
...removed.filter((x) => x.name === `${name}-e2e`).map((x) => x.root),
|
|
134
|
+
...(!envShared && fs.existsSync(path.join(root, 'environments', envProject))
|
|
135
|
+
? [`environments/${envProject}`]
|
|
136
|
+
: []),
|
|
137
|
+
];
|
|
138
|
+
const files = [`docs/migrations/${name}.md`, `docs/migrations/${name}.manifest.json`].filter((f) => fs.existsSync(path.join(root, f)));
|
|
139
|
+
const dist = [`dist/${p.root}`, `dist/apps/${name}`].filter((d, i, a) => a.indexOf(d) === i && fs.existsSync(path.join(root, d)));
|
|
140
|
+
return { name, root: p.root, extraDirs, files, aliases: aliasesInto(p.root), envProject, dist };
|
|
141
|
+
});
|
|
142
|
+
const goneDirs = new Set(apps.flatMap((a) => [a.root, ...a.extraDirs]));
|
|
143
|
+
// Who still uses an app: imports of its aliases, implicitDependencies, target references.
|
|
144
|
+
const dependents = [];
|
|
145
|
+
const keptFiles = new Map(kept.map((k) => [k, textFiles(root, k.root, goneDirs)]));
|
|
146
|
+
for (const a of apps) {
|
|
147
|
+
for (const k of kept) {
|
|
148
|
+
const pj = readJson(root, `${k.root}/project.json`);
|
|
149
|
+
const why = [];
|
|
150
|
+
if (Array.isArray(pj['implicitDependencies']) && pj['implicitDependencies'].includes(a.name))
|
|
151
|
+
why.push('implicitDependencies');
|
|
152
|
+
if (JSON.stringify(pj['targets'] ?? {}).includes(`"${a.name}:`))
|
|
153
|
+
why.push('a target');
|
|
154
|
+
const importer = (keptFiles.get(k) ?? []).find((f) => a.aliases.some((al) => new RegExp(`['"]${esc(al)}(/[^'"]*)?['"]`).test(read(root, f))));
|
|
155
|
+
if (importer)
|
|
156
|
+
why.push(`imports it in ${importer}`);
|
|
157
|
+
if (why.length > 0)
|
|
158
|
+
dependents.push(`${k.name} → ${a.name} (${why.join(', ')})`);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
// Libraries the apps import that no kept project imports.
|
|
162
|
+
const libAliases = kept
|
|
163
|
+
.filter((k) => !k.app)
|
|
164
|
+
.map((l) => ({ lib: l, aliases: aliasesInto(l.root) }))
|
|
165
|
+
.filter((x) => x.aliases.length > 0);
|
|
166
|
+
const imports = (files, aliases) => files.some((f) => aliases.some((al) => new RegExp(`['"]${esc(al)}(/[^'"]*)?['"]`).test(read(root, f))));
|
|
167
|
+
const appFiles = apps.flatMap((a) => textFiles(root, a.root, new Set()));
|
|
168
|
+
const libsOnlyHere = libAliases
|
|
169
|
+
.filter(({ lib, aliases }) => imports(appFiles, aliases) &&
|
|
170
|
+
!kept.some((k) => k.root !== lib.root && imports(keptFiles.get(k) ?? [], aliases)))
|
|
171
|
+
.map(({ lib }) => lib.name)
|
|
172
|
+
.sort();
|
|
173
|
+
// Runtime packages: the apps use them, nothing else names them.
|
|
174
|
+
const pkg = readJson(root, 'package.json');
|
|
175
|
+
const runtime = isObject(pkg['dependencies']) ? Object.keys(pkg['dependencies']) : [];
|
|
176
|
+
const used = new Set();
|
|
177
|
+
for (const f of appFiles)
|
|
178
|
+
for (const n of packagesIn(read(root, f)))
|
|
179
|
+
used.add(n);
|
|
180
|
+
const elsewhere = textFiles(root, '', goneDirs).filter((f) => f !== 'package.json' && !f.startsWith('docs/migrations/'));
|
|
181
|
+
const packages = [];
|
|
182
|
+
const keptPackages = [];
|
|
183
|
+
for (const name of runtime.filter((n) => used.has(n)).sort()) {
|
|
184
|
+
if (NEVER_REMOVE.some((re) => re.test(name))) {
|
|
185
|
+
keptPackages.push({ name, why: 'framework or pipeline package' });
|
|
186
|
+
continue;
|
|
187
|
+
}
|
|
188
|
+
const re = new RegExp(`['"\`~/]${esc(name)}(['"\`/]|$)`, 'm');
|
|
189
|
+
const other = elsewhere.find((f) => re.test(read(root, f)));
|
|
190
|
+
if (other)
|
|
191
|
+
keptPackages.push({ name, why: `also named in ${other}` });
|
|
192
|
+
else
|
|
193
|
+
packages.push({ name, why: `only ${apps.map((a) => a.name).join(', ')} use it` });
|
|
194
|
+
}
|
|
195
|
+
// npm scripts: those for the apps only.
|
|
196
|
+
const scripts = {};
|
|
197
|
+
const sharedScripts = [];
|
|
198
|
+
const pkgScripts = isObject(pkg['scripts']) ? pkg['scripts'] : {};
|
|
199
|
+
const refers = (cmd, n, root_) => new RegExp(`(^|[\\s'"=/])${esc(n)}:`).test(cmd) || cmd.includes(`${root_}/`);
|
|
200
|
+
for (const [s, cmd] of Object.entries(pkgScripts)) {
|
|
201
|
+
if (typeof cmd !== 'string')
|
|
202
|
+
continue;
|
|
203
|
+
const mine = apps.some((a) => s.split(':').includes(a.name) || refers(cmd, a.name, a.root));
|
|
204
|
+
if (!mine)
|
|
205
|
+
continue;
|
|
206
|
+
const others = kept.some((k) => refers(cmd, k.name, k.root));
|
|
207
|
+
if (others)
|
|
208
|
+
sharedScripts.push(s);
|
|
209
|
+
else
|
|
210
|
+
scripts[s] = cmd;
|
|
211
|
+
}
|
|
212
|
+
// Mentions in CI files and the README (listed, not edited).
|
|
213
|
+
const mentions = [];
|
|
214
|
+
const ciFiles = [
|
|
215
|
+
'README.md',
|
|
216
|
+
'Jenkinsfile',
|
|
217
|
+
...(fs.existsSync(path.join(root, '.github/workflows'))
|
|
218
|
+
? fs.readdirSync(path.join(root, '.github/workflows')).map((f) => `.github/workflows/${f}`)
|
|
219
|
+
: []),
|
|
220
|
+
];
|
|
221
|
+
for (const f of ciFiles) {
|
|
222
|
+
read(root, f)
|
|
223
|
+
.split('\n')
|
|
224
|
+
.forEach((line, i) => {
|
|
225
|
+
if (apps.some((a) => new RegExp(`(^|[^\\w-])${esc(a.name)}([^\\w-]|$)`).test(line))) {
|
|
226
|
+
mentions.push(`${f}:${i + 1}: ${line.trim().slice(0, 120)}`);
|
|
227
|
+
}
|
|
228
|
+
});
|
|
229
|
+
}
|
|
230
|
+
return {
|
|
231
|
+
apps,
|
|
232
|
+
scripts,
|
|
233
|
+
sharedScripts: sharedScripts.sort(),
|
|
234
|
+
packages,
|
|
235
|
+
keptPackages,
|
|
236
|
+
libsOnlyHere,
|
|
237
|
+
dependents,
|
|
238
|
+
mentions,
|
|
239
|
+
};
|
|
240
|
+
}
|
|
241
|
+
exports.planRemoval = planRemoval;
|
|
242
|
+
/** The plan as lines for the console. */
|
|
243
|
+
function describePlan(plan) {
|
|
244
|
+
const out = [];
|
|
245
|
+
for (const a of plan.apps) {
|
|
246
|
+
out.push(`Remove app ${a.name}:`);
|
|
247
|
+
for (const d of [a.root, ...a.extraDirs])
|
|
248
|
+
out.push(` delete ${d}/`);
|
|
249
|
+
for (const f of a.files)
|
|
250
|
+
out.push(` delete ${f}`);
|
|
251
|
+
for (const d of a.dist)
|
|
252
|
+
out.push(` delete ${d}/ (build output)`);
|
|
253
|
+
for (const al of a.aliases)
|
|
254
|
+
out.push(` tsconfig.base.json: path ${al}`);
|
|
255
|
+
out.push(` nx.json: pstack.envEncryption.keys.${a.envProject} (if set)`);
|
|
256
|
+
}
|
|
257
|
+
const scripts = Object.keys(plan.scripts);
|
|
258
|
+
if (scripts.length > 0)
|
|
259
|
+
out.push(`npm scripts removed: ${scripts.join(', ')}`);
|
|
260
|
+
if (plan.packages.length > 0) {
|
|
261
|
+
out.push('npm packages uninstalled:');
|
|
262
|
+
for (const p of plan.packages)
|
|
263
|
+
out.push(` ${p.name} (${p.why})`);
|
|
264
|
+
}
|
|
265
|
+
if (plan.keptPackages.length > 0) {
|
|
266
|
+
out.push('npm packages kept:');
|
|
267
|
+
for (const p of plan.keptPackages)
|
|
268
|
+
out.push(` ${p.name} (${p.why})`);
|
|
269
|
+
}
|
|
270
|
+
if (plan.libsOnlyHere.length > 0) {
|
|
271
|
+
out.push(`Libraries only these apps used (kept; retire them yourself if unused): ${plan.libsOnlyHere.join(', ')}`);
|
|
272
|
+
}
|
|
273
|
+
if (plan.sharedScripts.length > 0) {
|
|
274
|
+
out.push(`npm scripts kept (they name other projects too): ${plan.sharedScripts.join(', ')}`);
|
|
275
|
+
}
|
|
276
|
+
if (plan.mentions.length > 0) {
|
|
277
|
+
out.push('Mentions to update by hand:');
|
|
278
|
+
for (const m of plan.mentions)
|
|
279
|
+
out.push(` ${m}`);
|
|
280
|
+
}
|
|
281
|
+
if (plan.dependents.length > 0) {
|
|
282
|
+
out.push('Projects that depend on these apps:');
|
|
283
|
+
for (const d of plan.dependents)
|
|
284
|
+
out.push(` ${d}`);
|
|
285
|
+
}
|
|
286
|
+
return out;
|
|
287
|
+
}
|
|
288
|
+
exports.describePlan = describePlan;
|
|
289
|
+
/** The plan's file changes on a tree (folders, tsconfig paths, npm scripts, nx.json keys). */
|
|
290
|
+
function applyRemoval(tree, plan) {
|
|
291
|
+
for (const a of plan.apps) {
|
|
292
|
+
for (const d of [a.root, ...a.extraDirs])
|
|
293
|
+
tree.delete(d);
|
|
294
|
+
for (const f of a.files)
|
|
295
|
+
tree.delete(f);
|
|
296
|
+
}
|
|
297
|
+
const edit = (file, fn) => {
|
|
298
|
+
if (!tree.exists(file))
|
|
299
|
+
return;
|
|
300
|
+
const json = JSON.parse(tree.read(file, 'utf8') ?? '{}');
|
|
301
|
+
const before = JSON.stringify(json);
|
|
302
|
+
fn(json);
|
|
303
|
+
if (JSON.stringify(json) !== before)
|
|
304
|
+
tree.write(file, JSON.stringify(json, null, 2) + '\n');
|
|
305
|
+
};
|
|
306
|
+
edit('tsconfig.base.json', (json) => {
|
|
307
|
+
const co = json['compilerOptions'];
|
|
308
|
+
if (!isObject(co) || !isObject(co['paths']))
|
|
309
|
+
return;
|
|
310
|
+
for (const a of plan.apps)
|
|
311
|
+
for (const al of a.aliases)
|
|
312
|
+
delete co['paths'][al];
|
|
313
|
+
});
|
|
314
|
+
edit('package.json', (json) => {
|
|
315
|
+
if (!isObject(json['scripts']))
|
|
316
|
+
return;
|
|
317
|
+
for (const s of Object.keys(plan.scripts))
|
|
318
|
+
delete json['scripts'][s];
|
|
319
|
+
});
|
|
320
|
+
edit('nx.json', (json) => {
|
|
321
|
+
const enc = isObject(json['pstack']) ? json['pstack']['envEncryption'] : undefined;
|
|
322
|
+
const keys = isObject(enc) ? enc['keys'] : undefined;
|
|
323
|
+
if (!isObject(keys))
|
|
324
|
+
return;
|
|
325
|
+
for (const a of plan.apps)
|
|
326
|
+
delete keys[a.envProject];
|
|
327
|
+
});
|
|
328
|
+
(0, llm_block_1.refreshLlmBlocks)(tree);
|
|
329
|
+
}
|
|
330
|
+
exports.applyRemoval = applyRemoval;
|
|
331
|
+
/** pstack remove --app=<a,b> [--dry-run] [--yes] [--force] */
|
|
332
|
+
async function runRemove(ctx, deps = upgrade_1.defaultUpgradeDeps) {
|
|
333
|
+
const root = (0, context_1.findWorkspaceRoot)(ctx.cwd);
|
|
334
|
+
if (!root)
|
|
335
|
+
throw new types_1.CliError('run "pstack remove" inside an Nx workspace.');
|
|
336
|
+
if (ctx.flags['app'] === true || !(0, args_1.flagString)(ctx.flags, 'app')) {
|
|
337
|
+
throw new types_1.CliError('pass the apps to retire: pstack remove --app=<name>[,<name>…]');
|
|
338
|
+
}
|
|
339
|
+
const names = [
|
|
340
|
+
...new Set(((0, args_1.flagString)(ctx.flags, 'app') ?? '')
|
|
341
|
+
.split(',')
|
|
342
|
+
.map((s) => s.trim())
|
|
343
|
+
.filter(Boolean)),
|
|
344
|
+
];
|
|
345
|
+
const plan = planRemoval(root, names);
|
|
346
|
+
for (const line of describePlan(plan))
|
|
347
|
+
deps.log(line);
|
|
348
|
+
if (plan.dependents.length > 0 && !(0, args_1.flagBoolean)(ctx.flags, 'force')) {
|
|
349
|
+
throw new types_1.CliError('other projects depend on these apps (listed above); fix them, or pass --force to remove anyway.');
|
|
350
|
+
}
|
|
351
|
+
if (ctx.dryRun) {
|
|
352
|
+
deps.log('\nDry run: nothing was changed.');
|
|
353
|
+
return 0;
|
|
354
|
+
}
|
|
355
|
+
const status = deps.gitStatus(root);
|
|
356
|
+
if (status === null)
|
|
357
|
+
throw new types_1.CliError('pstack remove needs a git repository (one commit).');
|
|
358
|
+
if (status.trim() !== '')
|
|
359
|
+
throw new types_1.CliError('commit or stash your changes first.');
|
|
360
|
+
if (!(0, args_1.flagBoolean)(ctx.flags, 'yes')) {
|
|
361
|
+
if (!deps.interactive)
|
|
362
|
+
throw new types_1.CliError('pass --yes to remove without asking.');
|
|
363
|
+
const prompter = deps.prompter();
|
|
364
|
+
const answer = await prompter.ask(`\nRemove ${names.join(', ')}? (yes/no)`, 'no');
|
|
365
|
+
prompter.close();
|
|
366
|
+
if (!/^y(es)?$/i.test(answer)) {
|
|
367
|
+
deps.log('Nothing removed.');
|
|
368
|
+
return 1;
|
|
369
|
+
}
|
|
370
|
+
}
|
|
371
|
+
// The last commit that still has the app, easy to find later.
|
|
372
|
+
for (const n of names) {
|
|
373
|
+
const tag = `retired/${n}`;
|
|
374
|
+
const exists = deps.capture?.('git', ['tag', '--list', tag], root).trim() === tag;
|
|
375
|
+
if (exists)
|
|
376
|
+
deps.log(` tag ${tag} exists already; not moved`);
|
|
377
|
+
else
|
|
378
|
+
deps.exec('git', ['tag', tag], root);
|
|
379
|
+
}
|
|
380
|
+
await (0, run_tree_1.runInTree)(root, { dryRun: false, verbose: ctx.verbose, quietWhenUnchanged: true }, (tree) => applyRemoval(tree, plan));
|
|
381
|
+
for (const a of plan.apps) {
|
|
382
|
+
for (const d of a.dist)
|
|
383
|
+
fs.rmSync(path.join(root, d), { recursive: true, force: true });
|
|
384
|
+
}
|
|
385
|
+
if (plan.packages.length > 0) {
|
|
386
|
+
deps.exec('npm', ['uninstall', ...plan.packages.map((p) => p.name)], root);
|
|
387
|
+
}
|
|
388
|
+
deps.exec('git', ['add', '-A'], root);
|
|
389
|
+
const body = [
|
|
390
|
+
...(plan.packages.length > 0
|
|
391
|
+
? [`npm packages uninstalled: ${plan.packages.map((p) => p.name).join(', ')}`]
|
|
392
|
+
: []),
|
|
393
|
+
...(plan.libsOnlyHere.length > 0
|
|
394
|
+
? [`Libraries only it used: ${plan.libsOnlyHere.join(', ')}`]
|
|
395
|
+
: []),
|
|
396
|
+
`The app is at tag ${names.map((n) => `retired/${n}`).join(', ')}.`,
|
|
397
|
+
];
|
|
398
|
+
deps.exec('git', [
|
|
399
|
+
'commit',
|
|
400
|
+
'-m',
|
|
401
|
+
`chore: remove app ${names.join(', ')} (pstack remove)`,
|
|
402
|
+
'-m',
|
|
403
|
+
body.join('\n'),
|
|
404
|
+
], root);
|
|
405
|
+
deps.log(`\n✔ Removed ${names.join(', ')}. Undo with: git revert HEAD`);
|
|
406
|
+
return 0;
|
|
407
|
+
}
|
|
408
|
+
exports.runRemove = runRemove;
|
|
409
|
+
//# sourceMappingURL=remove.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../src/cli/commands/remove.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ const json_layout_1 = require("../../lib/utils/json-layout");
|
|
|
9
9
|
const args_1 = require("../args");
|
|
10
10
|
const context_1 = require("../context");
|
|
11
11
|
const exec_1 = require("../exec");
|
|
12
|
-
const install_source_1 = require("../install-source");
|
|
13
12
|
const launcher_1 = require("../launcher");
|
|
14
13
|
const types_1 = require("../types");
|
|
15
14
|
const update_plan_1 = require("../update-plan");
|
|
@@ -113,8 +112,22 @@ async function runUpdate(ctx, deps = defaultDeps) {
|
|
|
113
112
|
}
|
|
114
113
|
const toVersion = requestedVersion(ctx.positionals, (0, args_1.flagString)(ctx.flags, 'to'));
|
|
115
114
|
const pkgText = fs.readFileSync(pkgPath, 'utf8');
|
|
116
|
-
const
|
|
117
|
-
const
|
|
115
|
+
const installedNow = (0, context_1.resolveLocalPlugin)(root);
|
|
116
|
+
const installedVersion = installedNow?.version;
|
|
117
|
+
// A workspace on a renamed copy of the plugin keeps that name and its install source.
|
|
118
|
+
const pkgJson = JSON.parse(pkgText.replace(/^\uFEFF/, ''));
|
|
119
|
+
let plugin = installedNow?.other ?? (0, update_plan_1.selfIdentity)();
|
|
120
|
+
if (installedNow?.other) {
|
|
121
|
+
// An installed copy older than git install sources says "npm": keep the git URL it is pinned to.
|
|
122
|
+
const spec = pkgJson.devDependencies?.[plugin.name] ?? pkgJson.dependencies?.[plugin.name];
|
|
123
|
+
const fromPin = plugin.source.kind !== 'git' && typeof spec === 'string'
|
|
124
|
+
? (0, versions_1.templateFromPin)(spec, installedNow.version)
|
|
125
|
+
: null;
|
|
126
|
+
if (fromPin)
|
|
127
|
+
plugin = { name: plugin.name, source: fromPin };
|
|
128
|
+
console.log(`The workspace uses the plugin as ${plugin.name}; updating that package.`);
|
|
129
|
+
}
|
|
130
|
+
const pin = (0, update_plan_1.findPluginPin)(pkgJson, ctx.selfVersion, installedVersion, plugin);
|
|
118
131
|
if (pin.fromInstalled) {
|
|
119
132
|
console.log(`${pin.field}: "${pin.spec}" is not a version pin; migrating from the installed v${pin.version}.`);
|
|
120
133
|
}
|
|
@@ -136,7 +149,7 @@ async function runUpdate(ctx, deps = defaultDeps) {
|
|
|
136
149
|
console.log(`\n${cipher}`);
|
|
137
150
|
return 0;
|
|
138
151
|
}
|
|
139
|
-
console.log(`${pin.field}: ${pin.spec} → ${(0, versions_1.formatPluginSpec)(target.to)}`);
|
|
152
|
+
console.log(`${pin.field}: ${pin.spec} → ${(0, versions_1.formatPluginSpec)(target.to, plugin.source)}`);
|
|
140
153
|
if (ctx.dryRun) {
|
|
141
154
|
console.log('Dry run — nothing changed. Pending migrations ship with the target version and run after it is installed.');
|
|
142
155
|
return 0;
|
|
@@ -162,11 +175,13 @@ async function runUpdate(ctx, deps = defaultDeps) {
|
|
|
162
175
|
try {
|
|
163
176
|
deps.exec('npm', [
|
|
164
177
|
'install',
|
|
165
|
-
`${
|
|
178
|
+
`${plugin.name}@${(0, versions_1.formatPluginSpec)(target.to, plugin.source)}`,
|
|
166
179
|
...(devkit ? [`@nx/devkit@${devkit}`] : []),
|
|
167
180
|
pin.field === 'dependencies' ? '--save-prod' : '--save-dev',
|
|
168
|
-
...(0, versions_1.pinInstallFlags)(),
|
|
169
|
-
...(devkit && !(0, versions_1.pinInstallFlags)().includes('--save-exact')
|
|
181
|
+
...(0, versions_1.pinInstallFlags)(plugin.source),
|
|
182
|
+
...(devkit && !(0, versions_1.pinInstallFlags)(plugin.source).includes('--save-exact')
|
|
183
|
+
? ['--save-exact']
|
|
184
|
+
: []),
|
|
170
185
|
], root);
|
|
171
186
|
if (devkit)
|
|
172
187
|
console.log(`@nx/devkit pinned to ${devkit} (the workspace's Nx).`);
|
|
@@ -206,8 +221,9 @@ async function runUpdate(ctx, deps = defaultDeps) {
|
|
|
206
221
|
}
|
|
207
222
|
console.log(`\nUpdated nx-polystack v${pin.version} → v${target.to}. Review with "git diff".`);
|
|
208
223
|
const stale = githubWorkflows(root);
|
|
209
|
-
if (
|
|
210
|
-
|
|
224
|
+
if (plugin.source.kind !== 'github' && stale.length > 0) {
|
|
225
|
+
const from = plugin.source.kind === 'npm' ? 'npm' : 'its git install source';
|
|
226
|
+
console.log(`\nThe plugin now comes from ${from}, but ${stale.join(', ')} still install it from GitHub ` +
|
|
211
227
|
'(PSTACK_REPO_TOKEN, gh release). Rewrite them with: pstack infra --with=ci,upgrades --force');
|
|
212
228
|
}
|
|
213
229
|
const cipher = cipherNote(root);
|