@mouryaamit/nx-polystack 1.5.0 → 1.6.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.
Files changed (65) hide show
  1. package/dist/migrations.json +5 -0
  2. package/dist/src/cli/commands/csp.js +55 -11
  3. package/dist/src/cli/commands/csp.js.map +1 -1
  4. package/dist/src/cli/help.js +3 -0
  5. package/dist/src/cli/help.js.map +1 -1
  6. package/dist/src/cli/launcher.js +1 -1
  7. package/dist/src/cli/launcher.js.map +1 -1
  8. package/dist/src/executors/build/executor.js +20 -0
  9. package/dist/src/executors/build/executor.js.map +1 -1
  10. package/dist/src/executors/build/schema.d.ts +5 -0
  11. package/dist/src/executors/build/schema.json +5 -0
  12. package/dist/src/executors/capacitor/executor.js +13 -0
  13. package/dist/src/executors/capacitor/executor.js.map +1 -1
  14. package/dist/src/executors/flutter-build/executor.js +33 -4
  15. package/dist/src/executors/flutter-build/executor.js.map +1 -1
  16. package/dist/src/executors/flutter-build/schema.d.ts +6 -1
  17. package/dist/src/executors/flutter-build/schema.json +10 -1
  18. package/dist/src/generators/app/files/angular/server/README.md__template__ +7 -3
  19. package/dist/src/generators/app/from.js +56 -21
  20. package/dist/src/generators/app/from.js.map +1 -1
  21. package/dist/src/generators/app/generator.d.ts +2 -0
  22. package/dist/src/generators/app/generator.js +18 -3
  23. package/dist/src/generators/app/generator.js.map +1 -1
  24. package/dist/src/generators/env/generator.js +110 -17
  25. package/dist/src/generators/env/generator.js.map +1 -1
  26. package/dist/src/generators/migrate/adapters/angular-cli.js +11 -6
  27. package/dist/src/generators/migrate/adapters/angular-cli.js.map +1 -1
  28. package/dist/src/generators/migrate/adapters/angular-workspace.js +12 -0
  29. package/dist/src/generators/migrate/adapters/angular-workspace.js.map +1 -1
  30. package/dist/src/generators/migrate/adapters/flutter.js +13 -7
  31. package/dist/src/generators/migrate/adapters/flutter.js.map +1 -1
  32. package/dist/src/generators/migrate/adapters/npm-workspaces.js +6 -0
  33. package/dist/src/generators/migrate/adapters/npm-workspaces.js.map +1 -1
  34. package/dist/src/generators/migrate/adapters/nx-workspace.js +19 -5
  35. package/dist/src/generators/migrate/adapters/nx-workspace.js.map +1 -1
  36. package/dist/src/generators/migrate/adapters/types.d.ts +10 -0
  37. package/dist/src/generators/migrate/adapters/types.js.map +1 -1
  38. package/dist/src/generators/migrate/generator.js +3 -0
  39. package/dist/src/generators/migrate/generator.js.map +1 -1
  40. package/dist/src/lib/csp/allowlist.d.ts +11 -1
  41. package/dist/src/lib/csp/allowlist.js +73 -15
  42. package/dist/src/lib/csp/allowlist.js.map +1 -1
  43. package/dist/src/lib/csp/render.d.ts +8 -0
  44. package/dist/src/lib/csp/render.js +37 -1
  45. package/dist/src/lib/csp/render.js.map +1 -1
  46. package/dist/src/lib/release/htaccess-adopt.d.ts +22 -0
  47. package/dist/src/lib/release/htaccess-adopt.js +108 -0
  48. package/dist/src/lib/release/htaccess-adopt.js.map +1 -0
  49. package/dist/src/lib/release/htaccess.d.ts +23 -0
  50. package/dist/src/lib/release/htaccess.js +81 -0
  51. package/dist/src/lib/release/htaccess.js.map +1 -0
  52. package/dist/src/lib/utils/angular-project.js +2 -1
  53. package/dist/src/lib/utils/angular-project.js.map +1 -1
  54. package/dist/src/lib/utils/env-files.d.ts +19 -4
  55. package/dist/src/lib/utils/env-files.js +48 -4
  56. package/dist/src/lib/utils/env-files.js.map +1 -1
  57. package/dist/src/lib/utils/env-move.d.ts +37 -0
  58. package/dist/src/lib/utils/env-move.js +186 -0
  59. package/dist/src/lib/utils/env-move.js.map +1 -0
  60. package/dist/src/lib/utils/llm-block.js +8 -3
  61. package/dist/src/lib/utils/llm-block.js.map +1 -1
  62. package/dist/src/migrations/env-files-layout/env-files-layout.d.ts +22 -0
  63. package/dist/src/migrations/env-files-layout/env-files-layout.js +180 -0
  64. package/dist/src/migrations/env-files-layout/env-files-layout.js.map +1 -0
  65. package/package.json +1 -1
@@ -92,6 +92,11 @@
92
92
  "version": "1.2.7",
93
93
  "description": "Import env files through the @env/* tsconfig alias instead of a relative path into environments/ (refused by @nx/enforce-module-boundaries from Nx 18 on)",
94
94
  "implementation": "./src/migrations/env-import-alias/env-import-alias"
95
+ },
96
+ "env-files-layout": {
97
+ "version": "1.5.2",
98
+ "description": "Move per-environment files into environments/<project>/: the .htaccess an app's build copied becomes htaccess.<env> per release env (htaccess: false when it had none), Flutter env JSON moves to environment.<env>.json, and Flutter targets on tools/scripts/flutter/flutter-build.js move to the plugin executor",
99
+ "implementation": "./src/migrations/env-files-layout/env-files-layout"
95
100
  }
96
101
  }
97
102
  }
@@ -7,6 +7,7 @@ const path = tslib_1.__importStar(require("path"));
7
7
  const allowlist_1 = require("../../lib/csp/allowlist");
8
8
  const import_1 = require("../../lib/csp/import");
9
9
  const render_1 = require("../../lib/csp/render");
10
+ const htaccess_1 = require("../../lib/release/htaccess");
10
11
  const angular_project_1 = require("../../lib/utils/angular-project");
11
12
  const project_json_files_1 = require("../../lib/utils/project-json-files");
12
13
  const args_1 = require("../args");
