@mouryaamit/nx-polystack 1.24.1 → 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,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ngPackagrDependencies = exports.ensureAngularDependencies = exports.workspaceGeneratorMajor = exports.workspaceGeneratorVersions = exports.angularGeneratorVersions = exports.ionicAngularImport = exports.ionicStandaloneImport = exports.BUNDLER_RESOLUTION_MAJOR = exports.CONTROL_FLOW_MAJOR = exports.IONIC_LAZY_MAJOR = exports.ZONE_PROVIDER_MAJOR = exports.PREFER_INJECT_MAJOR = exports.STANDALONE_FALSE_MAJOR = exports.PROVIDE_HTTP_CLIENT_MAJOR = exports.assertStandaloneSupported = exports.STANDALONE_MIN_MAJOR = exports.POLYFILLS_ARRAY_MAJOR = exports.GENERATOR_ANGULAR_MAJORS = exports.ANGULAR_MAJOR = exports.ANGULAR_VERSION = void 0;
|
|
3
|
+
exports.ngPackagrDependencies = exports.ensureAngularDependencies = exports.workspaceGeneratorMajor = exports.workspaceGeneratorVersions = exports.angularGeneratorVersions = exports.ionicAngularImport = exports.ionicStandaloneImport = exports.FLAT_ESLINT_MAJOR = exports.BUNDLER_RESOLUTION_MAJOR = exports.CONTROL_FLOW_MAJOR = exports.IONIC_LAZY_MAJOR = exports.ZONE_PROVIDER_MAJOR = exports.PREFER_INJECT_MAJOR = exports.STANDALONE_FALSE_MAJOR = exports.PROVIDE_HTTP_CLIENT_MAJOR = exports.assertStandaloneSupported = exports.STANDALONE_MIN_MAJOR = exports.POLYFILLS_ARRAY_MAJOR = exports.GENERATOR_ANGULAR_MAJORS = exports.ANGULAR_MAJOR = exports.ANGULAR_VERSION = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const pins_1 = require("../upgrade/pins");
|
|
6
6
|
const dependencies_1 = require("./dependencies");
|
|
@@ -11,7 +11,7 @@ exports.ANGULAR_MAJOR = 15;
|
|
|
11
11
|
* Angular majors the generators write for: `pstack new --angular=<major>`, and `pstack app` / `:lib`
|
|
12
12
|
* fill in packages for a workspace on one of them. One major is added per public release.
|
|
13
13
|
*/
|
|
14
|
-
exports.GENERATOR_ANGULAR_MAJORS = [14, 15, 16, 17, 18, 19, 20, 21];
|
|
14
|
+
exports.GENERATOR_ANGULAR_MAJORS = [14, 15, 16, 17, 18, 19, 20, 21, 22];
|
|
15
15
|
/**
|
|
16
16
|
* From this major the browser builder takes `polyfills: ['zone.js']`; Angular 14 apps load zone.js
|
|
17
17
|
* from a `src/polyfills.ts` file and target ES2020.
|
|
@@ -69,6 +69,12 @@ exports.CONTROL_FLOW_MAJOR = 21;
|
|
|
69
69
|
* points in `exports`, which `"node"` resolution does not read.
|
|
70
70
|
*/
|
|
71
71
|
exports.BUNDLER_RESOLUTION_MAJOR = 21;
|
|
72
|
+
/**
|
|
73
|
+
* From this major, angular-eslint ships flat configs only (and Nx 23, the major's Nx, needs ESLint
|
|
74
|
+
* 9): new workspaces lint with eslint.config.mjs and get the `angular-eslint` package the Nx flat
|
|
75
|
+
* presets load.
|
|
76
|
+
*/
|
|
77
|
+
exports.FLAT_ESLINT_MAJOR = 22;
|
|
72
78
|
/**
|
|
73
79
|
* Where generated standalone code imports Ionic's standalone components and providers from:
|
|
74
80
|
* `@ionic/angular/standalone` on Ionic 7.5–8, `@ionic/angular` on Ionic 9 (Angular 21).
|
|
@@ -92,6 +98,7 @@ const ZONE_JS = {
|
|
|
92
98
|
19: '~0.15.0',
|
|
93
99
|
20: '~0.15.0',
|
|
94
100
|
21: '~0.16.0',
|
|
101
|
+
22: '~0.16.0',
|
|
95
102
|
};
|
|
96
103
|
/** @types/node the major's TypeScript can parse (a latest one uses newer syntax: TS1139). */
|
|
97
104
|
const TYPES_NODE = {
|
|
@@ -104,6 +111,7 @@ const TYPES_NODE = {
|
|
|
104
111
|
20: '~20.10.0',
|
|
105
112
|
// Angular 21 workspaces run on Node 22 (Capacitor 8).
|
|
106
113
|
21: '~22.10.0',
|
|
114
|
+
22: '~22.10.0',
|
|
107
115
|
};
|
|
108
116
|
function angularGeneratorVersions(major) {
|
|
109
117
|
if (major === 15) {
|
|
@@ -131,6 +139,7 @@ function angularGeneratorVersions(major) {
|
|
|
131
139
|
angularEslint: (0, pins_1.pinRange)(pins.angularEslint),
|
|
132
140
|
ionicAngular: (0, pins_1.pinRange)(pins.ionic),
|
|
133
141
|
capacitor: `^${pins.capacitor}.0.0`,
|
|
142
|
+
...(major >= exports.FLAT_ESLINT_MAJOR ? { flatEslint: true } : {}),
|
|
134
143
|
};
|
|
135
144
|
}
|
|
136
145
|
exports.angularGeneratorVersions = angularGeneratorVersions;
|
|
@@ -180,6 +189,8 @@ function buildAndLintPackages(angular, nx, v) {
|
|
|
180
189
|
'@angular-eslint/eslint-plugin': v.angularEslint,
|
|
181
190
|
'@angular-eslint/eslint-plugin-template': v.angularEslint,
|
|
182
191
|
'@angular-eslint/template-parser': v.angularEslint,
|
|
192
|
+
// Nx's flat/angular presets require it (Angular 22+, whose angular-eslint is flat only).
|
|
193
|
+
...(v.flatEslint ? { 'angular-eslint': v.angularEslint } : {}),
|
|
183
194
|
};
|
|
184
195
|
}
|
|
185
196
|
/**
|
|
@@ -196,7 +207,7 @@ function typeScriptPackages(v) {
|
|
|
196
207
|
* never upgraded:
|
|
197
208
|
* - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
|
|
198
209
|
* and @types/node;
|
|
199
|
-
* - a generator major installed (15–
|
|
210
|
+
* - a generator major installed (15–22) → missing build/lint packages at the installed Angular
|
|
200
211
|
* version (plus the imported runtime packages when `includeRuntime`);
|
|
201
212
|
* - another Angular major → nothing; warns which build/lint packages are missing.
|
|
202
213
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-deps.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-deps.ts"],"names":[],"mappings":";;;AAAA,uCAA6D;AAE7D,0CAAyD;AAEzD,iDAA6F;AAE7F,sGAAsG;AACzF,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,aAAa,GAAG,EAAE,CAAC;AAEhC;;;GAGG;AACU,QAAA,wBAAwB,GAAsB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"angular-deps.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-deps.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,18 @@ export declare function addMissingDependencies(tree: Tree, deps: Deps, devDeps:
|
|
|
19
19
|
* angular-eslint 17.2+ need it.
|
|
20
20
|
*/
|
|
21
21
|
export declare function typescriptEslintVersion(nx: string): string;
|
|
22
|
+
/**
|
|
23
|
+
* From this Nx major, @nx/eslint needs ESLint 9+ and @nx/eslint-plugin typescript-eslint 8, so the
|
|
24
|
+
* workspace lints with a flat config (eslint.config.mjs). Angular 22 is the first major on it.
|
|
25
|
+
*/
|
|
26
|
+
export declare const FLAT_ESLINT_NX = 23;
|
|
27
|
+
/** True when the workspace's Nx needs the flat-config ESLint stack. */
|
|
28
|
+
export declare function usesFlatEslintStack(nx: string): boolean;
|
|
29
|
+
/**
|
|
30
|
+
* ESLint 9 stack for a flat config. ESLint stays on 9: eslint-plugin-import 2.32 (the quality
|
|
31
|
+
* checks) does not accept ESLint 10. eslint-config-prettier 10 is @nx/eslint-plugin 23's peer.
|
|
32
|
+
*/
|
|
33
|
+
export declare const FLAT_ESLINT_STACK: Readonly<Record<string, string>>;
|
|
22
34
|
/** ESLint stack every workspace needs for the root .eslintrc.json (same versions as the sample). */
|
|
23
35
|
export declare function lintDependencies(nx: string): Deps;
|
|
24
36
|
export declare function ensureLintDependencies(tree: Tree): GeneratorCallback | undefined;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ensureObfuscationDependencies = exports.OBFUSCATION_DEV_DEPENDENCIES = exports.ensureReleaseHardeningDependencies = exports.RELEASE_HARDENING_DEV_DEPENDENCIES = exports.ensureLintDependencies = exports.lintDependencies = exports.typescriptEslintVersion = exports.addMissingDependencies = exports.nxVersion = exports.declaredVersion = exports.majorOf = void 0;
|
|
3
|
+
exports.ensureObfuscationDependencies = exports.OBFUSCATION_DEV_DEPENDENCIES = exports.ensureReleaseHardeningDependencies = exports.RELEASE_HARDENING_DEV_DEPENDENCIES = exports.ensureLintDependencies = exports.lintDependencies = exports.FLAT_ESLINT_STACK = exports.usesFlatEslintStack = exports.FLAT_ESLINT_NX = exports.typescriptEslintVersion = exports.addMissingDependencies = exports.nxVersion = exports.declaredVersion = exports.majorOf = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
/** Major version of a semver-ish range ("~15.2.0" → 15); undefined when it can't be read. */
|
|
6
6
|
function majorOf(version) {
|
|
@@ -45,11 +45,37 @@ exports.addMissingDependencies = addMissingDependencies;
|
|
|
45
45
|
* angular-eslint 17.2+ need it.
|
|
46
46
|
*/
|
|
47
47
|
function typescriptEslintVersion(nx) {
|
|
48
|
-
|
|
48
|
+
const major = majorOf(nx) ?? 17;
|
|
49
|
+
if (major >= exports.FLAT_ESLINT_NX)
|
|
50
|
+
return exports.FLAT_ESLINT_STACK['typescript-eslint'];
|
|
51
|
+
return major >= 18 ? '^7.18.0' : '^5.62.0';
|
|
49
52
|
}
|
|
50
53
|
exports.typescriptEslintVersion = typescriptEslintVersion;
|
|
54
|
+
/**
|
|
55
|
+
* From this Nx major, @nx/eslint needs ESLint 9+ and @nx/eslint-plugin typescript-eslint 8, so the
|
|
56
|
+
* workspace lints with a flat config (eslint.config.mjs). Angular 22 is the first major on it.
|
|
57
|
+
*/
|
|
58
|
+
exports.FLAT_ESLINT_NX = 23;
|
|
59
|
+
/** True when the workspace's Nx needs the flat-config ESLint stack. */
|
|
60
|
+
function usesFlatEslintStack(nx) {
|
|
61
|
+
return (majorOf(nx) ?? 17) >= exports.FLAT_ESLINT_NX;
|
|
62
|
+
}
|
|
63
|
+
exports.usesFlatEslintStack = usesFlatEslintStack;
|
|
64
|
+
/**
|
|
65
|
+
* ESLint 9 stack for a flat config. ESLint stays on 9: eslint-plugin-import 2.32 (the quality
|
|
66
|
+
* checks) does not accept ESLint 10. eslint-config-prettier 10 is @nx/eslint-plugin 23's peer.
|
|
67
|
+
*/
|
|
68
|
+
exports.FLAT_ESLINT_STACK = {
|
|
69
|
+
eslint: '^9.39.0',
|
|
70
|
+
'@eslint/js': '^9.39.0',
|
|
71
|
+
'typescript-eslint': '^8.72.0',
|
|
72
|
+
'eslint-config-prettier': '^10.1.0',
|
|
73
|
+
};
|
|
51
74
|
/** ESLint stack every workspace needs for the root .eslintrc.json (same versions as the sample). */
|
|
52
75
|
function lintDependencies(nx) {
|
|
76
|
+
if (usesFlatEslintStack(nx)) {
|
|
77
|
+
return { ...exports.FLAT_ESLINT_STACK, '@nx/eslint': nx, '@nx/eslint-plugin': nx };
|
|
78
|
+
}
|
|
53
79
|
const tsEslint = typescriptEslintVersion(nx);
|
|
54
80
|
return {
|
|
55
81
|
eslint: '^8.57.0',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../src/lib/utils/dependencies.ts"],"names":[],"mappings":";;;AAAA,uCAA6F;AAI7F,6FAA6F;AAC7F,SAAgB,OAAO,CAAC,OAAe;IACrC,MAAM,CAAC,GAAG,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACtD,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtC,CAAC;AAHD,0BAGC;AAED,sEAAsE;AACtE,SAAgB,eAAe,CAAC,IAAU,EAAE,IAAY;IACtD,MAAM,GAAG,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC3C,OAAO,GAAG,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC;AACjE,CAAC;AAHD,0CAGC;AAED;;;GAGG;AACH,SAAgB,SAAS,CAAC,IAAU;IAClC,IAAI,IAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,EAAE;QAC/C,MAAM,SAAS,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,8BAA8B,CAAC,CAAC,OAAO,CAAC;QACzE,IAAI,OAAO,SAAS,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAC;KACrD;IACD,OAAO,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,SAAS,CAAC;AAClD,CAAC;AAND,8BAMC;AAED;;;GAGG;AACH,SAAgB,sBAAsB,CACpC,IAAU,EACV,IAAU,EACV,OAAa;IAEb,MAAM,OAAO,GAAG,CAAC,MAAY,EAAQ,EAAE,CACrC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,SAAS,CAAC,CACrF,CAAC;IACJ,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAClF,OAAO,IAAA,qCAA4B,EAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AACnD,CAAC;AAbD,wDAaC;AAED;;;GAGG;AACH,SAAgB,uBAAuB,CAAC,EAAU;IAChD,
|
|
1
|
+
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../src/lib/utils/dependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.applyEnvAlias = exports.workspaceTsFiles = exports.rewriteEnvImports = e
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const path = tslib_1.__importStar(require("path"));
|
|
6
6
|
const devkit_1 = require("@nx/devkit");
|
|
7
|
+
const ts_paths_1 = require("./ts-paths");
|
|
7
8
|
/**
|
|
8
9
|
* Env files live in the root `environments/` folder, which is not part of any Nx project. From
|
|
9
10
|
* Nx 18 on, `@nx/enforce-module-boundaries` refuses relative imports of files outside a project
|
|
@@ -34,7 +35,7 @@ function readPaths(tree, file) {
|
|
|
34
35
|
function hasEnvAlias(tree) {
|
|
35
36
|
const file = tsconfigFile(tree);
|
|
36
37
|
const target = file ? readPaths(tree, file)?.[exports.ENV_ALIAS] : undefined;
|
|
37
|
-
return Array.isArray(target) && target.length === 1 && target[0]
|
|
38
|
+
return (Array.isArray(target) && target.length === 1 && (0, ts_paths_1.samePathTarget)(target[0], exports.ENV_ALIAS_TARGET));
|
|
38
39
|
}
|
|
39
40
|
exports.hasEnvAlias = hasEnvAlias;
|
|
40
41
|
/**
|
|
@@ -55,7 +56,10 @@ function ensureEnvAlias(tree) {
|
|
|
55
56
|
return hasEnvAlias(tree) ? 'present' : 'conflict';
|
|
56
57
|
(0, devkit_1.updateJson)(tree, file, (json) => {
|
|
57
58
|
const opts = (json['compilerOptions'] ?? {});
|
|
58
|
-
|
|
59
|
+
// Without baseUrl (TypeScript 6 / Angular 22) the target needs a leading "./" (TS5090).
|
|
60
|
+
const relative = typeof opts['baseUrl'] !== 'string' && (0, ts_paths_1.workspaceOnTypeScript6)(tree);
|
|
61
|
+
const target = relative ? (0, ts_paths_1.relativePathTarget)(exports.ENV_ALIAS_TARGET) : exports.ENV_ALIAS_TARGET;
|
|
62
|
+
opts['paths'] = { ...(opts['paths'] ?? {}), [exports.ENV_ALIAS]: [target] };
|
|
59
63
|
json['compilerOptions'] = opts;
|
|
60
64
|
return json;
|
|
61
65
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-alias.js","sourceRoot":"","sources":["../../../../src/lib/utils/env-alias.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAE7B,uCAAwD;AAExD;;;;;;;GAOG;AACU,QAAA,SAAS,GAAG,QAAQ,CAAC;AACrB,QAAA,gBAAgB,GAAG,gBAAgB,CAAC;AACpC,QAAA,OAAO,GAAG,cAAc,CAAC;AAItC,SAAS,YAAY,CAAC,IAAU;IAC9B,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;QAAE,OAAO,oBAAoB,CAAC;IACnE,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;QAAE,OAAO,eAAe,CAAC;IACzD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,SAAS,CAAC,IAAU,EAAE,IAAY;IACzC,IAAI;QACF,OAAO,IAAA,iBAAQ,EAAC,IAAI,EAAE,IAAI,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC;KACrD;IAAC,MAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAED,6EAA6E;AAC7E,SAAgB,WAAW,CAAC,IAAU;IACpC,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,iBAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACrE,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"env-alias.js","sourceRoot":"","sources":["../../../../src/lib/utils/env-alias.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAE7B,uCAAwD;AAExD,yCAAwF;AAExF;;;;;;;GAOG;AACU,QAAA,SAAS,GAAG,QAAQ,CAAC;AACrB,QAAA,gBAAgB,GAAG,gBAAgB,CAAC;AACpC,QAAA,OAAO,GAAG,cAAc,CAAC;AAItC,SAAS,YAAY,CAAC,IAAU;IAC9B,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;QAAE,OAAO,oBAAoB,CAAC;IACnE,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;QAAE,OAAO,eAAe,CAAC;IACzD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,SAAS,CAAC,IAAU,EAAE,IAAY;IACzC,IAAI;QACF,OAAO,IAAA,iBAAQ,EAAC,IAAI,EAAE,IAAI,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC;KACrD;IAAC,MAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAED,6EAA6E;AAC7E,SAAgB,WAAW,CAAC,IAAU;IACpC,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,iBAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACrE,OAAO,CACL,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,IAAA,yBAAc,EAAC,MAAM,CAAC,CAAC,CAAC,EAAE,wBAAgB,CAAC,CAC5F,CAAC;AACJ,CAAC;AAND,kCAMC;AAED;;;GAGG;AACH,SAAgB,cAAc,CAAC,IAAU;IACvC,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,CAAC,IAAI;QAAE,OAAO,aAAa,CAAC;IAChC,IAAI;QACF,IAAA,iBAAQ,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;KACtB;IAAC,MAAM;QACN,OAAO,aAAa,CAAC;KACtB;IACD,IAAI,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,iBAAS,CAAC;QAAE,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;IAC1F,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAI,EAAE,CAAC,IAA6B,EAAE,EAAE;QACvD,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAA4B,CAAC;QACxE,wFAAwF;QACxF,MAAM,QAAQ,GAAG,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,QAAQ,IAAI,IAAA,iCAAsB,EAAC,IAAI,CAAC,CAAC;QACrF,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,6BAAkB,EAAC,wBAAgB,CAAC,CAAC,CAAC,CAAC,wBAAgB,CAAC;QAClF,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAE,IAAI,CAAC,OAAO,CAAY,IAAI,EAAE,CAAC,EAAE,CAAC,iBAAS,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;QAChF,IAAI,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC;AAnBD,wCAmBC;AAED,oFAAoF;AACpF,SAAgB,cAAc,CAAC,iBAAyB;IACtD,OAAO,QAAQ,iBAAiB,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC;AACzF,CAAC;AAFD,wCAEC;AAED,+FAA+F;AAC/F,MAAM,SAAS,GAAG,+EAA+E,CAAC;AAElG;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,IAAU,EAAE,IAAY;IACxD,IAAI,IAAI,KAAK,eAAO,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,eAAO,GAAG,CAAC;QAAE,OAAO,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACrC,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAO,CAAC;QAAE,OAAO,CAAC,CAAC;IACvD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,IAAY,EAAE,CAAS,EAAE,IAAY,EAAE,EAAE;QACnF,IAAI,MAA0B,CAAC;QAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;aAC/E,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,eAAO,GAAG,CAAC;YAAE,MAAM,GAAG,IAAI,CAAC;QACvD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,eAAO,GAAG,CAAC,IAAI,MAAM,KAAK,eAAO;YAAE,OAAO,KAAK,CAAC;QACrF,KAAK,EAAE,CAAC;QACR,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;IACpD,CAAC,CAAC,CAAC;IACH,IAAI,KAAK,GAAG,CAAC;QAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACrC,OAAO,KAAK,CAAC;AACf,CAAC;AAhBD,8CAgBC;AAED,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC;IACxB,cAAc;IACd,MAAM;IACN,KAAK;IACL,UAAU;IACV,MAAM;IACN,KAAK;IACL,UAAU;IACV,eAAO;CACR,CAAC,CAAC;AAEH,2EAA2E;AAC3E,SAAgB,gBAAgB,CAAC,IAAU,EAAE,GAAG,GAAG,EAAE;IACnD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACrC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACxC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;YAClB,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACtE;aAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE;YACxE,GAAG,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SACxC;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAXD,4CAWC;AAQD;;;GAGG;AACH,SAAgB,aAAa,CAAC,IAAU;IACtC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAO,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAO,CAAC;QAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAClG,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,KAAK,GAA2B,EAAE,CAAC;IACzC,IAAI,KAAK,KAAK,UAAU,IAAI,KAAK,KAAK,aAAa;QAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC7E,KAAK,MAAM,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE;QACtC,MAAM,CAAC,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACrC,IAAI,CAAC,GAAG,CAAC;YAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;KACzB;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1B,CAAC;AAVD,sCAUC"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { Tree } from '@nx/devkit';
|
|
2
|
+
/**
|
|
3
|
+
* ESLint flat config (eslint.config.mjs) for workspaces on Nx 23+ (Angular 22+): @nx/eslint 23
|
|
4
|
+
* needs ESLint 9 or later, and angular-eslint 22 ships flat configs only. The generators keep their
|
|
5
|
+
* .eslintrc.json templates; in a workspace whose root config is flat, the project config they write
|
|
6
|
+
* is turned into an eslint.config.mjs here.
|
|
7
|
+
*/
|
|
8
|
+
/** Root flat config file names, the one pstack writes first. */
|
|
9
|
+
export declare const FLAT_ESLINT_CONFIGS: string[];
|
|
10
|
+
/** True when the workspace lints with a root flat config. */
|
|
11
|
+
export declare function workspaceUsesFlatEslint(tree: Tree): boolean;
|
|
12
|
+
/**
|
|
13
|
+
* The root eslint.config.mjs of a new Angular 22+ workspace: the same rules as the .eslintrc.json
|
|
14
|
+
* of earlier majors (module boundaries, Nx TypeScript / JavaScript presets, and the quality checks'
|
|
15
|
+
* import/no-unresolved and unused-imports/no-unused-imports as warnings).
|
|
16
|
+
*/
|
|
17
|
+
export declare const ROOT_FLAT_ESLINT_CONFIG = "import nx from '@nx/eslint-plugin';\nimport importPlugin from 'eslint-plugin-import';\nimport unusedImports from 'eslint-plugin-unused-imports';\n\nexport default [\n ...nx.configs['flat/base'],\n ...nx.configs['flat/typescript'],\n ...nx.configs['flat/javascript'],\n {\n ignores: ['**/node_modules', '**/dist', '**/out-tsc', '**/.nx'],\n },\n {\n files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],\n rules: {\n '@nx/enforce-module-boundaries': [\n 'error',\n {\n enforceBuildableLibDependency: true,\n allow: [],\n depConstraints: [{ sourceTag: '*', onlyDependOnLibsWithTags: ['*'] }],\n },\n ],\n },\n },\n {\n files: ['**/*.ts', '**/*.tsx'],\n plugins: { import: importPlugin, 'unused-imports': unusedImports },\n settings: {\n 'import/resolver': { typescript: { alwaysTryTypes: true, project: 'tsconfig.base.json' } },\n },\n rules: {\n 'import/no-unresolved': 'warn',\n 'unused-imports/no-unused-imports': 'warn',\n },\n },\n];\n";
|
|
18
|
+
/** Replaces the preset's root .eslintrc.json and .eslintignore with eslint.config.mjs. */
|
|
19
|
+
export declare function writeRootFlatEslint(tree: Tree): void;
|
|
20
|
+
type Json = Record<string, unknown>;
|
|
21
|
+
/**
|
|
22
|
+
* The eslint.config.mjs text for a project .eslintrc.json in the shape the generators write
|
|
23
|
+
* (`extends` the root config, `overrides` with Nx / angular-eslint presets and rules), or undefined
|
|
24
|
+
* when the config has anything else (it is left as .eslintrc.json then).
|
|
25
|
+
*/
|
|
26
|
+
export declare function projectEslintrcToFlat(json: Json): string | undefined;
|
|
27
|
+
/**
|
|
28
|
+
* In a workspace with a root flat config, turns `<projectRoot>/.eslintrc.json` into
|
|
29
|
+
* eslint.config.mjs. Returns true when it did; warns when the config has a shape it does not know.
|
|
30
|
+
*/
|
|
31
|
+
export declare function flattenProjectEslint(tree: Tree, projectRoot: string): boolean;
|
|
32
|
+
/**
|
|
33
|
+
* In a workspace with a root flat config, turns every .eslintrc.json the run created (a migrated
|
|
34
|
+
* project's) into eslint.config.mjs. Returns notes for the ones left as they were.
|
|
35
|
+
*/
|
|
36
|
+
export declare function flattenCreatedEslintrcs(tree: Tree): string[];
|
|
37
|
+
export {};
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.flattenCreatedEslintrcs = exports.flattenProjectEslint = exports.projectEslintrcToFlat = exports.writeRootFlatEslint = exports.ROOT_FLAT_ESLINT_CONFIG = exports.workspaceUsesFlatEslint = exports.FLAT_ESLINT_CONFIGS = void 0;
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
/**
|
|
6
|
+
* ESLint flat config (eslint.config.mjs) for workspaces on Nx 23+ (Angular 22+): @nx/eslint 23
|
|
7
|
+
* needs ESLint 9 or later, and angular-eslint 22 ships flat configs only. The generators keep their
|
|
8
|
+
* .eslintrc.json templates; in a workspace whose root config is flat, the project config they write
|
|
9
|
+
* is turned into an eslint.config.mjs here.
|
|
10
|
+
*/
|
|
11
|
+
/** Root flat config file names, the one pstack writes first. */
|
|
12
|
+
exports.FLAT_ESLINT_CONFIGS = ['eslint.config.mjs', 'eslint.config.js', 'eslint.config.cjs'];
|
|
13
|
+
/** True when the workspace lints with a root flat config. */
|
|
14
|
+
function workspaceUsesFlatEslint(tree) {
|
|
15
|
+
return exports.FLAT_ESLINT_CONFIGS.some((f) => tree.exists(f));
|
|
16
|
+
}
|
|
17
|
+
exports.workspaceUsesFlatEslint = workspaceUsesFlatEslint;
|
|
18
|
+
/**
|
|
19
|
+
* The root eslint.config.mjs of a new Angular 22+ workspace: the same rules as the .eslintrc.json
|
|
20
|
+
* of earlier majors (module boundaries, Nx TypeScript / JavaScript presets, and the quality checks'
|
|
21
|
+
* import/no-unresolved and unused-imports/no-unused-imports as warnings).
|
|
22
|
+
*/
|
|
23
|
+
exports.ROOT_FLAT_ESLINT_CONFIG = `import nx from '@nx/eslint-plugin';
|
|
24
|
+
import importPlugin from 'eslint-plugin-import';
|
|
25
|
+
import unusedImports from 'eslint-plugin-unused-imports';
|
|
26
|
+
|
|
27
|
+
export default [
|
|
28
|
+
...nx.configs['flat/base'],
|
|
29
|
+
...nx.configs['flat/typescript'],
|
|
30
|
+
...nx.configs['flat/javascript'],
|
|
31
|
+
{
|
|
32
|
+
ignores: ['**/node_modules', '**/dist', '**/out-tsc', '**/.nx'],
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
|
|
36
|
+
rules: {
|
|
37
|
+
'@nx/enforce-module-boundaries': [
|
|
38
|
+
'error',
|
|
39
|
+
{
|
|
40
|
+
enforceBuildableLibDependency: true,
|
|
41
|
+
allow: [],
|
|
42
|
+
depConstraints: [{ sourceTag: '*', onlyDependOnLibsWithTags: ['*'] }],
|
|
43
|
+
},
|
|
44
|
+
],
|
|
45
|
+
},
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
files: ['**/*.ts', '**/*.tsx'],
|
|
49
|
+
plugins: { import: importPlugin, 'unused-imports': unusedImports },
|
|
50
|
+
settings: {
|
|
51
|
+
'import/resolver': { typescript: { alwaysTryTypes: true, project: 'tsconfig.base.json' } },
|
|
52
|
+
},
|
|
53
|
+
rules: {
|
|
54
|
+
'import/no-unresolved': 'warn',
|
|
55
|
+
'unused-imports/no-unused-imports': 'warn',
|
|
56
|
+
},
|
|
57
|
+
},
|
|
58
|
+
];
|
|
59
|
+
`;
|
|
60
|
+
/** Replaces the preset's root .eslintrc.json and .eslintignore with eslint.config.mjs. */
|
|
61
|
+
function writeRootFlatEslint(tree) {
|
|
62
|
+
if (tree.exists('.eslintrc.json'))
|
|
63
|
+
tree.delete('.eslintrc.json');
|
|
64
|
+
// ESLint 9 no longer reads .eslintignore; its patterns are in the config's ignores.
|
|
65
|
+
if (tree.exists('.eslintignore'))
|
|
66
|
+
tree.delete('.eslintignore');
|
|
67
|
+
tree.write('eslint.config.mjs', exports.ROOT_FLAT_ESLINT_CONFIG);
|
|
68
|
+
}
|
|
69
|
+
exports.writeRootFlatEslint = writeRootFlatEslint;
|
|
70
|
+
const PRESETS = {
|
|
71
|
+
'plugin:@nx/angular': "nx.configs['flat/angular']",
|
|
72
|
+
'plugin:@nx/angular-template': "nx.configs['flat/angular-template']",
|
|
73
|
+
// Part of flat/angular (its processor handles inline templates).
|
|
74
|
+
'plugin:@angular-eslint/template/process-inline-templates': '',
|
|
75
|
+
'plugin:@nx/typescript': "nx.configs['flat/typescript']",
|
|
76
|
+
'plugin:@nx/javascript': "nx.configs['flat/javascript']",
|
|
77
|
+
};
|
|
78
|
+
const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
|
|
79
|
+
/** "*.ts" → "**\/*.ts"; patterns with a slash stay as they are. */
|
|
80
|
+
function flatGlob(pattern) {
|
|
81
|
+
return pattern.includes('/') ? pattern : `**/${pattern}`;
|
|
82
|
+
}
|
|
83
|
+
/**
|
|
84
|
+
* The eslint.config.mjs text for a project .eslintrc.json in the shape the generators write
|
|
85
|
+
* (`extends` the root config, `overrides` with Nx / angular-eslint presets and rules), or undefined
|
|
86
|
+
* when the config has anything else (it is left as .eslintrc.json then).
|
|
87
|
+
*/
|
|
88
|
+
function projectEslintrcToFlat(json) {
|
|
89
|
+
const known = new Set(['extends', 'ignorePatterns', 'overrides']);
|
|
90
|
+
if (Object.keys(json).some((k) => !known.has(k)))
|
|
91
|
+
return undefined;
|
|
92
|
+
const ext = Array.isArray(json['extends']) ? json['extends'] : [json['extends']];
|
|
93
|
+
const base = ext.filter((e) => typeof e === 'string');
|
|
94
|
+
if (base.length !== 1 || !/^(\.\.\/)*\.eslintrc\.json$/.test(base[0]))
|
|
95
|
+
return undefined;
|
|
96
|
+
const baseImport = base[0].replace(/\.eslintrc\.json$/, 'eslint.config.mjs');
|
|
97
|
+
const presets = [];
|
|
98
|
+
const blocks = [];
|
|
99
|
+
const overrides = Array.isArray(json['overrides']) ? json['overrides'] : [];
|
|
100
|
+
for (const o of overrides) {
|
|
101
|
+
if (!isObject(o))
|
|
102
|
+
return undefined;
|
|
103
|
+
if (Object.keys(o).some((k) => !['files', 'extends', 'rules'].includes(k)))
|
|
104
|
+
return undefined;
|
|
105
|
+
const files = (Array.isArray(o['files']) ? o['files'] : [o['files']]).filter((f) => typeof f === 'string');
|
|
106
|
+
const oext = (Array.isArray(o['extends']) ? o['extends'] : o['extends'] ? [o['extends']] : []).filter((e) => typeof e === 'string');
|
|
107
|
+
for (const e of oext) {
|
|
108
|
+
if (!(e in PRESETS))
|
|
109
|
+
return undefined;
|
|
110
|
+
if (PRESETS[e] && !presets.includes(PRESETS[e]))
|
|
111
|
+
presets.push(PRESETS[e]);
|
|
112
|
+
}
|
|
113
|
+
const rules = isObject(o['rules']) ? o['rules'] : {};
|
|
114
|
+
if (Object.keys(rules).length === 0)
|
|
115
|
+
continue;
|
|
116
|
+
blocks.push(` {\n files: ${JSON.stringify(files.map(flatGlob))},\n` +
|
|
117
|
+
` rules: ${JSON.stringify(rules, null, 2).replace(/\n/g, '\n ')},\n },`);
|
|
118
|
+
}
|
|
119
|
+
const needsNx = presets.length > 0;
|
|
120
|
+
return ((needsNx ? "import nx from '@nx/eslint-plugin';\n" : '') +
|
|
121
|
+
`import baseConfig from '${baseImport}';\n\n` +
|
|
122
|
+
'export default [\n ...baseConfig,\n' +
|
|
123
|
+
presets.map((p) => ` ...${p},\n`).join('') +
|
|
124
|
+
blocks.map((b) => `${b}\n`).join('') +
|
|
125
|
+
'];\n');
|
|
126
|
+
}
|
|
127
|
+
exports.projectEslintrcToFlat = projectEslintrcToFlat;
|
|
128
|
+
/**
|
|
129
|
+
* In a workspace with a root flat config, turns `<projectRoot>/.eslintrc.json` into
|
|
130
|
+
* eslint.config.mjs. Returns true when it did; warns when the config has a shape it does not know.
|
|
131
|
+
*/
|
|
132
|
+
function flattenProjectEslint(tree, projectRoot) {
|
|
133
|
+
if (!workspaceUsesFlatEslint(tree))
|
|
134
|
+
return false;
|
|
135
|
+
const file = `${projectRoot.replace(/\/$/, '')}/.eslintrc.json`;
|
|
136
|
+
const text = tree.read(file, 'utf8');
|
|
137
|
+
if (text === null)
|
|
138
|
+
return false;
|
|
139
|
+
let json;
|
|
140
|
+
try {
|
|
141
|
+
json = JSON.parse(text);
|
|
142
|
+
}
|
|
143
|
+
catch {
|
|
144
|
+
json = undefined;
|
|
145
|
+
}
|
|
146
|
+
const flat = isObject(json) ? projectEslintrcToFlat(json) : undefined;
|
|
147
|
+
if (flat === undefined) {
|
|
148
|
+
devkit_1.logger.warn(`nx-polystack: the workspace lints with eslint.config.mjs, but ${file} could not be ` +
|
|
149
|
+
'converted; move it to an eslint.config.mjs by hand (nx g @nx/eslint:convert-to-flat-config).');
|
|
150
|
+
return false;
|
|
151
|
+
}
|
|
152
|
+
tree.delete(file);
|
|
153
|
+
tree.write(`${projectRoot.replace(/\/$/, '')}/eslint.config.mjs`, flat);
|
|
154
|
+
return true;
|
|
155
|
+
}
|
|
156
|
+
exports.flattenProjectEslint = flattenProjectEslint;
|
|
157
|
+
/**
|
|
158
|
+
* In a workspace with a root flat config, turns every .eslintrc.json the run created (a migrated
|
|
159
|
+
* project's) into eslint.config.mjs. Returns notes for the ones left as they were.
|
|
160
|
+
*/
|
|
161
|
+
function flattenCreatedEslintrcs(tree) {
|
|
162
|
+
if (!workspaceUsesFlatEslint(tree))
|
|
163
|
+
return [];
|
|
164
|
+
const notes = [];
|
|
165
|
+
for (const change of tree.listChanges()) {
|
|
166
|
+
if (change.type !== 'CREATE' || !/(^|\/)\.eslintrc\.json$/.test(change.path))
|
|
167
|
+
continue;
|
|
168
|
+
const dir = change.path.replace(/\/?\.eslintrc\.json$/, '');
|
|
169
|
+
if (dir === '')
|
|
170
|
+
continue;
|
|
171
|
+
if (!flattenProjectEslint(tree, dir)) {
|
|
172
|
+
notes.push(`\`${change.path}\` was kept: the workspace lints with eslint.config.mjs, so move its rules ` +
|
|
173
|
+
`to \`${dir}/eslint.config.mjs\` (npx nx g @nx/eslint:convert-to-flat-config).`);
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
return notes;
|
|
177
|
+
}
|
|
178
|
+
exports.flattenCreatedEslintrcs = flattenCreatedEslintrcs;
|
|
179
|
+
//# sourceMappingURL=flat-eslint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flat-eslint.js","sourceRoot":"","sources":["../../../../src/lib/utils/flat-eslint.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export interface JsonNode {
|
|
|
7
7
|
children?: JsonNode[];
|
|
8
8
|
value?: unknown;
|
|
9
9
|
}
|
|
10
|
-
/** The part of jsonc-parser used here (it ships with every nx 17-
|
|
10
|
+
/** The part of jsonc-parser used here (it ships with every nx 17-23). */
|
|
11
11
|
export interface JsoncParser {
|
|
12
12
|
parse(text: string, errors?: unknown[], options?: {
|
|
13
13
|
allowTrailingComma?: boolean;
|
|
@@ -12,13 +12,13 @@ function nxTree() {
|
|
|
12
12
|
}
|
|
13
13
|
catch (err) {
|
|
14
14
|
throw new Error(`nx-polystack: could not load nx/src/generators/tree from the workspace's nx ` +
|
|
15
|
-
`(${err.message}). nx-polystack supports Nx 17 to
|
|
15
|
+
`(${err.message}). nx-polystack supports Nx 17 to 23.`);
|
|
16
16
|
}
|
|
17
17
|
if (typeof mod.FsTree !== 'function' ||
|
|
18
18
|
typeof mod.flushChanges !== 'function' ||
|
|
19
19
|
typeof mod.printChanges !== 'function') {
|
|
20
20
|
throw new Error('nx-polystack: this nx version has no FsTree/flushChanges/printChanges in ' +
|
|
21
|
-
'nx/src/generators/tree. nx-polystack supports Nx 17 to
|
|
21
|
+
'nx/src/generators/tree. nx-polystack supports Nx 17 to 23.');
|
|
22
22
|
}
|
|
23
23
|
cached = mod;
|
|
24
24
|
return cached;
|
|
@@ -362,6 +362,13 @@ const OTHER_ESLINT_CONFIGS = [
|
|
|
362
362
|
/** Adds the quality override to the root .eslintrc.json unless one of its rules is configured. */
|
|
363
363
|
function addQualityEslintRules(tree) {
|
|
364
364
|
const text = tree.read('.eslintrc.json', 'utf8');
|
|
365
|
+
// A flat root config (Angular 22+ workspaces) that already sets both rules.
|
|
366
|
+
const flat = ['eslint.config.mjs', 'eslint.config.js', 'eslint.config.cjs']
|
|
367
|
+
.map((f) => tree.read(f, 'utf8'))
|
|
368
|
+
.find((t) => t !== null);
|
|
369
|
+
if (text === null && flat && Object.keys(exports.QUALITY_RULES).every((rule) => flat.includes(rule))) {
|
|
370
|
+
return 'present';
|
|
371
|
+
}
|
|
365
372
|
if (text === null) {
|
|
366
373
|
return OTHER_ESLINT_CONFIGS.some((f) => tree.exists(f)) ? 'no-json-config' : 'present';
|
|
367
374
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quality.js","sourceRoot":"","sources":["../../../../src/lib/utils/quality.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"quality.js","sourceRoot":"","sources":["../../../../src/lib/utils/quality.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,21 @@
|
|
|
1
1
|
import { Tree } from '@nx/devkit';
|
|
2
|
+
/**
|
|
3
|
+
* A `paths` target as TypeScript needs it when the config has no `baseUrl` (Angular 22 workspaces,
|
|
4
|
+
* TypeScript 6): relative to the config file, with a leading "./" (else error TS5090).
|
|
5
|
+
*/
|
|
6
|
+
export declare function relativePathTarget(target: string): string;
|
|
7
|
+
/** Two paths targets name the same location ("libs/x" and "./libs/x"). */
|
|
8
|
+
export declare function samePathTarget(a: string, b: string): boolean;
|
|
9
|
+
/**
|
|
10
|
+
* The workspace is on TypeScript 6 (declared `typescript` 6+, or Angular 22+, which needs it). Only
|
|
11
|
+
* those workspaces drop baseUrl; older fixtures and workspaces are left as they are.
|
|
12
|
+
*/
|
|
13
|
+
export declare function workspaceOnTypeScript6(tree: Tree): boolean;
|
|
14
|
+
/**
|
|
15
|
+
* In a TypeScript 6 workspace whose tsconfig has no `baseUrl`, gives every non-relative `paths`
|
|
16
|
+
* target a leading "./" (generators and migrations write "libs/…" targets).
|
|
17
|
+
* Returns true when it changed the file.
|
|
18
|
+
*/
|
|
19
|
+
export declare function relativizePathsWithoutBaseUrl(tree: Tree, file?: string): boolean;
|
|
2
20
|
export declare function addTsPath(tree: Tree, alias: string, target: string): void;
|
|
3
21
|
export declare function removeTsPath(tree: Tree, alias: string): void;
|