@mouryaamit/nx-polystack 1.24.2 → 1.25.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +16 -5
- package/dist/src/cli/commands/upgrade-standalone.d.ts +4 -1
- package/dist/src/cli/commands/upgrade-standalone.js +14 -2
- package/dist/src/cli/commands/upgrade-standalone.js.map +1 -1
- package/dist/src/cli/commands/upgrade.js +25 -0
- package/dist/src/cli/commands/upgrade.js.map +1 -1
- package/dist/src/cli/help.js +3 -3
- package/dist/src/cli/launcher.d.ts +2 -2
- package/dist/src/cli/launcher.js +3 -3
- package/dist/src/generators/app/generator.js +4 -0
- package/dist/src/generators/app/generator.js.map +1 -1
- package/dist/src/generators/lib/generator.js +4 -0
- package/dist/src/generators/lib/generator.js.map +1 -1
- package/dist/src/generators/migrate/generator.js +8 -0
- package/dist/src/generators/migrate/generator.js.map +1 -1
- package/dist/src/generators/migrate/nx/detect.d.ts +1 -1
- package/dist/src/generators/migrate/nx/detect.js +2 -2
- package/dist/src/generators/migrate/nx/detect.js.map +1 -1
- package/dist/src/generators/preset/generator.d.ts +1 -1
- package/dist/src/generators/preset/generator.js +18 -1
- package/dist/src/generators/preset/generator.js.map +1 -1
- package/dist/src/generators/preset/schema.d.ts +1 -1
- package/dist/src/generators/preset/schema.json +1 -1
- package/dist/src/lib/upgrade/angular22.d.ts +18 -0
- package/dist/src/lib/upgrade/angular22.js +67 -0
- package/dist/src/lib/upgrade/angular22.js.map +1 -0
- package/dist/src/lib/upgrade/pins.d.ts +7 -1
- package/dist/src/lib/upgrade/pins.js +19 -2
- package/dist/src/lib/upgrade/pins.js.map +1 -1
- package/dist/src/lib/upgrade/typescript6.d.ts +7 -0
- package/dist/src/lib/upgrade/typescript6.js +103 -0
- package/dist/src/lib/upgrade/typescript6.js.map +1 -0
- package/dist/src/lib/utils/angular-deps.d.ts +9 -1
- package/dist/src/lib/utils/angular-deps.js +14 -3
- package/dist/src/lib/utils/angular-deps.js.map +1 -1
- package/dist/src/lib/utils/dependencies.d.ts +12 -0
- package/dist/src/lib/utils/dependencies.js +28 -2
- package/dist/src/lib/utils/dependencies.js.map +1 -1
- package/dist/src/lib/utils/env-alias.js +6 -2
- package/dist/src/lib/utils/env-alias.js.map +1 -1
- package/dist/src/lib/utils/flat-eslint.d.ts +37 -0
- package/dist/src/lib/utils/flat-eslint.js +179 -0
- package/dist/src/lib/utils/flat-eslint.js.map +1 -0
- package/dist/src/lib/utils/json-layout.d.ts +1 -1
- package/dist/src/lib/utils/nx-tree.js +2 -2
- package/dist/src/lib/utils/quality.js +7 -0
- package/dist/src/lib/utils/quality.js.map +1 -1
- package/dist/src/lib/utils/ts-paths.d.ts +18 -0
- package/dist/src/lib/utils/ts-paths.js +71 -2
- package/dist/src/lib/utils/ts-paths.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const devkit_1 = require("@nx/devkit");
|
|
4
|
+
const flat_eslint_1 = require("../../lib/utils/flat-eslint");
|
|
4
5
|
const llm_block_1 = require("../../lib/utils/llm-block");
|
|
5
6
|
const quality_1 = require("../../lib/utils/quality");
|
|
6
7
|
const ts_paths_1 = require("../../lib/utils/ts-paths");
|
|
@@ -18,6 +19,9 @@ async function libGenerator(tree, schema) {
|
|
|
18
19
|
}
|
|
19
20
|
(0, ts_paths_1.addTsPath)(tree, o.importPath, `${o.projectRoot}/src/index.ts`);
|
|
20
21
|
}
|
|
22
|
+
// Angular 22+ workspaces lint with eslint.config.mjs: the lib's .eslintrc.json becomes one.
|
|
23
|
+
(0, flat_eslint_1.flattenProjectEslint)(tree, o.projectRoot);
|
|
24
|
+
(0, ts_paths_1.relativizePathsWithoutBaseUrl)(tree);
|
|
21
25
|
await (0, devkit_1.formatFiles)(tree);
|
|
22
26
|
spec.afterFormat?.(tree, o);
|
|
23
27
|
// After formatting: Prettier must not touch the text around the block.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/lib/generator.ts"],"names":[],"mappings":";;AAAA,uCAA6E;AAE7E,yDAA6D;AAC7D,qDAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/lib/generator.ts"],"names":[],"mappings":";;AAAA,uCAA6E;AAE7E,6DAAmE;AACnE,yDAA6D;AAC7D,qDAA6D;AAC7D,uDAAoF;AAEpF,2CAA+C;AAE/C,mCAA0E;AAE3D,KAAK,UAAU,YAAY,CACxC,IAAU,EACV,MAA0B;IAE1B,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,CAAC,GAAG,IAAA,4BAAgB,EAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAE/C,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACpC,kFAAkF;IAClF,IAAA,4BAAkB,EAAC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;IAExC,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE;YACtC,IAAA,kBAAS,EAAC,IAAI,EAAE,oBAAoB,EAAE,EAAE,eAAe,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;SAC3E;QACD,IAAA,oBAAS,EAAC,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,WAAW,eAAe,CAAC,CAAC;KAChE;IAED,4FAA4F;IAC5F,IAAA,kCAAoB,EAAC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,IAAA,wCAA6B,EAAC,IAAI,CAAC,CAAC;IAEpC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACxB,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC5B,uEAAuE;IACvE,IAAA,4BAAgB,EAAC,IAAI,CAAC,CAAC;IACvB,OAAO,IAAI,CAAC;AACd,CAAC;AA3BD,+BA2BC;AAED,SAAS,WAAW,CAAC,IAAgC;IACnD,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,uDAAuD,SAAS,EAAE,GAAG,CAAC,CAAC;KACxF;IACD,IAAK,IAAe,KAAK,kBAAkB,EAAE;QAC3C,MAAM,IAAI,KAAK,CACb,yFAAyF;YACvF,uFAAuF;YACvF,gDAAgD,SAAS,EAAE,GAAG,CACjE,CAAC;KACH;IACD,IAAI,yBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACpC,MAAM,IAAI,KAAK,CACb,yBAAyB,IAAI,uDAAuD;YAClF,oBAAoB,SAAS,EAAE,GAAG,CACrC,CAAC;KACH;IACD,IAAI,yBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACpC,MAAM,IAAI,KAAK,CACb,yBAAyB,IAAI,6CAA6C,SAAS,EAAE,GAAG,CACzF,CAAC;KACH;IACD,MAAM,IAAI,GAAG,iBAAS,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,uBAAuB,SAAS,EAAE,GAAG,CAAC,CAAC;KAC9F;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,SAAS;IAChB,OAAO,MAAM,CAAC,IAAI,CAAC,iBAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC"}
|
|
@@ -8,6 +8,8 @@ const devkit_1 = require("@nx/devkit");
|
|
|
8
8
|
const context_1 = require("../../cli/context");
|
|
9
9
|
const env_alias_1 = require("../../lib/utils/env-alias");
|
|
10
10
|
const env_move_1 = require("../../lib/utils/env-move");
|
|
11
|
+
const flat_eslint_1 = require("../../lib/utils/flat-eslint");
|
|
12
|
+
const ts_paths_1 = require("../../lib/utils/ts-paths");
|
|
11
13
|
const llm_block_1 = require("../../lib/utils/llm-block");
|
|
12
14
|
const adapters_1 = require("./adapters");
|
|
13
15
|
const external_1 = require("./adapters/external");
|
|
@@ -354,6 +356,9 @@ async function migrateOne(tree, schema, batch) {
|
|
|
354
356
|
applyBatchHooks(rec.tree, data, batch);
|
|
355
357
|
(0, quality_1.applyTypecheck)(rec.tree, rec.originals, data);
|
|
356
358
|
(0, quality_1.applyToolScripts)(rec.tree, rec.originals, data, sourceDir, !!schema.keepOldScripts);
|
|
359
|
+
// Angular 22+ workspaces lint with eslint.config.mjs.
|
|
360
|
+
data.notes.push(...(0, flat_eslint_1.flattenCreatedEslintrcs)(rec.tree));
|
|
361
|
+
(0, ts_paths_1.relativizePathsWithoutBaseUrl)(rec.tree);
|
|
357
362
|
if (dir && knipMissesNestedApps(tree)) {
|
|
358
363
|
data.notes.push(`knip.json lists \`apps/*/src/main.ts\` as an entry, which does not reach ${projectRoot}; ` +
|
|
359
364
|
'change it to `apps/**/src/main.ts` so `npm run stale-code` does not report the app as unused.');
|
|
@@ -421,6 +426,9 @@ async function migrateWorkspace(tree, schema, adapter, detection, forced, source
|
|
|
421
426
|
applyBatchHooks(rec.tree, data, batch);
|
|
422
427
|
(0, quality_1.applyTypecheck)(rec.tree, rec.originals, data);
|
|
423
428
|
(0, quality_1.applyToolScripts)(rec.tree, rec.originals, data, sourceDir, !!schema.keepOldScripts);
|
|
429
|
+
// Angular 22+ workspaces lint with eslint.config.mjs.
|
|
430
|
+
data.notes.push(...(0, flat_eslint_1.flattenCreatedEslintrcs)(rec.tree));
|
|
431
|
+
(0, ts_paths_1.relativizePathsWithoutBaseUrl)(rec.tree);
|
|
424
432
|
const reportArgs = {
|
|
425
433
|
name,
|
|
426
434
|
adapterId: adapter.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/migrate/generator.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B,uCAA6D;AAE7D,+CAAwE;AACxE,yDAA0E;AAC1E,uDAAyD;AACzD,yDAAoF;AAEpF,yCAOoB;AACpB,kDAAwE;AACxE,kDAAsD;AACtD,4CAO0B;AAC1B,iCAA2C;AAC3C,+CAAiF;AACjF,mCAAiF;AACjF,mCAA0E;AAC1E,uCAA6D;AAC7D,qCAAwC;AACxC,kDAAiF;AACjF,8DAAqE;AACrE,kDAA+E;AAG/E,iCAAkC;AAAzB,gGAAA,OAAO,OAAA;AAChB,mCAAkC;AAElC,iCAAoC;AAA3B,kGAAA,SAAS,OAAA;AAElB,8GAA8G;AAC9G,SAAgB,aAAa,CAAC,IAAU,EAAE,MAA0B;IAClE,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,yEAAyE;YACvE,wCAAwC,CAC3C,CAAC;KACH;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAChD,IAAI,IAAc,CAAC;IACnB,IAAI;QACF,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;KACzB;IAAC,MAAM;QACN,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,iCAAiC,GAAG,IAAI,CAAC,CAAC;KACvF;IACD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,uBAAuB,CAAC,CAAC;KACtE;IACD,MAAM,IAAI,GAAG,CAAC,CAAS,EAAE,EAAE;QACzB,IAAI;YACF,OAAO,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;SAC3B;QAAC,MAAM;YACN,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SACxB;IACH,CAAC,CAAC;IACF,IAAI,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;QAChD,MAAM,IAAI,KAAK,CACb,sBAAsB,MAAM,wEAAwE,CACrG,CAAC;KACH;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AA9BD,sCA8BC;AAED,qGAAqG;AACrG,SAAgB,gBAAgB,CAAC,KAAa,EAAE,KAAa;IAC3D,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACxC,OAAO,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AACxE,CAAC;AAHD,4CAGC;AAED,qGAAqG;AACrG;;;GAGG;AACH,SAAS,gBAAgB,CAAC,IAAU,EAAE,SAAkB;IACtD,IAAI,SAAS,KAAK,SAAS,IAAI,sBAAW,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,OAAO,EAAE,CAAC;IAC1E,MAAM,MAAM,GAAG,IAAA,sBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9F,OAAO,IAAA,+BAAoB,EAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU;IACtC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;AAClF,CAAC;AAED,wFAAwF;AACxF,SAAS,sBAAsB,CAAC,IAAU,EAAE,IAAY;IACtD,KAAK,MAAM,CAAC,IAAI,CAAC,mBAAmB,IAAI,KAAK,EAAE,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC,EAAE;QAClE,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YAClB,MAAM,IAAI,KAAK,CACb,aAAa,CAAC,sDAAsD,IAAI,MAAM;gBAC5E,sBAAsB,CACzB,CAAC;SACH;KACF;AACH,CAAC;AAED,wFAAwF;AACxF,SAAS,cAAc,CACrB,IAAU,EACV,SAAoB,EACpB,IAAY,EACZ,SAAiB,EACjB,MAAc,EACd,IAAyB;IAEzB,MAAM,MAAM,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,IAAI,CAAC,IAAA,yBAAe,EAAC,SAAS,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;IACzF,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;IACnF,IAAA,wBAAa,EACX,IAAI,EACJ,IAAA,wBAAa,EAAC,IAAI,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CACxF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,IAAU,EAAE,MAA8B;IAChE,MAAM,IAAI,GAAG,MAAM,CAAC,QAAkB,CAAC;IACvC,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,MAAM,IAAI,KAAK,CACb,kGAAkG,CACnG,CAAC;KACH;IACD,IACE,MAAM,CAAC,OAAO;QACd,MAAM,CAAC,IAAI;QACX,MAAM,CAAC,QAAQ;QACf,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,YAAY;QACnB,MAAM,CAAC,aAAa,KAAK,SAAS;QAClC,MAAM,CAAC,GAAG,KAAK,SAAS,EACxB;QACA,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;KAC5E;IACD,IAAI,CAAC,eAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACvB,MAAM,IAAI,KAAK,CACb,wBAAwB,IAAI,iDAAiD;YAC3E,4BAA4B,CAC/B,CAAC;KACH;IACD,MAAM,MAAM,GAAG,IAAA,4BAAiB,EAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7D,IAAA,4BAAgB,EAAC,IAAI,CAAC,CAAC;IACvB,eAAM,CAAC,IAAI,CAAC,IAAA,gCAAqB,EAAC,MAAM,CAAC,CAAC,CAAC;IAC3C,OAAO,SAAS,CAAC;AACnB,CAAC;AAEc,KAAK,UAAU,gBAAgB,CAC5C,IAAU,EACV,MAA8B;IAE9B,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE;QACnC,0FAA0F;QAC1F,MAAM,GAAG,GACP,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,CAChF,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;QACzC,MAAM,EAAE,GAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,CAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7F,MAAM,MAAM,GAAe,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,IAAI,KAAK,CACb,kFAAkF;gBAChF,QAAQ,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAChD,CAAC;SACH;QACD,IAAA,0BAAe,EAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACzC,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACnE,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACjE,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAC;KACH;IACD,OAAO,CAAC,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,WAAW,CAAC;AACvD,CAAC;AA5BD,mCA4BC;AAED,KAAK,UAAU,YAAY,CACzB,IAAU,EACV,MAA8B;IAE9B,IACE,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,QAAQ,KAAK,SAAS;QAC7B,MAAM,CAAC,KAAK;QACZ,MAAM,CAAC,IAAI;QACX,MAAM,CAAC,OAAO;QACd,MAAM,CAAC,QAAQ;QACf,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,MAAM;QACb,MAAM,CAAC,MAAM,EACb;QACA,MAAM,IAAI,KAAK,CACb,sFAAsF;YACpF,qCAAqC,CACxC,CAAC;KACH;IACD,IAAA,gBAAQ,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,MAAgB,CAAC,CAAC;IAClE,6FAA6F;IAC7F,oFAAoF;IACpF,IAAI,KAAuC,CAAC;IAC5C,IAAI;QACF,KAAK,GAAG,IAAA,qBAAa,EAAC,IAAI,EAAE,sBAAW,CAAC,CAAC;KAC1C;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAC;YAAE,MAAM,GAAG,CAAC;QAC5F,KAAK,GAAG,IAAA,qBAAa,EACnB,IAAI,EACJ,IAAA,sBAAW,EAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACrD,CAAC;KACH;IACD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACpC,MAAM,GAAG,GAAkB,EAAE,CAAC;IAC9B,IAAI,MAAM,CAAC,YAAY,KAAK,SAAS;QAAE,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;IAC9E,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS;QAAE,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IAClE,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS;QAAE,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;IACjF,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS;QAAE,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACnD,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS;QAAE,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;IAEpF,MAAM,IAAI,GAAqB,EAAE,CAAC;IAClC,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE;QAC1C,0FAA0F;QAC1F,2DAA2D;QAC3D,MAAM,UAAU,GAAe;YAC7B,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YACxC,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;SACrD,CAAC;QACF,IAAI;YACF,MAAM,MAAM,GAAG,IAAA,yBAAiB,EAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YACvD,IAAI,MAAM,CAAC,cAAc;gBAAE,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;YACxD,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;YAC3D,IAAI,OAAO;gBAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACjC;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,OAAO,GAAG,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;iBAC/D,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;gBAC1B,8EAA8E;iBAC7E,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,2BAA2B,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,MAAM,OAAO,EAAE,CAAC,CAAC;SACxF;KACF;IACD,eAAM,CAAC,IAAI,CACT;QACE,YAAY,IAAI,CAAC,MAAM,iBAAiB,MAAM,CAAC,MAAM,GAAG;QACxD,mBAAmB;QACnB,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,+BAA+B,CAAC,CAAC,IAAI,EAAE,CAAC;KAC3E,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAChD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACzC,OAAO,KAAK,IAAI,EAAE;QAChB,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;YACrB,IAAI;gBACF,MAAO,CAAC,CAAC,WAAiC,EAAE,CAAC;aAC9C;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,kCAAkC,CAAC,CAAC,IAAI,+CAA+C;oBACrF,0BAA0B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAC/E,CAAC;aACH;SACF;IACH,CAAC,CAAC;AACJ,CAAC;AAqBD;;;;GAIG;AACH,SAAS,qBAAqB,CAC5B,IAAU,EACV,OAAyB,EACzB,QAAsB;IAEtB,MAAM,GAAG,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC;IAC9D,MAAM,GAAG,GAAyC,EAAE,CAAC;IACrD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,OAAO;YAAE,SAAS;QACvB,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,0BAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3E,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAChC,MAAM,CAAC,GAAG,IAAA,wBAAc,EAAC,IAAI,EAAE;YAC7B,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACnD,IAAI,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACvD,CAAC,CAAC;QACH,qFAAqF;QACrF,uEAAuE;QACvE,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAClD,OAAO,CAAC,UAAU,GAAG;YACnB,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,GAAG,CAAC,CAAC,UAAU;SAChB,CAAC;QACF,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,MAAM;YAAE,SAAS;QACxF,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC;QACvC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;QAC3C,OAAO,CAAC,eAAe,GAAG;YACxB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,eAAe,CAAC,CAAC;SAC/D,CAAC,IAAI,EAAE,CAAC;QACT,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACjB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC;KAC1B;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAID,qFAAqF;AACrF,SAAS,eAAe,CAAC,IAAU,EAAE,IAAyB,EAAE,KAAkB;IAChF,IAAI,CAAC,KAAK,EAAE,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC1D,MAAM,QAAQ,GAAG,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IAC9E,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAClC,IAAI,IAAI,CAAC,OAAO;QAAE,IAAI,CAAC,OAAO,CAAC,eAAe,GAAG,QAAQ,CAAC;SACrD;QACH,IAAI,CAAC,KAAK,CAAC,IAAI,CACb,WAAW,QAAQ,CAAC,MAAM,iEAAiE;YACzF,mCAAmC,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC7F,CAAC;KACH;AACH,CAAC;AAED,iEAAiE;AACjE,KAAK,UAAU,UAAU,CACvB,IAAU,EACV,MAA8B,EAC9B,KAAkB;IAElB,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,wBAAiB,CAAC;IACtD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,CAAC,EAAE;QAC/C,MAAM,IAAI,KAAK,CACb,6DAA6D,MAAM,CAAC,QAAQ,IAAI,CACjF,CAAC;KACH;IAED,MAAM,aAAa,GAAG,IAAA,6BAAkB,EAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC/D,MAAM,GAAG,GAAG,IAAA,gBAAQ,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAEjC,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,eAAM,CAAC,IAAI,CACT,iBAAiB,SAAS,QAAQ,IAAA,+BAAoB,EACpD,IAAA,oBAAS,EAAC,SAAS,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAC7C,EAAE,CACJ,CAAC;QACF,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE;QACxD,MAAM,IAAI,KAAK,CACb,0FAA0F,CAC3F,CAAC;KACH;IACD,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAA,wBAAa,EAClD,SAAS,EACT,MAAM,CAAC,OAAO,EACd,aAAa,EACb,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CACvC,CAAC;IACF,MAAM,QAAQ,GACZ,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ;QACjC,CAAC,CAAC,MAAM,CAAC,QAAQ;aACZ,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACpB,MAAM,CAAC,OAAO,CAAC;QACpB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;IACtB,IAAI,IAAA,0BAAkB,EAAC,OAAO,CAAC,EAAE;QAC/B,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;YAC7C,MAAM,IAAI,KAAK,CACb,iDAAiD,OAAO,CAAC,EAAE,mCAAmC,CAC/F,CAAC;SACH;QACD,OAAO,gBAAgB,CACrB,IAAI,EACJ,MAAM,EACN,OAAO,EACP,SAAS,EACT,MAAM,EACN,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,KAAK,CACN,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;QACvE,MAAM,IAAI,KAAK,CACb,gFAAgF;YAC9E,GAAG,OAAO,CAAC,EAAE,4BAA4B,CAC5C,CAAC;KACH;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpE,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,2EAA2E,CAAC,CAAC;KAC9F;IACD,IAAI,CAAC,eAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACvB,MAAM,IAAI,KAAK,CACb,oBAAoB,IAAI,sEAAsE;YAC5F,0BAA0B,CAC7B,CAAC;KACH;IACD,MAAM,WAAW,GAAG,IAAA,eAAO,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACvC,IAAI,GAAG;QAAE,IAAA,gCAAwB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC7C,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,aAAa,WAAW,wCAAwC,CAAC,CAAC;KACnF;IACD,IAAI,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC9C,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,wCAAwC,CAAC,CAAC;KAC5F;IACD,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEnC,MAAM,GAAG,GAAqB;QAC5B,SAAS;QACT,IAAI;QACJ,WAAW;QACX,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY;QACnC,QAAQ;QACR,cAAc,EAAE,MAAM,CAAC,cAAc,KAAK,KAAK;KAChD,CAAC;IACF,MAAM,GAAG,GAAG,IAAA,8BAAa,EAAC,IAAI,CAAC,CAAC;IAChC,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5C,IAAI,GAAG,CAAC,cAAc,EAAE;QACtB,IAAI,CAAC,OAAO,GAAG,IAAA,wBAAc,EAAC,GAAG,CAAC,IAAI,EAAE;YACtC,SAAS;YACT,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;YACvB,UAAU,EAAE,KAAK,EAAE,UAAU;SAC9B,CAAC,CAAC;KACJ;IACD,IAAA,wBAAa,EAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IAClD,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACvC,IAAA,wBAAc,EAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9C,IAAA,0BAAgB,EAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IACpF,IAAI,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,EAAE;QACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CACb,4EAA4E,WAAW,IAAI;YACzF,+FAA+F,CAClG,CAAC;KACH;IAED,MAAM,UAAU,GAAG,mBAAmB,IAAI,KAAK,CAAC;IAChD,MAAM,UAAU,GAAG;QACjB,IAAI;QACJ,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,YAAY,EAAE,OAAO,CAAC,KAAK;QAC3B,SAAS;QACT,MAAM;QACN,WAAW;QACX,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,MAAM,EAAE,MAAM,CAAC,WAAW,IAAK,MAAM,CAAC,MAAiB;QACvD,IAAI;KACL,CAAC;IACF,MAAM,QAAQ,GAAG,CAAC,CAAO,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,IAAA,qBAAY,EAAC,UAAU,CAAC,CAAC,CAAC;IAC5E,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnB,sFAAsF;IACtF,WAAW,CAAC,IAAA,yBAAa,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IACrC,IAAA,4BAAgB,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC3B,cAAc,CACZ,IAAI,EACJ,GAAG,CAAC,SAAS,EACb,IAAI,EACJ,OAAO,CAAC,EAAE,EACV,MAAM,CAAC,WAAW,IAAK,MAAM,CAAC,MAAiB,EAC/C,IAAI,CACL,CAAC;IACF,eAAM,CAAC,IAAI,CACT,YAAY,SAAS,SAAS,WAAW,aAAa,OAAO,CAAC,EAAE,YAAY;QAC1E,WAAW,UAAU,0CAA0C,IAAI,EAAE,CACxE,CAAC;IACF,OAAO;QACL,IAAI;QACJ,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;QACvB,SAAS;QACT,IAAI;QACJ,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,IAAU,EACV,MAA8B,EAC9B,OAAkC,EAClC,SAAoB,EACpB,MAAe,EACf,SAAiB,EACjB,QAAgB,EAChB,QAA8B,EAC9B,KAAkB;IAElB,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpE,IAAI,CAAC,IAAI,IAAI,CAAC,eAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,6BAA6B,IAAI,iDAAiD,CACnF,CAAC;KACH;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,eAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC/D,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,CAAC,MAAM,uBAAuB,CAAC,CAAC;KAC7E;IACD,MAAM,UAAU,GAAG,mBAAmB,IAAI,KAAK,CAAC;IAChD,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACnC,MAAM,GAAG,GAA8B;QACrC,SAAS;QACT,QAAQ;QACR,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM;QACvB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;QAC3B,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY;QACnC,QAAQ;QACR,cAAc,EAAE,MAAM,CAAC,cAAc,KAAK,KAAK;KAChD,CAAC;IACF,MAAM,GAAG,GAAG,IAAA,8BAAa,EAAC,IAAI,CAAC,CAAC;IAChC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5C,IAAI,GAAG,CAAC,cAAc,EAAE;QACtB,IAAI,CAAC,OAAO,GAAG,IAAA,wBAAc,EAAC,GAAG,CAAC,IAAI,EAAE;YACtC,SAAS;YACT,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;YACvB,UAAU,EAAE,KAAK,EAAE,UAAU;SAC9B,CAAC,CAAC;KACJ;IACD,IAAA,wBAAa,EAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IAClD,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACvC,IAAA,wBAAc,EAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9C,IAAA,0BAAgB,EAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IACpF,MAAM,UAAU,GAAG;QACjB,IAAI;QACJ,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,YAAY,EAAE,OAAO,CAAC,KAAK;QAC3B,SAAS;QACT,MAAM;QACN,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,MAAM,EAAE,MAAM,CAAC,WAAW,IAAK,MAAM,CAAC,MAAiB;QACvD,IAAI;KACL,CAAC;IACF,MAAM,QAAQ,GAAG,CAAC,CAAO,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,IAAA,qBAAY,EAAC,UAAU,CAAC,CAAC,CAAC;IAC5E,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnB,WAAW,CAAC,IAAA,yBAAa,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IACrC,IAAA,4BAAgB,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC3B,cAAc,CACZ,IAAI,EACJ,GAAG,CAAC,SAAS,EACb,IAAI,EACJ,OAAO,CAAC,EAAE,EACV,MAAM,CAAC,WAAW,IAAK,MAAM,CAAC,MAAiB,EAC/C,IAAI,CACL,CAAC;IACF,eAAM,CAAC,IAAI,CACT,YAAY,IAAI,CAAC,QAAQ,CAAC,MAAM,oBAAoB,SAAS,aAAa,OAAO,CAAC,EAAE,GAAG;QACrF,oBAAoB,UAAU,0CAA0C,IAAI,EAAE,CACjF,CAAC;IACF,OAAO;QACL,IAAI;QACJ,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;QACvB,SAAS;QACT,IAAI;QACJ,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,gGAAgG;AAChG,SAAS,WAAW,CAAC,MAAsB;IACzC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACxC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,eAAM,CAAC,IAAI,CAAC,yCAAyC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChG,IAAI,MAAM,CAAC,KAAK,KAAK,UAAU,EAAE;QAC/B,eAAM,CAAC,IAAI,CAAC,4EAA4E,CAAC,CAAC;KAC3F;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/migrate/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Detection } from '../adapters/types';
|
|
2
|
-
/** Nx majors of source workspaces (the plugin itself runs on Nx 17–
|
|
2
|
+
/** Nx majors of source workspaces (the plugin itself runs on Nx 17–23). */
|
|
3
3
|
export declare const SUPPORTED_NX_MAJORS: number[];
|
|
4
4
|
export declare function detectNxWorkspace(sourceDir: string): Detection;
|
|
@@ -4,8 +4,8 @@ exports.detectNxWorkspace = exports.SUPPORTED_NX_MAJORS = void 0;
|
|
|
4
4
|
const dependencies_1 = require("../../../lib/utils/dependencies");
|
|
5
5
|
const source_1 = require("../source");
|
|
6
6
|
const workspace_source_1 = require("./workspace-source");
|
|
7
|
-
/** Nx majors of source workspaces (the plugin itself runs on Nx 17–
|
|
8
|
-
exports.SUPPORTED_NX_MAJORS = [14, 15, 16, 17, 18, 19, 20, 21, 22];
|
|
7
|
+
/** Nx majors of source workspaces (the plugin itself runs on Nx 17–23). */
|
|
8
|
+
exports.SUPPORTED_NX_MAJORS = [14, 15, 16, 17, 18, 19, 20, 21, 22, 23];
|
|
9
9
|
const SUPPORTED_RANGE = `${exports.SUPPORTED_NX_MAJORS[0]}–${exports.SUPPORTED_NX_MAJORS[exports.SUPPORTED_NX_MAJORS.length - 1]}`;
|
|
10
10
|
function detectNxWorkspace(sourceDir) {
|
|
11
11
|
if (!(0, source_1.sourceExists)(sourceDir, 'nx.json'))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detect.js","sourceRoot":"","sources":["../../../../../src/generators/migrate/nx/detect.ts"],"names":[],"mappings":";;;AAAA,kEAA0D;AAE1D,sCAAyC;AAEzC,yDAK4B;AAE5B,2EAA2E;AAC9D,QAAA,mBAAmB,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"detect.js","sourceRoot":"","sources":["../../../../../src/generators/migrate/nx/detect.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export declare function isRecursiveLintCommand(command: string): boolean;
|
|
|
12
12
|
* Nx and the lint stack for a new workspace on this Angular major: the major's Nx pin (Nx 18 from
|
|
13
13
|
* Angular 17), and from Nx 18 typescript-eslint 7 with eslint-plugin-unused-imports 3 (its peer).
|
|
14
14
|
* `.nvmrc` names the major's Node (22 from Angular 21, which Capacitor 8 needs), and from Angular 21
|
|
15
|
-
* tsconfig.base.json resolves modules as `bundler
|
|
15
|
+
* tsconfig.base.json resolves modules as `bundler` (and from Angular 22, TypeScript 6, has no `baseUrl`).
|
|
16
16
|
*/
|
|
17
17
|
export declare function alignWorkspaceStack(tree: Tree, angularMajor: number): void;
|
|
18
18
|
export default function presetGenerator(tree: Tree, options: PresetGeneratorSchema): Promise<void>;
|
|
@@ -12,6 +12,7 @@ const pins_1 = require("../../lib/upgrade/pins");
|
|
|
12
12
|
const angular_deps_1 = require("../../lib/utils/angular-deps");
|
|
13
13
|
const angular_style_1 = require("../../lib/utils/angular-style");
|
|
14
14
|
const dependencies_1 = require("../../lib/utils/dependencies");
|
|
15
|
+
const flat_eslint_1 = require("../../lib/utils/flat-eslint");
|
|
15
16
|
const lint_staged_1 = require("../../lib/utils/lint-staged");
|
|
16
17
|
const quality_1 = require("../../lib/utils/quality");
|
|
17
18
|
const llm_block_1 = require("../../lib/utils/llm-block");
|
|
@@ -33,7 +34,7 @@ exports.isRecursiveLintCommand = isRecursiveLintCommand;
|
|
|
33
34
|
* Nx and the lint stack for a new workspace on this Angular major: the major's Nx pin (Nx 18 from
|
|
34
35
|
* Angular 17), and from Nx 18 typescript-eslint 7 with eslint-plugin-unused-imports 3 (its peer).
|
|
35
36
|
* `.nvmrc` names the major's Node (22 from Angular 21, which Capacitor 8 needs), and from Angular 21
|
|
36
|
-
* tsconfig.base.json resolves modules as `bundler
|
|
37
|
+
* tsconfig.base.json resolves modules as `bundler` (and from Angular 22, TypeScript 6, has no `baseUrl`).
|
|
37
38
|
*/
|
|
38
39
|
function alignWorkspaceStack(tree, angularMajor) {
|
|
39
40
|
const nx = `~${pins_1.ANGULAR_PINS[angularMajor].nx}`;
|
|
@@ -42,6 +43,10 @@ function alignWorkspaceStack(tree, angularMajor) {
|
|
|
42
43
|
if (angularMajor >= angular_deps_1.BUNDLER_RESOLUTION_MAJOR && tree.exists('tsconfig.base.json')) {
|
|
43
44
|
(0, devkit_1.updateJson)(tree, 'tsconfig.base.json', (json) => {
|
|
44
45
|
json.compilerOptions = { ...json.compilerOptions, moduleResolution: 'bundler' };
|
|
46
|
+
// TypeScript 6 (Angular 22) reports baseUrl as deprecated (TS5101). The generated paths
|
|
47
|
+
// start empty, and TypeScript resolves paths against this file without it.
|
|
48
|
+
if (angularMajor >= pins_1.TYPESCRIPT6_ANGULAR)
|
|
49
|
+
delete json.compilerOptions.baseUrl;
|
|
45
50
|
return json;
|
|
46
51
|
});
|
|
47
52
|
}
|
|
@@ -59,6 +64,18 @@ function alignWorkspaceStack(tree, angularMajor) {
|
|
|
59
64
|
json.devDependencies = dev;
|
|
60
65
|
return json;
|
|
61
66
|
});
|
|
67
|
+
if (angularMajor >= angular_deps_1.FLAT_ESLINT_MAJOR) {
|
|
68
|
+
// Nx 23 needs ESLint 9 and angular-eslint 22 has flat configs only: eslint.config.mjs with
|
|
69
|
+
// typescript-eslint (which brings its own parser and plugin) instead of .eslintrc.json.
|
|
70
|
+
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
71
|
+
const dev = { ...(json.devDependencies ?? {}), ...dependencies_1.FLAT_ESLINT_STACK };
|
|
72
|
+
delete dev['@typescript-eslint/eslint-plugin'];
|
|
73
|
+
delete dev['@typescript-eslint/parser'];
|
|
74
|
+
json.devDependencies = dev;
|
|
75
|
+
return json;
|
|
76
|
+
});
|
|
77
|
+
(0, flat_eslint_1.writeRootFlatEslint)(tree);
|
|
78
|
+
}
|
|
62
79
|
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
63
80
|
if (json.devDependencies?.['eslint-plugin-unused-imports'] !== undefined) {
|
|
64
81
|
json.devDependencies['eslint-plugin-unused-imports'] = (0, quality_1.unusedImportsVersion)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/preset/generator.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAE7B,uCAA0E;AAE1E,+CAAwE;AACxE,iDAAuF;AACvF,4DAA6E;AAC7E,kEAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/preset/generator.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAE7B,uCAA0E;AAE1E,+CAAwE;AACxE,iDAAuF;AACvF,4DAA6E;AAC7E,kEAA6E;AAC7E,iDAA2E;AAC3E,+DAMsC;AACtC,iEAA0E;AAC1E,+DAA0F;AAC1F,6DAAkE;AAClE,6DAAiE;AACjE,qDAKiC;AACjC,yDAA+D;AAC/D,2EAAgD;AAChD,8CAAgE;AAChE,yEAA4C;AAI5C,4FAA4F;AAC/E,QAAA,mBAAmB,GAAG,qBAAqB,CAAC;AAEzD;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,OAAe;IACpD,OAAO,8EAA8E,CAAC,IAAI,CACxF,OAAO,CACR,CAAC;AACJ,CAAC;AAJD,wDAIC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,YAAoB;IAClE,MAAM,EAAE,GAAG,IAAI,mBAAY,CAAC,YAAY,CAAC,CAAC,EAAE,EAAE,CAAC;IAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;QAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,mBAAY,CAAC,YAAY,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;IACxF,IAAI,YAAY,IAAI,uCAAwB,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE;QACjF,IAAA,mBAAU,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9C,IAAI,CAAC,eAAe,GAAG,EAAE,GAAG,IAAI,CAAC,eAAe,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC;YAChF,wFAAwF;YACxF,2EAA2E;YAC3E,IAAI,YAAY,IAAI,0BAAmB;gBAAE,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YAC7E,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IACD,MAAM,QAAQ,GAAG,IAAA,sCAAuB,EAAC,EAAE,CAAC,CAAC;IAC7C,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,MAAM,GAAG,GAA2B,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;QAC/D,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,mBAAmB,CAAC,EAAE;YAC1E,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,SAAS;gBAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SAC7C;QACD,KAAK,MAAM,IAAI,IAAI,CAAC,kCAAkC,EAAE,2BAA2B,CAAC,EAAE;YACpF,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,SAAS;gBAAE,GAAG,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;SACnD;QACD,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,IAAI,YAAY,IAAI,gCAAiB,EAAE;QACrC,2FAA2F;QAC3F,wFAAwF;QACxF,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,MAAM,GAAG,GAA2B,EAAE,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,EAAE,GAAG,gCAAiB,EAAE,CAAC;YAC9F,OAAO,GAAG,CAAC,kCAAkC,CAAC,CAAC;YAC/C,OAAO,GAAG,CAAC,2BAA2B,CAAC,CAAC;YACxC,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC;YAC3B,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,IAAA,iCAAmB,EAAC,IAAI,CAAC,CAAC;KAC3B;IACD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC,8BAA8B,CAAC,KAAK,SAAS,EAAE;YACxE,IAAI,CAAC,eAAe,CAAC,8BAA8B,CAAC,GAAG,IAAA,8BAAoB,EAAC,IAAI,CAAC,CAAC;SACnF;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AA1CD,kDA0CC;AAEc,KAAK,UAAU,eAAe,CAC3C,IAAU,EACV,OAA8B;IAE9B,MAAM,EACJ,QAAQ,GAAG,YAAY,EACvB,UAAU,GAAG,QAAQ,EACrB,EAAE,GAAG,EAAE,EACP,KAAK,EACL,GAAG,GAAG,EAAE,EACR,kBAAkB,GAAG,EAAE,EACvB,WAAW,GAAG,cAAc,EAC5B,UAAU,GAAG,KAAK,GACnB,GAAG,OAAO,CAAC;IAEZ,yFAAyF;IACzF,MAAM,UAAU,GAAG,IAAA,oBAAU,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAChD,MAAM,WAAW,GAAG,IAAA,0BAAgB,EAAC,EAAE,CAAC,CAAC;IACzC,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAA,8BAAkB,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE/D,2FAA2F;IAC3F,iGAAiG;IACjG,wEAAwE;IACxE,MAAM,eAAe,GAAG,2DAA2D,CAAC,IAAI,CACtF,WAAW,CACZ,CAAC;IACF,MAAM,UAAU,GACd,eAAe,IAAI,sBAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,2BAAmB,CAAC,CAAC,CAAC,WAAW,CAAC;IAC7F,MAAM,IAAI,GAAG;QACX,QAAQ;QACR,UAAU;QACV,kBAAkB;QAClB,WAAW;QACX,UAAU;QACV,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACtE,8FAA8F;IAC9F,gGAAgG;IAChG,+CAA+C;IAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,SAAS,CAAC;IAC3C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,UAAU,EAAE;QACjD,MAAM,IAAI,KAAK,CAAC,sDAAsD,MAAM,KAAK,CAAC,CAAC;KACpF;IACD,IAAA,mCAAuB,EAAC,IAAI,EAAE,EAAE,GAAG,IAAA,mCAA0B,GAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1F,MAAM,aAAa,GACjB,OAAO,CAAC,aAAa;QACrB,IAAA,4BAAkB,EAAC,IAAI,CAAC,IAAI,CAAC,IAAA,yBAAe,EAAC,SAAS,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5E,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,IAAI,CAAC,eAAe,GAAG;YACrB,GAAG,IAAI,CAAC,eAAe;YACvB,CAAC,sBAAW,CAAC,EAAE,IAAA,6BAAkB,GAAE,IAAI,IAAA,2BAAgB,EAAC,aAAa,CAAC;SACvE,CAAC;QACF,kFAAkF;QAClF,yFAAyF;QACzF,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,SAAS,EAAE;YACrC,IAAI,CAAC,aAAa,CAAC,GAAG;gBACpB,GAAG,gCAAkB;gBACrB,MAAM,EAAE,CAAC,oCAA0B,CAAC,IAAI,CAAC;aAC1C,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,KAAK,CAAC,mCAAyB,EAAE,+BAAqB,CAAC,CAAC;IAE7D,yFAAyF;IACzF,iFAAiF;IACjF,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS;YAAE,IAAA,wCAAyB,EAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACxF,IAAA,yCAAyB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;KAC/C;IACD,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE;QACjC,IAAI,CAAC,uCAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACvD,MAAM,IAAI,KAAK,CACb,oCAAoC,uCAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,SACrE,OAAO,CAAC,OACV,IAAI,CACL,CAAC;SACH;QACD,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAA,wCAAyB,EAAC,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;KAC7D;IAED,iGAAiG;IACjG,sFAAsF;IACtF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,MAAM,IAAA,mBAAc,EAAC,IAAI,EAAE;YACzB,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;YAC1B,EAAE,EAAE,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC;YACzB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,4EAA4E;YAC5E,IAAI,EAAE,KAAK;YACX,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;KACJ;IAED,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;KACzB;IAED,wFAAwF;IACxF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,IAAA,mBAAY,EAAC,IAAI,EAAE,EAAE,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KACjE;AACH,CAAC;AA5GD,kCA4GC"}
|
|
@@ -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 (14–
|
|
18
|
+
/** Angular major to add now (14–22); 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": [14, 15, 16, 17, 18, 19, 20, 21],
|
|
82
|
+
"enum": [14, 15, 16, 17, 18, 19, 20, 21, 22],
|
|
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": {
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Angular 22 makes OnPush the default change detection. Its migration keeps the old behaviour by
|
|
3
|
+
* marking every component that did not choose a strategy as eager, and angular-eslint 22's
|
|
4
|
+
* recommended `prefer-on-push-component-change-detection` reports exactly those components as
|
|
5
|
+
* errors. The step keeps the migration's choice (no behaviour change) and turns the rule into a
|
|
6
|
+
* warning in each project's flat ESLint config, so the workspace lints and the components to move
|
|
7
|
+
* to OnPush stay listed.
|
|
8
|
+
*/
|
|
9
|
+
export declare const ON_PUSH_RULE = "@angular-eslint/prefer-on-push-component-change-detection";
|
|
10
|
+
/**
|
|
11
|
+
* Adds the warning override at the end of every Angular project's flat config that does not set
|
|
12
|
+
* the rule. Returns the files changed (workspace-relative); configs it cannot edit (no closing
|
|
13
|
+
* `];`) are returned in `skipped`.
|
|
14
|
+
*/
|
|
15
|
+
export declare function onPushRuleAsWarning(root: string): {
|
|
16
|
+
changed: string[];
|
|
17
|
+
skipped: string[];
|
|
18
|
+
};
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.onPushRuleAsWarning = exports.ON_PUSH_RULE = 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
|
+
/**
|
|
8
|
+
* Angular 22 makes OnPush the default change detection. Its migration keeps the old behaviour by
|
|
9
|
+
* marking every component that did not choose a strategy as eager, and angular-eslint 22's
|
|
10
|
+
* recommended `prefer-on-push-component-change-detection` reports exactly those components as
|
|
11
|
+
* errors. The step keeps the migration's choice (no behaviour change) and turns the rule into a
|
|
12
|
+
* warning in each project's flat ESLint config, so the workspace lints and the components to move
|
|
13
|
+
* to OnPush stay listed.
|
|
14
|
+
*/
|
|
15
|
+
exports.ON_PUSH_RULE = '@angular-eslint/prefer-on-push-component-change-detection';
|
|
16
|
+
const BLOCK = ` {
|
|
17
|
+
files: ['**/*.ts'],
|
|
18
|
+
// Angular 22: its migration marks components without a strategy as eager (no behaviour change);
|
|
19
|
+
// move them to OnPush, then remove this override (pstack upgrade angular --to=22).
|
|
20
|
+
rules: { '${exports.ON_PUSH_RULE}': 'warn' },
|
|
21
|
+
},
|
|
22
|
+
`;
|
|
23
|
+
/** eslint.config.{mjs,js,cjs} files under apps/ and libs/ (no node_modules, no dot folders). */
|
|
24
|
+
function projectFlatConfigs(root) {
|
|
25
|
+
const out = [];
|
|
26
|
+
const go = (d) => {
|
|
27
|
+
if (!fs.existsSync(d))
|
|
28
|
+
return;
|
|
29
|
+
for (const e of fs.readdirSync(d, { withFileTypes: true })) {
|
|
30
|
+
if (e.name === 'node_modules' || e.name.startsWith('.'))
|
|
31
|
+
continue;
|
|
32
|
+
const p = path.join(d, e.name);
|
|
33
|
+
if (e.isDirectory())
|
|
34
|
+
go(p);
|
|
35
|
+
else if (/^eslint\.config\.(mjs|js|cjs)$/.test(e.name))
|
|
36
|
+
out.push(p);
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
go(path.join(root, 'apps'));
|
|
40
|
+
go(path.join(root, 'libs'));
|
|
41
|
+
return out;
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Adds the warning override at the end of every Angular project's flat config that does not set
|
|
45
|
+
* the rule. Returns the files changed (workspace-relative); configs it cannot edit (no closing
|
|
46
|
+
* `];`) are returned in `skipped`.
|
|
47
|
+
*/
|
|
48
|
+
function onPushRuleAsWarning(root) {
|
|
49
|
+
const changed = [];
|
|
50
|
+
const skipped = [];
|
|
51
|
+
for (const file of projectFlatConfigs(root)) {
|
|
52
|
+
const text = fs.readFileSync(file, 'utf8');
|
|
53
|
+
if (!/flat\/angular['"]|angular-eslint/.test(text) || text.includes(exports.ON_PUSH_RULE))
|
|
54
|
+
continue;
|
|
55
|
+
const m = /\]\s*;?\s*$/.exec(text);
|
|
56
|
+
if (!m) {
|
|
57
|
+
skipped.push(path.relative(root, file));
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
60
|
+
const before = text.slice(0, m.index).replace(/,?\s*$/, ',\n');
|
|
61
|
+
fs.writeFileSync(file, before + BLOCK + text.slice(m.index));
|
|
62
|
+
changed.push(path.relative(root, file));
|
|
63
|
+
}
|
|
64
|
+
return { changed, skipped };
|
|
65
|
+
}
|
|
66
|
+
exports.onPushRuleAsWarning = onPushRuleAsWarning;
|
|
67
|
+
//# sourceMappingURL=angular22.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"angular22.js","sourceRoot":"","sources":["../../../../src/lib/upgrade/angular22.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B;;;;;;;GAOG;AACU,QAAA,YAAY,GAAG,2DAA2D,CAAC;AAExF,MAAM,KAAK,GAAG;;;;gBAIE,oBAAY;;CAE3B,CAAC;AAEF,gGAAgG;AAChG,SAAS,kBAAkB,CAAC,IAAY;IACtC,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,EAAE,GAAG,CAAC,CAAS,EAAE,EAAE;QACvB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YAAE,OAAO;QAC9B,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE;YAC1D,IAAI,CAAC,CAAC,IAAI,KAAK,cAAc,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,SAAS;YAClE,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAC/B,IAAI,CAAC,CAAC,WAAW,EAAE;gBAAE,EAAE,CAAC,CAAC,CAAC,CAAC;iBACtB,IAAI,gCAAgC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACrE;IACH,CAAC,CAAC;IACF,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5B,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5B,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,IAAY;IAC9C,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,IAAI,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE;QAC3C,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,oBAAY,CAAC;YAAE,SAAS;QAC5F,MAAM,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC,EAAE;YACN,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;YACxC,SAAS;SACV;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC/D,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7D,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;KACzC;IACD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AAC9B,CAAC;AAhBD,kDAgBC"}
|
|
@@ -20,7 +20,7 @@ export interface AngularPins {
|
|
|
20
20
|
}
|
|
21
21
|
export declare const ANGULAR_PINS: Readonly<Record<number, AngularPins>>;
|
|
22
22
|
export declare const MIN_ANGULAR = 14;
|
|
23
|
-
export declare const MAX_ANGULAR =
|
|
23
|
+
export declare const MAX_ANGULAR = 22;
|
|
24
24
|
/**
|
|
25
25
|
* The step that runs Angular's inject() migration (`@angular/core:inject`): angular-eslint 20 turns
|
|
26
26
|
* on `@angular-eslint/prefer-inject` as an error, so constructor parameter injection stops linting.
|
|
@@ -28,6 +28,12 @@ export declare const MAX_ANGULAR = 21;
|
|
|
28
28
|
export declare const INJECT_MIGRATION_ANGULAR = 20;
|
|
29
29
|
/** The first Angular major whose Nx step needs the second `nx migrate @angular/core` pass. */
|
|
30
30
|
export declare const NX_SKIPS_ANGULAR_FROM = 21;
|
|
31
|
+
/**
|
|
32
|
+
* From this major the workspace is on TypeScript 6, which reports `baseUrl` and `moduleResolution:
|
|
33
|
+
* "node"` (node10) as deprecated (error TS5101 / TS5107). New workspaces leave them out; the
|
|
34
|
+
* upgrade step to this major takes them out of the configs (see lib/upgrade/typescript6.ts).
|
|
35
|
+
*/
|
|
36
|
+
export declare const TYPESCRIPT6_ANGULAR = 22;
|
|
31
37
|
/** npm range for a pin: "5.4.5" → "~5.4.5", "21" → "^21.0.0". */
|
|
32
38
|
export declare function pinRange(pin: string): string;
|
|
33
39
|
/** Major of a version or range ("~17.3.0", "^16.2.12", "17.3.9", "20"); undefined if none. */
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
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;
|
|
3
|
+
exports.majorOfSpec = exports.pinRange = exports.TYPESCRIPT6_ANGULAR = 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
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
6
|
// Capacitor 5 as on 15.
|
|
@@ -76,9 +76,20 @@ exports.ANGULAR_PINS = {
|
|
|
76
76
|
node: 22,
|
|
77
77
|
angularEslint: '21',
|
|
78
78
|
},
|
|
79
|
+
// Nx 23.1 is the first Nx with Angular 22 (and TypeScript 6) in its matrix; 23.3.1 is the newest
|
|
80
|
+
// 23.x patch that had been out two weeks when the step was added. Angular 22 needs Node ^22.22.3.
|
|
81
|
+
22: {
|
|
82
|
+
angular: '22.2.5',
|
|
83
|
+
nx: '23.3.1',
|
|
84
|
+
typescript: '6.0.3',
|
|
85
|
+
ionic: '9',
|
|
86
|
+
capacitor: 8,
|
|
87
|
+
node: 22,
|
|
88
|
+
angularEslint: '22',
|
|
89
|
+
},
|
|
79
90
|
};
|
|
80
91
|
exports.MIN_ANGULAR = 14;
|
|
81
|
-
exports.MAX_ANGULAR =
|
|
92
|
+
exports.MAX_ANGULAR = 22;
|
|
82
93
|
/**
|
|
83
94
|
* The step that runs Angular's inject() migration (`@angular/core:inject`): angular-eslint 20 turns
|
|
84
95
|
* on `@angular-eslint/prefer-inject` as an error, so constructor parameter injection stops linting.
|
|
@@ -86,6 +97,12 @@ exports.MAX_ANGULAR = 21;
|
|
|
86
97
|
exports.INJECT_MIGRATION_ANGULAR = 20;
|
|
87
98
|
/** The first Angular major whose Nx step needs the second `nx migrate @angular/core` pass. */
|
|
88
99
|
exports.NX_SKIPS_ANGULAR_FROM = 21;
|
|
100
|
+
/**
|
|
101
|
+
* From this major the workspace is on TypeScript 6, which reports `baseUrl` and `moduleResolution:
|
|
102
|
+
* "node"` (node10) as deprecated (error TS5101 / TS5107). New workspaces leave them out; the
|
|
103
|
+
* upgrade step to this major takes them out of the configs (see lib/upgrade/typescript6.ts).
|
|
104
|
+
*/
|
|
105
|
+
exports.TYPESCRIPT6_ANGULAR = 22;
|
|
89
106
|
/** npm range for a pin: "5.4.5" → "~5.4.5", "21" → "^21.0.0". */
|
|
90
107
|
function pinRange(pin) {
|
|
91
108
|
return pin.includes('.') ? `~${pin}` : `^${pin}.0.0`;
|
|
@@ -1 +1 @@
|
|
|
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"}
|
|
1
|
+
{"version":3,"file":"pins.js","sourceRoot":"","sources":["../../../../src/lib/upgrade/pins.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export interface TypeScript6Result {
|
|
2
|
+
/** Files changed (workspace-relative). */
|
|
3
|
+
changed: string[];
|
|
4
|
+
/** Files kept on a non-"." baseUrl with ignoreDeprecations "6.0" (workspace-relative). */
|
|
5
|
+
kept: string[];
|
|
6
|
+
}
|
|
7
|
+
export declare function typescript6Configs(root: string): TypeScript6Result;
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.typescript6Configs = 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
|
+
const ts_paths_1 = require("../utils/ts-paths");
|
|
8
|
+
/**
|
|
9
|
+
* The step to Angular 22 moves the workspace to TypeScript 6, which reports these tsconfig options
|
|
10
|
+
* as deprecated (errors TS5101 / TS5107 unless `ignoreDeprecations: "6.0"`; TypeScript 7 drops
|
|
11
|
+
* them). Nx's migrations do not touch every config pstack workspaces have, so the step does:
|
|
12
|
+
* - `moduleResolution: "node"` / `"node10"` → `"bundler"` (Angular's builders bundle);
|
|
13
|
+
* - `baseUrl: "."` is removed and the `paths` targets get a leading "./" (they then resolve
|
|
14
|
+
* against the tsconfig itself, the same folder; without the "./" TypeScript reports TS5090);
|
|
15
|
+
* - `downlevelIteration` is removed (it only affects ES5 targets; the workspace compiles ES2022);
|
|
16
|
+
* - any other `baseUrl` (non-relative imports may depend on it) is kept, with
|
|
17
|
+
* `ignoreDeprecations: "6.0"` so the build runs, and reported to move by hand.
|
|
18
|
+
* Text edits, so comments and layout stay.
|
|
19
|
+
*/
|
|
20
|
+
/** tsconfig*.json files at the root and under apps/ and libs/ (no node_modules, no dot folders). */
|
|
21
|
+
function tsconfigFiles(root) {
|
|
22
|
+
const out = [];
|
|
23
|
+
const isTsconfig = (n) => /^tsconfig.*\.json$/.test(n);
|
|
24
|
+
for (const f of fs.readdirSync(root))
|
|
25
|
+
if (isTsconfig(f))
|
|
26
|
+
out.push(path.join(root, f));
|
|
27
|
+
const go = (d) => {
|
|
28
|
+
if (!fs.existsSync(d))
|
|
29
|
+
return;
|
|
30
|
+
for (const e of fs.readdirSync(d, { withFileTypes: true })) {
|
|
31
|
+
if (e.name === 'node_modules' || e.name.startsWith('.'))
|
|
32
|
+
continue;
|
|
33
|
+
const p = path.join(d, e.name);
|
|
34
|
+
if (e.isDirectory())
|
|
35
|
+
go(p);
|
|
36
|
+
else if (isTsconfig(e.name))
|
|
37
|
+
out.push(p);
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
go(path.join(root, 'apps'));
|
|
41
|
+
go(path.join(root, 'libs'));
|
|
42
|
+
return out;
|
|
43
|
+
}
|
|
44
|
+
/** Removes a `"name": value` line; drops the comma it leaves before a closing brace. */
|
|
45
|
+
function removeProperty(text, name, value) {
|
|
46
|
+
const line = new RegExp(`^[ \\t]*"${name}"\\s*:\\s*${value.source}\\s*,?[ \\t]*(//[^\\n]*)?\\r?\\n`, 'm');
|
|
47
|
+
const m = line.exec(text);
|
|
48
|
+
if (!m)
|
|
49
|
+
return text;
|
|
50
|
+
let before = text.slice(0, m.index);
|
|
51
|
+
const after = text.slice(m.index + m[0].length);
|
|
52
|
+
// It was the object's last property: the one before it keeps a trailing comma.
|
|
53
|
+
if (/^\s*}/.test(after))
|
|
54
|
+
before = before.replace(/,(\s*)$/, '$1');
|
|
55
|
+
return before + after;
|
|
56
|
+
}
|
|
57
|
+
/** Gives every non-relative target in the file's `paths` block a leading "./" (text edit). */
|
|
58
|
+
function relativePaths(text) {
|
|
59
|
+
const m = /"paths"\s*:\s*\{/.exec(text);
|
|
60
|
+
if (!m)
|
|
61
|
+
return text;
|
|
62
|
+
let depth = 1;
|
|
63
|
+
let i = m.index + m[0].length;
|
|
64
|
+
for (; i < text.length && depth > 0; i++) {
|
|
65
|
+
if (text[i] === '{')
|
|
66
|
+
depth++;
|
|
67
|
+
else if (text[i] === '}')
|
|
68
|
+
depth--;
|
|
69
|
+
}
|
|
70
|
+
const block = text
|
|
71
|
+
.slice(m.index, i)
|
|
72
|
+
.replace(/\[[^\]]*\]/g, (arr) => arr.replace(/"([^"]*)"/g, (q, t) => `"${(0, ts_paths_1.relativePathTarget)(t)}"`));
|
|
73
|
+
return text.slice(0, m.index) + block + text.slice(i);
|
|
74
|
+
}
|
|
75
|
+
function typescript6Configs(root) {
|
|
76
|
+
const changed = [];
|
|
77
|
+
const kept = [];
|
|
78
|
+
for (const file of tsconfigFiles(root)) {
|
|
79
|
+
const text = fs.readFileSync(file, 'utf8');
|
|
80
|
+
let out = text.replace(/("moduleResolution"\s*:\s*)"(node|node10)"/i, '$1"bundler"');
|
|
81
|
+
out = removeProperty(out, 'downlevelIteration', /(true|false)/);
|
|
82
|
+
const withoutBase = removeProperty(out, 'baseUrl', /"\.\/?"/);
|
|
83
|
+
// Without baseUrl, paths targets resolve against this file but must start with "./" (TS5090).
|
|
84
|
+
out = withoutBase === out ? out : relativePaths(withoutBase);
|
|
85
|
+
const other = /"baseUrl"\s*:\s*"[^"]*"/.exec(out);
|
|
86
|
+
if (other && !/"ignoreDeprecations"/.test(out)) {
|
|
87
|
+
const lineStart = out.lastIndexOf('\n', other.index) + 1;
|
|
88
|
+
const indent = /^[ \t]*/.exec(out.slice(lineStart))?.[0] ?? ' ';
|
|
89
|
+
out =
|
|
90
|
+
out.slice(0, other.index + other[0].length) +
|
|
91
|
+
`,\n${indent}"ignoreDeprecations": "6.0"` +
|
|
92
|
+
out.slice(other.index + other[0].length);
|
|
93
|
+
kept.push(path.relative(root, file));
|
|
94
|
+
}
|
|
95
|
+
if (out !== text) {
|
|
96
|
+
fs.writeFileSync(file, out);
|
|
97
|
+
changed.push(path.relative(root, file));
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
return { changed, kept };
|
|
101
|
+
}
|
|
102
|
+
exports.typescript6Configs = typescript6Configs;
|
|
103
|
+
//# sourceMappingURL=typescript6.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"typescript6.js","sourceRoot":"","sources":["../../../../src/lib/upgrade/typescript6.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,6 +58,12 @@ export declare const CONTROL_FLOW_MAJOR = 21;
|
|
|
58
58
|
* points in `exports`, which `"node"` resolution does not read.
|
|
59
59
|
*/
|
|
60
60
|
export declare const BUNDLER_RESOLUTION_MAJOR = 21;
|
|
61
|
+
/**
|
|
62
|
+
* From this major, angular-eslint ships flat configs only (and Nx 23, the major's Nx, needs ESLint
|
|
63
|
+
* 9): new workspaces lint with eslint.config.mjs and get the `angular-eslint` package the Nx flat
|
|
64
|
+
* presets load.
|
|
65
|
+
*/
|
|
66
|
+
export declare const FLAT_ESLINT_MAJOR = 22;
|
|
61
67
|
/**
|
|
62
68
|
* Where generated standalone code imports Ionic's standalone components and providers from:
|
|
63
69
|
* `@ionic/angular/standalone` on Ionic 7.5–8, `@ionic/angular` on Ionic 9 (Angular 21).
|
|
@@ -79,6 +85,8 @@ export interface AngularGeneratorVersions {
|
|
|
79
85
|
* Angular 14's last framework release is 14.3.0, its CLI's 14.2.13.
|
|
80
86
|
*/
|
|
81
87
|
angularCli?: string;
|
|
88
|
+
/** The major lints with a flat config (FLAT_ESLINT_MAJOR and later). */
|
|
89
|
+
flatEslint?: boolean;
|
|
82
90
|
}
|
|
83
91
|
export declare function angularGeneratorVersions(major: number): AngularGeneratorVersions;
|
|
84
92
|
/**
|
|
@@ -99,7 +107,7 @@ export interface EnsureAngularOptions {
|
|
|
99
107
|
* never upgraded:
|
|
100
108
|
* - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
|
|
101
109
|
* and @types/node;
|
|
102
|
-
* - a generator major installed (15–
|
|
110
|
+
* - a generator major installed (15–22) → missing build/lint packages at the installed Angular
|
|
103
111
|
* version (plus the imported runtime packages when `includeRuntime`);
|
|
104
112
|
* - another Angular major → nothing; warns which build/lint packages are missing.
|
|
105
113
|
*/
|