@@ -172,9 +173,15 @@ function syncNoncePlaceholder(tree, root, wanted, dryRun = false) {
172
173
  return lines;
173
174
  }
174
175
  exports.syncNoncePlaceholder = syncNoncePlaceholder;
176
+ /** The release target's env names, lower-cased (its configurations' env, else their names). */
177
+ function releaseEnvs(release) {
178
+ return [
179
+ ...new Set(Object.entries(release.configurations ?? {}).map(([name, c]) => String(c?.env ?? name).toLowerCase())),
180
+ ];
181
+ }
175
182
  /** pstack csp --app=<project>: edit csp-allowlist.json and render .htaccess / nginx.conf from it. */
176
183
  async function runCsp(ctx) {
177
- for (const f of ['app', 'add', 'remove', 'import', 'nonceSource']) {
184
+ for (const f of ['app', 'add', 'remove', 'import', 'nonceSource', 'env']) {
178
185
  if (ctx.flags[f] === true)
179
186
  throw new types_1.CliError(`--${f} needs a value.`);
180
187
  }
@@ -186,6 +193,13 @@ async function runCsp(ctx) {
186
193
  const force = ctx.flags['force'] !== undefined && (0, args_1.flagBoolean)(ctx.flags, 'force');
187
194
  const nonceSourceFlag = (0, args_1.flagString)(ctx.flags, 'nonceSource');
188
195
  const importFlag = (0, args_1.flagString)(ctx.flags, 'import');
196
+ const envFlag = (0, args_1.flagString)(ctx.flags, 'env')?.toLowerCase();
197
+ if (envFlag !== undefined && importFlag !== undefined) {
198
+ throw new types_1.CliError('--import merges into the sources of every env; it does not take --env.');
199
+ }
200
+ if (envFlag !== undefined && adds.length + removes.length === 0) {
201
+ throw new types_1.CliError('--env changes the sources of one env: give --add and/or --remove too.');
202
+ }
189
203
  const imported = importFlag === undefined ? undefined : readImportSource(importFlag, ctx.cwd);
190
204
  let parsedImport;
191
205
  if (imported) {
@@ -210,7 +224,8 @@ async function runCsp(ctx) {
210
224
  if (!project)
211
225
  throw new types_1.CliError(`No project named "${app}".`);
212
226
  const targets = (project.json['targets'] ?? {});
213
- if (!Object.values(targets).some((t) => t.executor === angular_project_1.POLYSTACK_BUILD_EXECUTOR)) {
227
+ const release = Object.values(targets).find((t) => t.executor === angular_project_1.POLYSTACK_BUILD_EXECUTOR);
228
+ if (!release) {
214
229
  throw new types_1.CliError(`"${app}" has no release target (${angular_project_1.POLYSTACK_BUILD_EXECUTOR}); pstack csp is for Angular and Ionic apps.`);
215
230
  }
216
231
  const listFile = `${project.root}/csp-allowlist.json`;
@@ -222,10 +237,21 @@ async function runCsp(ctx) {
222
237
  catch (err) {
223
238
  throw new types_1.CliError(`${listFile}: ${err.message}`);
224
239
  }
240
+ const envs = releaseEnvs(release);
241
+ if (envFlag !== undefined && !envs.includes(envFlag)) {
242
+ throw new types_1.CliError(`--env=${envFlag}: ${app} has no "${envFlag}" release configuration (envs: ${envs.join(', ')}).`);
243
+ }
244
+ const copySources = (src) => Object.fromEntries(Object.entries(src).map(([k, v]) => [k, [...v]]));
225
245
  const edited = {
226
246
  ...allowlist,
227
- sources: Object.fromEntries(Object.entries(allowlist.sources).map(([k, v]) => [k, [...v]])),
247
+ sources: copySources(allowlist.sources),
248
+ envs: Object.fromEntries(Object.entries(allowlist.envs ?? {}).map(([e, src]) => [e, copySources(src)])),
228
249
  };
250
+ // --env: --add/--remove change that env's own sources.
251
+ const target = envFlag
252
+ ? (edited.envs[envFlag] ??= {})
253
+ : edited.sources;
254
+ const where = envFlag ? `envs.${envFlag} ` : '';
229
255
  let importLines = [];
230
256
  let importAdded = false;
231
257
  if (imported && parsedImport) {
@@ -235,14 +261,14 @@ async function runCsp(ctx) {
235
261
  importLines = importReport(imported.label, parsedImport.format, result, parsedImport.notes);
236
262
  }
237
263
  for (const { directive, source } of adds) {
238
- edited.sources[directive] = [...(edited.sources[directive] ?? []), source];
264
+ target[directive] = [...(target[directive] ?? []), source];
239
265
  }
240
266
  for (const { directive, source } of removes) {
241
- const before = edited.sources[directive] ?? [];
267
+ const before = target[directive] ?? [];
242
268
  if (!before.includes(source)) {
243
- out.push(`Note: ${directive} has no "${source}"; nothing removed.`);
269
+ out.push(`Note: ${where}${directive} has no "${source}"; nothing removed.`);
244
270
  }
245
- edited.sources[directive] = before.filter((s) => s !== source);
271
+ target[directive] = before.filter((s) => s !== source);
246
272
  }
247
273
  if (nonceSourceFlag !== undefined)
248
274
  edited.nonceSource = nonceSourceFlag;
@@ -265,15 +291,33 @@ async function runCsp(ctx) {
265
291
  out.push(...importLines);
266
292
  out.unshift(`CSP of ${app} (${listFile}):`, ...Object.entries(checked.sources)
267
293
  .filter(([, v]) => v.length > 0)
268
- .map(([k, v]) => ` ${k.padEnd(16)}${v.join(' ')}`), ` policy ${(0, allowlist_1.buildPolicy)(checked).replace(/\{N\}/g, '<nonce>')}`);
294
+ .map(([k, v]) => ` ${k.padEnd(16)}${v.join(' ')}`), ` policy ${(0, allowlist_1.buildPolicy)(checked).replace(/\{N\}/g, '<nonce>')}`, ...Object.entries(checked.envs ?? {}).flatMap(([env, src]) => [
295
+ ` ${env} adds:`,
296
+ ...Object.entries(src).map(([k, v]) => ` ${k.padEnd(14)}${v.join(' ')}`),
297
+ ` policy ${(0, allowlist_1.buildPolicy)((0, allowlist_1.allowlistForEnv)(checked, env)).replace(/\{N\}/g, '<nonce>')}`,
298
+ ]));
299
+ for (const env of Object.keys(checked.envs ?? {})) {
300
+ if (!envs.includes(env)) {
301
+ out.push(`Note: envs.${env} is not a release env of ${app}; no htaccess uses it.`);
302
+ }
303
+ }
269
304
  let htaccessKept = false;
305
+ // One .htaccess per release env (environments/<envProject>/htaccess.<env>); none when the
306
+ // release target has htaccess: false.
307
+ const htaccessFiles = release.options?.htaccess === false
308
+ ? []
309
+ : envs.map((env) => [
310
+ (0, htaccess_1.htaccessSourcePath)(release.options?.envProject ?? app, env),
311
+ (0, render_1.renderHtaccess)(app, (0, allowlist_1.allowlistForEnv)(checked, env)),
312
+ ]);
270
313
  for (const [file, text] of [
271
- [`${project.root}/src/.htaccess`, (0, render_1.renderHtaccess)(app, checked)],
314
+ ...htaccessFiles,
272
315
  [`${project.root}/server/nginx.conf`, (0, render_1.renderNginx)(app, checked)],
273
316
  ]) {
274
317
  const state = fileState(tree, file, text);
275
- if (state === 'hand-written' && !force && file.endsWith('.htaccess'))
318
+ if (state === 'hand-written' && !force && file !== `${project.root}/server/nginx.conf`) {
276
319
  htaccessKept = true;
320
+ }
277
321
  if (state === 'hand-written' && !force) {
278
322
  out.push(` ${file}: hand-written, kept (--force replaces it)` +
279
323
  (edits > 0 ? ' — it does not have this change' : ''));
@@ -290,7 +334,7 @@ async function runCsp(ctx) {
290
334
  // The build must write what the Apache config fills; a kept hand-written .htaccess may
291
335
  // expect something else, so the target is left alone then.
292
336
  if (htaccessKept) {
293
- out.push(' release nonce.placeholder not synced: src/.htaccess is hand-written (--force replaces it)');
337
+ out.push(' release nonce.placeholder not synced: a .htaccess is hand-written (--force replaces it)');
294
338
  }
295
339
  else {
296
340
  out.push(...syncNoncePlaceholder(tree, project.root, (0, render_1.noncePlaceholder)(checked), !!ctx.dryRun));
@@ -1 +1 @@
1
- {"version":3,"file":"csp.js","sourceRoot":"","sources":["../../../../src/cli/commands/csp.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"csp.js","sourceRoot":"","sources":["../../../../src/cli/commands/csp.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAI7B,uDASiC;AACjC,iDAA8E;AAC9E,iDAM8B;AAC9B,yDAAgE;AAChE,qEAA2E;AAC3E,2EAAkE;AAClE,kCAAkD;AAClD,0CAAwC;AACxC,oCAAoD;AAEpD,+BAAyC;AAIzC,0FAA0F;AAC1F,SAAS,UAAU,CAAC,IAAY,EAAE,KAAyB;IACzD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,KAAK;SAChB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1C,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,SAAS,IAAI,0BAAc,CAAC,EAAE;YACvD,MAAM,IAAI,gBAAQ,CAChB,KAAK,IAAI,MAAM,KAAK,2EAA2E;gBAC7F,gBAAgB,MAAM,CAAC,IAAI,CAAC,0BAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAC7D,CAAC;SACH;QACD,OAAO,EAAE,SAAS,EAAE,SAAyB,EAAE,MAAM,EAAE,CAAC;IAC1D,CAAC,CAAC,CAAC;IACL,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,gBAAQ,CAAC,KAAK,IAAI,2CAA2C,CAAC,CAAC;IACjG,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,SAAgB,kBAAkB,CAAC,WAAoC;IACrE,MAAM,OAAO,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,EAAE,CAA4C,CAAC;IAC1F,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9C,uHAAuH,CAAC,IAAI,CAC1H,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CACtB,CACF,CAAC;IACF,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACtB,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAA4C,CAAC;IAC3F,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAA4B,CAAC;IACpE,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;SAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QAChB,MAAM,GAAG,GAAG,CAAC,CAAC,cAAc,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC;QACjE,IAAI,GAAG,KAAK,KAAK;YAAE,OAAO,KAAK,CAAC;QAChC,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAC9B,MAAM,MAAM,GAAI,GAA+B,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;QAClE,IAAI,MAAM,KAAK,KAAK;YAAE,OAAO,KAAK,CAAC;QACnC,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QACjC,OAAQ,MAAkC,CAAC,gBAAgB,CAAC,KAAK,KAAK,CAAC;IACzE,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC;AArBD,gDAqBC;AAID,SAAS,SAAS,CAAC,IAAU,EAAE,IAAY,EAAE,MAAc;IACzD,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACnC,sDAAsD;IACtD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,yBAAgB,CAAC;QAAE,OAAO,cAAc,CAAC;IAC9D,OAAO,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;AACjD,CAAC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,KAAa,EAAE,GAAW;IACzD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACtC,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QACrD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;KAC9D;IACD,wFAAwF;IACxF,MAAM,MAAM,GACV,0FAA0F,CAAC;IAC7F,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,mCAAmC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACzE,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;KACnD;IACD,MAAM,IAAI,gBAAQ,CAChB,sBAAsB,KAAK,kEAAkE;QAC3F,6EAA6E,CAChF,CAAC;AACJ,CAAC;AAfD,4CAeC;AAED,kCAAkC;AAClC,SAAgB,YAAY,CAC1B,KAAa,EACb,MAAc,EACd,CAAe,EACf,YAAsB,EAAE;IAExB,MAAM,KAAK,GAAG,CAAC,iBAAiB,KAAK,KAAK,MAAM,IAAI,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACpD,KAAK,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,KAAK;QAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClF,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO;QAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,MAAM,gBAAgB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC9F,MAAM,KAAK,GAAG,CAAC,IAA6B,EAAE,KAAa,EAAE,EAAE;QAC7D,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QACvD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAC/B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClB,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;YACrB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;SAChF;IACH,CAAC,CAAC;IACF,KAAK,CAAC,SAAS,EAAE,kDAAkD,CAAC,CAAC;IACrE,KAAK,CAAC,WAAW,EAAE,yDAAyD,CAAC,CAAC;IAC9E,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACrE,OAAO,KAAK,CAAC;AACf,CAAC;AAvBD,oCAuBC;AAED,iEAAiE;AACjE,MAAM,eAAe,GAAG,8CAA8C,CAAC;AAEvE;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,IAAU,EACV,IAAY,EACZ,MAAc,EACd,MAAM,GAAG,KAAK;IAEd,MAAM,IAAI,GAAG,GAAG,IAAI,eAAe,CAAC;IACpC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,EAAE,CAAC;IAE5B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAK1B,CAAC;IACF,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,IAAI,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3D,MAAM,IAAI,GAAG,CAAC,KAAa,EAAE,MAAY,EAAE,MAAe,EAAE,EAAE;QAC5D,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,SAAS;YAAE,OAAO;QACrD,MAAM,KAAK,GAAG,EAAE,GAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAU,EAAE,CAAC;QACvD,MAAM,OAAO,GAAI,KAAK,CAAC,aAAa,CAAwB,IAAI,sBAAa,CAAC;QAC9E,IAAI,OAAO,KAAK,MAAM;YAAE,OAAO;QAC/B,IAAI,MAAM,KAAK,sBAAa,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC9D,KAAK,CAAC,IAAI,CACR,SAAS,KAAK,6BAA6B,OAAO,uBAAuB,sBAAa,GAAG,CAC1F,CAAC;YACF,OAAO;SACR;QACD,IAAI,MAAM,KAAK,sBAAa;YAAE,OAAO,KAAK,CAAC,aAAa,CAAC,CAAC;;YACrD,KAAK,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;QACnC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC;;YACvD,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;QAC7B,OAAO,GAAG,IAAI,CAAC;QACf,KAAK,CAAC,IAAI,CACR,KAAK,IAAI,KAAK,KAAK,sBAAsB,IAAI,CAC3C,MAAM,KAAK,sBAAa,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,UAAU,MAAM,EAAE,CACvE,EAAE,CACJ,CAAC;IACJ,CAAC,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE;QAC/D,IAAI,MAAM,CAAC,QAAQ,KAAK,0CAAwB;YAAE,SAAS;QAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,KAAK,sBAAa,CAAC,CAAC;QAC9C,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;QAC9D,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC,EAAE;YACrE,IAAI,CAAC,GAAG,IAAI,IAAI,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;SACrC;KACF;IACD,IAAI,OAAO;QAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACpE,OAAO,KAAK,CAAC;AACf,CAAC;AAtDD,oDAsDC;AAQD,+FAA+F;AAC/F,SAAS,WAAW,CAAC,OAA0B;IAC7C,OAAO;QACL,GAAG,IAAI,GAAG,CACR,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAC7D,MAAM,CAAC,CAAC,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC,WAAW,EAAE,CACrC,CACF;KACF,CAAC;AACJ,CAAC;AAED,qGAAqG;AAC9F,KAAK,UAAU,MAAM,CAAC,GAAmB;IAC9C,KAAK,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,KAAK,CAAC,EAAE;QACxE,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;YAAE,MAAM,IAAI,gBAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;KACxE;IACD,MAAM,GAAG,GAAG,IAAA,iBAAU,EAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACzC,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,gBAAQ,CAAC,8BAA8B,CAAC,CAAC;IAC7D,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,EAAE,IAAA,iBAAU,EAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE,IAAA,iBAAU,EAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IACtE,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,SAAS,IAAI,IAAA,kBAAW,EAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClF,MAAM,eAAe,GAAG,IAAA,iBAAU,EAAC,GAAG,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,IAAA,iBAAU,EAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,IAAA,iBAAU,EAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;IAC5D,IAAI,OAAO,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,EAAE;QACrD,MAAM,IAAI,gBAAQ,CAAC,wEAAwE,CAAC,CAAC;KAC9F;IACD,IAAI,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QAC/D,MAAM,IAAI,gBAAQ,CAAC,uEAAuE,CAAC,CAAC;KAC7F;IACD,MAAM,QAAQ,GAAG,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9F,IAAI,YAAuD,CAAC;IAC5D,IAAI,QAAQ,EAAE;QACZ,IAAI;YACF,YAAY,GAAG,IAAA,mBAAU,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SAC1C;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,gBAAQ,CAAC,aAAa,QAAQ,CAAC,KAAK,KAAM,GAAa,CAAC,OAAO,GAAG,CAAC,CAAC;SAC/E;KACF;IACD,MAAM,IAAI,GAAG,IAAA,sBAAgB,EAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAE9C,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,EAAE,GAAG,GAAG,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;QACnE,IAAI,QAAQ,CAAC;QACb,IAAI;YACF,QAAQ,GAAG,IAAA,iCAAY,EAAC,IAAI,CAAC,CAAC;SAC/B;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,gBAAQ,CAAE,GAAa,CAAC,OAAO,CAAC,CAAC;SAC5C;QACD,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,gBAAQ,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAAC;QAC/D,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAsC,CAAC;QACrF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,0CAAwB,CAAC,CAAC;QAC5F,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,gBAAQ,CAChB,IAAI,GAAG,4BAA4B,0CAAwB,8CAA8C,CAC1G,CAAC;SACH;QAED,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,IAAI,qBAAqB,CAAC;QACtD,IAAI,SAAuB,CAAC;QAC5B,IAAI;YACF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC1C,SAAS,GAAG,IAAA,0BAAc,EAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;SACnE;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,gBAAQ,CAAC,GAAG,QAAQ,KAAM,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SAC9D;QACD,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;QAClC,IAAI,OAAO,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACpD,MAAM,IAAI,gBAAQ,CAChB,SAAS,OAAO,KAAK,GAAG,YAAY,OAAO,kCAAkC,IAAI,CAAC,IAAI,CACpF,IAAI,CACL,IAAI,CACN,CAAC;SACH;QACD,MAAM,WAAW,GAAG,CAAC,GAAe,EAAc,EAAE,CAClD,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAAI,CAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QACrF,MAAM,MAAM,GAAiB;YAC3B,GAAG,SAAS;YACZ,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC;YACvC,IAAI,EAAE,MAAM,CAAC,WAAW,CACtB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAC9E;SACF,CAAC;QACF,uDAAuD;QACvD,MAAM,MAAM,GAAe,OAAO;YAChC,CAAC,CAAC,CAAE,MAAM,CAAC,IAAmC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YAC/D,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;QACnB,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,QAAQ,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,IAAI,WAAW,GAAa,EAAE,CAAC;QAC/B,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,IAAI,QAAQ,IAAI,YAAY,EAAE;YAC5B,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YACjE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YAChC,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YACnD,WAAW,GAAG,YAAY,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;SAC7F;QACD,KAAK,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,IAAI,EAAE;YACxC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;SAC5D;QACD,KAAK,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,OAAO,EAAE;YAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBAC5B,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,GAAG,SAAS,YAAY,MAAM,qBAAqB,CAAC,CAAC;aAC7E;YACD,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;SACxD;QACD,IAAI,eAAe,KAAK,SAAS;YAAE,MAAM,CAAC,WAAW,GAAG,eAAe,CAAC;QACxE,IAAI,OAAqB,CAAC;QAC1B,IAAI;YACF,OAAO,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC,KAAK,CAAC,IAAA,8BAAkB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SAClE;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,gBAAQ,CAAE,GAAa,CAAC,OAAO,CAAC,CAAC;SAC5C;QACD,wFAAwF;QACxF,MAAM,kBAAkB,GACtB,eAAe,KAAK,SAAS;YAC7B,CAAC,OAAO,CAAC,WAAW,IAAI,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,IAAI,eAAe,CAAC,CAAC;QAC1F,MAAM,KAAK,GACT,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtF,IAAI,KAAK,GAAG,CAAC,EAAE;YACb,MAAM,IAAI,GAAG,IAAA,8BAAkB,EAAC,OAAO,CAAC,CAAC;YACzC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,IAAI;gBAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;SACvE;QACD,GAAG,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;QAEzB,GAAG,CAAC,OAAO,CACT,UAAU,GAAG,KAAK,QAAQ,IAAI,EAC9B,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;aAC/B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAE,CAAc,CAAC,MAAM,GAAG,CAAC,CAAC;aAC7C,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAI,CAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EACnE,qBAAqB,IAAA,uBAAW,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,EACxE,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;YAC5D,KAAK,GAAG,QAAQ;YAChB,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAI,CAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACzF,qBAAqB,IAAA,uBAAW,EAAC,IAAA,2BAAe,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CACrE,QAAQ,EACR,SAAS,CACV,EAAE;SACJ,CAAC,CACH,CAAC;QACF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE;YACjD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACvB,GAAG,CAAC,IAAI,CAAC,cAAc,GAAG,4BAA4B,GAAG,wBAAwB,CAAC,CAAC;aACpF;SACF;QAED,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,0FAA0F;QAC1F,sCAAsC;QACtC,MAAM,aAAa,GACjB,OAAO,CAAC,OAAO,EAAE,QAAQ,KAAK,KAAK;YACjC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC;gBAChB,IAAA,6BAAkB,EAAC,OAAO,CAAC,OAAO,EAAE,UAAU,IAAI,GAAG,EAAE,GAAG,CAAC;gBAC3D,IAAA,uBAAc,EAAC,GAAG,EAAE,IAAA,2BAAe,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;aACnD,CAAC,CAAC;QACT,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI;YACzB,GAAG,aAAa;YAChB,CAAC,GAAG,OAAO,CAAC,IAAI,oBAAoB,EAAE,IAAA,oBAAW,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;SACxD,EAAE;YACV,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAC1C,IAAI,KAAK,KAAK,cAAc,IAAI,CAAC,KAAK,IAAI,IAAI,KAAK,GAAG,OAAO,CAAC,IAAI,oBAAoB,EAAE;gBACtF,YAAY,GAAG,IAAI,CAAC;aACrB;YACD,IAAI,KAAK,KAAK,cAAc,IAAI,CAAC,KAAK,EAAE;gBACtC,GAAG,CAAC,IAAI,CACN,KAAK,IAAI,4CAA4C;oBACnD,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC,CAAC,EAAE,CAAC,CACvD,CAAC;aACH;iBAAM,IAAI,KAAK,KAAK,SAAS,EAAE;gBAC9B,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,WAAW,CAAC,CAAC;aAChC;iBAAM;gBACL,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACvB,MAAM,IAAI,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;gBAC5F,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;aAClE;SACF;QAED,uFAAuF;QACvF,2DAA2D;QAC3D,IAAI,YAAY,EAAE;YAChB,GAAG,CAAC,IAAI,CACN,2FAA2F,CAC5F,CAAC;SACH;aAAM;YACL,GAAG,CAAC,IAAI,CACN,GAAG,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAA,yBAAgB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CACrF,CAAC;SACH;QAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,GAAG,CAAC,IAAI,CACN,gBAAgB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,uDAAuD;gBACxF,6EAA6E,CAChF,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IACH,KAAK,MAAM,IAAI,IAAI,GAAG;QAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC1C,OAAO,CAAC,CAAC;AACX,CAAC;AA7LD,wBA6LC"}
@@ -236,6 +236,8 @@ OPTIONS — csp (--app required; writes the server files that are missing or wer
236
236
  --app=<project> Angular/Ionic app
237
237
  --add=<dir>:<src>[,…] Add sources, e.g. script-src:https://www.googletagmanager.com
238
238
  --remove=<dir>:<src>[,…] Remove sources
239
+ --env=<env> --add/--remove change that release env's sources ("envs" in
240
+ csp-allowlist.json), which only its htaccess.<env> gets
239
241
  --import=<file|policy> Merge an existing policy into csp-allowlist.json: a CSP header value,
240
242
  .htaccess / nginx.conf, or JSON (directive → sources); refused
241
243
  sources ('unsafe-inline', 'unsafe-eval', http:, …) are listed, not
@@ -314,6 +316,7 @@ EXAMPLES
314
316
  nx run portal:clean
315
317
  pstack csp --app=portal --add=connect-src:https://api.example.com
316
318
  pstack csp --app=portal --import=apps/portal/src/.htaccess --dry-run
319
+ pstack csp --app=portal --env=uat --add=connect-src:https://uat-api.example.com
317
320
  pstack hardening --app=portal
318
321
  pstack hardening --app=portal --configuration=uat --obfuscate=light --sri
319
322
  pstack update
@@ -1 +1 @@
1
- {"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cli/help.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,yCAAkD;AAElD,SAAgB,QAAQ,CAAC,OAAe;IACtC,OAAO;yCACgC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA0Q5C,IAAA,8BAAa,GAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,mDAAmD,CAAC,CAAC,CAAC,EAC5F;IACE,IAAA,+BAAoB,EAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiDhC,CAAC,SAAS,EAAE,CAAC;AACd,CAAC;AAhUD,4BAgUC"}
1
+ {"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cli/help.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,yCAAkD;AAElD,SAAgB,QAAQ,CAAC,OAAe;IACtC,OAAO;yCACgC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA4Q5C,IAAA,8BAAa,GAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,mDAAmD,CAAC,CAAC,CAAC,EAC5F;IACE,IAAA,+BAAoB,EAAC,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkDhC,CAAC,SAAS,EAAE,CAAC;AACd,CAAC;AAnUD,4BAmUC"}
@@ -50,7 +50,7 @@ exports.MIN_LOCAL_FLAG_VERSION = {
50
50
  },
51
51
  env: { app: '0.34.0', all: '0.34.0', from: '0.34.0', baseHref: '0.34.0', domains: '0.34.0' },
52
52
  lib: { dir: '0.19.0' },
53
- csp: { import: '0.38.0', nonceSource: '1.2.5' },
53
+ csp: { import: '0.38.0', nonceSource: '1.2.5', env: '1.5.5' },
54
54
  infra: { lintStaged: '0.36.0' },
55
55
  migrate: {
56
56
  rollback: '0.13.0',
@@ -1 +1 @@
1
- {"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../../src/cli/launcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../../src/cli/launcher.ts"],"names":[],"mappings":"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"}
@@ -19,6 +19,7 @@ const inject_meta_1 = require("../../lib/helpers/inject-meta");
19
19
  const inject_nonce_1 = require("../../lib/helpers/inject-nonce");
20
20
  const inject_sri_1 = require("../../lib/helpers/inject-sri");
21
21
  const strip_exif_1 = require("../../lib/helpers/strip-exif");
22
+ const htaccess_1 = require("../../lib/release/htaccess");
22
23
  const ci_resolve_1 = require("../../lib/utils/ci-resolve");
23
24
  const defaultRunner = (cmd, opts) => {
24
25
  console.log(`▶ ${cmd}`);
@@ -49,6 +50,10 @@ async function buildExecutor(options, context, runner = defaultRunner, seams = {
49
50
  throw new Error(`build executor: ${err.message}`);
50
51
  }
51
52
  hardening.warnings.forEach((w) => console.warn(`⚠ ${w}`));
53
+ // The env's Apache config, checked before anything is built (no fallback to another env).
54
+ const htaccessSource = options.htaccess === false
55
+ ? undefined
56
+ : (0, htaccess_1.requireHtaccessSource)(repoRoot, projectName, envProject, env);
52
57
  const ciCtx = (0, ci_resolve_1.resolveCiContext)();
53
58
  // Checked before the Angular build, so a bad buildMeta option fails fast.
54
59
  const gen = (0, build_gen_1.generatorInfo)(repoRoot, options.buildMeta);
@@ -186,6 +191,21 @@ async function buildExecutor(options, context, runner = defaultRunner, seams = {
186
191
  noteExternalScripts(path.join(checkRoot, 'index.html'));
187
192
  }
188
193
  }
194
+ // The env's .htaccess is the only one in the output (htaccess: false: none at all).
195
+ if (fs.existsSync(distDir)) {
196
+ if (htaccessSource) {
197
+ const removed = (0, htaccess_1.placeHtaccess)(htaccessSource, distDir, checkRoot);
198
+ console.log(`ℹ htaccess: ${path.relative(repoRoot, htaccessSource)} → ` +
199
+ `${path.relative(repoRoot, path.join(checkRoot, '.htaccess'))}` +
200
+ (removed.length > 0 ? ` (removed from the build: ${removed.join(', ')})` : ''));
201
+ }
202
+ else {
203
+ const removed = (0, htaccess_1.removeHtaccessFiles)(distDir);
204
+ if (removed.length > 0) {
205
+ console.log(`ℹ htaccess: off; removed ${removed.join(', ')} from the output`);
206
+ }
207
+ }
208
+ }
189
209
  // Last: every rewrite above (strip, obfuscate, hashes, meta, nonce, SRI) changes files the
190
210
  // service worker hashed.
191
211
  const ngswUpdated = (0, ngsw_1.refreshNgswHashes)(checkRoot);
@@ -1 +1 @@
1
- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/build/executor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/build/executor.ts"],"names":[],"mappings":"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"}
@@ -41,6 +41,11 @@ export interface BuildExecutorSchema {
41
41
  obfuscate?: 'off' | 'light' | 'medium' | 'strong';
42
42
  /** non-DEV: javascript-obfuscator options on top of the preset (a CSP-safe subset). */
43
43
  obfuscateOptions?: Record<string, unknown>;
44
+ /**
45
+ * Copy environments/<envProject>/htaccess.<env> into the served root as .htaccess (default
46
+ * true; the build fails when the file is missing). false: no .htaccess in the output.
47
+ */
48
+ htaccess?: boolean;
44
49
  baseHref?: string;
45
50
  /** aes-gcm: where the per-build key's shares go. */
46
51
  keySplit?: 'meta-bundle' | 'meta-bundle-asset';
@@ -132,6 +132,11 @@
132
132
  "type": "object",
133
133
  "description": "non-DEV: javascript-obfuscator options on top of the obfuscate preset, e.g. { \"stringArrayThreshold\": 0.3 }. Options that need eval, lock domains, rename globals or properties, or change the target cannot be set."
134
134
  },
135
+ "htaccess": {
136
+ "type": "boolean",
137
+ "default": true,
138
+ "description": "Copy environments/<envProject>/htaccess.<env> (env lower-cased) into the served root as .htaccess; the build fails before it starts when that file is missing, and any other .htaccess in the output is removed. false: the output has no .htaccess."
139
+ },
135
140
  "baseHref": {
136
141
  "type": "string",
137
142
  "description": "URL base href forwarded to the Angular builder (e.g. /my-app/)."
@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
4
4
  const child_process_1 = require("child_process");
5
5
  const fs = tslib_1.__importStar(require("fs"));
6
6
  const path = tslib_1.__importStar(require("path"));
7
+ const htaccess_1 = require("../../lib/release/htaccess");
7
8
  const defaultRunner = (cmd, opts) => {
8
9
  console.log(`▶ ${cmd}`);
9
10
  (0, child_process_1.execSync)(cmd, opts);
@@ -12,6 +13,11 @@ const COMMANDS = ['sync', 'open', 'add', 'copy'];
12
13
  const PLATFORMS = ['android', 'ios'];
13
14
  /** Commands that copy the web build into the native project. */
14
15
  const NEEDS_WEB_BUILD = ['sync', 'copy'];
16
+ /** Where `cap sync` / `cap copy` put the web build in each native project (relative to the app). */
17
+ const NATIVE_WEB_DIR = {
18
+ android: 'android/app/src/main/assets/public',
19
+ ios: 'ios/App/App/public',
20
+ };
15
21
  async function capacitorExecutor(options, context, runner = defaultRunner) {
16
22
  const { command, platform } = options;
17
23
  const project = context.projectName;
@@ -39,6 +45,13 @@ async function capacitorExecutor(options, context, runner = defaultRunner) {
39
45
  }
40
46
  // --no-install: never fetch an unrelated "cap" package from the registry.
41
47
  runner(`npx --no-install cap ${command} ${platform}`, opts);
48
+ // The web release's .htaccess is Apache config: it has no place in the app bundle.
49
+ if (NEEDS_WEB_BUILD.includes(command)) {
50
+ const removed = (0, htaccess_1.removeHtaccessFiles)(path.join(appDir, NATIVE_WEB_DIR[platform]));
51
+ if (removed.length > 0) {
52
+ console.log(`ℹ removed ${removed.join(', ')} from the ${platform} app's web assets`);
53
+ }
54
+ }
42
55
  return { success: true };
43
56
  }
44
57
  exports.default = capacitorExecutor;
@@ -1 +1 @@
1
- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/capacitor/executor.ts"],"names":[],"mappings":";;;AAAA,iDAA0D;AAC1D,+CAAyB;AACzB,mDAA6B;AAQ7B,MAAM,aAAa,GAAW,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;IAC1C,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;IACxB,IAAA,wBAAQ,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACjD,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AACrC,gEAAgE;AAChE,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE1B,KAAK,UAAU,iBAAiB,CAC7C,OAAgC,EAChC,OAAwB,EACxB,SAAiB,aAAa;IAE9B,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,OAAO,GAAG,OAAO,CAAC,WAAqB,CAAC;IAE9C,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CACb,8CAA8C,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,OAAO,KAAK,CACxF,CAAC;KACH;IACD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACjC,MAAM,IAAI,KAAK,CACb,6DAA6D,QAAQ,MAAM;YACzE,mBAAmB,OAAO,8BAA8B,CAC3D,CAAC;KACH;IAED,MAAM,OAAO,GACX,OAAO,CAAC,sBAAsB,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1F,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEhD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,EAAE;QACrD,MAAM,IAAI,KAAK,CACb,uBAAuB,OAAO,4DAA4D,CAC3F,CAAC;KACH;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACpE,IAAI,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE;QACxF,MAAM,IAAI,KAAK,CACb,8CAA8C,MAAM,IAAI;YACtD,+BAA+B,OAAO,eAAe,CACxD,CAAC;KACH;IAED,MAAM,IAAI,GAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IAChE,yEAAyE;IACzE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,EAAE;QAC1E,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;KAC7B;IACD,0EAA0E;IAC1E,MAAM,CAAC,wBAAwB,OAAO,IAAI,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;IAC5D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC3B,CAAC;AA9CD,oCA8CC"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/capacitor/executor.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,7 @@ const path = tslib_1.__importStar(require("path"));
7
7
  const build_gen_1 = require("../../lib/helpers/build-gen");
8
8
  const inject_meta_1 = require("../../lib/helpers/inject-meta");
9
9
  const strip_exif_1 = require("../../lib/helpers/strip-exif");
10
+ const htaccess_1 = require("../../lib/release/htaccess");
10
11
  const ci_resolve_1 = require("../../lib/utils/ci-resolve");
11
12
  const defaultRunner = (cmd, opts) => {
12
13
  console.log(`▶ ${cmd}`);
@@ -23,11 +24,22 @@ async function flutterBuildExecutor(options, context, runner = defaultRunner) {
23
24
  // Migrated projects keep their source root; generated ones live in apps/<name>.
24
25
  const configuredRoot = context.projectsConfigurations?.projects?.[projectName]?.root;
25
26
  const projectDir = path.join(repoRoot, configuredRoot ?? path.join('apps', projectName));
26
- const envFile = path.join(projectDir, 'env', `${env}.json`);
27
- const dartDefine = fs.existsSync(envFile) ? `--dart-define-from-file=env/${env}.json` : '';
28
- if (!dartDefine) {
29
- console.log(`ℹ No env file at ${envFile} — skipping --dart-define-from-file`);
27
+ // Env values: environments/<envProject>/environment.<env>.json (every env file of the
28
+ // workspace lives under environments/). A missing file fails: the app would build without them.
29
+ const envProject = options.envProject ?? projectName;
30
+ const envRel = `${htaccess_1.ENVIRONMENTS_DIR}/${envProject}/environment.${env}.json`;
31
+ const envFile = path.join(repoRoot, envRel);
32
+ if (!fs.existsSync(envFile)) {
33
+ const old = path.join(projectDir, 'env', `${env}.json`);
34
+ throw new Error(`flutter-build: ${projectName}: ${envRel} not found` +
35
+ (fs.existsSync(old)
36
+ ? ` (the app still has ${path.relative(repoRoot, old)}; pstack update moves the env files to ${htaccess_1.ENVIRONMENTS_DIR}/${envProject}/).`
37
+ : '. Create it with the values for --dart-define-from-file ({} for none).'));
30
38
  }
39
+ const dartDefine = `--dart-define-from-file=${path
40
+ .relative(projectDir, envFile)
41
+ .split(path.sep)
42
+ .join('/')}`;
31
43
  const execOpts = { stdio: 'inherit', cwd: projectDir };
32
44
  if (serve) {
33
45
  const cmd = `flutter run -d web-server --web-port=${port} ${dartDefine}`.trim();
@@ -39,6 +51,10 @@ async function flutterBuildExecutor(options, context, runner = defaultRunner) {
39
51
  }
40
52
  // Checked before the Flutter build, so a bad buildMeta option fails fast.
41
53
  const gen = (0, build_gen_1.generatorInfo)(repoRoot, options.buildMeta);
54
+ // Web: the env's Apache config, checked before building (no fallback to another env).
55
+ const htaccessSource = target === 'web' && options.htaccess !== false
56
+ ? (0, htaccess_1.requireHtaccessSource)(repoRoot, projectName, envProject, env)
57
+ : undefined;
42
58
  const outRel = path.relative(projectDir, path.join(repoRoot, dist));
43
59
  const baseHrefArg = baseHref ? `--base-href ${baseHref}` : '';
44
60
  const obfuscateArgs = (t) => {
@@ -88,6 +104,19 @@ async function flutterBuildExecutor(options, context, runner = defaultRunner) {
88
104
  });
89
105
  console.log(`ℹ ${(0, strip_exif_1.stripExifSummary)(exif)}`);
90
106
  }
107
+ // Web: the env's .htaccess is the only one in the output (htaccess: false: none at all).
108
+ if (target === 'web' && fs.existsSync(outDir)) {
109
+ if (htaccessSource) {
110
+ const removed = (0, htaccess_1.placeHtaccess)(htaccessSource, outDir, outDir);
111
+ console.log(`ℹ htaccess: ${path.relative(repoRoot, htaccessSource)} → ${path.join(dist, '.htaccess')}` +
112
+ (removed.length > 0 ? ` (removed: ${removed.join(', ')})` : ''));
113
+ }
114
+ else {
115
+ const removed = (0, htaccess_1.removeHtaccessFiles)(outDir);
116
+ if (removed.length > 0)
117
+ console.log(`ℹ htaccess: off; removed ${removed.join(', ')}`);
118
+ }
119
+ }
91
120
  // Web: the same build meta as Angular release builds (env, time, branch, commit, tool).
92
121
  const indexHtml = path.join(outDir, 'index.html');
93
122
  if (target === 'web' && fs.existsSync(indexHtml)) {
@@ -1 +1 @@
1
- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/flutter-build/executor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/flutter-build/executor.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,11 @@
1
1
  export interface FlutterBuildExecutorSchema {
2
2
  target?: 'web' | 'apk' | 'ios';
3
- env?: 'dev' | 'uat' | 'prod';
3
+ /** Env name (dev, uat, prod or a custom one): environments/<envProject>/environment.<env>.json. */
4
+ env?: string;
5
+ /** Folder under environments/ with this app's env files (default: the project name). */
6
+ envProject?: string;
7
+ /** Web builds: copy environments/<envProject>/htaccess.<env> as .htaccess (default true). */
8
+ htaccess?: boolean;
4
9
  dist?: string;
5
10
  baseHref?: string;
6
11
  serve?: boolean;
@@ -14,7 +14,16 @@
14
14
  "env": {
15
15
  "type": "string",
16
16
  "default": "dev",
17
- "description": "Environment tier \u2014 selects <project root>/env/<env>.json for --dart-define-from-file."
17
+ "description": "Environment (dev, uat, prod or a custom one): environments/<envProject>/environment.<env>.json is passed with --dart-define-from-file; the build fails when it is missing."
18
+ },
19
+ "envProject": {
20
+ "type": "string",
21
+ "description": "Folder under environments/ with this app's env files and .htaccess sources. Default: the project name."
22
+ },
23
+ "htaccess": {
24
+ "type": "boolean",
25
+ "default": true,
26
+ "description": "Web builds: copy environments/<envProject>/htaccess.<env> into the output as .htaccess; the build fails before it starts when that file is missing, and any other .htaccess is removed. false: no .htaccess. Ignored for apk / ios."
18
27
  },
19
28
  "dist": {
20
29
  "type": "string",
@@ -3,7 +3,8 @@
3
3
  ## Files
4
4
 
5
5
  - `nginx.conf` — Nginx configuration for containerised / reverse-proxy deployments
6
- - `../src/.htaccess` — Apache configuration for shared-hosting or cPanel deployments
6
+ - `environments/<%= name %>/htaccess.<env>` (workspace root) — Apache configuration for
7
+ shared-hosting or cPanel deployments, one file per environment
7
8
 
8
9
  ## Nginx (Docker / Kubernetes)
9
10
 
@@ -16,7 +17,10 @@ COPY <%= root %>/server/nginx.conf /etc/nginx/conf.d/default.conf
16
17
 
17
18
  ## Apache
18
19
 
19
- Deploy the `.htaccess` file alongside the Angular build output. It needs the
20
+ Release builds (`nx run <%= name %>:release:<env>`) copy that env's `htaccess.<env>` into the
21
+ build output as `.htaccess`; plain `nx build` adds none. To build without one, set
22
+ `"htaccess": false` on the release target. A new environment (`pstack env --name=<env>`) gets
23
+ a copy of `htaccess.prod`. The `.htaccess` needs the
20
24
  `mod_rewrite`, `mod_headers`, `mod_include`, `mod_unique_id` and `mod_setenvif` Apache
21
25
  modules (the last three give each request its own CSP nonce when the release build runs with
22
26
  `secure: true`), and `AllowOverride FileInfo Options=IncludesNOEXEC` (or `All`) for the
@@ -29,5 +33,5 @@ then not needed.
29
33
  Per-app Content Security Policy additions (e.g. API domains for `connect-src`) live
30
34
  in `<%= root %>/csp-allowlist.json`. Change it with
31
35
  `pstack csp --app=<%= name %> --add=connect-src:https://api.example.com` (or edit it and run
32
- `pstack csp --app=<%= name %>`); that rewrites `.htaccess` and `nginx.conf`. Files without the
36
+ `pstack csp --app=<%= name %>`); that rewrites every env's `htaccess.<env>` and `nginx.conf`. Files without the
33
37
  "Generated by pstack csp" first line are kept unless `--force`.