@mouryaamit/nx-polystack 1.9.0 → 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 CHANGED
@@ -30,15 +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 | 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 |
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) |
42
42
 
43
43
  Supported means:
44
44
 
@@ -48,8 +48,8 @@ Supported means:
48
48
  - `pstack upgrade angular` moves a workspace there from the previous major.
49
49
 
50
50
  `pstack upgrade angular` moves a workspace one major at a time, with one commit per step. Each step
51
- pins Nx, TypeScript, the build and lint packages, Ionic, Capacitor and Node. It works up to Angular 21
52
- today. Generators for 21 come in the next release; until then they warn which packages to 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
 
@@ -62,6 +62,10 @@ Known breakpoints when upgrading:
62
62
  - **20:** angular-eslint 20 makes `prefer-inject` an error; the step runs Angular's `inject()` migration.
63
63
  Generated code injects with `inject()`.
64
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`).
65
69
 
66
70
  ## What you get
67
71
 
@@ -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 | 20 (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
- .bootstrapModule(AppModule)
16
- .catch((err) => console.error(err));
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));
@@ -5,3 +5,6 @@ android/app/build
5
5
  ios/Pods
6
6
  ios/build
7
7
  ios/DerivedData
8
+ # Web build copied in by cap sync
9
+ android/app/src/main/assets/public
10
+ ios/App/App/public
@@ -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 '@ionic/angular';
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":";;;;AAAA,iDAA0C;AAC1C,mDAA6B;AAE7B,uCASoB;AAEpB,+DAOsC;AACtC,qEAQyC;AACzC,uDAAyD;AACzD,iDAA0F;AAC1F,yDAAgE;AAChE,yDAAuF;AACvF,qDAA4F;AAC5F,+DAIsC;AACtC,yDAA2E;AAC3E,yDAA6F;AAC7F,yDAAoF;AACpF,6DAA4D;AAC5D,6DAA8D;AAC9D,2DAA4D;AAC5D,2DAAuF;AACvF,6DAA+E;AAC/E,uDAAqD;AAErD,iCAA8D;AAG9D,MAAM,SAAS,GAAG,CAAC,CAAS,EAAY,EAAE,CACxC,CAAC;KACE,KAAK,CAAC,GAAG,CAAC;KACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;KACpB,MAAM,CAAC,OAAO,CAAC,CAAC;AAEN,KAAK,UAAU,YAAY,CACxC,IAAU,EACV,OAA2B;IAE3B,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE;QAC9B,MAAM,MAAM,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE;YAC3B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ;YAC/D,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI;YAC/E,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;SACzE,CAAC,CAAC;QACH,eAAM,CAAC,IAAI,CAAC,IAAA,oBAAa,EAAC,MAAM,CAAC,CAAC,CAAC;QACnC,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,EACJ,IAAI,EACJ,IAAI,GAAG,SAAS,EAChB,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,MAAM,EACb,QAAQ,EACR,IAAI,GAAG,EAAE,EACT,aAAa,GACd,GAAG,OAAO,CAAC;IACZ,MAAM,WAAW,GAAG,IAAI,CAAC;IAEzB,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,OAAO,EAAE;QAChE,MAAM,IAAI,KAAK,CACb,0BAA0B,IAAI,+DAA+D,CAC9F,CAAC;KACH;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE;QAClC,IAAI;YACF,IAAA,yBAAa,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SACjC;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,kBAAmB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SAC7D;KACF;IACD,MAAM,GAAG,GAAG,IAAA,kBAAQ,EAAC,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;IACnD,MAAM,WAAW,GAAG,IAAA,iBAAO,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAC9C,MAAM,EAAE,GAAG,IAAA,cAAI,EAAC,WAAW,CAAC,CAAC;IAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,IAAA,mBAAY,EAAC,WAAW,CAAC,CAAC;IACzD,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,mDAAmD,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACxF,MAAM,IAAI,KAAK,CACb,2BAA2B,KAAK,oEAAoE,CACrG,CAAC;KACH;IAED,MAAM,SAAS,GAAc,OAAO,CAAC,SAAS,IAAI,SAAS,CAAC;IAC5D,IAAI,CAAC,6BAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACpC,MAAM,IAAI,KAAK,CACb,+BAA+B,SAAS,2BAA2B,6BAAW,CAAC,IAAI,CACjF,MAAM,CACP,GAAG,CACL,CAAC;KACH;IACD,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE;QAC9B,MAAM,OAAO,GAAG,IAAA,wBAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,OAAO,GAAG,CAAC,CAAC;KAC5D;IAED,IAAI,GAAG;QAAE,IAAA,kCAAwB,EAAC,IAAI,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;IAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,mBAAmB,WAAW,iDAAiD,CAChF,CAAC;KACH;IACD,IAAI,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,WAAW,EAAE;QAC9F,MAAM,IAAI,KAAK,CACb,mCAAmC,WAAW,wCAAwC,CACvF,CAAC;KACH;IAED,MAAM,IAAI,GAAG,IAAA,2BAAc,EAAC,IAAI,CAAC,CAAC;IAClC,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,KAAK,EAAE;YACT,MAAM,IAAI,KAAK,CACb,uBAAuB,OAAO,CAAC,IAAI,eAAe,KAAK,CAAC,OAAO,EAAE;gBAC/D,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kCAAkC,wBAAwB,CACtF,CAAC;SACH;KACF;IACD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAA,yBAAY,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAEnE,MAAM,CAAC,GAAG,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC;IAC7B,MAAM,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;IAC9B,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;IAE5D,IAAI,WAA0C,CAAC;IAE/C,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,OAAO,EAAE;QAC1C,MAAM,IAAI,GAAG;YACX,IAAI,EAAE,WAAW;YACjB,uGAAuG;YACvG,gBAAgB,EAAE,IAAA,yCAA0B,EAAC,IAAI,CAAC,CAAC,SAAS;YAC5D,WAAW,EAAE,IAAA,sCAAuB,EAAC,IAAI,CAAC,IAAI,wCAAyB;YACvE,eAAe,EAAE,IAAA,sCAAuB,EAAC,IAAI,CAAC,IAAI,qCAAsB;YACxE,SAAS;YACT,KAAK;YACL,KAAK;YACL,aAAa,EAAE,aAAa,IAAI,EAAE;YAClC,IAAI,EAAE,WAAW;YACjB,EAAE;YACF,SAAS,EAAE,kBAAkB,CAC3B,IAAI,EACJ,SAAS,KAAK,SAAS;gBACrB,CAAC,CAAC,mCAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxC,CAAC,CAAC,gBAAgB,WAAW,cAAc,EAC7C,GAAG,WAAW,MAAM,CACrB;YACD,QAAQ,EAAE,EAAE;SACb,CAAC;QACF,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;QACjF,IAAI,IAAI,KAAK,OAAO,EAAE;YACpB,sFAAsF;YACtF,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;SAChF;QAED,oFAAoF;QACpF,IAAI,SAAS,CAAC;QACd,IAAI;YACF,SAAS,GAAG,IAAA,0BAAc,EAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SACrF;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,mCAAoC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SAC9E;QACD,wFAAwF;QACxF,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,EAAE;YACnC,IAAI,CAAC,KAAK,CAAC,IAAA,6BAAkB,EAAC,WAAW,EAAE,GAAG,CAAC,EAAE,IAAA,uBAAc,EAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;SAC1F;QACD,IAAI,CAAC,KAAK,CAAC,GAAG,WAAW,oBAAoB,EAAE,IAAA,oBAAW,EAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;QAEpF,IAAA,mCAAuB,EAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QAEtD,MAAM,aAAa,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,IAAA,sCAAuB,EAAC,IAAI,CAAC,EAAE,CAAC;QACvF,MAAM,OAAO,GACX,IAAI,KAAK,OAAO;YACd,CAAC,CAAC,IAAA,qCAAmB,EAAC,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC;YAC9D,CAAC,CAAC,IAAA,uCAAqB,EAAC,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;QACrE,MAAM,WAAW,GAAG,uBAAuB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAG5E,CAAC;QACF,oFAAoF;QACpF,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC,IAAI,CAAC,CAAC;QACtC,IAAA,4BAAc,EAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAA0C,EAAE,MAAM,CAAC,CAAC;QAC/F,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK;YAAE,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,KAAK,CAAC,GAAG,WAAW,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QAEvF,MAAM,QAAQ,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,cAAc,CAAC;QACvE,IAAA,2BAAc,EAAC,IAAI,EAAE,WAAW,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAEhF,IAAA,2BAAa,EACX,IAAI,EACJ,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,WAAW,CAAC,EAC1F,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CAAC;QAEF,IAAA,oBAAS,EAAC,IAAI,EAAE,eAAe,WAAW,EAAE,EAAE,GAAG,WAAW,MAAM,CAAC,CAAC;QAEpE,6DAA6D;QAC7D,MAAM,aAAa,GAAG,IAAA,iDAAkC,EAAC,IAAI,CAAC,CAAC;QAC/D,WAAW,GAAG,IAAA,wCAAyB,EAAC,IAAI,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,IAAI,aAAa,CAAC;QACzF,IAAI,IAAI,KAAK,OAAO,EAAE;YACpB,MAAM,IAAI,GAAG,IAAA,8BAAe,EAAC,IAAI,EAAE,eAAe,CAAC,IAAI,8BAAe,CAAC;YACvE,2EAA2E;YAC3E,MAAM,SAAS,GAAG,IAAA,qCAAsB,EACtC,IAAI,EACJ,EAAE,gBAAgB,EAAE,IAAA,yCAA0B,EAAC,IAAI,CAAC,CAAC,YAAY,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAC3F,EAAE,CACH,CAAC;YACF,MAAM,QAAQ,GAAG,WAAW,CAAC;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YACjD,WAAW,GAAG,KAAK,IAAI,EAAE;gBACvB,IAAI,QAAQ;oBAAE,MAAM,QAAQ,EAAE,CAAC;qBAC1B,IAAI,SAAS;oBAAE,MAAM,SAAS,EAAE,CAAC;gBACtC,2DAA2D;gBAC3D,MAAM,CAAC,GAAG,IAAA,yBAAS,EAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE;oBACtC,GAAG,EAAE,MAAM;oBACX,KAAK,EAAE,SAAS;oBAChB,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;iBACpC,CAAC,CAAC;gBACH,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC7B,MAAM,IAAI,KAAK,CACb,yBAAyB,WAAW,kDAAkD;wBACpF,mDAAmD,CACtD,CAAC;iBACH;YACH,CAAC,CAAC;SACH;KACF;SAAM;QACL,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,WAAW,EAAE;YACzE,IAAI,EAAE,WAAW;YACjB,YAAY;YACZ,SAAS;YACT,KAAK;YACL,IAAI;YACJ,IAAI;YACJ,QAAQ;YACR,QAAQ,EAAE,EAAE;YACZ,cAAc,EAAE,IAAA,uBAAc,EAAC,WAAW,CAAC;SAC5C,CAAC,CAAC;QAEH,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAA,6BAAe,EAAC,WAAW,CAAC,CAAC,EAAE;YAC1E,IAAI,CAAC,KAAK,CAAC,GAAG,WAAW,IAAI,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;SAC/C;QAED,IAAA,mCAAuB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC3C,KAAK,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE;YACxC,IAAI,CAAC,KAAK,CAAC,IAAA,6BAAkB,EAAC,WAAW,EAAE,GAAG,CAAC,EAAE,IAAA,8BAAqB,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;SAC3F;QAED,IAAI,CAAC,KAAK,CACR,GAAG,WAAW,eAAe,EAC7B,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAC3F,CAAC;QAEF,IAAA,2BAAc,EAAC,IAAI,EAAE,WAAW,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAE1F,IAAA,2BAAa,EAAC,IAAI,EAAE,eAAe,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAEpE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;SACvC;QAED,IAAI,IAAI,KAAK,KAAK,EAAE;YAClB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;SAC9C;QAED,IAAI,QAAQ,EAAE;YACZ,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;SAC/C;KACF;IAED,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,yDAAyD;QACzD,IAAA,2BAAa,EACX,IAAI,EACJ,EAAE,CAAC,SAAS,WAAW,EAAE,CAAC,EAAE,UAAU,WAAW,QAAQ,EAAE,EAC3D,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CAAC;KACH;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE;QAClC,MAAM,EAAE,GAAG,GAAG,WAAW,eAAe,CAAC;QACzC,MAAM,IAAI,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,KAAK,EAAE;YACT,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAChF,IAAA,uBAAW,EAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;YACrD,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;SACtD;KACF;IAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACxB,uEAAuE;IACvE,IAAA,4BAAgB,EAAC,IAAI,CAAC,CAAC;IACvB,OAAO,WAAW,CAAC;AACrB,CAAC;AAvQD,+BAuQC;AAcD,SAAgB,gBAAgB,CAAC,IAAY,EAAE,OAA8B,EAAE;IAC7E,MAAM,QAAQ,GAAG,0BAA0B,CAAC;IAC5C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,OAAO;QACL,IAAI;QACJ,OAAO,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C;QAC5E,WAAW,EAAE,aAAa;QAC1B,UAAU,EAAE,GAAG,IAAI,MAAM;QACzB,IAAI,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,kBAAkB,CAAC;QACnD,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,QAAQ,EAAE,GAAG,QAAQ,gBAAgB;gBACrC,OAAO,EAAE;oBACP,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,IAAI;oBACX,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACxD;aACF;YACD,WAAW,EAAE;gBACX,QAAQ,EAAE,GAAG,QAAQ,gBAAgB;gBACrC,OAAO,EAAE;oBACP,MAAM,EAAE,KAAK;oBACb,IAAI,EAAE,QAAQ,IAAI,MAAM;oBACxB,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACxD;gBACD,cAAc,EAAE;oBACd,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;oBACnB,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;oBACnB,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;iBACtB;aACF;YACD,eAAe,EAAE;gBACf,QAAQ,EAAE,GAAG,QAAQ,gBAAgB;gBACrC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;gBAC1B,cAAc,EAAE;oBACd,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;oBACnB,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;oBACnB,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;iBACtB;aACF;YACD,WAAW,EAAE;gBACX,QAAQ,EAAE,GAAG,QAAQ,gBAAgB;gBACrC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;gBAC1B,cAAc,EAAE;oBACd,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;oBACnB,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;oBACnB,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;iBACtB;aACF;YACD,GAAG,CAAC,IAAI,CAAC,YAAY,KAAK,KAAK;gBAC7B,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC;oBACE,MAAM,EAAE;wBACN,QAAQ,EAAE,GAAG,QAAQ,iBAAiB;wBACtC,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;qBACxB;iBACF,CAAC;YACN,KAAK,EAAE,IAAA,6BAAW,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;SAClD;KACF,CAAC;AACJ,CAAC;AA7DD,4CA6DC;AAED,SAAS,uBAAuB,CAC9B,IAAY,EACZ,IAAY,EACZ,OAAgC;IAEhC,OAAO;QACL,IAAI;QACJ,OAAO,EAAE,GAAG,IAAA,cAAI,EAAC,IAAI,CAAC,6CAA6C;QACnE,WAAW,EAAE,aAAa;QAC1B,UAAU,EAAE,GAAG,IAAI,MAAM;QACzB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,EAAE;QACR,OAAO;KACR,CAAC;AACJ,CAAC;AAED,mFAAmF;AACnF,SAAS,eAAe,CAAC,IAAU;IACjC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;QAAE,OAAO,SAAS,CAAC;IACnD,IAAI;QACF,OAAO,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC;KAC5C;IAAC,MAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY;IACxC,MAAM,OAAO,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC7C,KAAK,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE;QACxC,KAAK,MAAM,QAAQ,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;YACzC,OAAO,CACL,SAAS,IAAI,IAAI,GAAG,IAAI,QAAQ,EAAE,CACnC,GAAG,UAAU,IAAI,YAAY,GAAG,cAAc,IAAI,wBAAwB,QAAQ,EAAE,CAAC;SACvF;KACF;IACD,KAAK,MAAM,QAAQ,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;QACzC,OAAO,CAAC,QAAQ,IAAI,IAAI,QAAQ,EAAE,CAAC,GAAG,UAAU,IAAI,wBAAwB,QAAQ,EAAE,CAAC;KACxF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAY;IAC1C,OAAO;QACL,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,YAAY,IAAI,EAAE;QACrC,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,UAAU,IAAI,cAAc;QACnD,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,UAAU,IAAI,cAAc;QACnD,CAAC,SAAS,IAAI,OAAO,CAAC,EAAE,UAAU,IAAI,eAAe;QACrD,CAAC,SAAS,IAAI,cAAc,CAAC,EAAE,UAAU,IAAI,wBAAwB;QACrE,CAAC,SAAS,IAAI,kBAAkB,CAAC,EAAE,UAAU,IAAI,8BAA8B;KAChF,CAAC;AACJ,CAAC;AAED,kEAAkE;AAClE,SAAgB,eAAe,CAC7B,IAAY,EACZ,OAA8B,EAAE;IAEhC,MAAM,OAAO,GAA2B;QACtC,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,YAAY,IAAI,EAAE;QACrC,CAAC,SAAS,IAAI,UAAU,CAAC,EAAE,UAAU,IAAI,gBAAgB;QACzD,CAAC,SAAS,IAAI,UAAU,CAAC,EAAE,UAAU,IAAI,gBAAgB;QACzD,CAAC,SAAS,IAAI,WAAW,CAAC,EAAE,UAAU,IAAI,iBAAiB;QAC3D,CAAC,SAAS,IAAI,UAAU,CAAC,EAAE,UAAU,IAAI,oBAAoB;QAC7D,CAAC,SAAS,IAAI,UAAU,CAAC,EAAE,UAAU,IAAI,oBAAoB;QAC7D,CAAC,SAAS,IAAI,WAAW,CAAC,EAAE,UAAU,IAAI,qBAAqB;QAC/D,CAAC,SAAS,IAAI,UAAU,CAAC,EAAE,UAAU,IAAI,gBAAgB;QACzD,CAAC,SAAS,IAAI,UAAU,CAAC,EAAE,UAAU,IAAI,gBAAgB;QACzD,CAAC,SAAS,IAAI,WAAW,CAAC,EAAE,UAAU,IAAI,iBAAiB;QAC3D,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,UAAU,IAAI,QAAQ;KAC1C,CAAC;IACF,IAAI,IAAI,CAAC,YAAY,KAAK,KAAK;QAAE,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,GAAG,aAAa,IAAI,EAAE,CAAC;IACjF,OAAO,OAAO,CAAC;AACjB,CAAC;AAnBD,0CAmBC;AAED,SAAS,YAAY,CAAC,IAAU,EAAE,WAAmB,EAAE,OAAiB;IACtE,MAAM,OAAO,GAAG,GAAG,WAAW,WAAW,CAAC;IAC1C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,QAAQ,MAAM,MAAM,EAC9B,IAAI,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CACxE,CAAC;KACH;IACD,IAAI,CAAC,KAAK,CACR,GAAG,WAAW,YAAY,EAC1B,6CAA6C,OAAO,CAAC,CAAC,CAAC,0DAA0D,CAClH,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,WAAmB,EAAE,aAAqB;IACzE,IAAI,CAAC,KAAK,CACR,GAAG,WAAW,yBAAyB,EACvC,oSAAoS,CACrS,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAU,EAAE,WAAmB,EAAE,QAAgB;IACzE,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,WAAW,GAAG,eAAe,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;IACpE,MAAM,UAAU,GAAG;QACjB;YACE,QAAQ,EAAE,CAAC,4CAA4C,CAAC;YACxD,MAAM,EAAE;gBACN,SAAS,EAAE,aAAa;gBACxB,YAAY,EAAE,WAAW;gBACzB,wBAAwB,EAAE,CAAC,0BAA0B,CAAC;aACvD;SACF;KACF,CAAC;IACF,MAAM,QAAQ,GAAG;QACf,QAAQ,EAAE;YACR,IAAI,EAAE,EAAE;YACR,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,WAAW,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;SAC5D;KACF,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE;QACxC,MAAM,IAAI,GAAG,mBAAmB,GAAG,cAAc,CAAC;QAClD,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QAClF,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,6BAA6B,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;KAC5F;IACD,gFAAgF;IAChF,IAAI,CAAC,KAAK,CACR,2BAA2B,EAC3B,kFAAkF,MAAM,6GAA6G,CACtM,CAAC;AACJ,CAAC;AAED,wEAAwE;AACxE,SAAS,eAAe;IACtB,OAAO,MAAM,CAAC,MAAM,CAAC,wCAAsB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;AAC/E,CAAC;AAED;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAe,EAAE,OAAe;IACtE,MAAM,KAAK,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC,CAAC;IACnC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,OAAO,EAAE;QAC5C,OAAO,IAAA,0BAAc,EAAC,OAAO,CAAC,CAAC;KAChC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClD,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;AAChD,CAAC"}
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,+DAMsC;AACtC,+DAIsC;AAEtC,2CAOqB;AAER,QAAA,oBAAoB,GAAG,CAAC,UAAU,EAAE,WAAW,EAAE,aAAa,CAAU,CAAC;AAiBtF,qFAAqF;AACrF,SAAgB,cAAc,CAAC,WAA+B;IAC5D,OAAO,IAAA,oCAAqB,EAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC;AAC1D,CAAC;AAFD,wCAEC;AAID;;;;;GAKG;AACH,SAAgB,eAAe,CAC7B,IAAU,EACV,CAAuB,EACvB,IAAuB;IAEvB,MAAM,IAAI,GAAG;QACX,GAAG,IAAA,wBAAY,EAAC,CAAC,CAAC;QAClB,WAAW,EAAE,IAAA,cAAK,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC,YAAY;QACzC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,IAAI,IAAI;QACjD,+FAA+F;QAC/F,eAAe,EAAE,IAAA,sCAAuB,EAAC,IAAI,CAAC,IAAI,qCAAsB;QACxE,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;KACrB,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAK,CAAC,CAAC,OAA2B,CAAC;IAC3D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAC7F,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAE5D,MAAM,QAAQ,GAAG,IAAA,wBAAY,EAAC,IAAA,qCAAsB,EAAC,IAAI,CAAC,EAAE,IAAA,wCAAyB,EAAC,IAAI,CAAC,CAAC,CAAC;IAC7F,2FAA2F;IAC3F,qDAAqD;IACrD,MAAM,IAAI,GAAG,IAAA,8BAAe,EAAC,IAAI,EAAE,eAAe,CAAC,IAAI,8BAAe,CAAC;IACvE,MAAM,QAAQ,GAAG,KAAK,KAAK,UAAU,CAAC;IAEtC,MAAM,SAAS,GAAG,IAAA,qCAAsB,EACtC,IAAI,EACJ,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EACjE,QAAQ,CAAC,CAAC,CAAC,IAAA,oCAAqB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAC5C,CAAC;IAEF,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,IAAI,QAAQ,EAAE;QACZ,OAAO,CAAC,OAAO,CAAC,GAAG;YACjB,QAAQ,EAAE,KAAK,KAAK,aAAa,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,6BAA6B;YACzF,OAAO,EAAE,CAAC,oCAAoC,CAAC;YAC/C,OAAO,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,WAAW,kBAAkB,EAAE;YACxD,cAAc,EAAE;gBACd,UAAU,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,WAAW,yBAAyB,EAAE;gBACnE,WAAW,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,WAAW,oBAAoB,EAAE;aAChE;YACD,oBAAoB,EAAE,YAAY;SACnC,CAAC;KACH;IACD,OAAO,CAAC,MAAM,CAAC,GAAG,IAAA,sBAAU,EAAC,CAAC,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;IAE1D,IAAA,+BAAmB,EAAC,IAAI,EAAE,CAAC,EAAE;QAC3B,UAAU,EAAE,GAAG,CAAC,CAAC,WAAW,MAAM;QAClC,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,OAAO;KACR,CAAC,CAAC;IAEH,IAAI,QAAQ,EAAE;QACZ,IAAA,kBAAS,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC,WAAW,kBAAkB,EAAE;YAClD,OAAO,EAAE,GAAG,CAAC,CAAC,MAAM,gDAAgD;YACpE,IAAI,EAAE,GAAG,CAAC,CAAC,MAAM,QAAQ,CAAC,CAAC,WAAW,EAAE;YACxC,GAAG,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE;SACnC,CAAC,CAAC;QACH,IAAA,kBAAS,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC,WAAW,yBAAyB,EAAE;YACzD,OAAO,EAAE,qBAAqB;YAC9B,eAAe,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;YAC1C,sBAAsB,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE;SACvD,CAAC,CAAC;QACH,wFAAwF;QACxF,MAAM,IAAI,GAAG,IAAA,sBAAU,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACzC,IAAA,kBAAS,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC,WAAW,eAAe,EAAE;YAC/C,IAAI,EAAE,CAAC,CAAC,UAAU;YAClB,OAAO,EAAE,OAAO;YAChB,gBAAgB,EAAE;gBAChB,iBAAiB,EAAE,IAAI;gBACvB,eAAe,EAAE,IAAI;gBACrB,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;aAC/C;YACD,YAAY,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;YACjC,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,wBAAY,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;AAC3C,CAAC;AA7ED,0CA6EC"}
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 '@ionic/angular';
3
+ import { IonicModule } from '<%= ionicImport %>';
4
4
 
5
5
  import { <%= className %>Page } from './<%= fileName %>/<%= fileName %>.page';
6
6
 
@@ -1,4 +1,26 @@
1
- <ng-container *ngIf="{ view: view$ | async } as ctx">
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
+ <% } %>
@@ -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":"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"}
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, 20],
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": {
@@ -24,6 +24,30 @@ export declare const STANDALONE_FALSE_MAJOR = 19;
24
24
  * off when the copied code still uses constructor parameter injection.
25
25
  */
26
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;
27
51
  /** Versions the generators add for one Angular major (only where a package is missing). */
28
52
  export interface AngularGeneratorVersions {
29
53
  angular: string;
@@ -53,7 +77,7 @@ export interface EnsureAngularOptions {
53
77
  * never upgraded:
54
78
  * - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
55
79
  * and @types/node;
56
- * - a generator major installed (15–20) → missing build/lint packages at the installed Angular
80
+ * - a generator major installed (15–21) → missing build/lint packages at the installed Angular
57
81
  * version (plus the imported runtime packages when `includeRuntime`);
58
82
  * - another Angular major → nothing; warns which build/lint packages are missing.
59
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.PREFER_INJECT_MAJOR = 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, 20];
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).
@@ -29,6 +29,33 @@ exports.STANDALONE_FALSE_MAJOR = 19;
29
29
  * off when the copied code still uses constructor parameter injection.
30
30
  */
31
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;
32
59
  const ZONE_JS = {
33
60
  15: '~0.12.0',
34
61
  16: '~0.13.0',
@@ -36,6 +63,7 @@ const ZONE_JS = {
36
63
  18: '~0.14.0',
37
64
  19: '~0.15.0',
38
65
  20: '~0.15.0',
66
+ 21: '~0.16.0',
39
67
  };
40
68
  /** @types/node the major's TypeScript can parse (a latest one uses newer syntax: TS1139). */
41
69
  const TYPES_NODE = {
@@ -45,6 +73,8 @@ const TYPES_NODE = {
45
73
  18: '~20.10.0',
46
74
  19: '~20.10.0',
47
75
  20: '~20.10.0',
76
+ // Angular 21 workspaces run on Node 22 (Capacitor 8).
77
+ 21: '~22.10.0',
48
78
  };
49
79
  function angularGeneratorVersions(major) {
50
80
  if (major === 15) {
@@ -136,7 +166,7 @@ function typeScriptPackages(v) {
136
166
  * never upgraded:
137
167
  * - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
138
168
  * and @types/node;
139
- * - a generator major installed (15–20) → missing build/lint packages at the installed Angular
169
+ * - a generator major installed (15–21) → missing build/lint packages at the installed Angular
140
170
  * version (plus the imported runtime packages when `includeRuntime`);
141
171
  * - another Angular major → nothing; warns which build/lint packages are missing.
142
172
  */
@@ -1 +1 @@
1
- {"version":3,"file":"angular-deps.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-deps.ts"],"names":[],"mappings":"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"}
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,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAExF;;;GAGG;AACU,QAAA,yBAAyB,GAAG,EAAE,CAAC;AAE5C;;;;GAIG;AACU,QAAA,sBAAsB,GAAG,EAAE,CAAC;AAEzC;;;;GAIG;AACU,QAAA,mBAAmB,GAAG,EAAE,CAAC;AAEtC;;;;GAIG;AACU,QAAA,mBAAmB,GAAG,EAAE,CAAC;AAEtC;;;GAGG;AACU,QAAA,gBAAgB,GAAG,EAAE,CAAC;AAEnC;;;GAGG;AACU,QAAA,kBAAkB,GAAG,EAAE,CAAC;AAErC;;;;GAIG;AACU,QAAA,wBAAwB,GAAG,EAAE,CAAC;AAE3C,8EAA8E;AAC9E,SAAgB,kBAAkB,CAAC,KAAa;IAC9C,OAAO,KAAK,IAAI,wBAAgB,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,gBAAgB,CAAC;AAC9E,CAAC;AAFD,gDAEC;AAaD,MAAM,OAAO,GAA2B;IACtC,EAAE,EAAE,SAAS;IACb,EAAE,EAAE,SAAS;IACb,EAAE,EAAE,SAAS;IACb,EAAE,EAAE,SAAS;IACb,EAAE,EAAE,SAAS;IACb,EAAE,EAAE,SAAS;IACb,EAAE,EAAE,SAAS;CACd,CAAC;AACF,6FAA6F;AAC7F,MAAM,UAAU,GAA2B;IACzC,EAAE,EAAE,UAAU;IACd,EAAE,EAAE,UAAU;IACd,EAAE,EAAE,UAAU;IACd,EAAE,EAAE,UAAU;IACd,EAAE,EAAE,UAAU;IACd,EAAE,EAAE,UAAU;IACd,sDAAsD;IACtD,EAAE,EAAE,UAAU;CACf,CAAC;AAEF,SAAgB,wBAAwB,CAAC,KAAa;IACpD,IAAI,KAAK,KAAK,EAAE,EAAE;QAChB,qEAAqE;QACrE,OAAO;YACL,OAAO,EAAE,uBAAe;YACxB,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;YACnB,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,UAAU,CAAC,EAAE,CAAC;YACzB,aAAa,EAAE,uBAAe;YAC9B,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,QAAQ;SACpB,CAAC;KACH;IACD,MAAM,IAAI,GAAG,mBAAY,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,CAAC,IAAI,IAAI,CAAC,gCAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACtD,MAAM,IAAI,KAAK,CACb,WAAW,KAAK,wCAAwC,gCAAwB,CAAC,IAAI,CACnF,IAAI,CACL,IAAI,CACN,CAAC;KACH;IACD,OAAO;QACL,OAAO,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE;QAC3B,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC;QACtB,UAAU,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE;QACjC,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC;QAC5B,aAAa,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC,aAAa,CAAC;QAC3C,YAAY,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC,KAAK,CAAC;QAClC,SAAS,EAAE,IAAI,IAAI,CAAC,SAAS,MAAM;KACpC,CAAC;AACJ,CAAC;AA9BD,4DA8BC;AAED;;;GAGG;AACH,SAAgB,0BAA0B,CAAC,IAAU;IACnD,OAAO,wBAAwB,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC;AACjE,CAAC;AAFD,gEAEC;AAED,2FAA2F;AAC3F,SAAgB,uBAAuB,CAAC,IAAU;IAChD,MAAM,KAAK,GAAG,IAAA,sBAAO,EAAC,IAAA,8BAAe,EAAC,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC;IACpE,OAAO,KAAK,KAAK,SAAS,IAAI,gCAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,qBAAa,CAAC;AACjG,CAAC;AAHD,0DAGC;AAED,gEAAgE;AAChE,MAAM,WAAW,GAAG;IAClB,qBAAqB;IACrB,iBAAiB;IACjB,mBAAmB;IACnB,eAAe;IACf,gBAAgB;IAChB,2BAA2B;IAC3B,mCAAmC;IACnC,iBAAiB;CAClB,CAAC;AAEF,qGAAqG;AACrG,MAAM,gBAAgB,GAAG;IACvB,iBAAiB;IACjB,mBAAmB;IACnB,2BAA2B;IAC3B,mCAAmC;IACnC,iBAAiB;CAClB,CAAC;AAEF,SAAS,cAAc,CAAC,CAA2B;IACjD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;AAClE,CAAC;AAED,SAAS,oBAAoB,CAC3B,OAAe,EACf,EAAU,EACV,CAA2B;IAE3B,OAAO;QACL,+BAA+B,EAAE,OAAO;QACxC,cAAc,EAAE,OAAO;QACvB,uBAAuB,EAAE,OAAO;QAChC,aAAa,EAAE,EAAE;QACjB,YAAY,EAAE,EAAE;QAChB,+BAA+B,EAAE,CAAC,CAAC,aAAa;QAChD,wCAAwC,EAAE,CAAC,CAAC,aAAa;QACzD,iCAAiC,EAAE,CAAC,CAAC,aAAa;KACnD,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB,CAAC,CAA2B;IACrD,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;AAClE,CAAC;AASD;;;;;;;;GAQG;AACH,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAA6B,EAAE;IAE/B,MAAM,EAAE,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAC,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAA,8BAAe,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAEpD,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,MAAM,CAAC,GAAG,wBAAwB,CAAC,IAAI,CAAC,KAAK,IAAI,qBAAa,CAAC,CAAC;QAChE,MAAM,IAAI,GAA2B;YACnC,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC7D,GAAG,cAAc,CAAC,CAAC,CAAC;SACrB,CAAC;QACF,MAAM,OAAO,GAAG,EAAE,GAAG,oBAAoB,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC;QACxF,OAAO,IAAA,qCAAsB,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;KACpD;IAED,MAAM,KAAK,GAAG,IAAA,sBAAO,EAAC,IAAI,CAAC,CAAC;IAC5B,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,gCAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACpE,MAAM,OAAO,GAAG,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,wBAAwB,CAAC,qBAAa,CAAC,CAAC,CAAC;QACxF,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CACzC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,8BAAe,EAAC,IAAI,EAAE,IAAI,CAAC,KAAK,SAAS,CACpD,CAAC;QACF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,eAAM,CAAC,IAAI,CACT,wCAAwC,KAAK,IAAI,IAAI,mCAAmC;gBACtF,GAAG,gCAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,gDAAgD;gBACtF,uCAAuC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC/D,CAAC;SACH;QACD,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,CAAC,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;IAC1C,MAAM,IAAI,GAA2B,IAAI,CAAC,cAAc;QACtD,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE;QACzF,CAAC,CAAC,EAAE,CAAC;IACP,OAAO,IAAA,qCAAsB,EAAC,IAAI,EAAE,IAAI,EAAE;QACxC,GAAG,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACpC,GAAG,kBAAkB,CAAC,CAAC,CAAC;KACzB,CAAC,CAAC;AACL,CAAC;AAzCD,8DAyCC;AAED;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,WAA+B;IACnE,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,IAAA,sBAAO,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7D,OAAO;QACL,iFAAiF;QACjF,YAAY,EAAE,IAAI,KAAK,IAAI,qBAAa,MAAM;QAC9C,OAAO,EAAE,QAAQ;QACjB,oBAAoB,EAAE,QAAQ;QAC9B,aAAa,EAAE,SAAS;QACxB,YAAY,EAAE,SAAS;KACxB,CAAC;AACJ,CAAC;AAVD,sDAUC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mouryaamit/nx-polystack",
3
- "version": "1.9.0",
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",