@mouryaamit/nx-polystack 1.8.7 → 1.10.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 +16 -11
- package/dist/src/cli/help.js +1 -1
- package/dist/src/generators/app/files/angular/src/main.ts__template__ +7 -3
- package/dist/src/generators/app/files/ionic/.gitignore__template__ +3 -0
- package/dist/src/generators/app/files/ionic/src/app/app.module.ts__template__ +1 -1
- package/dist/src/generators/app/generator.js +3 -1
- 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/ionic/src/lib/__fileName__.module.ts__template__ +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.html__template__ +24 -1
- 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/generator.d.ts +2 -0
- package/dist/src/generators/preset/generator.js +10 -0
- package/dist/src/generators/preset/generator.js.map +1 -1
- package/dist/src/generators/preset/schema.json +1 -1
- package/dist/src/lib/utils/angular-deps.d.ts +31 -1
- package/dist/src/lib/utils/angular-deps.js +41 -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.2 | 22.7 | 5.9 | 9 | 8 | 22 | supported (1.10.0) |
|
|
41
42
|
|
|
42
43
|
Supported means:
|
|
43
44
|
|
|
@@ -47,9 +48,8 @@ Supported means:
|
|
|
47
48
|
- `pstack upgrade angular` moves a workspace there from the previous major.
|
|
48
49
|
|
|
49
50
|
`pstack upgrade angular` moves a workspace one major at a time, with one commit per step. Each step
|
|
50
|
-
pins Nx, TypeScript, the build and lint packages, Ionic, Capacitor and Node. It works up to Angular 21
|
|
51
|
-
|
|
52
|
-
add.
|
|
51
|
+
pins Nx, TypeScript, the build and lint packages, Ionic, Capacitor and Node. It works up to Angular 21,
|
|
52
|
+
the newest major the generators support.
|
|
53
53
|
|
|
54
54
|
Known breakpoints when upgrading:
|
|
55
55
|
|
|
@@ -60,7 +60,12 @@ 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.
|
|
65
|
+
Angular 21 is zoneless by default; new apps on 21 keep zone.js with `provideZoneChangeDetection()`,
|
|
66
|
+
import `IonicModule` from `@ionic/angular/lazy` and resolve modules as `bundler`. Use npm 11: the
|
|
67
|
+
npm 10.9 that ships with Node 22 fails to install new Angular 21 projects (`ng new`,
|
|
68
|
+
`create-nx-workspace`).
|
|
64
69
|
|
|
65
70
|
## What you get
|
|
66
71
|
|
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 | 21 (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
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Gives <script>/<style> elements added at runtime the page's CSP nonce (keep it first).
|
|
2
2
|
import '@mouryaamit/nx-polystack/runtime/csp-nonce';
|
|
3
3
|
|
|
4
|
-
import { enableProdMode } from '@angular/core';
|
|
4
|
+
import { enableProdMode<% if (zoneProviders) { %>, provideZoneChangeDetection<% } %> } from '@angular/core';
|
|
5
5
|
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
|
|
6
6
|
|
|
7
7
|
import { AppModule } from './app/app.module';
|
|
@@ -12,5 +12,9 @@ if (environment.production) {
|
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
platformBrowserDynamic()
|
|
15
|
-
.
|
|
16
|
-
.
|
|
15
|
+
<% if (zoneProviders) { %> // Angular 21 is zoneless by default; this app keeps zone.js change detection.
|
|
16
|
+
.bootstrapModule(AppModule, {
|
|
17
|
+
applicationProviders: [provideZoneChangeDetection()],
|
|
18
|
+
})
|
|
19
|
+
<% } else { %> .bootstrapModule(AppModule)
|
|
20
|
+
<% } %> .catch((err) => console.error(err));
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<% } %>import { NgModule } from '@angular/core';
|
|
4
4
|
import { BrowserModule } from '@angular/platform-browser';
|
|
5
5
|
import { RouteReuseStrategy } from '@angular/router';
|
|
6
|
-
import { IonicModule, IonicRouteStrategy } from '
|
|
6
|
+
import { IonicModule, IonicRouteStrategy } from '<%= ionicImport %>';
|
|
7
7
|
|
|
8
8
|
import { AppRoutingModule } from './app-routing.module';
|
|
9
9
|
import { AppComponent } from './app.component';
|
|
@@ -97,10 +97,12 @@ async function appGenerator(tree, options) {
|
|
|
97
97
|
if (type === 'angular' || type === 'ionic') {
|
|
98
98
|
const vars = {
|
|
99
99
|
name: projectName,
|
|
100
|
-
// Capacitor for the workspace's Angular (5 on 15, 6 on 16–17, 7 on 18); Angular itself is added below.
|
|
100
|
+
// Capacitor for the workspace's Angular (5 on 15, 6 on 16–17, 7 on 18–20, 8 on 21); Angular itself is added below.
|
|
101
101
|
capacitorVersion: (0, angular_deps_1.workspaceGeneratorVersions)(tree).capacitor,
|
|
102
102
|
provideHttp: (0, angular_deps_1.workspaceGeneratorMajor)(tree) >= angular_deps_1.PROVIDE_HTTP_CLIENT_MAJOR,
|
|
103
103
|
standaloneFalse: (0, angular_deps_1.workspaceGeneratorMajor)(tree) >= angular_deps_1.STANDALONE_FALSE_MAJOR,
|
|
104
|
+
zoneProviders: (0, angular_deps_1.workspaceGeneratorMajor)(tree) >= angular_deps_1.ZONE_PROVIDER_MAJOR,
|
|
105
|
+
ionicImport: (0, angular_deps_1.ionicAngularImport)((0, angular_deps_1.workspaceGeneratorMajor)(tree)),
|
|
104
106
|
className,
|
|
105
107
|
title,
|
|
106
108
|
appId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/app/generator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/app/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,8 @@ function writeAngularLib(tree, o, opts) {
|
|
|
26
26
|
componentSuffixes: opts.componentSuffixes ?? null,
|
|
27
27
|
// Read before ensureAngularDependencies: a workspace without Angular gets 15 (no flag needed).
|
|
28
28
|
standaloneFalse: (0, angular_deps_1.workspaceGeneratorMajor)(tree) >= angular_deps_1.STANDALONE_FALSE_MAJOR,
|
|
29
|
+
ionicImport: (0, angular_deps_1.ionicAngularImport)((0, angular_deps_1.workspaceGeneratorMajor)(tree)),
|
|
30
|
+
controlFlow: (0, angular_deps_1.workspaceGeneratorMajor)(tree) >= angular_deps_1.CONTROL_FLOW_MAJOR,
|
|
29
31
|
...(opts.vars ?? {}),
|
|
30
32
|
};
|
|
31
33
|
const build = opts.build ?? o.variant;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-lib.js","sourceRoot":"","sources":["../../../../src/generators/lib/angular-lib.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAE7B,uCAAsF;AAEtF,+
|
|
1
|
+
{"version":3,"file":"angular-lib.js","sourceRoot":"","sources":["../../../../src/generators/lib/angular-lib.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { CommonModule } from '@angular/common';
|
|
2
2
|
import { NgModule } from '@angular/core';
|
|
3
|
-
import { IonicModule } from '
|
|
3
|
+
import { IonicModule } from '<%= ionicImport %>';
|
|
4
4
|
|
|
5
5
|
import { <%= className %>Page } from './<%= fileName %>/<%= fileName %>.page';
|
|
6
6
|
|
|
@@ -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
|
|
|
@@ -1,4 +1,26 @@
|
|
|
1
|
-
|
|
1
|
+
<% if (controlFlow) { %>@let view = view$ | async;
|
|
2
|
+
<!-- Always present, so the first announcement is read. -->
|
|
3
|
+
<p class="session-warning__live" aria-live="assertive">{{ view?.announce }}</p>
|
|
4
|
+
@if (view) {
|
|
5
|
+
<div
|
|
6
|
+
class="session-warning"
|
|
7
|
+
role="dialog"
|
|
8
|
+
[attr.aria-labelledby]="id + '-title'"
|
|
9
|
+
[attr.aria-describedby]="id + '-text'"
|
|
10
|
+
>
|
|
11
|
+
<h2 class="session-warning__title" [id]="id + '-title'">{{ view.title }}</h2>
|
|
12
|
+
<p class="session-warning__text" [id]="id + '-text'">{{ view.message }}</p>
|
|
13
|
+
<div class="session-warning__actions">
|
|
14
|
+
@if (view.idle) {
|
|
15
|
+
<button #firstButton type="button" (click)="stay()">{{ view.stay }}</button>
|
|
16
|
+
<button type="button" (click)="signOut.emit()">{{ view.signOut }}</button>
|
|
17
|
+
} @else {
|
|
18
|
+
<button #firstButton type="button" (click)="signOut.emit()">{{ view.signOut }}</button>
|
|
19
|
+
}
|
|
20
|
+
</div>
|
|
21
|
+
</div>
|
|
22
|
+
}
|
|
23
|
+
<% } else { %><ng-container *ngIf="{ view: view$ | async } as ctx">
|
|
2
24
|
<!-- Always present, so the first announcement is read. -->
|
|
3
25
|
<p class="session-warning__live" aria-live="assertive">{{ ctx.view?.announce }}</p>
|
|
4
26
|
<div
|
|
@@ -19,3 +41,4 @@
|
|
|
19
41
|
</div>
|
|
20
42
|
</div>
|
|
21
43
|
</ng-container>
|
|
44
|
+
<% } %>
|
|
@@ -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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"}
|
|
@@ -11,6 +11,8 @@ export declare function isRecursiveLintCommand(command: string): boolean;
|
|
|
11
11
|
/**
|
|
12
12
|
* Nx and the lint stack for a new workspace on this Angular major: the major's Nx pin (Nx 18 from
|
|
13
13
|
* Angular 17), and from Nx 18 typescript-eslint 7 with eslint-plugin-unused-imports 3 (its peer).
|
|
14
|
+
* `.nvmrc` names the major's Node (22 from Angular 21, which Capacitor 8 needs), and from Angular 21
|
|
15
|
+
* tsconfig.base.json resolves modules as `bundler`.
|
|
14
16
|
*/
|
|
15
17
|
export declare function alignWorkspaceStack(tree: Tree, angularMajor: number): void;
|
|
16
18
|
export default function presetGenerator(tree: Tree, options: PresetGeneratorSchema): Promise<void>;
|
|
@@ -31,9 +31,19 @@ exports.isRecursiveLintCommand = isRecursiveLintCommand;
|
|
|
31
31
|
/**
|
|
32
32
|
* Nx and the lint stack for a new workspace on this Angular major: the major's Nx pin (Nx 18 from
|
|
33
33
|
* Angular 17), and from Nx 18 typescript-eslint 7 with eslint-plugin-unused-imports 3 (its peer).
|
|
34
|
+
* `.nvmrc` names the major's Node (22 from Angular 21, which Capacitor 8 needs), and from Angular 21
|
|
35
|
+
* tsconfig.base.json resolves modules as `bundler`.
|
|
34
36
|
*/
|
|
35
37
|
function alignWorkspaceStack(tree, angularMajor) {
|
|
36
38
|
const nx = `~${pins_1.ANGULAR_PINS[angularMajor].nx}`;
|
|
39
|
+
if (tree.exists('.nvmrc'))
|
|
40
|
+
tree.write('.nvmrc', `${pins_1.ANGULAR_PINS[angularMajor].node}\n`);
|
|
41
|
+
if (angularMajor >= angular_deps_1.BUNDLER_RESOLUTION_MAJOR && tree.exists('tsconfig.base.json')) {
|
|
42
|
+
(0, devkit_1.updateJson)(tree, 'tsconfig.base.json', (json) => {
|
|
43
|
+
json.compilerOptions = { ...json.compilerOptions, moduleResolution: 'bundler' };
|
|
44
|
+
return json;
|
|
45
|
+
});
|
|
46
|
+
}
|
|
37
47
|
const tsEslint = (0, dependencies_1.typescriptEslintVersion)(nx);
|
|
38
48
|
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
39
49
|
const dev = json.devDependencies ?? {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/preset/generator.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAE7B,uCAA0E;AAE1E,+CAAwE;AACxE,iDAAmE;AACnE,4DAA6E;AAC7E,kEAA6E;AAC7E,iDAAsD;AACtD,+
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/preset/generator.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, 21],
|
|
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,36 @@ 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;
|
|
27
|
+
/**
|
|
28
|
+
* From this major, Angular is zoneless unless the app asks for zone.js, so generated NgModule apps
|
|
29
|
+
* pass `applicationProviders: [provideZoneChangeDetection()]` to `bootstrapModule` (what Angular
|
|
30
|
+
* 21's own migration writes).
|
|
31
|
+
*/
|
|
32
|
+
export declare const ZONE_PROVIDER_MAJOR = 21;
|
|
33
|
+
/**
|
|
34
|
+
* From this major the generators install Ionic 9, which moves `IonicModule` and the other NgModule
|
|
35
|
+
* APIs to `@ionic/angular/lazy` (what `@ionic/migrate` rewrites).
|
|
36
|
+
*/
|
|
37
|
+
export declare const IONIC_LAZY_MAJOR = 21;
|
|
38
|
+
/**
|
|
39
|
+
* From this major, generated templates use the built-in control flow (`@if`, `@let`):
|
|
40
|
+
* angular-eslint 21's template rules report `*ngIf` (`prefer-control-flow`).
|
|
41
|
+
*/
|
|
42
|
+
export declare const CONTROL_FLOW_MAJOR = 21;
|
|
43
|
+
/**
|
|
44
|
+
* From this major, new workspaces resolve modules the way bundlers do (`moduleResolution:
|
|
45
|
+
* "bundler"`): Angular 21's packages and Ionic 9's `@ionic/angular/lazy` only declare their entry
|
|
46
|
+
* points in `exports`, which `"node"` resolution does not read.
|
|
47
|
+
*/
|
|
48
|
+
export declare const BUNDLER_RESOLUTION_MAJOR = 21;
|
|
49
|
+
/** Where generated NgModule code imports Ionic from, for an Angular major. */
|
|
50
|
+
export declare function ionicAngularImport(major: number): string;
|
|
21
51
|
/** Versions the generators add for one Angular major (only where a package is missing). */
|
|
22
52
|
export interface AngularGeneratorVersions {
|
|
23
53
|
angular: string;
|
|
@@ -47,7 +77,7 @@ export interface EnsureAngularOptions {
|
|
|
47
77
|
* never upgraded:
|
|
48
78
|
* - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
|
|
49
79
|
* and @types/node;
|
|
50
|
-
* - a generator major installed (15–
|
|
80
|
+
* - a generator major installed (15–21) → missing build/lint packages at the installed Angular
|
|
51
81
|
* version (plus the imported runtime packages when `includeRuntime`);
|
|
52
82
|
* - another Angular major → nothing; warns which build/lint packages are missing.
|
|
53
83
|
*/
|
|
@@ -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.ionicAngularImport = exports.BUNDLER_RESOLUTION_MAJOR = exports.CONTROL_FLOW_MAJOR = exports.IONIC_LAZY_MAJOR = exports.ZONE_PROVIDER_MAJOR = 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, 21];
|
|
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,47 @@ 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;
|
|
32
|
+
/**
|
|
33
|
+
* From this major, Angular is zoneless unless the app asks for zone.js, so generated NgModule apps
|
|
34
|
+
* pass `applicationProviders: [provideZoneChangeDetection()]` to `bootstrapModule` (what Angular
|
|
35
|
+
* 21's own migration writes).
|
|
36
|
+
*/
|
|
37
|
+
exports.ZONE_PROVIDER_MAJOR = 21;
|
|
38
|
+
/**
|
|
39
|
+
* From this major the generators install Ionic 9, which moves `IonicModule` and the other NgModule
|
|
40
|
+
* APIs to `@ionic/angular/lazy` (what `@ionic/migrate` rewrites).
|
|
41
|
+
*/
|
|
42
|
+
exports.IONIC_LAZY_MAJOR = 21;
|
|
43
|
+
/**
|
|
44
|
+
* From this major, generated templates use the built-in control flow (`@if`, `@let`):
|
|
45
|
+
* angular-eslint 21's template rules report `*ngIf` (`prefer-control-flow`).
|
|
46
|
+
*/
|
|
47
|
+
exports.CONTROL_FLOW_MAJOR = 21;
|
|
48
|
+
/**
|
|
49
|
+
* From this major, new workspaces resolve modules the way bundlers do (`moduleResolution:
|
|
50
|
+
* "bundler"`): Angular 21's packages and Ionic 9's `@ionic/angular/lazy` only declare their entry
|
|
51
|
+
* points in `exports`, which `"node"` resolution does not read.
|
|
52
|
+
*/
|
|
53
|
+
exports.BUNDLER_RESOLUTION_MAJOR = 21;
|
|
54
|
+
/** Where generated NgModule code imports Ionic from, for an Angular major. */
|
|
55
|
+
function ionicAngularImport(major) {
|
|
56
|
+
return major >= exports.IONIC_LAZY_MAJOR ? '@ionic/angular/lazy' : '@ionic/angular';
|
|
57
|
+
}
|
|
58
|
+
exports.ionicAngularImport = ionicAngularImport;
|
|
26
59
|
const ZONE_JS = {
|
|
27
60
|
15: '~0.12.0',
|
|
28
61
|
16: '~0.13.0',
|
|
29
62
|
17: '~0.14.0',
|
|
30
63
|
18: '~0.14.0',
|
|
31
64
|
19: '~0.15.0',
|
|
65
|
+
20: '~0.15.0',
|
|
66
|
+
21: '~0.16.0',
|
|
32
67
|
};
|
|
33
68
|
/** @types/node the major's TypeScript can parse (a latest one uses newer syntax: TS1139). */
|
|
34
69
|
const TYPES_NODE = {
|
|
@@ -37,6 +72,9 @@ const TYPES_NODE = {
|
|
|
37
72
|
17: '~20.10.0',
|
|
38
73
|
18: '~20.10.0',
|
|
39
74
|
19: '~20.10.0',
|
|
75
|
+
20: '~20.10.0',
|
|
76
|
+
// Angular 21 workspaces run on Node 22 (Capacitor 8).
|
|
77
|
+
21: '~22.10.0',
|
|
40
78
|
};
|
|
41
79
|
function angularGeneratorVersions(major) {
|
|
42
80
|
if (major === 15) {
|
|
@@ -128,7 +166,7 @@ function typeScriptPackages(v) {
|
|
|
128
166
|
* never upgraded:
|
|
129
167
|
* - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
|
|
130
168
|
* and @types/node;
|
|
131
|
-
* - a generator major installed (15–
|
|
169
|
+
* - a generator major installed (15–21) → missing build/lint packages at the installed Angular
|
|
132
170
|
* version (plus the imported runtime packages when `includeRuntime`);
|
|
133
171
|
* - another Angular major → nothing; warns which build/lint packages are missing.
|
|
134
172
|
*/
|
|
@@ -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.10.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",
|