@mouryaamit/nx-polystack 1.6.0 → 1.7.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -3
- package/dist/bin/cli.js +5 -0
- package/dist/bin/cli.js.map +1 -1
- package/dist/generators.json +5 -0
- package/dist/src/cli/commands/adopt.d.ts +3 -0
- package/dist/src/cli/commands/adopt.js +55 -0
- package/dist/src/cli/commands/adopt.js.map +1 -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/update.js +11 -0
- package/dist/src/cli/commands/update.js.map +1 -1
- package/dist/src/cli/help.js +10 -1
- package/dist/src/cli/help.js.map +1 -1
- package/dist/src/cli/launcher.d.ts +12 -0
- package/dist/src/cli/launcher.js +54 -1
- package/dist/src/cli/launcher.js.map +1 -1
- package/dist/src/generators/adopt/generator.d.ts +33 -0
- package/dist/src/generators/adopt/generator.js +324 -0
- package/dist/src/generators/adopt/generator.js.map +1 -0
- package/dist/src/generators/adopt/pipeline.d.ts +31 -0
- package/dist/src/generators/adopt/pipeline.js +133 -0
- package/dist/src/generators/adopt/pipeline.js.map +1 -0
- package/dist/src/generators/adopt/schema.json +21 -0
- package/dist/src/generators/app/files/angular/.eslintrc.json__template__ +2 -1
- package/dist/src/generators/app/files/angular/src/app/app.component.ts__template__ +2 -1
- package/dist/src/generators/app/generator.js +1 -0
- package/dist/src/generators/app/generator.js.map +1 -1
- package/dist/src/generators/lib/angular-lib.js +2 -0
- package/dist/src/generators/lib/angular-lib.js.map +1 -1
- package/dist/src/generators/lib/files/angular/component/src/lib/__fileName__/__fileName__.component.ts__template__ +2 -1
- package/dist/src/generators/lib/files/angular/config/.eslintrc.json__template__ +2 -1
- package/dist/src/generators/lib/files/ionic/src/lib/__fileName__/__fileName__.page.ts__template__ +2 -1
- package/dist/src/generators/lib/files/pii/src/lib/pii-mask.directive.ts__template__ +1 -1
- package/dist/src/generators/lib/files/pii/src/lib/pii-mask.pipe.ts__template__ +1 -1
- package/dist/src/generators/lib/files/session/src/lib/session-warning/session-warning.component.ts__template__ +2 -1
- package/dist/src/generators/migrate/adapters/angular-cli.js +6 -0
- package/dist/src/generators/migrate/adapters/angular-cli.js.map +1 -1
- package/dist/src/generators/migrate/adapters/nx-workspace.js +1 -47
- package/dist/src/generators/migrate/adapters/nx-workspace.js.map +1 -1
- package/dist/src/generators/migrate/nx/build-scripts.d.ts +8 -0
- package/dist/src/generators/migrate/nx/build-scripts.js +50 -1
- package/dist/src/generators/migrate/nx/build-scripts.js.map +1 -1
- package/dist/src/generators/preset/schema.json +1 -1
- package/dist/src/lib/utils/angular-deps.d.ts +7 -1
- package/dist/src/lib/utils/angular-deps.js +11 -3
- package/dist/src/lib/utils/angular-deps.js.map +1 -1
- package/dist/src/lib/utils/json-layout.d.ts +37 -0
- package/dist/src/lib/utils/json-layout.js +247 -0
- package/dist/src/lib/utils/json-layout.js.map +1 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -36,7 +36,8 @@ Each release adds one Angular major and keeps every earlier one.
|
|
|
36
36
|
| 16.2 | 17.0.6 | 5.1 | 7.8 | 6 | 20 | supported (1.3.1) |
|
|
37
37
|
| 17.3 | 18.3.5 | 5.4 | 7.8 | 6 | 20 | supported (1.4.0) |
|
|
38
38
|
| 18.2 | 19.8 | 5.5 | 8.7 | 7 | 20 | supported (1.5.0) |
|
|
39
|
-
| 19
|
|
39
|
+
| 19.2 | 20.8 | 5.8 | 8.7 | 7 | 20 | supported (1.7.0) |
|
|
40
|
+
| 20–21 | 21–22 | 5.9 | 8–9 | 7–8 | 20/22 | `pstack upgrade angular` only, for now |
|
|
40
41
|
|
|
41
42
|
Supported means:
|
|
42
43
|
|
|
@@ -47,7 +48,7 @@ Supported means:
|
|
|
47
48
|
|
|
48
49
|
`pstack upgrade angular` moves a workspace one major at a time, with one commit per step. Each step
|
|
49
50
|
pins Nx, TypeScript, the build and lint packages, Ionic, Capacitor and Node. It works up to Angular 21
|
|
50
|
-
today. Generators for
|
|
51
|
+
today. Generators for 20 and later come in the next releases; until then they warn which packages to
|
|
51
52
|
add.
|
|
52
53
|
|
|
53
54
|
Known breakpoints when upgrading:
|
|
@@ -56,6 +57,8 @@ Known breakpoints when upgrading:
|
|
|
56
57
|
- **17:** Nx 18's module-boundary rule refuses relative environment imports (pstack uses `@env/*`).
|
|
57
58
|
- **18:** `HttpClientModule` can be left in an NgModule's lists; `pstack upgrade angular` removes it.
|
|
58
59
|
New apps on 18 provide HttpClient with `provideHttpClient(withInterceptorsFromDi())`.
|
|
60
|
+
- **19:** components, directives and pipes are standalone by default; Angular's migration adds
|
|
61
|
+
`standalone: false` to NgModule declarations, and new apps and libraries on 19 write it.
|
|
59
62
|
- **20:** angular-eslint 20 makes `prefer-inject` an error; the step runs Angular's `inject()` migration.
|
|
60
63
|
- **21:** Node 22 is required, Ionic 9 comes through `@ionic/migrate`, and Capacitor moves to 8.
|
|
61
64
|
|
|
@@ -88,6 +91,7 @@ Known breakpoints when upgrading:
|
|
|
88
91
|
| `pstack app` / `pstack lib` | Add an application or a shared library |
|
|
89
92
|
| `pstack env` | Add an environment to some or all apps |
|
|
90
93
|
| `pstack migrate` | Copy an existing project into the workspace (the source is never modified) |
|
|
94
|
+
| `pstack adopt` | Move apps that build with the repo's own scripts to the release target |
|
|
91
95
|
| `pstack build` | Build every app (or some) for one environment |
|
|
92
96
|
| `pstack csp` | Edit an app's CSP allowlist and write its server config |
|
|
93
97
|
| `pstack hardening` / `pstack encryption` | Show or change release hardening and env encryption |
|
|
@@ -99,7 +103,8 @@ Run `pstack --help` for every option. The full guide is the **[user manual](USER
|
|
|
99
103
|
## Using it as an Nx plugin
|
|
100
104
|
|
|
101
105
|
```bash
|
|
102
|
-
|
|
106
|
+
# pin @nx/devkit to the workspace's nx version (17-22), e.g. @nx/devkit@17.0.6
|
|
107
|
+
npm i -D --save-exact @mouryaamit/nx-polystack @nx/devkit@17.0.6
|
|
103
108
|
npx nx list @mouryaamit/nx-polystack
|
|
104
109
|
npx nx g @mouryaamit/nx-polystack:app --type=angular --name=portal
|
|
105
110
|
```
|
package/dist/bin/cli.js
CHANGED
|
@@ -28,6 +28,11 @@ async function main(argv) {
|
|
|
28
28
|
console.log((0, help_1.helpText)(selfVersion));
|
|
29
29
|
return 0;
|
|
30
30
|
}
|
|
31
|
+
const nxProblem = wsRoot ? (0, launcher_1.workspaceNxProblem)(command, wsRoot) : null;
|
|
32
|
+
if (nxProblem) {
|
|
33
|
+
console.error(`\nError: ${nxProblem}`);
|
|
34
|
+
return 1;
|
|
35
|
+
}
|
|
31
36
|
if (local && wsRoot && (0, launcher_1.shouldDelegate)({ command, flags, env: process.env, selfRoot, local })) {
|
|
32
37
|
try {
|
|
33
38
|
(0, launcher_1.assertLocalSupports)(command, local.version, flags);
|
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,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../bin/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/generators.json
CHANGED
|
@@ -38,6 +38,11 @@
|
|
|
38
38
|
"schema": "./src/generators/migrate/schema.json",
|
|
39
39
|
"description": "Bring existing code into the workspace, the source never modified: a standalone Angular CLI or Flutter app as apps/<name>, or the Angular and Flutter projects of an Nx 15-17 workspace at their own paths."
|
|
40
40
|
},
|
|
41
|
+
"adopt": {
|
|
42
|
+
"factory": "./src/generators/adopt/generator",
|
|
43
|
+
"schema": "./src/generators/adopt/schema.json",
|
|
44
|
+
"description": "Move the Angular apps that build without the plugin (their own build scripts) to its release target, in place."
|
|
45
|
+
},
|
|
41
46
|
"shared-libs": {
|
|
42
47
|
"factory": "./src/generators/shared-libs/generator",
|
|
43
48
|
"schema": "./src/generators/shared-libs/schema.json",
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.runAdopt = void 0;
|
|
27
|
+
const args_1 = require("../args");
|
|
28
|
+
const run_tree_1 = require("../run-tree");
|
|
29
|
+
const types_1 = require("../types");
|
|
30
|
+
const app_1 = require("./app");
|
|
31
|
+
/** pstack adopt [--app=a,b] [--no-scripts]: Angular apps on their own build scripts → release target. */
|
|
32
|
+
async function runAdopt(ctx) {
|
|
33
|
+
if (ctx.flags['app'] === true)
|
|
34
|
+
throw new types_1.CliError('--app needs a value (e.g. --app=portal,admin).');
|
|
35
|
+
const projects = (0, args_1.flagString)(ctx.flags, 'app')
|
|
36
|
+
?.split(',')
|
|
37
|
+
.map((s) => s.trim())
|
|
38
|
+
.filter(Boolean);
|
|
39
|
+
const root = (0, app_1.requireWorkspace)(ctx.cwd, 'adopt');
|
|
40
|
+
const { default: adoptGenerator } = await Promise.resolve().then(() => __importStar(require('../../generators/adopt/generator')));
|
|
41
|
+
try {
|
|
42
|
+
await (0, run_tree_1.runInTree)(root, ctx, (tree) => adoptGenerator(tree, {
|
|
43
|
+
projects,
|
|
44
|
+
scripts: ctx.flags['scripts'] === false ? false : ctx.flags['noScripts'] !== true,
|
|
45
|
+
}));
|
|
46
|
+
}
|
|
47
|
+
catch (err) {
|
|
48
|
+
if (err instanceof types_1.CliError)
|
|
49
|
+
throw err;
|
|
50
|
+
throw new types_1.CliError(err.message.replace(/^adopt: /, ''));
|
|
51
|
+
}
|
|
52
|
+
return 0;
|
|
53
|
+
}
|
|
54
|
+
exports.runAdopt = runAdopt;
|
|
55
|
+
//# sourceMappingURL=adopt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adopt.js","sourceRoot":"","sources":["../../../../src/cli/commands/adopt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAAqC;AACrC,0CAAwC;AACxC,oCAAoD;AAEpD,+BAAyC;AAEzC,yGAAyG;AAClG,KAAK,UAAU,QAAQ,CAAC,GAAmB;IAChD,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;SAClF,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;AArBD,4BAqBC"}
|
|
@@ -41,6 +41,7 @@ exports.COMMANDS = {
|
|
|
41
41
|
_migrate: async (c) => (await Promise.resolve().then(() => __importStar(require('./internal-migrate')))).runInternalMigrate(c),
|
|
42
42
|
update: async (c) => (await Promise.resolve().then(() => __importStar(require('./update')))).runUpdate(c),
|
|
43
43
|
migrate: async (c) => (await Promise.resolve().then(() => __importStar(require('./migrate')))).runMigrate(c),
|
|
44
|
+
adopt: async (c) => (await Promise.resolve().then(() => __importStar(require('./adopt')))).runAdopt(c),
|
|
44
45
|
inspect: async (c) => (await Promise.resolve().then(() => __importStar(require('./inspect')))).runInspect(c),
|
|
45
46
|
upgrade: async (c) => (await Promise.resolve().then(() => __importStar(require('./upgrade')))).runUpgrade(c),
|
|
46
47
|
};
|
|
@@ -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,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,WAAW,GAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/D,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,WAAW,GAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;CAChE,CAAC"}
|
|
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,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,wDAAa,WAAW,GAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;CAChE,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.runUpdate = exports.requestedVersion = exports.migrateArgs = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const fs = tslib_1.__importStar(require("fs"));
|
|
6
6
|
const path = tslib_1.__importStar(require("path"));
|
|
7
|
+
const json_layout_1 = require("../../lib/utils/json-layout");
|
|
7
8
|
const args_1 = require("../args");
|
|
8
9
|
const context_1 = require("../context");
|
|
9
10
|
const exec_1 = require("../exec");
|
|
@@ -118,7 +119,17 @@ async function runUpdate(ctx, deps = defaultDeps) {
|
|
|
118
119
|
console.log(`\nPinned nx-polystack v${target.to}. Review with "git diff".`);
|
|
119
120
|
return 0;
|
|
120
121
|
}
|
|
122
|
+
// Migrations write JSON through formatFiles/writeJson, which re-lays-out whole files; put the
|
|
123
|
+
// workspace's own layout back afterwards so the diff shows only what changed.
|
|
124
|
+
const jsonc = (0, json_layout_1.loadJsonc)(root);
|
|
125
|
+
const snapshot = jsonc ? (0, json_layout_1.snapshotJsonConfigs)(root) : null;
|
|
121
126
|
const code = deps.runLocalMigrate(local.cliPath, pin.version, target.to, root, ctx.verbose);
|
|
127
|
+
if (jsonc && snapshot) {
|
|
128
|
+
const kept = (0, json_layout_1.restoreJsonLayouts)(root, snapshot, jsonc);
|
|
129
|
+
if (kept.length > 0) {
|
|
130
|
+
console.log(`\nKept the existing layout of ${kept.join(', ')} (only changed values moved).`);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
122
133
|
if (code !== 0) {
|
|
123
134
|
console.error(`\nThe plugin is already on v${target.to}, but migrations from v${pin.version} did not all apply.\n` +
|
|
124
135
|
'To retry from scratch: git checkout -- . && npm install, then run "pstack update" again.\n' +
|
|
@@ -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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"}
|
package/dist/src/cli/help.js
CHANGED
|
@@ -29,6 +29,9 @@ COMMANDS
|
|
|
29
29
|
Flutter projects of an Nx 15-22 workspace (same paths, names and aliases), or the
|
|
30
30
|
app and TypeScript library packages of an npm, Yarn or pnpm workspaces repo
|
|
31
31
|
(apps/, libs/)
|
|
32
|
+
adopt Move the Angular apps that still build with the workspace's own scripts to the
|
|
33
|
+
plugin's release target, in place (base hrefs, nonce and obfuscation read from the
|
|
34
|
+
script, environments/<app>/htaccess.<env>, env encryption, build:<app>:<env>)
|
|
32
35
|
encryption Show or change the env encryption settings of release builds (nx.json
|
|
33
36
|
pstack.envEncryption)
|
|
34
37
|
build Build every app (or some) for one environment: release targets of Angular/Ionic
|
|
@@ -57,7 +60,7 @@ OPTIONS — new / preset
|
|
|
57
60
|
--llm=<tools> AI-assistant files, as pstack llm: claude | agents | copilot
|
|
58
61
|
(codex, openai-gpt → agents; comma-separated)
|
|
59
62
|
--projectDescription=<text> Short project description
|
|
60
|
-
--angular=<major> Start on this Angular: 15 | 16 | 17 | 18 (default: Angular 15, added by the
|
|
63
|
+
--angular=<major> Start on this Angular: 15 | 16 | 17 | 18 | 19 (default: Angular 15, added by the
|
|
61
64
|
first Angular or Ionic app)
|
|
62
65
|
--skipFormat Skip Prettier format pass
|
|
63
66
|
--skip-install new only — do not run npm install
|
|
@@ -198,6 +201,12 @@ OPTIONS — migrate
|
|
|
198
201
|
Writes docs/migrations/<name>.md and <name>.manifest.json (for --rollback). Without
|
|
199
202
|
--adapter the most confident adapter is used if its confidence is at least 0.80.
|
|
200
203
|
|
|
204
|
+
OPTIONS — adopt
|
|
205
|
+
--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
|
|
207
|
+
--dry-run Show the changes without writing them
|
|
208
|
+
Writes docs/migrations/adopt.md. The workspace's own build scripts are not deleted.
|
|
209
|
+
|
|
201
210
|
OPTIONS — infra
|
|
202
211
|
--with=<parts> docs | ci | quality | upgrades, comma-separated, or all | none
|
|
203
212
|
(default: all)
|
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAqR5C,IAAA,8BAAa,GAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,mDAAmD,CAAC,CAAC,CAAC,EAC5F;IACE,IAAA,+BAAoB,EAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkDhC,CAAC,SAAS,EAAE,CAAC;AACd,CAAC;AA5UD,4BA4UC"}
|
|
@@ -30,3 +30,15 @@ export declare function shouldDelegate(i: DelegationInput): boolean;
|
|
|
30
30
|
/** Run another pstack CLI with the given args; returns its exit code. */
|
|
31
31
|
export declare function delegate(cliPath: string, args: string[], cwd: string): number;
|
|
32
32
|
export declare function upgradeHint(localVersion: string, selfVersion: string): string | null;
|
|
33
|
+
/** Nx majors the plugin loads on (package.json peer range `>=17.0.0 <23.0.0`). */
|
|
34
|
+
export declare const NX_MAJORS: {
|
|
35
|
+
min: number;
|
|
36
|
+
max: number;
|
|
37
|
+
};
|
|
38
|
+
/**
|
|
39
|
+
* Why `command` cannot run in this workspace, or null: an Nx outside 17–22 (the plugin does not
|
|
40
|
+
* load there; npm only reports a peer conflict), or an installed @nx/devkit of another major
|
|
41
|
+
* than nx (npm resolves the plugin's devkit peer to the newest one when the workspace does not
|
|
42
|
+
* pin it). Workspaces without node_modules/nx are let through.
|
|
43
|
+
*/
|
|
44
|
+
export declare function workspaceNxProblem(command: string, wsRoot: string): string | null;
|
package/dist/src/cli/launcher.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.upgradeHint = exports.delegate = exports.shouldDelegate = exports.assertLocalSupports = exports.delegationArgs = exports.MIN_LOCAL_FLAG_VERSION = exports.MIN_LOCAL_VERSION = exports.WORKSPACE_COMMANDS = exports.NEVER_DELEGATE = void 0;
|
|
3
|
+
exports.workspaceNxProblem = exports.NX_MAJORS = exports.upgradeHint = exports.delegate = exports.shouldDelegate = exports.assertLocalSupports = exports.delegationArgs = exports.MIN_LOCAL_FLAG_VERSION = exports.MIN_LOCAL_VERSION = exports.WORKSPACE_COMMANDS = exports.NEVER_DELEGATE = 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"));
|
|
@@ -11,6 +11,7 @@ const versions_1 = require("./versions");
|
|
|
11
11
|
exports.NEVER_DELEGATE = new Set(['', 'help', 'new', 'update', '_migrate', 'inspect']);
|
|
12
12
|
/** Generator commands that act on the workspace (run from its root when delegated). */
|
|
13
13
|
exports.WORKSPACE_COMMANDS = new Set([
|
|
14
|
+
'adopt',
|
|
14
15
|
'app',
|
|
15
16
|
'env',
|
|
16
17
|
'lib',
|
|
@@ -38,6 +39,7 @@ exports.MIN_LOCAL_VERSION = {
|
|
|
38
39
|
csp: '0.33.0',
|
|
39
40
|
shared: '0.35.0',
|
|
40
41
|
upgrade: '1.2.12',
|
|
42
|
+
adopt: '1.7.1',
|
|
41
43
|
};
|
|
42
44
|
/** First plugin version that understands a flag of a command (checked when the flag is given). */
|
|
43
45
|
exports.MIN_LOCAL_FLAG_VERSION = {
|
|
@@ -173,4 +175,55 @@ function upgradeHint(localVersion, selfVersion) {
|
|
|
173
175
|
`run "pstack update" to upgrade.`);
|
|
174
176
|
}
|
|
175
177
|
exports.upgradeHint = upgradeHint;
|
|
178
|
+
/** Nx majors the plugin loads on (package.json peer range `>=17.0.0 <23.0.0`). */
|
|
179
|
+
exports.NX_MAJORS = { min: 17, max: 22 };
|
|
180
|
+
/** Commands that need the workspace on a supported Nx with a matching @nx/devkit. */
|
|
181
|
+
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
|
+
const majorOf = (v) => Number(/^(\d+)\./.exec(v)?.[1] ?? NaN);
|
|
193
|
+
/**
|
|
194
|
+
* Why `command` cannot run in this workspace, or null: an Nx outside 17–22 (the plugin does not
|
|
195
|
+
* load there; npm only reports a peer conflict), or an installed @nx/devkit of another major
|
|
196
|
+
* than nx (npm resolves the plugin's devkit peer to the newest one when the workspace does not
|
|
197
|
+
* pin it). Workspaces without node_modules/nx are let through.
|
|
198
|
+
*/
|
|
199
|
+
function workspaceNxProblem(command, wsRoot) {
|
|
200
|
+
if (!NEEDS_SUPPORTED_NX.has(command))
|
|
201
|
+
return null;
|
|
202
|
+
const nx = installedVersion(wsRoot, 'nx');
|
|
203
|
+
if (!nx)
|
|
204
|
+
return null;
|
|
205
|
+
const major = majorOf(nx);
|
|
206
|
+
if (Number.isNaN(major))
|
|
207
|
+
return null;
|
|
208
|
+
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
|
+
return (`this workspace is on Nx ${nx}; nx-polystack needs Nx ${exports.NX_MAJORS.min}-${exports.NX_MAJORS.max}. ` +
|
|
214
|
+
`Move it first, one major at a time: ${steps} (each followed by npm install and ` +
|
|
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.');
|
|
217
|
+
}
|
|
218
|
+
if (major > exports.NX_MAJORS.max) {
|
|
219
|
+
return `this workspace is on Nx ${nx}; nx-polystack supports Nx ${exports.NX_MAJORS.min}-${exports.NX_MAJORS.max}.`;
|
|
220
|
+
}
|
|
221
|
+
const devkit = installedVersion(wsRoot, '@nx/devkit');
|
|
222
|
+
if (devkit && majorOf(devkit) !== major) {
|
|
223
|
+
return (`@nx/devkit ${devkit} does not match nx ${nx}. Pin it to the workspace's Nx: ` +
|
|
224
|
+
`npm i -D @nx/devkit@${nx}`);
|
|
225
|
+
}
|
|
226
|
+
return null;
|
|
227
|
+
}
|
|
228
|
+
exports.workspaceNxProblem = workspaceNxProblem;
|
|
176
229
|
//# sourceMappingURL=launcher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../../src/cli/launcher.ts"],"names":[],"mappings":";;;;AAAA,iDAA0C;AAC1C,+CAAyB;AACzB,mDAA6B;AAI7B,mCAAmC;AACnC,yCAA6C;AAE7C,kDAAkD;AACrC,QAAA,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;AAE5F,uFAAuF;AAC1E,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACxC,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,SAAS;IACT,OAAO;IACP,YAAY;IACZ,WAAW;IACX,OAAO;IACP,SAAS;IACT,KAAK;IACL,QAAQ;IACR,SAAS;CACV,CAAC,CAAC;AAEH,4FAA4F;AAC/E,QAAA,iBAAiB,GAAqC;IACjE,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,OAAO;IACZ,OAAO,EAAE,QAAQ;IACjB,KAAK,EAAE,OAAO;IACd,UAAU,EAAE,QAAQ;IACpB,SAAS,EAAE,QAAQ;IACnB,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,QAAQ;IACjB,GAAG,EAAE,QAAQ;IACb,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../../src/cli/launcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { Tree } from '@nx/devkit';
|
|
2
|
+
export interface AdoptGeneratorSchema {
|
|
3
|
+
/** Apps to adopt (default: every Angular app without a release target). */
|
|
4
|
+
projects?: string[];
|
|
5
|
+
/** Point the apps' build:<app>:<env> npm scripts at the release target (default true). */
|
|
6
|
+
scripts?: boolean;
|
|
7
|
+
}
|
|
8
|
+
export declare const ADOPT_REPORT = "docs/migrations/adopt.md";
|
|
9
|
+
export interface AdoptResult {
|
|
10
|
+
adopted: string[];
|
|
11
|
+
skipped: string[];
|
|
12
|
+
notes: string[];
|
|
13
|
+
scripts: Record<string, string>;
|
|
14
|
+
}
|
|
15
|
+
/** Angular apps of the workspace that build without the plugin: build target, no release target. */
|
|
16
|
+
export declare function adoptCandidates(tree: Tree): {
|
|
17
|
+
name: string;
|
|
18
|
+
root: string;
|
|
19
|
+
reason?: string;
|
|
20
|
+
}[];
|
|
21
|
+
/**
|
|
22
|
+
* Sets npm scripts in package.json without reformatting the rest of the file: existing scripts
|
|
23
|
+
* are changed in place, new ones go after the app's last build script (or at the end of scripts).
|
|
24
|
+
*/
|
|
25
|
+
export declare function setScriptsInPlace(tree: Tree, scripts: Record<string, string>): void;
|
|
26
|
+
/**
|
|
27
|
+
* pstack adopt: moves the Angular apps of this workspace that still build with their own scripts
|
|
28
|
+
* to the plugin's release target, in place. Each app gets a release target (base hrefs, env folder
|
|
29
|
+
* and the post-build steps read from the workspace's build script), its .htaccess becomes
|
|
30
|
+
* environments/<app>/htaccess.<env>, the workspace's env encryption is mirrored in nx.json, and its
|
|
31
|
+
* build:<app>:<env> npm scripts call nx run <app>:release:<env>. Old scripts are not deleted.
|
|
32
|
+
*/
|
|
33
|
+
export default function adoptGenerator(tree: Tree, options?: AdoptGeneratorSchema): Promise<AdoptResult>;
|