@mouryaamit/nx-polystack 1.11.3 → 1.11.11

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.
Files changed (88) hide show
  1. package/README.md +3 -1
  2. package/dist/migrations.json +5 -0
  3. package/dist/src/cli/commands/adopt-compare.d.ts +8 -0
  4. package/dist/src/cli/commands/adopt-compare.js +9 -4
  5. package/dist/src/cli/commands/adopt-compare.js.map +1 -1
  6. package/dist/src/cli/commands/standalone-providers.d.ts +34 -0
  7. package/dist/src/cli/commands/standalone-providers.js +423 -0
  8. package/dist/src/cli/commands/standalone-providers.js.map +1 -0
  9. package/dist/src/cli/commands/upgrade-standalone.d.ts +14 -1
  10. package/dist/src/cli/commands/upgrade-standalone.js +107 -10
  11. package/dist/src/cli/commands/upgrade-standalone.js.map +1 -1
  12. package/dist/src/cli/commands/upgrade.d.ts +1 -1
  13. package/dist/src/cli/commands/upgrade.js +34 -2
  14. package/dist/src/cli/commands/upgrade.js.map +1 -1
  15. package/dist/src/cli/help.js +6 -4
  16. package/dist/src/cli/help.js.map +1 -1
  17. package/dist/src/executors/build/executor.d.ts +17 -0
  18. package/dist/src/executors/build/executor.js +67 -12
  19. package/dist/src/executors/build/executor.js.map +1 -1
  20. package/dist/src/executors/build/schema.json +7 -3
  21. package/dist/src/executors/flutter-build/executor.js +32 -1
  22. package/dist/src/executors/flutter-build/executor.js.map +1 -1
  23. package/dist/src/executors/flutter-build/schema.d.ts +8 -0
  24. package/dist/src/executors/flutter-build/schema.json +53 -0
  25. package/dist/src/generators/adopt/flutter.d.ts +32 -0
  26. package/dist/src/generators/adopt/flutter.js +305 -0
  27. package/dist/src/generators/adopt/flutter.js.map +1 -0
  28. package/dist/src/generators/adopt/generator.d.ts +17 -0
  29. package/dist/src/generators/adopt/generator.js +187 -17
  30. package/dist/src/generators/adopt/generator.js.map +1 -1
  31. package/dist/src/generators/adopt/old-script-refs.d.ts +12 -0
  32. package/dist/src/generators/adopt/old-script-refs.js +239 -0
  33. package/dist/src/generators/adopt/old-script-refs.js.map +1 -0
  34. package/dist/src/generators/adopt/pipeline.d.ts +3 -1
  35. package/dist/src/generators/adopt/pipeline.js +13 -2
  36. package/dist/src/generators/adopt/pipeline.js.map +1 -1
  37. package/dist/src/generators/adopt/schema.json +2 -2
  38. package/dist/src/generators/app/files/angular/tsconfig.app.json__template__ +1 -1
  39. package/dist/src/generators/app/files/angular/tsconfig.json__template__ +1 -1
  40. package/dist/src/generators/app/generator.js +9 -0
  41. package/dist/src/generators/app/generator.js.map +1 -1
  42. package/dist/src/generators/env/generator.js +23 -7
  43. package/dist/src/generators/env/generator.js.map +1 -1
  44. package/dist/src/generators/lib/angular-lib.js +15 -0
  45. package/dist/src/generators/lib/angular-lib.js.map +1 -1
  46. package/dist/src/generators/lib/files/angular/config/tsconfig.json__template__ +1 -1
  47. package/dist/src/generators/lib/files/pii/README.md__template__ +1 -1
  48. package/dist/src/generators/lib/files/pii/src/index.ts__template__ +2 -2
  49. package/dist/src/generators/lib/files/session/src/index.ts__template__ +2 -2
  50. package/dist/src/generators/lib/files/state/ngrx/README.md__template__ +2 -2
  51. package/dist/src/generators/lib/files/state/ngrx/src/index.ts__template__ +2 -2
  52. package/dist/src/generators/lib/types/state.js +13 -8
  53. package/dist/src/generators/lib/types/state.js.map +1 -1
  54. package/dist/src/generators/migrate/nx/build-scripts.d.ts +6 -0
  55. package/dist/src/generators/migrate/nx/build-scripts.js +33 -1
  56. package/dist/src/generators/migrate/nx/build-scripts.js.map +1 -1
  57. package/dist/src/generators/migrate/nx/env-encryption.d.ts +7 -0
  58. package/dist/src/generators/migrate/nx/env-encryption.js +34 -10
  59. package/dist/src/generators/migrate/nx/env-encryption.js.map +1 -1
  60. package/dist/src/generators/preset/generator.js +4 -1
  61. package/dist/src/generators/preset/generator.js.map +1 -1
  62. package/dist/src/generators/preset/schema.d.ts +1 -1
  63. package/dist/src/generators/preset/schema.json +1 -1
  64. package/dist/src/lib/helpers/inject-nonce.d.ts +10 -2
  65. package/dist/src/lib/helpers/inject-nonce.js +19 -4
  66. package/dist/src/lib/helpers/inject-nonce.js.map +1 -1
  67. package/dist/src/lib/release/flat-output.d.ts +33 -0
  68. package/dist/src/lib/release/flat-output.js +88 -0
  69. package/dist/src/lib/release/flat-output.js.map +1 -0
  70. package/dist/src/lib/release/htaccess-adopt.d.ts +8 -0
  71. package/dist/src/lib/release/htaccess-adopt.js +39 -14
  72. package/dist/src/lib/release/htaccess-adopt.js.map +1 -1
  73. package/dist/src/lib/upgrade/angular15.d.ts +23 -0
  74. package/dist/src/lib/upgrade/angular15.js +139 -0
  75. package/dist/src/lib/upgrade/angular15.js.map +1 -0
  76. package/dist/src/lib/upgrade/pins.d.ts +1 -1
  77. package/dist/src/lib/upgrade/pins.js +12 -1
  78. package/dist/src/lib/upgrade/pins.js.map +1 -1
  79. package/dist/src/lib/utils/angular-deps.d.ts +17 -0
  80. package/dist/src/lib/utils/angular-deps.js +29 -4
  81. package/dist/src/lib/utils/angular-deps.js.map +1 -1
  82. package/dist/src/lib/utils/angular-project.d.ts +1 -1
  83. package/dist/src/lib/utils/angular-project.js +7 -3
  84. package/dist/src/lib/utils/angular-project.js.map +1 -1
  85. package/dist/src/migrations/application-builder-flat-output/application-builder-flat-output.d.ts +9 -0
  86. package/dist/src/migrations/application-builder-flat-output/application-builder-flat-output.js +68 -0
  87. package/dist/src/migrations/application-builder-flat-output/application-builder-flat-output.js.map +1 -0
  88. package/package.json +1 -1
