@mouryaamit/nx-polystack 1.8.5 → 1.9.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/README.md +11 -10
- package/dist/src/cli/commands/internal-migrate.d.ts +6 -1
- package/dist/src/cli/commands/internal-migrate.js +43 -11
- package/dist/src/cli/commands/internal-migrate.js.map +1 -1
- package/dist/src/cli/commands/update.d.ts +4 -0
- package/dist/src/cli/commands/update.js +59 -2
- package/dist/src/cli/commands/update.js.map +1 -1
- package/dist/src/cli/help.js +5 -1
- package/dist/src/cli/help.js.map +1 -1
- package/dist/src/cli/migrations.d.ts +7 -0
- package/dist/src/cli/migrations.js +21 -1
- package/dist/src/cli/migrations.js.map +1 -1
- package/dist/src/generators/adopt/generator.d.ts +2 -0
- package/dist/src/generators/adopt/generator.js +6 -2
- package/dist/src/generators/adopt/generator.js.map +1 -1
- package/dist/src/generators/adopt/old-scripts.js +3 -1
- package/dist/src/generators/adopt/old-scripts.js.map +1 -1
- package/dist/src/generators/lib/files/pii/src/lib/pii-mask.directive.ts__template__ +3 -5
- package/dist/src/generators/lib/files/pii/src/lib/pii-mask.pipe.ts__template__ +2 -2
- package/dist/src/generators/lib/files/session/src/lib/session-timeout.service.ts__template__ +7 -9
- package/dist/src/generators/lib/files/session/src/lib/session-warning/session-warning.component.ts__template__ +3 -2
- package/dist/src/generators/lib/files/state/ngrx/README.md__template__ +1 -1
- package/dist/src/generators/lib/files/state/ngrx/src/lib/__fileName__.effects.ts__template__ +3 -3
- package/dist/src/generators/lib/files/state/simple-service/README.md__template__ +1 -2
- package/dist/src/generators/migrate/adapters/angular-cli.js +19 -3
- package/dist/src/generators/migrate/adapters/angular-cli.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/package.json +1 -1
package/README.md
CHANGED
|
@@ -30,14 +30,15 @@ Requires Node 20 and npm 10+. `pstack new` creates Nx 17 workspaces on Angular 1
|
|
|
30
30
|
|
|
31
31
|
Each release adds one Angular major and keeps every earlier one.
|
|
32
32
|
|
|
33
|
-
| Angular | Nx | TypeScript | Ionic | Capacitor | Node
|
|
34
|
-
| ------- | ------ | ---------- | ----- | --------- |
|
|
35
|
-
| 15.2 | 17.0.6 | 4.9 | 7.8 | 5 | 20
|
|
36
|
-
| 16.2 | 17.0.6 | 5.1 | 7.8 | 6 | 20
|
|
37
|
-
| 17.3 | 18.3.5 | 5.4 | 7.8 | 6 | 20
|
|
38
|
-
| 18.2 | 19.8 | 5.5 | 8.7 | 7 | 20
|
|
39
|
-
| 19.2 | 20.8 | 5.8 | 8.7 | 7 | 20
|
|
40
|
-
| 20
|
|
33
|
+
| Angular | Nx | TypeScript | Ionic | Capacitor | Node | Status |
|
|
34
|
+
| ------- | ------ | ---------- | ----- | --------- | ---- | -------------------------------------- |
|
|
35
|
+
| 15.2 | 17.0.6 | 4.9 | 7.8 | 5 | 20 | supported |
|
|
36
|
+
| 16.2 | 17.0.6 | 5.1 | 7.8 | 6 | 20 | supported (1.3.1) |
|
|
37
|
+
| 17.3 | 18.3.5 | 5.4 | 7.8 | 6 | 20 | supported (1.4.0) |
|
|
38
|
+
| 18.2 | 19.8 | 5.5 | 8.7 | 7 | 20 | supported (1.5.0) |
|
|
39
|
+
| 19.2 | 20.8 | 5.8 | 8.7 | 7 | 20 | supported (1.7.0) |
|
|
40
|
+
| 20.3 | 21.6 | 5.9 | 8.7 | 7 | 20 | supported (1.9.0) |
|
|
41
|
+
| 21 | 22 | 5.9 | 9 | 8 | 22 | `pstack upgrade angular` only, for now |
|
|
41
42
|
|
|
42
43
|
Supported means:
|
|
43
44
|
|
|
@@ -48,8 +49,7 @@ Supported means:
|
|
|
48
49
|
|
|
49
50
|
`pstack upgrade angular` moves a workspace one major at a time, with one commit per step. Each step
|
|
50
51
|
pins Nx, TypeScript, the build and lint packages, Ionic, Capacitor and Node. It works up to Angular 21
|
|
51
|
-
today. Generators for
|
|
52
|
-
add.
|
|
52
|
+
today. Generators for 21 come in the next release; until then they warn which packages to add.
|
|
53
53
|
|
|
54
54
|
Known breakpoints when upgrading:
|
|
55
55
|
|
|
@@ -60,6 +60,7 @@ Known breakpoints when upgrading:
|
|
|
60
60
|
- **19:** components, directives and pipes are standalone by default; Angular's migration adds
|
|
61
61
|
`standalone: false` to NgModule declarations, and new apps and libraries on 19 write it.
|
|
62
62
|
- **20:** angular-eslint 20 makes `prefer-inject` an error; the step runs Angular's `inject()` migration.
|
|
63
|
+
Generated code injects with `inject()`.
|
|
63
64
|
- **21:** Node 22 is required, Ionic 9 comes through `@ionic/migrate`, and Capacitor moves to 8.
|
|
64
65
|
|
|
65
66
|
## What you get
|
|
@@ -1,3 +1,8 @@
|
|
|
1
1
|
import { CommandContext } from '../types';
|
|
2
|
-
/**
|
|
2
|
+
/**
|
|
3
|
+
* Hidden, spawned by `pstack update` from the workspace's installed plugin:
|
|
4
|
+
* - `pstack _migrate --from=X --to=Y`: the migrations after X up to Y;
|
|
5
|
+
* - `pstack _migrate --only=a,b`: those migrations, whatever their version (v1.8.6 dev, public 1.8.7);
|
|
6
|
+
* - `pstack _migrate --list`: every migration with its version.
|
|
7
|
+
*/
|
|
3
8
|
export declare function runInternalMigrate(ctx: CommandContext): Promise<number>;
|
|
@@ -11,21 +11,53 @@ const run_tree_1 = require("../run-tree");
|
|
|
11
11
|
const types_1 = require("../types");
|
|
12
12
|
const versions_1 = require("../versions");
|
|
13
13
|
const app_1 = require("./app");
|
|
14
|
-
/**
|
|
14
|
+
/**
|
|
15
|
+
* Hidden, spawned by `pstack update` from the workspace's installed plugin:
|
|
16
|
+
* - `pstack _migrate --from=X --to=Y`: the migrations after X up to Y;
|
|
17
|
+
* - `pstack _migrate --only=a,b`: those migrations, whatever their version (v1.8.6 dev, public 1.8.7);
|
|
18
|
+
* - `pstack _migrate --list`: every migration with its version.
|
|
19
|
+
*/
|
|
15
20
|
async function runInternalMigrate(ctx) {
|
|
16
|
-
const fromFlag = (0, args_1.flagString)(ctx.flags, 'from');
|
|
17
|
-
const toFlag = (0, args_1.flagString)(ctx.flags, 'to');
|
|
18
|
-
if (!fromFlag || !toFlag) {
|
|
19
|
-
throw new types_1.CliError('_migrate requires --from=<version> and --to=<version>.');
|
|
20
|
-
}
|
|
21
|
-
const from = (0, versions_1.normalizeVersion)(fromFlag);
|
|
22
|
-
const to = (0, versions_1.normalizeVersion)(toFlag);
|
|
23
|
-
const root = (0, app_1.requireWorkspace)(ctx.cwd, '_migrate');
|
|
24
21
|
const dir = (0, context_1.manifestRoot)(ctx.selfRoot);
|
|
25
22
|
const manifest = JSON.parse(fs.readFileSync(path.join(dir, 'migrations.json'), 'utf8'));
|
|
26
|
-
|
|
23
|
+
if (ctx.flags['list']) {
|
|
24
|
+
for (const e of (0, migrations_1.allMigrations)(manifest)) {
|
|
25
|
+
console.log(`${e.name.padEnd(32)} ${e.version.padEnd(8)} ${e.description ?? ''}`.trimEnd());
|
|
26
|
+
}
|
|
27
|
+
return 0;
|
|
28
|
+
}
|
|
29
|
+
const only = (0, args_1.flagString)(ctx.flags, 'only');
|
|
30
|
+
let entries;
|
|
31
|
+
let none;
|
|
32
|
+
if (only !== undefined) {
|
|
33
|
+
const names = only
|
|
34
|
+
.split(',')
|
|
35
|
+
.map((n) => n.trim())
|
|
36
|
+
.filter(Boolean);
|
|
37
|
+
if (names.length === 0)
|
|
38
|
+
throw new types_1.CliError('--only needs migration names.');
|
|
39
|
+
try {
|
|
40
|
+
entries = (0, migrations_1.namedMigrations)(manifest, names);
|
|
41
|
+
}
|
|
42
|
+
catch (err) {
|
|
43
|
+
throw new types_1.CliError(err.message);
|
|
44
|
+
}
|
|
45
|
+
none = 'No migrations to run.';
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
const fromFlag = (0, args_1.flagString)(ctx.flags, 'from');
|
|
49
|
+
const toFlag = (0, args_1.flagString)(ctx.flags, 'to');
|
|
50
|
+
if (!fromFlag || !toFlag) {
|
|
51
|
+
throw new types_1.CliError('_migrate requires --from=<version> and --to=<version>, or --only=<names>.');
|
|
52
|
+
}
|
|
53
|
+
const from = (0, versions_1.normalizeVersion)(fromFlag);
|
|
54
|
+
const to = (0, versions_1.normalizeVersion)(toFlag);
|
|
55
|
+
entries = (0, migrations_1.selectMigrations)(manifest, from, to);
|
|
56
|
+
none = `No migrations to run (v${from} → v${to}).`;
|
|
57
|
+
}
|
|
58
|
+
const root = (0, app_1.requireWorkspace)(ctx.cwd, '_migrate');
|
|
27
59
|
if (entries.length === 0) {
|
|
28
|
-
console.log(
|
|
60
|
+
console.log(none);
|
|
29
61
|
return 0;
|
|
30
62
|
}
|
|
31
63
|
const changed = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-migrate.js","sourceRoot":"","sources":["../../../../src/cli/commands/internal-migrate.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B,kCAAqC;AACrC,wCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"internal-migrate.js","sourceRoot":"","sources":["../../../../src/cli/commands/internal-migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,11 @@ export interface UpdateDeps {
|
|
|
5
5
|
gitStatus(cwd: string): string | null;
|
|
6
6
|
/** Run the installed plugin's `_migrate`; returns its exit code. */
|
|
7
7
|
runLocalMigrate(cliPath: string, from: string, to: string, cwd: string, verbose?: boolean): number;
|
|
8
|
+
/** Run the installed plugin's CLI with these arguments; returns its exit code. */
|
|
9
|
+
runLocal?(cliPath: string, args: string[], cwd: string): number;
|
|
8
10
|
}
|
|
11
|
+
/** First plugin version whose `_migrate` takes --only and --list. */
|
|
12
|
+
export declare const RUN_MIGRATION_VERSION = "1.8.6";
|
|
9
13
|
/** Arguments for the child `_migrate` process. */
|
|
10
14
|
export declare function migrateArgs(from: string, to: string, verbose?: boolean): string[];
|
|
11
15
|
/**
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.runUpdate = exports.requestedVersion = exports.migrateArgs = void 0;
|
|
3
|
+
exports.runUpdate = exports.requestedVersion = exports.migrateArgs = exports.RUN_MIGRATION_VERSION = 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");
|
|
8
7
|
const devkit_pin_1 = require("../../lib/utils/devkit-pin");
|
|
8
|
+
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");
|
|
@@ -14,6 +14,8 @@ const launcher_1 = require("../launcher");
|
|
|
14
14
|
const types_1 = require("../types");
|
|
15
15
|
const update_plan_1 = require("../update-plan");
|
|
16
16
|
const versions_1 = require("../versions");
|
|
17
|
+
/** First plugin version whose `_migrate` takes --only and --list. */
|
|
18
|
+
exports.RUN_MIGRATION_VERSION = '1.8.6';
|
|
17
19
|
/** Arguments for the child `_migrate` process. */
|
|
18
20
|
function migrateArgs(from, to, verbose = false) {
|
|
19
21
|
return ['_migrate', `--from=${from}`, `--to=${to}`, ...(verbose ? ['--verbose'] : [])];
|
|
@@ -41,7 +43,56 @@ const defaultDeps = {
|
|
|
41
43
|
exec: exec_1.execOrThrow,
|
|
42
44
|
gitStatus: exec_1.gitStatus,
|
|
43
45
|
runLocalMigrate: (cliPath, from, to, cwd, verbose) => (0, launcher_1.delegate)(cliPath, migrateArgs(from, to, verbose), cwd),
|
|
46
|
+
runLocal: (cliPath, args, cwd) => (0, launcher_1.delegate)(cliPath, args, cwd),
|
|
44
47
|
};
|
|
48
|
+
/**
|
|
49
|
+
* `pstack update --run-migration=a,b`: runs those migrations of the installed plugin again,
|
|
50
|
+
* whatever their version (an update only runs the ones newer than the version it starts from).
|
|
51
|
+
* `pstack update --list-migrations`: prints them.
|
|
52
|
+
*/
|
|
53
|
+
function runNamedMigrations(ctx, root, deps) {
|
|
54
|
+
const local = (0, context_1.resolveLocalPlugin)(root);
|
|
55
|
+
if (!local) {
|
|
56
|
+
throw new types_1.CliError('nx-polystack is not installed in this workspace; run npm install first.');
|
|
57
|
+
}
|
|
58
|
+
if ((0, versions_1.compareVersions)(local.version, exports.RUN_MIGRATION_VERSION) < 0) {
|
|
59
|
+
throw new types_1.CliError(`the workspace has nx-polystack v${local.version}; --run-migration and --list-migrations ` +
|
|
60
|
+
`need v1.8.7 or later in the workspace. Run "pstack update" first.`);
|
|
61
|
+
}
|
|
62
|
+
const run = deps.runLocal ?? ((cli, args, cwd) => (0, launcher_1.delegate)(cli, args, cwd));
|
|
63
|
+
if ((0, args_1.flagBoolean)(ctx.flags, 'listMigrations')) {
|
|
64
|
+
return run(local.cliPath, ['_migrate', '--list'], root);
|
|
65
|
+
}
|
|
66
|
+
const names = (0, args_1.flagString)(ctx.flags, 'runMigration')
|
|
67
|
+
?.split(',')
|
|
68
|
+
.map((n) => n.trim())
|
|
69
|
+
.filter(Boolean);
|
|
70
|
+
if (!names || names.length === 0) {
|
|
71
|
+
throw new types_1.CliError('--run-migration needs migration names, e.g. --run-migration=flutter-web-platform ' +
|
|
72
|
+
'(pstack update --list-migrations lists them).');
|
|
73
|
+
}
|
|
74
|
+
if (!ctx.dryRun && !ctx.flags['allowDirty']) {
|
|
75
|
+
const status = deps.gitStatus(root);
|
|
76
|
+
if (status !== null && status.trim() !== '') {
|
|
77
|
+
throw new types_1.CliError('the workspace has uncommitted changes. Commit or stash first, or pass --allow-dirty.');
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
const jsonc = (0, json_layout_1.loadJsonc)(root);
|
|
81
|
+
const snapshot = jsonc ? (0, json_layout_1.snapshotJsonConfigs)(root) : null;
|
|
82
|
+
const code = run(local.cliPath, [
|
|
83
|
+
'_migrate',
|
|
84
|
+
`--only=${names.join(',')}`,
|
|
85
|
+
...(ctx.verbose ? ['--verbose'] : []),
|
|
86
|
+
...(ctx.dryRun ? ['--dry-run'] : []),
|
|
87
|
+
], root);
|
|
88
|
+
if (jsonc && snapshot) {
|
|
89
|
+
const kept = (0, json_layout_1.restoreJsonLayouts)(root, snapshot, jsonc);
|
|
90
|
+
if (kept.length > 0) {
|
|
91
|
+
console.log(`\nKept the existing layout of ${kept.join(', ')} (only changed values moved).`);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
return code;
|
|
95
|
+
}
|
|
45
96
|
async function runUpdate(ctx, deps = defaultDeps) {
|
|
46
97
|
const root = (0, context_1.findWorkspaceRoot)(ctx.cwd);
|
|
47
98
|
if (!root) {
|
|
@@ -51,6 +102,12 @@ async function runUpdate(ctx, deps = defaultDeps) {
|
|
|
51
102
|
const lockPath = path.join(root, 'package-lock.json');
|
|
52
103
|
if (!fs.existsSync(pkgPath))
|
|
53
104
|
throw new types_1.CliError(`no package.json at ${root}`);
|
|
105
|
+
if (ctx.flags['runMigration'] !== undefined || ctx.flags['listMigrations'] !== undefined) {
|
|
106
|
+
if (ctx.positionals.length > 0 || ctx.flags['to'] !== undefined) {
|
|
107
|
+
throw new types_1.CliError('--run-migration and --list-migrations use the installed plugin; give no version.');
|
|
108
|
+
}
|
|
109
|
+
return runNamedMigrations(ctx, root, deps);
|
|
110
|
+
}
|
|
54
111
|
if (ctx.flags['to'] === true) {
|
|
55
112
|
throw new types_1.CliError('--to requires a version, e.g. --to=0.3.0');
|
|
56
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/cli/commands/update.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B,6DAAiG;AACjG,
|
|
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
|
@@ -62,7 +62,7 @@ OPTIONS — new / preset
|
|
|
62
62
|
--llm=<tools> AI-assistant files, as pstack llm: claude | agents | copilot
|
|
63
63
|
(codex, openai-gpt → agents; comma-separated)
|
|
64
64
|
--projectDescription=<text> Short project description
|
|
65
|
-
--angular=<major> Start on this Angular: 15 | 16 | 17 | 18 | 19 (default: Angular 15, added by the
|
|
65
|
+
--angular=<major> Start on this Angular: 15 | 16 | 17 | 18 | 19 | 20 (default: Angular 15, added by the
|
|
66
66
|
first Angular or Ionic app)
|
|
67
67
|
--skipFormat Skip Prettier format pass
|
|
68
68
|
--skip-install new only — do not run npm install
|
|
@@ -79,6 +79,10 @@ OPTIONS — update
|
|
|
79
79
|
(default: this CLI's version)
|
|
80
80
|
--allow-dirty Run with uncommitted changes
|
|
81
81
|
--force Allow downgrading
|
|
82
|
+
--run-migration=<a,b> Run these migrations of the installed plugin again, whatever their
|
|
83
|
+
version (an update runs only those newer than where it starts);
|
|
84
|
+
needs v1.8.7+ in the workspace
|
|
85
|
+
--list-migrations List the installed plugin's migrations with their versions
|
|
82
86
|
|
|
83
87
|
OPTIONS — upgrade angular
|
|
84
88
|
--to=<major> Go up to this Angular major, one step at a time (default: the
|
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAiT5C,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;AA3WD,4BA2WC"}
|
|
@@ -21,5 +21,12 @@ export interface MigrationResult {
|
|
|
21
21
|
};
|
|
22
22
|
}
|
|
23
23
|
export declare function selectMigrations(manifest: MigrationsManifest, from: string, to: string): MigrationEntry[];
|
|
24
|
+
/** Every migration of the manifest, oldest first. */
|
|
25
|
+
export declare function allMigrations(manifest: MigrationsManifest): MigrationEntry[];
|
|
26
|
+
/**
|
|
27
|
+
* The named migrations (any version), in release order. Throws with the known names when one is
|
|
28
|
+
* not in the manifest.
|
|
29
|
+
*/
|
|
30
|
+
export declare function namedMigrations(manifest: MigrationsManifest, names: string[]): MigrationEntry[];
|
|
24
31
|
export declare function runMigrations(entries: MigrationEntry[], runOne: (e: MigrationEntry) => Promise<void>): Promise<MigrationResult>;
|
|
25
32
|
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.runMigrations = exports.selectMigrations = void 0;
|
|
3
|
+
exports.runMigrations = exports.namedMigrations = exports.allMigrations = exports.selectMigrations = void 0;
|
|
4
4
|
const versions_1 = require("./versions");
|
|
5
5
|
function selectMigrations(manifest, from, to) {
|
|
6
6
|
return Object.entries(manifest.generators ?? {})
|
|
@@ -15,6 +15,26 @@ function selectMigrations(manifest, from, to) {
|
|
|
15
15
|
.sort((a, b) => (0, versions_1.compareVersions)(a.version, b.version) || a.name.localeCompare(b.name));
|
|
16
16
|
}
|
|
17
17
|
exports.selectMigrations = selectMigrations;
|
|
18
|
+
/** Every migration of the manifest, oldest first. */
|
|
19
|
+
function allMigrations(manifest) {
|
|
20
|
+
return selectMigrations(manifest, '0.0.0', '999999.0.0');
|
|
21
|
+
}
|
|
22
|
+
exports.allMigrations = allMigrations;
|
|
23
|
+
/**
|
|
24
|
+
* The named migrations (any version), in release order. Throws with the known names when one is
|
|
25
|
+
* not in the manifest.
|
|
26
|
+
*/
|
|
27
|
+
function namedMigrations(manifest, names) {
|
|
28
|
+
const all = allMigrations(manifest);
|
|
29
|
+
const unknown = names.filter((n) => !all.some((e) => e.name === n));
|
|
30
|
+
if (unknown.length > 0) {
|
|
31
|
+
throw new Error(`no migration named ${unknown.map((n) => `"${n}"`).join(', ')}. Known: ${all
|
|
32
|
+
.map((e) => e.name)
|
|
33
|
+
.join(', ')}`);
|
|
34
|
+
}
|
|
35
|
+
return all.filter((e) => names.includes(e.name));
|
|
36
|
+
}
|
|
37
|
+
exports.namedMigrations = namedMigrations;
|
|
18
38
|
async function runMigrations(entries, runOne) {
|
|
19
39
|
const applied = [];
|
|
20
40
|
for (const e of entries) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../src/cli/migrations.ts"],"names":[],"mappings":";;;AAAA,yCAA6C;AAyB7C,SAAgB,gBAAgB,CAC9B,QAA4B,EAC5B,IAAY,EACZ,EAAU;IAEV,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,IAAI,EAAE,CAAC;SAC7C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;SACrC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAe,EAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,IAAA,0BAAe,EAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;SAC9F,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACnB,IAAI;QACJ,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,cAAc,EAAE,CAAC,CAAC,cAAwB;KAC3C,CAAC,CAAC;SACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAe,EAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAC3F,CAAC;AAfD,4CAeC;AAEM,KAAK,UAAU,aAAa,CACjC,OAAyB,EACzB,MAA4C;IAE5C,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,IAAI;YACF,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACtB;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO;gBACL,OAAO;gBACP,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;aAClF,CAAC;SACH;KACF;IACD,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC;AAjBD,sCAiBC"}
|
|
1
|
+
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../src/cli/migrations.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,8 @@ export interface AdoptResult {
|
|
|
30
30
|
removed: string[];
|
|
31
31
|
/** Scripts under tools/ nothing starts, outside the old pipeline (left in place). */
|
|
32
32
|
unreferenced: string[];
|
|
33
|
+
/** removeOldScripts looked (so the report's "Old scripts" section is current). */
|
|
34
|
+
oldScriptsChecked?: boolean;
|
|
33
35
|
}
|
|
34
36
|
/** Angular apps of the workspace that build without the plugin: build target, no release target. */
|
|
35
37
|
export declare function adoptCandidates(tree: Tree): {
|
|
@@ -351,6 +351,7 @@ function removeOldScripts(tree, oldScripts, result, file) {
|
|
|
351
351
|
const found = (0, old_scripts_1.findOldScripts)(tree, [...oldScripts, ...(0, old_scripts_1.recordedScripts)(previous)]);
|
|
352
352
|
for (const f of found.removable)
|
|
353
353
|
tree.delete(f);
|
|
354
|
+
result.oldScriptsChecked = true;
|
|
354
355
|
result.removed = found.removable;
|
|
355
356
|
result.unreferenced = found.unreferenced;
|
|
356
357
|
devkit_1.logger.info(found.removable.length > 0
|
|
@@ -361,8 +362,11 @@ function removeOldScripts(tree, oldScripts, result, file) {
|
|
|
361
362
|
}
|
|
362
363
|
}
|
|
363
364
|
function removalLines(result) {
|
|
364
|
-
if (result.removed.length === 0 && result.unreferenced.length === 0)
|
|
365
|
-
return
|
|
365
|
+
if (result.removed.length === 0 && result.unreferenced.length === 0) {
|
|
366
|
+
return result.oldScriptsChecked
|
|
367
|
+
? ['## Old scripts', '', 'None left: no old build script is still in the workspace.', '']
|
|
368
|
+
: [];
|
|
369
|
+
}
|
|
366
370
|
const lines = ['## Old scripts', ''];
|
|
367
371
|
if (result.removed.length > 0) {
|
|
368
372
|
lines.push(`Removed (nothing uses them any more): ${result.removed.map(code).join(', ')}.`, '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/adopt/generator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/adopt/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -117,8 +117,10 @@ const BUILD_DRIVER = /\b(?:npx\s+)?nx\s+(?:build|run-many\s[^`'"]*\bbuild\b|run\
|
|
|
117
117
|
const RUNS_BUILD_SCRIPTS = /\bnpm\b[^\n]{0,30}['"`]run['"`]|\bnpm\s+run\s+build:/;
|
|
118
118
|
/** Workspace-relative script paths named in backticks in a report (`tools/scripts/build.js`). */
|
|
119
119
|
function recordedScripts(report) {
|
|
120
|
+
// Not the scripts a report listed as left in place (not part of the old build).
|
|
121
|
+
const text = report.replace(/^Nothing starts these[^\n]*$/gm, '');
|
|
120
122
|
return [
|
|
121
|
-
...new Set([...
|
|
123
|
+
...new Set([...text.matchAll(/`((?:\.\/)?tools\/[\w./-]+\.(?:c|m)?js)\b[^`]*`/g)].map((m) => posix.normalize(m[1]))),
|
|
122
124
|
].sort();
|
|
123
125
|
}
|
|
124
126
|
exports.recordedScripts = recordedScripts;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"old-scripts.js","sourceRoot":"","sources":["../../../../src/generators/adopt/old-scripts.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAI7B;;;GAGG;AAEH,MAAM,EAAE,GAAG,eAAe,CAAC;AAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;AAEzB,0FAA0F;AAC1F,SAAgB,gBAAgB,CAAC,IAAU,EAAE,GAAkB,EAAE,IAAY;IAC3E,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC3C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,EAAE;QACxB,MAAM,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjE,CAAC,CAAC;IACF,4BAA4B;IAC5B,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,2CAA2C,CAAC;QAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtF,sEAAsE;IACtE,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAC3B,oFAAoF,CACrF,EAAE;QACD,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAC5B;IACD,wEAAwE;IACxE,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,uCAAuC,CAAC,EAAE;QACtE,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACzE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAAE,SAAS;QACtE,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;KAChF;IACD,gEAAgE;IAChE,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,mDAAmD,CAAC;QAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9F,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC;AAzBD,4CAyBC;AAED,iEAAiE;AACjE,SAAgB,aAAa,CAAC,IAAU,EAAE,OAAiB;IACzD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,KAAK,GAAG,CAAC,GAAW,EAAE,EAAE;QAC5B,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;YAAE,OAAO;QAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;QAC1C,KAAK,MAAM,GAAG,IAAI,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC;YAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAClE,CAAC,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,OAAO;QAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAClC,OAAO,IAAI,CAAC;AACd,CAAC;AAVD,sCAUC;AAED,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;AAElG,SAAS,IAAI,CAAC,IAAU,EAAE,GAAW,EAAE,IAA8B,EAAE,GAAa,EAAE,KAAK,GAAG,CAAC;IAC7F,IAAI,KAAK,GAAG,CAAC;QAAE,OAAO;IACtB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACrC,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAS;QAClC,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QAChE,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YACpB,IAAI,IAAI,CAAC,GAAG,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC9B;aAAM;YACL,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;SACvC;KACF;AACH,CAAC;AAED,kFAAkF;AAClF,MAAM,MAAM,GAAG,mCAAmC,CAAC;AAEnD;;;GAGG;AACH,SAAS,UAAU,CAAC,IAAU;IAC5B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,CACF,IAAI,EACJ,GAAG,EACH,CAAC,GAAG,EAAE,EAAE;QACN,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACjC,OAAO,CACL,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3C,IAAI,KAAK,cAAc;YACvB,IAAI,KAAK,cAAc;YACvB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;YACzB,4DAA4D,CAAC,IAAI,CAAC,IAAI,CAAC;YACvE,qCAAqC,CAAC,IAAI,CAAC,GAAG,CAAC;YAC/C,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC;YAC5B,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAC7B,CAAC;IACJ,CAAC,EACD,KAAK,CACN,CAAC;IACF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,4FAA4F;AAC5F,SAAgB,WAAW,CAAC,IAAU;IACpC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;QAC7C,KAAK,MAAM,GAAG,IAAI,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KACxE;IACD,OAAO,aAAa,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;AAC3C,CAAC;AAND,kCAMC;AAED,mCAAmC;AACnC,SAAgB,WAAW,CAAC,IAAU;IACpC,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;QAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC1E,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;AACpB,CAAC;AAJD,kCAIC;AAED,wEAAwE;AACxE,MAAM,YAAY,GAChB,6FAA6F,CAAC;AAEhG,sFAAsF;AACtF,MAAM,kBAAkB,GAAG,sDAAsD,CAAC;AAElF,iGAAiG;AACjG,SAAgB,eAAe,CAAC,MAAc;IAC5C,OAAO;QACL,GAAG,IAAI,GAAG,CACR,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"old-scripts.js","sourceRoot":"","sources":["../../../../src/generators/adopt/old-scripts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Directive, ElementRef,
|
|
1
|
+
import { Directive, ElementRef, inject, Input, OnChanges } from '@angular/core';
|
|
2
2
|
|
|
3
3
|
import { maskPii, PiiMaskOptions } from './pii-mask';
|
|
4
4
|
import { PII_MASK_OPTIONS } from './pii-mask.options';
|
|
@@ -14,10 +14,8 @@ export class PiiMaskDirective implements OnChanges {
|
|
|
14
14
|
@Input() piiFormat = '';
|
|
15
15
|
@Input() piiReveal = false;
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
@Optional() @Inject(PII_MASK_OPTIONS) private readonly options: PiiMaskOptions | null,
|
|
20
|
-
) {}
|
|
17
|
+
private readonly element: ElementRef<HTMLElement> = inject(ElementRef);
|
|
18
|
+
private readonly options: PiiMaskOptions | null = inject(PII_MASK_OPTIONS, { optional: true });
|
|
21
19
|
|
|
22
20
|
ngOnChanges(): void {
|
|
23
21
|
const plain = this.value === null || this.value === undefined ? '' : String(this.value);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { inject, Pipe, PipeTransform } from '@angular/core';
|
|
2
2
|
|
|
3
3
|
import { maskPii, PiiMaskOptions } from './pii-mask';
|
|
4
4
|
import { PII_MASK_OPTIONS } from './pii-mask.options';
|
|
@@ -6,7 +6,7 @@ import { PII_MASK_OPTIONS } from './pii-mask.options';
|
|
|
6
6
|
/** {{ customer.pan | piiMask: 'pan' }} → XXXXX1234F */
|
|
7
7
|
@Pipe({ name: 'piiMask'<% if (standaloneFalse) { %>, standalone: false<% } %> })
|
|
8
8
|
export class PiiMaskPipe implements PipeTransform {
|
|
9
|
-
|
|
9
|
+
private readonly options: PiiMaskOptions | null = inject(PII_MASK_OPTIONS, { optional: true });
|
|
10
10
|
|
|
11
11
|
transform(value: unknown, format: string): string {
|
|
12
12
|
return maskPii(value, format, this.options ?? {});
|
package/dist/src/generators/lib/files/session/src/lib/session-timeout.service.ts__template__
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DOCUMENT, isPlatformBrowser } from '@angular/common';
|
|
2
|
-
import {
|
|
2
|
+
import { inject, Injectable, NgZone, OnDestroy, PLATFORM_ID } from '@angular/core';
|
|
3
3
|
import {
|
|
4
4
|
BehaviorSubject,
|
|
5
5
|
distinctUntilChanged,
|
|
@@ -51,6 +51,9 @@ const ACTIVITY_THROTTLE_MS = 1000;
|
|
|
51
51
|
export class SessionTimeoutService implements OnDestroy {
|
|
52
52
|
readonly config: SessionTimeoutConfig;
|
|
53
53
|
|
|
54
|
+
private readonly zone = inject(NgZone);
|
|
55
|
+
private readonly document: Document = inject(DOCUMENT);
|
|
56
|
+
|
|
54
57
|
private readonly stateSubject = new BehaviorSubject<SessionState>({
|
|
55
58
|
status: 'stopped',
|
|
56
59
|
remainingMs: 0,
|
|
@@ -81,19 +84,14 @@ export class SessionTimeoutService implements OnDestroy {
|
|
|
81
84
|
private channel?: BroadcastChannel;
|
|
82
85
|
private storageListener?: (e: StorageEvent) => void;
|
|
83
86
|
|
|
84
|
-
constructor(
|
|
85
|
-
|
|
86
|
-
@Inject(DOCUMENT) private readonly document: Document,
|
|
87
|
-
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
88
|
-
@Inject(PLATFORM_ID) platformId: Object,
|
|
89
|
-
@Optional() @Inject(SESSION_TIMEOUT_CONFIG) config: Partial<SessionTimeoutConfig> | null,
|
|
90
|
-
) {
|
|
87
|
+
constructor() {
|
|
88
|
+
const config = inject(SESSION_TIMEOUT_CONFIG, { optional: true });
|
|
91
89
|
this.config = { ...DEFAULT_SESSION_TIMEOUT, ...(config ?? {}) };
|
|
92
90
|
const problems = sessionConfigProblems(this.config);
|
|
93
91
|
if (problems.length > 0) {
|
|
94
92
|
throw new Error(`SessionTimeoutService: ${problems.join('; ')}.`);
|
|
95
93
|
}
|
|
96
|
-
this.browser = isPlatformBrowser(
|
|
94
|
+
this.browser = isPlatformBrowser(inject(PLATFORM_ID));
|
|
97
95
|
this.key = channelKey(this.config.channelName, this.document.baseURI);
|
|
98
96
|
}
|
|
99
97
|
|
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
Component,
|
|
4
4
|
ElementRef,
|
|
5
5
|
EventEmitter,
|
|
6
|
+
inject,
|
|
6
7
|
Input,
|
|
7
8
|
Output,
|
|
8
9
|
ViewChild,
|
|
@@ -55,6 +56,8 @@ export class SessionWarningComponent {
|
|
|
55
56
|
/** The user chose to sign out now. */
|
|
56
57
|
@Output() readonly signOut = new EventEmitter<void>();
|
|
57
58
|
|
|
59
|
+
private readonly session = inject(SessionTimeoutService);
|
|
60
|
+
|
|
58
61
|
readonly id = `session-warning-${nextId++}`;
|
|
59
62
|
private announced = '';
|
|
60
63
|
private focused = false;
|
|
@@ -71,8 +74,6 @@ export class SessionWarningComponent {
|
|
|
71
74
|
if (!button) this.focused = false;
|
|
72
75
|
}
|
|
73
76
|
|
|
74
|
-
constructor(private readonly session: SessionTimeoutService) {}
|
|
75
|
-
|
|
76
77
|
stay(): void {
|
|
77
78
|
this.session.extend();
|
|
78
79
|
this.staySignedIn.emit();
|
package/dist/src/generators/lib/files/state/ngrx/src/lib/__fileName__.effects.ts__template__
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Injectable } from '@angular/core';
|
|
1
|
+
import { inject, Injectable } from '@angular/core';
|
|
2
2
|
import { Actions, createEffect, ofType } from '@ngrx/effects';
|
|
3
3
|
import { catchError, map, of, switchMap } from 'rxjs';
|
|
4
4
|
|
|
@@ -7,6 +7,8 @@ import { <%= className %>Item } from './<%= fileName %>.models';
|
|
|
7
7
|
|
|
8
8
|
@Injectable()
|
|
9
9
|
export class <%= className %>Effects {
|
|
10
|
+
private readonly actions$ = inject(Actions);
|
|
11
|
+
|
|
10
12
|
readonly load$ = createEffect(() =>
|
|
11
13
|
this.actions$.pipe(
|
|
12
14
|
ofType(<%= className %>Actions.load),
|
|
@@ -21,6 +23,4 @@ export class <%= className %>Effects {
|
|
|
21
23
|
),
|
|
22
24
|
),
|
|
23
25
|
);
|
|
24
|
-
|
|
25
|
-
constructor(private readonly actions$: Actions) {}
|
|
26
26
|
}
|
|
@@ -11,9 +11,8 @@ import { <%= className %>Store } from '<%= importPath %>';
|
|
|
11
11
|
|
|
12
12
|
@Component({ /* … */ })
|
|
13
13
|
export class ListComponent {
|
|
14
|
+
private readonly store = inject(<%= className %>Store);
|
|
14
15
|
readonly items$ = this.store.items$;
|
|
15
|
-
|
|
16
|
-
constructor(private readonly store: <%= className %>Store) {}
|
|
17
16
|
}
|
|
18
17
|
```
|
|
19
18
|
|
|
@@ -443,14 +443,30 @@ function migrateEslint(tree, ctx, prefix, copied, mapper, data) {
|
|
|
443
443
|
return;
|
|
444
444
|
}
|
|
445
445
|
const template = fs.readFileSync(path.join(__dirname, '..', '..', 'app', 'files', 'angular', '.eslintrc.json__template__'), 'utf8');
|
|
446
|
+
const major = (0, angular_deps_1.workspaceGeneratorMajor)(tree);
|
|
447
|
+
const sources = copied
|
|
448
|
+
.filter((f) => f.endsWith('.ts'))
|
|
449
|
+
.map((f) => tree.read(`${ctx.projectRoot}/${f}`, 'utf8') ?? '');
|
|
446
450
|
// angular-eslint 19 makes prefer-standalone an error; NgModule declarations opt out of it.
|
|
447
|
-
const standaloneFalse =
|
|
448
|
-
|
|
449
|
-
|
|
451
|
+
const standaloneFalse = major >= angular_deps_1.STANDALONE_FALSE_MAJOR && sources.some((s) => /\bstandalone\s*:\s*false\b/.test(s));
|
|
452
|
+
// angular-eslint 20 makes prefer-inject an error; constructor parameter injection opts out of it.
|
|
453
|
+
const constructorInjection = major >= angular_deps_1.PREFER_INJECT_MAJOR && sources.some((s) => CONSTRUCTOR_INJECTION.test(s));
|
|
450
454
|
tree.write(file, template
|
|
451
455
|
.replace(/<% if \(standaloneFalse\) \{ %>([\s\S]*?)<% \} %>/g, standaloneFalse ? '$1' : '')
|
|
452
456
|
.replace(/"prefix": "app"/g, `"prefix": ${JSON.stringify(prefix)}`)
|
|
453
457
|
.replace(/<%= up %>/g, (0, names_1.upTo)(ctx.projectRoot)));
|
|
458
|
+
if (constructorInjection) {
|
|
459
|
+
(0, devkit_1.updateJson)(tree, file, (json) => {
|
|
460
|
+
json.overrides[0].rules['@angular-eslint/prefer-inject'] = 'off';
|
|
461
|
+
return json;
|
|
462
|
+
});
|
|
463
|
+
data.notes.push('The copied code injects through constructor parameters, which angular-eslint ' +
|
|
464
|
+
`${angular_deps_1.PREFER_INJECT_MAJOR}+ reports (\`@angular-eslint/prefer-inject\`), so the rule is off in ` +
|
|
465
|
+
`\`${file}\`. To move to \`inject()\`, run \`npx nx g @angular/core:inject ` +
|
|
466
|
+
`--path=${ctx.projectRoot}\` and turn the rule back on.`);
|
|
467
|
+
}
|
|
454
468
|
}
|
|
455
469
|
exports.migrateEslint = migrateEslint;
|
|
470
|
+
/** A class with an Angular decorator whose constructor takes parameters. */
|
|
471
|
+
const CONSTRUCTOR_INJECTION = /@(?:Component|Directive|Pipe|Injectable|NgModule)\b[\s\S]*?\bconstructor\s*\(\s*[^)\s]/;
|
|
456
472
|
//# sourceMappingURL=angular-cli.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-cli.js","sourceRoot":"","sources":["../../../../../src/generators/migrate/adapters/angular-cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"angular-cli.js","sourceRoot":"","sources":["../../../../../src/generators/migrate/adapters/angular-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
},
|
|
80
80
|
"angular": {
|
|
81
81
|
"type": "number",
|
|
82
|
-
"enum": [15, 16, 17, 18, 19],
|
|
82
|
+
"enum": [15, 16, 17, 18, 19, 20],
|
|
83
83
|
"description": "Angular major to add to the workspace now. Without it, the first Angular or Ionic app adds Angular 15."
|
|
84
84
|
},
|
|
85
85
|
"pluginVersion": {
|
|
@@ -18,6 +18,12 @@ export declare const PROVIDE_HTTP_CLIENT_MAJOR = 18;
|
|
|
18
18
|
* and their ESLint configs turn off angular-eslint 19's `prefer-standalone` (as Nx 20.2's migration does).
|
|
19
19
|
*/
|
|
20
20
|
export declare const STANDALONE_FALSE_MAJOR = 19;
|
|
21
|
+
/**
|
|
22
|
+
* From this major, angular-eslint's recommended config makes `prefer-inject` an error. The generated
|
|
23
|
+
* code injects with `inject()` on every major; `pstack migrate` into such a workspace turns the rule
|
|
24
|
+
* off when the copied code still uses constructor parameter injection.
|
|
25
|
+
*/
|
|
26
|
+
export declare const PREFER_INJECT_MAJOR = 20;
|
|
21
27
|
/** Versions the generators add for one Angular major (only where a package is missing). */
|
|
22
28
|
export interface AngularGeneratorVersions {
|
|
23
29
|
angular: string;
|
|
@@ -47,7 +53,7 @@ export interface EnsureAngularOptions {
|
|
|
47
53
|
* never upgraded:
|
|
48
54
|
* - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
|
|
49
55
|
* and @types/node;
|
|
50
|
-
* - a generator major installed (15–
|
|
56
|
+
* - a generator major installed (15–20) → missing build/lint packages at the installed Angular
|
|
51
57
|
* version (plus the imported runtime packages when `includeRuntime`);
|
|
52
58
|
* - another Angular major → nothing; warns which build/lint packages are missing.
|
|
53
59
|
*/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ngPackagrDependencies = exports.ensureAngularDependencies = exports.workspaceGeneratorMajor = exports.workspaceGeneratorVersions = exports.angularGeneratorVersions = exports.STANDALONE_FALSE_MAJOR = exports.PROVIDE_HTTP_CLIENT_MAJOR = exports.GENERATOR_ANGULAR_MAJORS = exports.ANGULAR_MAJOR = exports.ANGULAR_VERSION = void 0;
|
|
3
|
+
exports.ngPackagrDependencies = exports.ensureAngularDependencies = exports.workspaceGeneratorMajor = exports.workspaceGeneratorVersions = exports.angularGeneratorVersions = exports.PREFER_INJECT_MAJOR = exports.STANDALONE_FALSE_MAJOR = exports.PROVIDE_HTTP_CLIENT_MAJOR = exports.GENERATOR_ANGULAR_MAJORS = exports.ANGULAR_MAJOR = exports.ANGULAR_VERSION = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const pins_1 = require("../upgrade/pins");
|
|
6
6
|
const dependencies_1 = require("./dependencies");
|
|
@@ -11,7 +11,7 @@ exports.ANGULAR_MAJOR = 15;
|
|
|
11
11
|
* Angular majors the generators write for: `pstack new --angular=<major>`, and `pstack app` / `:lib`
|
|
12
12
|
* fill in packages for a workspace on one of them. One major is added per public release.
|
|
13
13
|
*/
|
|
14
|
-
exports.GENERATOR_ANGULAR_MAJORS = [15, 16, 17, 18, 19];
|
|
14
|
+
exports.GENERATOR_ANGULAR_MAJORS = [15, 16, 17, 18, 19, 20];
|
|
15
15
|
/**
|
|
16
16
|
* From this major, generated apps provide HttpClient with `provideHttpClient(withInterceptorsFromDi())`
|
|
17
17
|
* (Angular 18 deprecates HttpClientModule; its own migration writes the same providers).
|
|
@@ -23,12 +23,19 @@ exports.PROVIDE_HTTP_CLIENT_MAJOR = 18;
|
|
|
23
23
|
* and their ESLint configs turn off angular-eslint 19's `prefer-standalone` (as Nx 20.2's migration does).
|
|
24
24
|
*/
|
|
25
25
|
exports.STANDALONE_FALSE_MAJOR = 19;
|
|
26
|
+
/**
|
|
27
|
+
* From this major, angular-eslint's recommended config makes `prefer-inject` an error. The generated
|
|
28
|
+
* code injects with `inject()` on every major; `pstack migrate` into such a workspace turns the rule
|
|
29
|
+
* off when the copied code still uses constructor parameter injection.
|
|
30
|
+
*/
|
|
31
|
+
exports.PREFER_INJECT_MAJOR = 20;
|
|
26
32
|
const ZONE_JS = {
|
|
27
33
|
15: '~0.12.0',
|
|
28
34
|
16: '~0.13.0',
|
|
29
35
|
17: '~0.14.0',
|
|
30
36
|
18: '~0.14.0',
|
|
31
37
|
19: '~0.15.0',
|
|
38
|
+
20: '~0.15.0',
|
|
32
39
|
};
|
|
33
40
|
/** @types/node the major's TypeScript can parse (a latest one uses newer syntax: TS1139). */
|
|
34
41
|
const TYPES_NODE = {
|
|
@@ -37,6 +44,7 @@ const TYPES_NODE = {
|
|
|
37
44
|
17: '~20.10.0',
|
|
38
45
|
18: '~20.10.0',
|
|
39
46
|
19: '~20.10.0',
|
|
47
|
+
20: '~20.10.0',
|
|
40
48
|
};
|
|
41
49
|
function angularGeneratorVersions(major) {
|
|
42
50
|
if (major === 15) {
|
|
@@ -128,7 +136,7 @@ function typeScriptPackages(v) {
|
|
|
128
136
|
* never upgraded:
|
|
129
137
|
* - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
|
|
130
138
|
* and @types/node;
|
|
131
|
-
* - a generator major installed (15–
|
|
139
|
+
* - a generator major installed (15–20) → missing build/lint packages at the installed Angular
|
|
132
140
|
* version (plus the imported runtime packages when `includeRuntime`);
|
|
133
141
|
* - another Angular major → nothing; warns which build/lint packages are missing.
|
|
134
142
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-deps.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-deps.ts"],"names":[],"mappings":";;;AAAA,uCAA6D;AAE7D,0CAAyD;AAEzD,iDAA6F;AAE7F,sGAAsG;AACzF,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,aAAa,GAAG,EAAE,CAAC;AAEhC;;;GAGG;AACU,QAAA,wBAAwB,GAAsB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"angular-deps.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-deps.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mouryaamit/nx-polystack",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.9.0",
|
|
4
4
|
"description": "Nx plugin and pstack CLI that scaffold and build multi-tech monorepos (Angular, Ionic, Flutter) with a hardened release pipeline.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "commonjs",
|