@@ -15,7 +15,7 @@ export interface PresetGeneratorSchema {
15
15
  lintCommand?: string;
16
16
  skipFormat?: boolean;
17
17
  skipInstall?: boolean;
18
- /** Angular major to add now (15, 16 or 17); without it Angular 15 is added by the first Angular app. */
18
+ /** Angular major to add now (14–21); without it Angular 15 is added by the first Angular app. */
19
19
  angular?: number;
20
20
  /** New Angular and Ionic apps and libraries use standalone components (nx.json pstack.angular.style). */
21
21
  standalone?: boolean;
@@ -79,7 +79,7 @@
79
79
  },
80
80
  "angular": {
81
81
  "type": "number",
82
- "enum": [15, 16, 17, 18, 19, 20, 21],
82
+ "enum": [14, 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
  "standalone": {
@@ -1,7 +1,10 @@
1
1
  /** Filled per request by the server config `pstack csp` writes (Apache SSI, Nginx sub_filter). */
2
2
  export declare const NONCE_SSI_PLACEHOLDER = "<!--#echo var=\"CSP_NONCE\" -->";
3
- /** Which tags get the nonce: all = every script, style and stylesheet link; legacy = inline scripts, every link, every style. */
4
- export type NonceTags = 'all' | 'legacy';
3
+ /**
4
+ * Which tags get the nonce: all = every script, style and stylesheet link; legacy = inline
5
+ * scripts, every link, every style; every = every script, link and style.
6
+ */
7
+ export type NonceTags = 'all' | 'legacy' | 'every';
5
8
  export type NoncePosition = 'end' | 'after-tag-name';
6
9
  export interface NonceSettings {
7
10
  /** What the server replaces per request. Default NONCE_SSI_PLACEHOLDER. */
@@ -13,6 +16,11 @@ export interface NonceSettings {
13
16
  replaceTokens?: string[];
14
17
  /** Add <meta property="csp-nonce" content="…"> to <head> (default true). */
15
18
  addMeta?: boolean;
19
+ /**
20
+ * Tag name of the Angular root element (e.g. "app-root") that gets ngCspNonce="<placeholder>":
21
+ * Angular 16+ puts that nonce on the <style> elements it adds at runtime. Default: none.
22
+ */
23
+ ngCspNonce?: string;
16
24
  /** Pages to rewrite, relative to the served root (default ["index.html"]). */
17
25
  files?: string[];
18
26
  /** Remove HTML comments (SSI directives and IE conditionals stay) from those pages. */
@@ -25,8 +25,14 @@ function resolveNonceSettings(raw) {
25
25
  throw new Error('nonce.placeholder must be one non-empty line');
26
26
  }
27
27
  const tags = s.tags ?? 'all';
28
- if (tags !== 'all' && tags !== 'legacy')
29
- throw new Error('nonce.tags must be "all" or "legacy"');
28
+ if (tags !== 'all' && tags !== 'legacy' && tags !== 'every') {
29
+ throw new Error('nonce.tags must be "all", "legacy" or "every"');
30
+ }
31
+ const ngCspNonce = s.ngCspNonce ?? '';
32
+ if (typeof ngCspNonce !== 'string' ||
33
+ (ngCspNonce !== '' && !/^[a-z][a-z0-9]*(-[a-z0-9]+)+$/i.test(ngCspNonce))) {
34
+ throw new Error('nonce.ngCspNonce must be the tag name of the root element, e.g. "app-root"');
35
+ }
30
36
  const position = s.position ?? 'end';
31
37
  if (position !== 'end' && position !== 'after-tag-name') {
32
38
  throw new Error('nonce.position must be "end" or "after-tag-name"');
@@ -56,6 +62,7 @@ function resolveNonceSettings(raw) {
56
62
  position,
57
63
  replaceTokens,
58
64
  addMeta: s.addMeta ?? true,
65
+ ngCspNonce: ngCspNonce.toLowerCase(),
59
66
  files,
60
67
  stripComments: s.stripComments ?? false,
61
68
  };
@@ -65,9 +72,9 @@ function wantsNonce(tag, mode) {
65
72
  if (tag.name === 'style')
66
73
  return true;
67
74
  if (tag.name === 'script')
68
- return mode === 'all' || !(0, tags_1.attr)(tag, 'src');
75
+ return mode !== 'legacy' || !(0, tags_1.attr)(tag, 'src');
69
76
  if (tag.name === 'link') {
70
- if (mode === 'legacy')
77
+ if (mode !== 'all')
71
78
  return true;
72
79
  return /(^|\s)stylesheet(\s|$)/i.test((0, tags_1.attr)(tag, 'rel')?.value ?? '');
73
80
  }
@@ -126,7 +133,15 @@ function injectNonceIntoHtml(input, settings, file = 'index.html') {
126
133
  html = replaceTokens(html, settings.replaceTokens, settings.placeholder, file);
127
134
  const insertions = [];
128
135
  const nonceAttr = `nonce="${settings.placeholder}"`;
136
+ let rootDone = false;
129
137
  for (const tag of (0, tags_1.scanTags)(html)) {
138
+ if (!rootDone &&
139
+ settings.ngCspNonce &&
140
+ tag.name === settings.ngCspNonce &&
141
+ !(0, tags_1.attr)(tag, 'ngcspnonce')) {
142
+ insertions.push({ at: tag.nameEnd, text: ` ngCspNonce="${settings.placeholder}"` });
143
+ rootDone = true;
144
+ }
130
145
  if (!wantsNonce(tag, settings.tags) || (0, tags_1.attr)(tag, 'nonce'))
131
146
  continue;
132
147
  insertions.push(settings.position === 'after-tag-name'
@@ -1 +1 @@
1
- {"version":3,"file":"inject-nonce.js","sourceRoot":"","sources":["../../../../src/lib/helpers/inject-nonce.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B,8CAAgD;AAChD,8CAAuD;AACvD,uCAAmF;AAEnF,kGAAkG;AACrF,QAAA,qBAAqB,GAAG,+BAA+B,CAAC;AA2BxD,QAAA,mBAAmB,GAAG,CAAC,YAAY,CAAC,CAAC;AAElD,yGAAyG;AACzG,MAAM,iBAAiB,GACrB,2GAA2G,CAAC;AAE9G;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,GAA8B;IACjE,MAAM,CAAC,GAAG,GAAG,IAAI,EAAE,CAAC;IACpB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC1F,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,IAAI,6BAAqB,CAAC;IAC3D,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;QACxF,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACjE;IACD,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC;IAC7B,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACjG,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC;IACrC,IAAI,QAAQ,KAAK,KAAK,IAAI,QAAQ,KAAK,gBAAgB,EAAE;QACvD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IACD,MAAM,aAAa,GAAG,CAAC,CAAC,aAAa,IAAI,EAAE,CAAC;IAC5C,IACE,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;QAC7B,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EACnF;QACA,MAAM,IAAI,KAAK,CACb,qFAAqF,CACtF,CAAC;KACH;IACD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,2BAAmB,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QAC/C,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;KACxE;IACD,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;QACrB,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtF,IACE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YACvB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YACpB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YACrB,IAAI,KAAK,QAAQ;YACjB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAC1B;YACA,MAAM,IAAI,KAAK,CACb,iBAAiB,CAAC,kEAAkE,CACrF,CAAC;SACH;KACF;IACD,OAAO;QACL,WAAW;QACX,IAAI;QACJ,QAAQ;QACR,aAAa;QACb,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI;QAC1B,KAAK;QACL,aAAa,EAAE,CAAC,CAAC,aAAa,IAAI,KAAK;KACxC,CAAC;AACJ,CAAC;AAjDD,oDAiDC;AAED,SAAS,UAAU,CAAC,GAAY,EAAE,IAAe;IAC/C,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACtC,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,KAAK,KAAK,IAAI,CAAC,IAAA,WAAI,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACtE,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE;QACvB,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QACnC,OAAO,yBAAyB,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,GAAG,EAAE,KAAK,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;KACtE;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,sFAAsF;AACtF,SAAS,cAAc,CAAC,IAAY,EAAE,EAAU,EAAE,MAAc;IAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACrD,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC;IAC9C,IAAI,OAAO,GAAG,CAAC;QAAE,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;IACvC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/C,8FAA8F;IAC9F,wCAAwC;IACxC,IAAI,IAA4C,CAAC;IACjD,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE;QAC/B,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,GAAG,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;YAAE,SAAS;QAChF,IAAI,CAAC,IAAI,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG;YAAE,IAAI,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;KAChD;IACD,OAAO,IAAI,EAAE,CAAC,CAAC;AACjB,CAAC;AAED;;;;GAIG;AACH,SAAS,aAAa,CAAC,IAAY,EAAE,MAAgB,EAAE,WAAmB,EAAE,IAAY;IACtF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACrC,MAAM,WAAW,GAAG,CAAC,GAAG,MAAM,CAAC;SAC5B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;SACnC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;SACpC,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,wBAAwB,WAAW,oBAAoB,EAAE,GAAG,CAAC,CAAC;IACpF,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,KAAa,EAAE,EAAU,EAAE,EAAE;QACpD,MAAM,CAAC,GAAG,cAAc,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;YAChC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;YAClD,MAAM,IAAI,KAAK,CACb,GAAG,IAAI,IAAI,IAAI,MAAM,KAAK,eAAe,CAAC,IAAI,CAAC,8BAA8B;gBAC3E,GAAG,WAAW,UAAU,CAAC,wDAAwD;gBACjF,0CAA0C,CAC7C,CAAC;SACH;QACD,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,kEAAkE;AAClE,SAAgB,mBAAmB,CACjC,KAAa,EACb,QAAiC,EACjC,IAAI,GAAG,YAAY;IAEnB,IAAI,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,IAAA,yBAAiB,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACrE,+FAA+F;IAC/F,gFAAgF;IAChF,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,EAAE,EAAE,CAAS,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAC;IAC3F,IAAI,GAAG,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAE/E,MAAM,UAAU,GAAgB,EAAE,CAAC;IACnC,MAAM,SAAS,GAAG,UAAU,QAAQ,CAAC,WAAW,GAAG,CAAC;IACpD,KAAK,MAAM,GAAG,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,EAAE;QAChC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAA,WAAI,EAAC,GAAG,EAAE,OAAO,CAAC;YAAE,SAAS;QACpE,UAAU,CAAC,IAAI,CACb,QAAQ,CAAC,QAAQ,KAAK,gBAAgB;YACpC,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,SAAS,EAAE,EAAE;YAC5C,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,SAAS,EAAE,EAAE,CAChD,CAAC;KACH;IACD,IAAI,GAAG,IAAA,sBAAe,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAEzC,IAAI,QAAQ,CAAC,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC1D,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;QAC3D,IAAI,IAAI,EAAE;YACR,MAAM,IAAI,GAAG,uCAAuC,QAAQ,CAAC,WAAW,IAAI,CAAC;YAC7E,IAAI,GAAG,IAAA,sBAAe,EAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;SACvE;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AA/BD,kDA+BC;AAED;;;;GAIG;AACH,SAAgB,cAAc,CAAC,IAAwB;IACrD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;KACvE;IACD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,IAAA,kBAAU,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,KAAK,EAAE;QAChC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,SAAS;QACnC,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QACrD,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAlBD,wCAkBC"}
1
+ {"version":3,"file":"inject-nonce.js","sourceRoot":"","sources":["../../../../src/lib/helpers/inject-nonce.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,33 @@
1
+ /**
2
+ * Angular's application builder writes the browser files to `<base>/browser/` unless
3
+ * `outputPath.browser` is "". pstack release builds never have a browser/ folder: the build
4
+ * target of an application-builder app gets `outputPath: { base, browser: "" }`, and the release
5
+ * build refuses anything else (see the build executor).
6
+ */
7
+ type Json = Record<string, unknown>;
8
+ /** Angular application builders (Angular 17+), as Nx and Angular name them. */
9
+ export declare const APPLICATION_BUILDER: RegExp;
10
+ /**
11
+ * Options of the application builder that make a server-rendered build (prerendering and an app
12
+ * shell still produce static browser files, so they are not among them).
13
+ */
14
+ export declare const SSR_OPTIONS: readonly ["server", "ssr"];
15
+ /** Whether a target runs the application builder. */
16
+ export declare function isApplicationBuilder(target: unknown): boolean;
17
+ /** The SSR option a set of options turns on, if any. */
18
+ export declare function ssrOption(options: Json): string | undefined;
19
+ export type FlatOutputChange = 'set' | 'flat' | 'ssr' | 'none';
20
+ /**
21
+ * Makes an application-builder target's outputs flat: a string outputPath becomes
22
+ * `{ base: <it>, browser: "" }`, an object gets `browser: ""` (other fields kept), in the options
23
+ * and in every configuration that sets outputPath. 'ssr' (nothing changed) for server-rendered
24
+ * builds, 'flat' when already flat, 'none' when the target is not an application builder.
25
+ */
26
+ export declare function flattenApplicationOutput(target: unknown): FlatOutputChange;
27
+ /** `base` of an object outputPath, or the string itself. */
28
+ export declare function outputBase(outputPath: unknown): string | undefined;
29
+ /** Whether two output paths name the same folder (workspace-relative, separators ignored). */
30
+ export declare function sameOutput(a: string, b: string): boolean;
31
+ /** The folder an outputPath serves from: base/<browser> (browser "" = base), or the string. */
32
+ export declare function servedOutput(outputPath: unknown): string | undefined;
33
+ export {};
@@ -0,0 +1,88 @@
1
+ "use strict";
2
+ /**
3
+ * Angular's application builder writes the browser files to `<base>/browser/` unless
4
+ * `outputPath.browser` is "". pstack release builds never have a browser/ folder: the build
5
+ * target of an application-builder app gets `outputPath: { base, browser: "" }`, and the release
6
+ * build refuses anything else (see the build executor).
7
+ */
8
+ Object.defineProperty(exports, "__esModule", { value: true });
9
+ exports.servedOutput = exports.sameOutput = exports.outputBase = exports.flattenApplicationOutput = exports.ssrOption = exports.isApplicationBuilder = exports.SSR_OPTIONS = exports.APPLICATION_BUILDER = void 0;
10
+ const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
11
+ /** Angular application builders (Angular 17+), as Nx and Angular name them. */
12
+ exports.APPLICATION_BUILDER = /^(?:@angular\/build|@angular-devkit\/build-angular|@nx\/angular|@nrwl\/angular):application$/;
13
+ /**
14
+ * Options of the application builder that make a server-rendered build (prerendering and an app
15
+ * shell still produce static browser files, so they are not among them).
16
+ */
17
+ exports.SSR_OPTIONS = ['server', 'ssr'];
18
+ /** Whether a target runs the application builder. */
19
+ function isApplicationBuilder(target) {
20
+ return isObject(target) && typeof target['executor'] === 'string'
21
+ ? exports.APPLICATION_BUILDER.test(target['executor'])
22
+ : false;
23
+ }
24
+ exports.isApplicationBuilder = isApplicationBuilder;
25
+ /** The SSR option a set of options turns on, if any. */
26
+ function ssrOption(options) {
27
+ if (options['outputMode'] === 'server')
28
+ return 'outputMode';
29
+ return exports.SSR_OPTIONS.find((k) => options[k] !== undefined && options[k] !== false);
30
+ }
31
+ exports.ssrOption = ssrOption;
32
+ const normalize = (p) => p.replace(/\\/g, '/').replace(/^\.\//, '').replace(/\/+$/, '');
33
+ /**
34
+ * Makes an application-builder target's outputs flat: a string outputPath becomes
35
+ * `{ base: <it>, browser: "" }`, an object gets `browser: ""` (other fields kept), in the options
36
+ * and in every configuration that sets outputPath. 'ssr' (nothing changed) for server-rendered
37
+ * builds, 'flat' when already flat, 'none' when the target is not an application builder.
38
+ */
39
+ function flattenApplicationOutput(target) {
40
+ if (!isApplicationBuilder(target))
41
+ return 'none';
42
+ const t = target;
43
+ const sets = [
44
+ t['options'],
45
+ ...Object.values(isObject(t['configurations']) ? t['configurations'] : {}),
46
+ ].filter(isObject);
47
+ if (sets.some((o) => ssrOption(o)))
48
+ return 'ssr';
49
+ let changed = false;
50
+ for (const o of sets) {
51
+ const out = o['outputPath'];
52
+ if (typeof out === 'string') {
53
+ o['outputPath'] = { base: out, browser: '' };
54
+ changed = true;
55
+ }
56
+ else if (isObject(out) && out['browser'] !== '') {
57
+ o['outputPath'] = { ...out, browser: '' };
58
+ changed = true;
59
+ }
60
+ }
61
+ return changed ? 'set' : 'flat';
62
+ }
63
+ exports.flattenApplicationOutput = flattenApplicationOutput;
64
+ /** `base` of an object outputPath, or the string itself. */
65
+ function outputBase(outputPath) {
66
+ if (typeof outputPath === 'string')
67
+ return outputPath;
68
+ if (isObject(outputPath) && typeof outputPath['base'] === 'string')
69
+ return outputPath['base'];
70
+ return undefined;
71
+ }
72
+ exports.outputBase = outputBase;
73
+ /** Whether two output paths name the same folder (workspace-relative, separators ignored). */
74
+ function sameOutput(a, b) {
75
+ return normalize(a) === normalize(b);
76
+ }
77
+ exports.sameOutput = sameOutput;
78
+ /** The folder an outputPath serves from: base/<browser> (browser "" = base), or the string. */
79
+ function servedOutput(outputPath) {
80
+ if (typeof outputPath === 'string')
81
+ return outputPath;
82
+ if (!isObject(outputPath) || typeof outputPath['base'] !== 'string')
83
+ return undefined;
84
+ const browser = outputPath['browser'] === undefined ? 'browser' : String(outputPath['browser']);
85
+ return browser === '' ? outputPath['base'] : `${normalize(outputPath['base'])}/${browser}`;
86
+ }
87
+ exports.servedOutput = servedOutput;
88
+ //# sourceMappingURL=flat-output.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"flat-output.js","sourceRoot":"","sources":["../../../../src/lib/release/flat-output.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,MAAM,QAAQ,GAAG,CAAC,CAAU,EAAa,EAAE,CACzC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAE3D,+EAA+E;AAClE,QAAA,mBAAmB,GAC9B,8FAA8F,CAAC;AAEjG;;;GAGG;AACU,QAAA,WAAW,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAU,CAAC;AAEtD,qDAAqD;AACrD,SAAgB,oBAAoB,CAAC,MAAe;IAClD,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,QAAQ;QAC/D,CAAC,CAAC,2BAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC9C,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC;AAJD,oDAIC;AAED,wDAAwD;AACxD,SAAgB,SAAS,CAAC,OAAa;IACrC,IAAI,OAAO,CAAC,YAAY,CAAC,KAAK,QAAQ;QAAE,OAAO,YAAY,CAAC;IAC5D,OAAO,mBAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC;AACnF,CAAC;AAHD,8BAGC;AAED,MAAM,SAAS,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAIhG;;;;;GAKG;AACH,SAAgB,wBAAwB,CAAC,MAAe;IACtD,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IACjD,MAAM,CAAC,GAAG,MAAc,CAAC;IACzB,MAAM,IAAI,GAAG;QACX,CAAC,CAAC,SAAS,CAAC;QACZ,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3E,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnB,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACjD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;QACpB,MAAM,GAAG,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC;QAC5B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YAC7C,OAAO,GAAG,IAAI,CAAC;SAChB;aAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE;YACjD,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YAC1C,OAAO,GAAG,IAAI,CAAC;SAChB;KACF;IACD,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;AAClC,CAAC;AApBD,4DAoBC;AAED,4DAA4D;AAC5D,SAAgB,UAAU,CAAC,UAAmB;IAC5C,IAAI,OAAO,UAAU,KAAK,QAAQ;QAAE,OAAO,UAAU,CAAC;IACtD,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,OAAO,UAAU,CAAC,MAAM,CAAC,KAAK,QAAQ;QAAE,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;IAC9F,OAAO,SAAS,CAAC;AACnB,CAAC;AAJD,gCAIC;AAED,8FAA8F;AAC9F,SAAgB,UAAU,CAAC,CAAS,EAAE,CAAS;IAC7C,OAAO,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC;AACvC,CAAC;AAFD,gCAEC;AAED,+FAA+F;AAC/F,SAAgB,YAAY,CAAC,UAAmB;IAC9C,IAAI,OAAO,UAAU,KAAK,QAAQ;QAAE,OAAO,UAAU,CAAC;IACtD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,OAAO,UAAU,CAAC,MAAM,CAAC,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IACtF,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;IAChG,OAAO,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;AAC7F,CAAC;AALD,oCAKC"}
@@ -1,4 +1,5 @@
1
1
  import { Tree } from '@nx/devkit';
2
+ type Json = Record<string, unknown>;
2
3
  export interface AdoptHtaccessResult {
3
4
  /** The .htaccess the build target copied (workspace-relative), when there was one. */
4
5
  source?: string;
@@ -11,6 +12,12 @@ export interface AdoptHtaccessResult {
11
12
  /** Release envs without an htaccess.<env> while others have one (nothing was written). */
12
13
  missing: string[];
13
14
  }
15
+ /**
16
+ * True when the project is on the plugin's release target (with env .htaccess files, not
17
+ * `htaccess: false`) but the Angular target it builds still copies a .htaccess through its assets
18
+ * (options or any configuration): an app whose .htaccess was never moved to the env files.
19
+ */
20
+ export declare function copiesHtaccess(pj: Json): boolean;
14
21
  /**
15
22
  * Moves an app to environment-specific .htaccess files, keeping what its release builds contain:
16
23
  * the .htaccess its build target copied becomes environments/<envProject>/htaccess.<env> for every
@@ -20,3 +27,4 @@ export interface AdoptHtaccessResult {
20
27
  export declare function adoptHtaccess(tree: Tree, projectJsonPath: string): AdoptHtaccessResult;
21
28
  /** What adoptHtaccess did, as a migration report note (none when nothing changed). */
22
29
  export declare function htaccessNote(r: AdoptHtaccessResult, name: string, notes: string[]): void;
30
+ export {};
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.htaccessNote = exports.adoptHtaccess = void 0;
3
+ exports.htaccessNote = exports.adoptHtaccess = exports.copiesHtaccess = void 0;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  const htaccess_1 = require("./htaccess");
6
6
  const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
@@ -14,6 +14,40 @@ function htaccessAsset(entry) {
14
14
  }
15
15
  return undefined;
16
16
  }
17
+ /** The release target, its options and the Angular target it builds, when there is a release. */
18
+ function releaseAndBuild(pj) {
19
+ const targets = isObject(pj['targets']) ? pj['targets'] : {};
20
+ const release = Object.values(targets).find((t) => isObject(t) && t['executor'] === RELEASE_EXECUTOR);
21
+ if (!release)
22
+ return undefined;
23
+ const options = isObject(release['options']) ? release['options'] : (release['options'] = {});
24
+ // The Angular target the release builds (options.buildTarget "project:target[:config]").
25
+ const buildTargetName = typeof options['buildTarget'] === 'string'
26
+ ? String(options['buildTarget']).split(':')[1] ?? 'build'
27
+ : 'build';
28
+ return { release, options, build: targets[buildTargetName] ?? targets['build'] };
29
+ }
30
+ /** The option sets of a target: its options and every configuration. */
31
+ function optionSets(target) {
32
+ return [
33
+ target?.['options'],
34
+ ...Object.values(isObject(target?.['configurations']) ? target?.['configurations'] : {}),
35
+ ];
36
+ }
37
+ /**
38
+ * True when the project is on the plugin's release target (with env .htaccess files, not
39
+ * `htaccess: false`) but the Angular target it builds still copies a .htaccess through its assets
40
+ * (options or any configuration): an app whose .htaccess was never moved to the env files.
41
+ */
42
+ function copiesHtaccess(pj) {
43
+ const r = releaseAndBuild(JSON.parse(JSON.stringify(pj)));
44
+ if (!r || r.options['htaccess'] === false)
45
+ return false;
46
+ return optionSets(r.build).some((o) => isObject(o) &&
47
+ Array.isArray(o['assets']) &&
48
+ o['assets'].some((a) => htaccessAsset(a) !== undefined));
49
+ }
50
+ exports.copiesHtaccess = copiesHtaccess;
17
51
  /** Drops .htaccess entries from an assets list; returns the paths they copied. */
18
52
  function dropHtaccessAssets(options) {
19
53
  if (!isObject(options) || !Array.isArray(options['assets']))
@@ -36,22 +70,13 @@ function dropHtaccessAssets(options) {
36
70
  function adoptHtaccess(tree, projectJsonPath) {
37
71
  const result = { written: [], kept: [], disabled: false, missing: [] };
38
72
  const pj = (0, devkit_1.readJson)(tree, projectJsonPath);
39
- const targets = isObject(pj['targets']) ? pj['targets'] : {};
40
- const release = Object.values(targets).find((t) => t['executor'] === RELEASE_EXECUTOR);
41
- if (!release)
73
+ const r = releaseAndBuild(pj);
74
+ if (!r)
42
75
  return result;
43
- const options = isObject(release['options']) ? release['options'] : (release['options'] = {});
76
+ const { release, options, build } = r;
44
77
  if (options['htaccess'] === false)
45
78
  return result;
46
- // The Angular target the release builds (options.buildTarget "project:target[:config]").
47
- const buildTargetName = typeof options['buildTarget'] === 'string'
48
- ? String(options['buildTarget']).split(':')[1] ?? 'build'
49
- : 'build';
50
- const build = targets[buildTargetName] ?? targets['build'];
51
- const copied = [
52
- ...dropHtaccessAssets(build?.['options']),
53
- ...Object.values(isObject(build?.['configurations']) ? build?.['configurations'] : {}).flatMap((c) => dropHtaccessAssets(c)),
54
- ];
79
+ const copied = optionSets(build).flatMap((o) => dropHtaccessAssets(o));
55
80
  const source = copied.find((p) => tree.exists(p) && tree.isFile(p));
56
81
  const envProject = String(options['envProject'] ?? pj['name']);
57
82
  const configs = isObject(release['configurations']) ? release['configurations'] : {};
@@ -1 +1 @@
1
- {"version":3,"file":"htaccess-adopt.js","sourceRoot":"","sources":["../../../../src/lib/release/htaccess-adopt.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"htaccess-adopt.js","sourceRoot":"","sources":["../../../../src/lib/release/htaccess-adopt.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,23 @@
1
+ /**
2
+ * The 14 → 15 step's fix-ups. Angular 14 and 15 both run on Nx 17.0, so the step is
3
+ * `nx migrate @angular/core@15` with no Nx migrations: what Angular's CLI migrations and Nx's
4
+ * Angular 15 migrations would have done is done here.
5
+ */
6
+ type Json = Record<string, unknown>;
7
+ /**
8
+ * Angular 15 compiles for ES2022 with `useDefineForClassFields: false` (its CLI forces both and
9
+ * warns otherwise). Rewrites older `target`s in the workspace's tsconfig files as Angular's own
10
+ * migration does, adding `useDefineForClassFields: false` where the file does not set it. Text
11
+ * edits, so comments and layout stay. Returns the files changed (workspace-relative).
12
+ */
13
+ export declare function es2022Targets(root: string): string[];
14
+ /**
15
+ * Apps whose build loads zone.js from a polyfills file that does nothing else (Angular 14's
16
+ * `polyfills: "<app>/src/polyfills.ts"`) get Angular 15's `polyfills: ["zone.js"]`; the file goes,
17
+ * and so does its entry in the app's tsconfig `files`. A polyfills file with anything else in it
18
+ * stays (Angular 15 still takes a file). Returns what changed (workspace-relative).
19
+ */
20
+ export declare function polyfillsToArray(root: string): string[];
21
+ /** zone.js and NgRx for Angular 15 (`pkg@range`), for the declared ones that are older. */
22
+ export declare function angular15RuntimeSpecs(pkg: Json): string[];
23
+ export {};
@@ -0,0 +1,139 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.angular15RuntimeSpecs = exports.polyfillsToArray = exports.es2022Targets = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const fs = tslib_1.__importStar(require("fs"));
6
+ const path = tslib_1.__importStar(require("path"));
7
+ /** Files under dir (no node_modules, no dot folders) whose name matches. */
8
+ function walk(dir, match) {
9
+ const out = [];
10
+ const go = (d) => {
11
+ if (!fs.existsSync(d))
12
+ return;
13
+ for (const e of fs.readdirSync(d, { withFileTypes: true })) {
14
+ if (e.name === 'node_modules' || e.name.startsWith('.'))
15
+ continue;
16
+ const p = path.join(d, e.name);
17
+ if (e.isDirectory())
18
+ go(p);
19
+ else if (match(e.name))
20
+ out.push(p);
21
+ }
22
+ };
23
+ go(dir);
24
+ return out;
25
+ }
26
+ const OLD_TARGET = /("target"\s*:\s*)"(es5|es2015|es2016|es2017|es2018|es2019|es2020|es2021)"/i;
27
+ /**
28
+ * Angular 15 compiles for ES2022 with `useDefineForClassFields: false` (its CLI forces both and
29
+ * warns otherwise). Rewrites older `target`s in the workspace's tsconfig files as Angular's own
30
+ * migration does, adding `useDefineForClassFields: false` where the file does not set it. Text
31
+ * edits, so comments and layout stay. Returns the files changed (workspace-relative).
32
+ */
33
+ function es2022Targets(root) {
34
+ const files = [
35
+ ...fs
36
+ .readdirSync(root)
37
+ .filter((f) => /^tsconfig.*\.json$/.test(f))
38
+ .map((f) => path.join(root, f)),
39
+ ...walk(path.join(root, 'apps'), (n) => /^tsconfig.*\.json$/.test(n)),
40
+ ...walk(path.join(root, 'libs'), (n) => /^tsconfig.*\.json$/.test(n)),
41
+ ];
42
+ const changed = [];
43
+ for (const file of files) {
44
+ const text = fs.readFileSync(file, 'utf8');
45
+ const m = OLD_TARGET.exec(text);
46
+ if (!m || m.index === undefined)
47
+ continue;
48
+ const lineStart = text.lastIndexOf('\n', m.index) + 1;
49
+ const indent = /^[ \t]*/.exec(text.slice(lineStart))?.[0] ?? ' ';
50
+ const defineFields = /"useDefineForClassFields"/.test(text)
51
+ ? ''
52
+ : `,\n${indent}"useDefineForClassFields": false`;
53
+ const out = text.slice(0, m.index) + `${m[1]}"es2022"${defineFields}` + text.slice(m.index + m[0].length);
54
+ fs.writeFileSync(file, out);
55
+ changed.push(path.relative(root, file));
56
+ }
57
+ return changed;
58
+ }
59
+ exports.es2022Targets = es2022Targets;
60
+ /** The file's code with comments and blank lines removed. */
61
+ function code(text) {
62
+ return text
63
+ .replace(/\/\*[\s\S]*?\*\//g, '')
64
+ .replace(/(^|[^:])\/\/.*$/gm, '$1')
65
+ .split('\n')
66
+ .map((l) => l.trim())
67
+ .filter(Boolean)
68
+ .join('\n');
69
+ }
70
+ /** A polyfills file that only loads zone.js (what Angular 15's `["zone.js"]` does). */
71
+ function onlyZone(text) {
72
+ const lines = code(text).split('\n');
73
+ return (lines.length > 0 && lines.every((l) => /^import\s+['"]zone\.js(\/dist\/zone)?['"];?$/.test(l)));
74
+ }
75
+ /**
76
+ * Apps whose build loads zone.js from a polyfills file that does nothing else (Angular 14's
77
+ * `polyfills: "<app>/src/polyfills.ts"`) get Angular 15's `polyfills: ["zone.js"]`; the file goes,
78
+ * and so does its entry in the app's tsconfig `files`. A polyfills file with anything else in it
79
+ * stays (Angular 15 still takes a file). Returns what changed (workspace-relative).
80
+ */
81
+ function polyfillsToArray(root) {
82
+ const changed = [];
83
+ for (const pjFile of walk(path.join(root, 'apps'), (n) => n === 'project.json')) {
84
+ const original = fs.readFileSync(pjFile, 'utf8');
85
+ let pj = original;
86
+ const seen = new Set();
87
+ for (const m of pj.matchAll(/"polyfills"\s*:\s*"([^"]+\.ts)"/g))
88
+ seen.add(m[1]);
89
+ for (const rel of seen) {
90
+ const file = path.join(root, rel);
91
+ if (!fs.existsSync(file) || !onlyZone(fs.readFileSync(file, 'utf8')))
92
+ continue;
93
+ const esc = rel.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
94
+ pj = pj.replace(new RegExp(`"polyfills"(\\s*):(\\s*)"${esc}"`, 'g'), '"polyfills"$1:$2["zone.js"]');
95
+ fs.rmSync(file);
96
+ changed.push(rel);
97
+ // The app's tsconfig files that list it (tsconfig.app.json, tsconfig.spec.json).
98
+ for (const ts of walk(path.dirname(pjFile), (n) => /^tsconfig.*\.json$/.test(n))) {
99
+ const entry = path.relative(path.dirname(ts), file).split(path.sep).join('/');
100
+ const e = entry.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
101
+ const text = fs.readFileSync(ts, 'utf8');
102
+ const out = text
103
+ .replace(new RegExp(`,\\s*"(\\./)?${e}"`), '')
104
+ .replace(new RegExp(`"(\\./)?${e}"\\s*,\\s*`), '');
105
+ if (out !== text) {
106
+ fs.writeFileSync(ts, out);
107
+ changed.push(path.relative(root, ts));
108
+ }
109
+ }
110
+ }
111
+ if (pj !== original) {
112
+ fs.writeFileSync(pjFile, pj);
113
+ changed.push(path.relative(root, pjFile));
114
+ }
115
+ }
116
+ return [...new Set(changed)];
117
+ }
118
+ exports.polyfillsToArray = polyfillsToArray;
119
+ /** zone.js and NgRx for Angular 15 (`pkg@range`), for the declared ones that are older. */
120
+ function angular15RuntimeSpecs(pkg) {
121
+ const deps = {
122
+ ...(pkg['devDependencies'] ?? {}),
123
+ ...(pkg['dependencies'] ?? {}),
124
+ };
125
+ const out = [];
126
+ const zone = deps['zone.js'];
127
+ const zm = zone ? /(\d+)\.(\d+)/.exec(zone) : null;
128
+ if (zm && Number(zm[1]) === 0 && Number(zm[2]) < 12)
129
+ out.push('zone.js@~0.12.0');
130
+ for (const [name, spec] of Object.entries(deps)) {
131
+ const major = /(\d+)/.exec(spec)?.[1];
132
+ if (name.startsWith('@ngrx/') && major !== undefined && Number(major) < 15) {
133
+ out.push(`${name}@~15.4.0`);
134
+ }
135
+ }
136
+ return out.sort();
137
+ }
138
+ exports.angular15RuntimeSpecs = angular15RuntimeSpecs;
139
+ //# sourceMappingURL=angular15.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"angular15.js","sourceRoot":"","sources":["../../../../src/lib/upgrade/angular15.ts"],"names":[],"mappings":"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"}
@@ -19,7 +19,7 @@ export interface AngularPins {
19
19
  angularEslint: string;
20
20
  }
21
21
  export declare const ANGULAR_PINS: Readonly<Record<number, AngularPins>>;
22
- export declare const MIN_ANGULAR = 15;
22
+ export declare const MIN_ANGULAR = 14;
23
23
  export declare const MAX_ANGULAR = 21;
24
24
  /**
25
25
  * The step that runs Angular's inject() migration (`@angular/core:inject`): angular-eslint 20 turns
@@ -2,6 +2,17 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.majorOfSpec = exports.pinRange = exports.NX_SKIPS_ANGULAR_FROM = exports.INJECT_MIGRATION_ANGULAR = exports.MAX_ANGULAR = exports.MIN_ANGULAR = exports.ANGULAR_PINS = void 0;
4
4
  exports.ANGULAR_PINS = {
5
+ // Nx 17.0 is the last Nx with Angular 14 in its matrix (so 14 → 15 keeps Nx 17.0.6); Ionic 7 and
6
+ // Capacitor 5 as on 15.
7
+ 14: {
8
+ angular: '14.3.0',
9
+ nx: '17.0.6',
10
+ typescript: '4.8.4',
11
+ ionic: '7.8.6',
12
+ capacitor: 5,
13
+ node: 20,
14
+ angularEslint: '14.4.0',
15
+ },
5
16
  15: {
6
17
  angular: '15.2.10',
7
18
  nx: '17.0.6',
@@ -66,7 +77,7 @@ exports.ANGULAR_PINS = {
66
77
  angularEslint: '21',
67
78
  },
68
79
  };
69
- exports.MIN_ANGULAR = 15;
80
+ exports.MIN_ANGULAR = 14;
70
81
  exports.MAX_ANGULAR = 21;
71
82
  /**
72
83
  * The step that runs Angular's inject() migration (`@angular/core:inject`): angular-eslint 20 turns
@@ -1 +1 @@
1
- {"version":3,"file":"pins.js","sourceRoot":"","sources":["../../../../src/lib/upgrade/pins.ts"],"names":[],"mappings":";;;AAqBa,QAAA,YAAY,GAA0C;IACjE,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,SAAS;QACb,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,SAAS;QACb,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,SAAS;QACb,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,IAAI;KACpB;CACF,CAAC;AAEW,QAAA,WAAW,GAAG,EAAE,CAAC;AACjB,QAAA,WAAW,GAAG,EAAE,CAAC;AAE9B;;;GAGG;AACU,QAAA,wBAAwB,GAAG,EAAE,CAAC;AAE3C,8FAA8F;AACjF,QAAA,qBAAqB,GAAG,EAAE,CAAC;AAExC,iEAAiE;AACjE,SAAgB,QAAQ,CAAC,GAAW;IAClC,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC;AACvD,CAAC;AAFD,4BAEC;AAED,8FAA8F;AAC9F,SAAgB,WAAW,CAAC,IAAwB;IAClD,MAAM,CAAC,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtC,CAAC;AAHD,kCAGC"}
1
+ {"version":3,"file":"pins.js","sourceRoot":"","sources":["../../../../src/lib/upgrade/pins.ts"],"names":[],"mappings":";;;AAqBa,QAAA,YAAY,GAA0C;IACjE,iGAAiG;IACjG,wBAAwB;IACxB,EAAE,EAAE;QACF,OAAO,EAAE,QAAQ;QACjB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,SAAS;QACb,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,QAAQ;QACZ,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,SAAS;QACb,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,QAAQ;KACxB;IACD,EAAE,EAAE;QACF,OAAO,EAAE,SAAS;QAClB,EAAE,EAAE,SAAS;QACb,UAAU,EAAE,OAAO;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,CAAC;QACZ,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,IAAI;KACpB;CACF,CAAC;AAEW,QAAA,WAAW,GAAG,EAAE,CAAC;AACjB,QAAA,WAAW,GAAG,EAAE,CAAC;AAE9B;;;GAGG;AACU,QAAA,wBAAwB,GAAG,EAAE,CAAC;AAE3C,8FAA8F;AACjF,QAAA,qBAAqB,GAAG,EAAE,CAAC;AAExC,iEAAiE;AACjE,SAAgB,QAAQ,CAAC,GAAW;IAClC,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC;AACvD,CAAC;AAFD,4BAEC;AAED,8FAA8F;AAC9F,SAAgB,WAAW,CAAC,IAAwB;IAClD,MAAM,CAAC,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtC,CAAC;AAHD,kCAGC"}