@mouryaamit/nx-polystack 1.3.1 → 1.5.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 +7 -4
- package/dist/src/cli/help.js +2 -2
- package/dist/src/generators/app/files/angular/src/app/app.module.ts__template__ +7 -4
- package/dist/src/generators/app/files/ionic/src/app/app.module.ts__template__ +10 -4
- package/dist/src/generators/app/generator.js +3 -2
- package/dist/src/generators/app/generator.js.map +1 -1
- package/dist/src/generators/migrate/adapters/nx-workspace.d.ts +3 -1
- package/dist/src/generators/migrate/adapters/nx-workspace.js +86 -10
- package/dist/src/generators/migrate/adapters/nx-workspace.js.map +1 -1
- package/dist/src/generators/migrate/adapters/types.d.ts +2 -0
- package/dist/src/generators/migrate/adapters/types.js.map +1 -1
- package/dist/src/generators/migrate/ionic/shape.js +2 -0
- package/dist/src/generators/migrate/ionic/shape.js.map +1 -1
- package/dist/src/generators/migrate/nx/detect.d.ts +1 -0
- package/dist/src/generators/migrate/nx/detect.js +3 -2
- package/dist/src/generators/migrate/nx/detect.js.map +1 -1
- package/dist/src/generators/migrate/nx/flat-eslint.d.ts +17 -0
- package/dist/src/generators/migrate/nx/flat-eslint.js +71 -0
- package/dist/src/generators/migrate/nx/flat-eslint.js.map +1 -0
- package/dist/src/generators/migrate/report.js +2 -2
- package/dist/src/generators/migrate/report.js.map +1 -1
- package/dist/src/generators/migrate/schema.json +1 -1
- package/dist/src/generators/preset/generator.d.ts +5 -0
- package/dist/src/generators/preset/generator.js +32 -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/utils/angular-deps.d.ts +8 -1
- package/dist/src/lib/utils/angular-deps.js +27 -7
- package/dist/src/lib/utils/angular-deps.js.map +1 -1
- package/dist/src/lib/utils/angular-project.d.ts +5 -1
- package/dist/src/lib/utils/angular-project.js +13 -7
- package/dist/src/lib/utils/angular-project.js.map +1 -1
- package/dist/src/lib/utils/dependencies.d.ts +5 -0
- package/dist/src/lib/utils/dependencies.js +12 -3
- package/dist/src/lib/utils/dependencies.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/generators/migrate/adapters/types.ts"],"names":[],"mappings":";;;AAMA;;;;GAIG;AAEH,qGAAqG;AACxF,QAAA,mBAAmB,GAAG,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/generators/migrate/adapters/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
const path = tslib_1.__importStar(require("path"));
|
|
7
7
|
const devkit_1 = require("@nx/devkit");
|
|
8
|
+
const angular_deps_1 = require("../../../lib/utils/angular-deps");
|
|
8
9
|
const angular_project_1 = require("../../../lib/utils/angular-project");
|
|
9
10
|
const dependencies_1 = require("../../../lib/utils/dependencies");
|
|
10
11
|
const npm_scripts_1 = require("../../../lib/utils/npm-scripts");
|
|
@@ -67,6 +68,7 @@ function applyIonicShape(tree, input) {
|
|
|
67
68
|
packagePath: `${appRoot}/package.json`,
|
|
68
69
|
ionic,
|
|
69
70
|
capacitor: (0, source_1.sourceDependency)(input.sourcePkg, '@capacitor/core'),
|
|
71
|
+
workspaceCapacitor: (0, dependencies_1.majorOf)((0, angular_deps_1.workspaceGeneratorVersions)(tree).capacitor),
|
|
70
72
|
nativePackages: [],
|
|
71
73
|
alsoAtRoot: [],
|
|
72
74
|
otherApps: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shape.js","sourceRoot":"","sources":["../../../../../src/generators/migrate/ionic/shape.ts"],"names":[],"mappings":";;;;AAAA,iDAA0C;AAC1C,mDAA6B;AAE7B,uCAA2E;AAE3E,wEAAkG;AAClG,
|
|
1
|
+
{"version":3,"file":"shape.js","sourceRoot":"","sources":["../../../../../src/generators/migrate/ionic/shape.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +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
|
-
|
|
7
|
+
/** Nx majors of source workspaces (the plugin itself runs on Nx 17–22). */
|
|
8
|
+
exports.SUPPORTED_NX_MAJORS = [15, 16, 17, 18, 19, 20, 21, 22];
|
|
8
9
|
function detectNxWorkspace(sourceDir) {
|
|
9
10
|
if (!(0, source_1.sourceExists)(sourceDir, 'nx.json'))
|
|
10
11
|
return { confidence: 0, reasons: ['no nx.json'] };
|
|
@@ -14,7 +15,7 @@ function detectNxWorkspace(sourceDir) {
|
|
|
14
15
|
let confidence = 0.95;
|
|
15
16
|
if (major === undefined || !exports.SUPPORTED_NX_MAJORS.includes(major)) {
|
|
16
17
|
confidence = 0.5;
|
|
17
|
-
reasons.push(`Nx ${major ?? '?'} is outside the supported 15–
|
|
18
|
+
reasons.push(`Nx ${major ?? '?'} is outside the supported 15–22`);
|
|
18
19
|
}
|
|
19
20
|
let projects;
|
|
20
21
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detect.js","sourceRoot":"","sources":["../../../../../src/generators/migrate/nx/detect.ts"],"names":[],"mappings":";;;AAAA,kEAA0D;AAE1D,sCAAyC;AAEzC,yDAK4B;
|
|
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,CAAC,CAAC;AAEpE,SAAgB,iBAAiB,CAAC,SAAiB;IACjD,IAAI,CAAC,IAAA,qBAAY,EAAC,SAAS,EAAE,SAAS,CAAC;QAAE,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;IAC3F,MAAM,OAAO,GAAG,IAAA,kCAAe,EAAC,SAAS,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,sBAAO,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACrD,MAAM,OAAO,GAAG,CAAC,eAAe,OAAO,IAAI,qCAAqC,EAAE,CAAC,CAAC;IACpF,IAAI,UAAU,GAAG,IAAI,CAAC;IACtB,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,2BAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC/D,UAAU,GAAG,GAAG,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,IAAI,GAAG,iCAAiC,CAAC,CAAC;KACnE;IACD,IAAI,QAAyB,CAAC;IAC9B,IAAI;QACF,QAAQ,GAAG,IAAA,mCAAgB,EAAC,SAAS,CAAC,CAAC;KACxC;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;KACtF;IACD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,KAAK,MAAM,CAAC,IAAI,QAAQ;QAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5E,OAAO,CAAC,IAAI,CACV,QAAQ,CAAC,MAAM,KAAK,CAAC;QACnB,CAAC,CAAC,mBAAmB;QACrB,CAAC,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;aACrB,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACpC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;aAClC,IAAI,CAAC,IAAI,CAAC,EAAE,CACpB,CAAC;IACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kCAAe,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE;QAClD,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;KACzD;IACD,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AACjC,CAAC;AAhCD,8CAgCC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { Tree } from '@nx/devkit';
|
|
2
|
+
/** ESLint flat config files (eslint.config.js and Nx's eslint.base.config.js, any JS flavour). */
|
|
3
|
+
export declare const FLAT_ESLINT_FILE: RegExp;
|
|
4
|
+
/**
|
|
5
|
+
* Packages that only a flat-config (ESLint 9) setup needs. A workspace on .eslintrc.json keeps
|
|
6
|
+
* ESLint 8 with typescript-eslint 5/7, and these would mix majors (typescript-eslint 8 rules
|
|
7
|
+
* crash under ESLint 8).
|
|
8
|
+
*/
|
|
9
|
+
export declare const FLAT_ESLINT_PACKAGE: RegExp;
|
|
10
|
+
/** The workspace lints with .eslintrc.json: it has no root flat config. */
|
|
11
|
+
export declare function workspaceUsesEslintrc(tree: Tree): boolean;
|
|
12
|
+
/**
|
|
13
|
+
* The .eslintrc.json Nx writes for a project, standing in for its flat eslint.config.js: Angular
|
|
14
|
+
* projects (the config uses Nx's flat/angular presets) get the Angular overrides with the
|
|
15
|
+
* selector prefixes of the flat config, others the TypeScript/JavaScript override.
|
|
16
|
+
*/
|
|
17
|
+
export declare function eslintrcForFlatConfig(text: string, root: string): Record<string, unknown>;
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.eslintrcForFlatConfig = exports.workspaceUsesEslintrc = exports.FLAT_ESLINT_PACKAGE = exports.FLAT_ESLINT_FILE = void 0;
|
|
4
|
+
/** ESLint flat config files (eslint.config.js and Nx's eslint.base.config.js, any JS flavour). */
|
|
5
|
+
exports.FLAT_ESLINT_FILE = /(^|\/)eslint(\.base)?\.config\.[cm]?js$/;
|
|
6
|
+
/**
|
|
7
|
+
* Packages that only a flat-config (ESLint 9) setup needs. A workspace on .eslintrc.json keeps
|
|
8
|
+
* ESLint 8 with typescript-eslint 5/7, and these would mix majors (typescript-eslint 8 rules
|
|
9
|
+
* crash under ESLint 8).
|
|
10
|
+
*/
|
|
11
|
+
exports.FLAT_ESLINT_PACKAGE = /^(typescript-eslint|angular-eslint|@eslint\/js|@eslint\/eslintrc|@typescript-eslint\/utils)$/;
|
|
12
|
+
/** The workspace lints with .eslintrc.json: it has no root flat config. */
|
|
13
|
+
function workspaceUsesEslintrc(tree) {
|
|
14
|
+
return !['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs'].some((f) => tree.exists(f));
|
|
15
|
+
}
|
|
16
|
+
exports.workspaceUsesEslintrc = workspaceUsesEslintrc;
|
|
17
|
+
/** The `prefix` of a selector rule in a flat config's text, if it is a plain string literal. */
|
|
18
|
+
function selectorPrefix(text, rule) {
|
|
19
|
+
const at = text.indexOf(rule);
|
|
20
|
+
if (at === -1)
|
|
21
|
+
return undefined;
|
|
22
|
+
const m = /prefix\s*:\s*['"]([A-Za-z][\w-]*)['"]/.exec(text.slice(at, at + 400));
|
|
23
|
+
return m?.[1];
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* The .eslintrc.json Nx writes for a project, standing in for its flat eslint.config.js: Angular
|
|
27
|
+
* projects (the config uses Nx's flat/angular presets) get the Angular overrides with the
|
|
28
|
+
* selector prefixes of the flat config, others the TypeScript/JavaScript override.
|
|
29
|
+
*/
|
|
30
|
+
function eslintrcForFlatConfig(text, root) {
|
|
31
|
+
const up = '../'.repeat(root.split('/').filter(Boolean).length);
|
|
32
|
+
const base = { extends: [`${up}.eslintrc.json`], ignorePatterns: ['!**/*'] };
|
|
33
|
+
if (!/flat\/angular/.test(text)) {
|
|
34
|
+
return {
|
|
35
|
+
...base,
|
|
36
|
+
overrides: [
|
|
37
|
+
{ files: ['*.ts', '*.tsx', '*.js', '*.jsx'], rules: {} },
|
|
38
|
+
{ files: ['*.ts', '*.tsx'], rules: {} },
|
|
39
|
+
{ files: ['*.js', '*.jsx'], rules: {} },
|
|
40
|
+
],
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
const directive = selectorPrefix(text, '@angular-eslint/directive-selector');
|
|
44
|
+
const component = selectorPrefix(text, '@angular-eslint/component-selector');
|
|
45
|
+
const rules = {};
|
|
46
|
+
if (directive) {
|
|
47
|
+
rules['@angular-eslint/directive-selector'] = [
|
|
48
|
+
'error',
|
|
49
|
+
{ type: 'attribute', prefix: directive, style: 'camelCase' },
|
|
50
|
+
];
|
|
51
|
+
}
|
|
52
|
+
if (component) {
|
|
53
|
+
rules['@angular-eslint/component-selector'] = [
|
|
54
|
+
'error',
|
|
55
|
+
{ type: 'element', prefix: component, style: 'kebab-case' },
|
|
56
|
+
];
|
|
57
|
+
}
|
|
58
|
+
return {
|
|
59
|
+
...base,
|
|
60
|
+
overrides: [
|
|
61
|
+
{
|
|
62
|
+
files: ['*.ts'],
|
|
63
|
+
extends: ['plugin:@nx/angular', 'plugin:@angular-eslint/template/process-inline-templates'],
|
|
64
|
+
rules,
|
|
65
|
+
},
|
|
66
|
+
{ files: ['*.html'], extends: ['plugin:@nx/angular-template'], rules: {} },
|
|
67
|
+
],
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
exports.eslintrcForFlatConfig = eslintrcForFlatConfig;
|
|
71
|
+
//# sourceMappingURL=flat-eslint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flat-eslint.js","sourceRoot":"","sources":["../../../../../src/generators/migrate/nx/flat-eslint.ts"],"names":[],"mappings":";;;AAEA,kGAAkG;AACrF,QAAA,gBAAgB,GAAG,yCAAyC,CAAC;AAE1E;;;;GAIG;AACU,QAAA,mBAAmB,GAC9B,8FAA8F,CAAC;AAEjG,2EAA2E;AAC3E,SAAgB,qBAAqB,CAAC,IAAU;IAC9C,OAAO,CAAC,CAAC,kBAAkB,EAAE,mBAAmB,EAAE,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAChF,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CACf,CAAC;AACJ,CAAC;AAJD,sDAIC;AAED,gGAAgG;AAChG,SAAS,cAAc,CAAC,IAAY,EAAE,IAAY;IAChD,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,EAAE,KAAK,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IAChC,MAAM,CAAC,GAAG,uCAAuC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;IACjF,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,IAAY,EAAE,IAAY;IAC9D,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;IAChE,MAAM,IAAI,GAAG,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IAC7E,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC/B,OAAO;YACL,GAAG,IAAI;YACP,SAAS,EAAE;gBACT,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;gBACxD,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;gBACvC,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;aACxC;SACF,CAAC;KACH;IACD,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,EAAE,oCAAoC,CAAC,CAAC;IAC7E,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,EAAE,oCAAoC,CAAC,CAAC;IAC7E,MAAM,KAAK,GAA4B,EAAE,CAAC;IAC1C,IAAI,SAAS,EAAE;QACb,KAAK,CAAC,oCAAoC,CAAC,GAAG;YAC5C,OAAO;YACP,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE;SAC7D,CAAC;KACH;IACD,IAAI,SAAS,EAAE;QACb,KAAK,CAAC,oCAAoC,CAAC,GAAG;YAC5C,OAAO;YACP,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE;SAC5D,CAAC;KACH;IACD,OAAO;QACL,GAAG,IAAI;QACP,SAAS,EAAE;YACT;gBACE,KAAK,EAAE,CAAC,MAAM,CAAC;gBACf,OAAO,EAAE,CAAC,oBAAoB,EAAE,0DAA0D,CAAC;gBAC3F,KAAK;aACN;YACD,EAAE,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,6BAA6B,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;SAC3E;KACF,CAAC;AACJ,CAAC;AAvCD,sDAuCC"}
|
|
@@ -214,8 +214,8 @@ function ionicBlock(i) {
|
|
|
214
214
|
lines.push(`- Ionic: ${code(i.ionic)}${(0, dependencies_1.majorOf)(i.ionic) === 6 ? ' (Ionic 6: works with Angular 15; plan the move to 7)' : ''}`);
|
|
215
215
|
}
|
|
216
216
|
if (i.capacitor) {
|
|
217
|
-
lines.push(`- Capacitor: ${code(i.capacitor)}${(0, dependencies_1.majorOf)(i.capacitor) !== 5
|
|
218
|
-
?
|
|
217
|
+
lines.push(`- Capacitor: ${code(i.capacitor)}${(0, dependencies_1.majorOf)(i.capacitor) !== (i.workspaceCapacitor ?? 5)
|
|
218
|
+
? ` (the workspace generates Capacitor ${i.workspaceCapacitor ?? 5} apps; this app keeps its version)`
|
|
219
219
|
: ''}`);
|
|
220
220
|
}
|
|
221
221
|
lines.push(`- Native packages (in ${code(i.packagePath)}): ${i.nativePackages.length > 0 ? codes(i.nativePackages) : 'none'}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../../src/generators/migrate/report.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../../src/generators/migrate/report.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"cli": "nx",
|
|
4
4
|
"id": "migrate",
|
|
5
5
|
"title": "Migrate a standalone project",
|
|
6
|
-
"description": "Copy an existing project into the workspace, the source never modified: a standalone Angular CLI, Ionic/Capacitor or Flutter app as apps/<name>, or the Angular, Ionic and Flutter projects of an Nx 15-
|
|
6
|
+
"description": "Copy an existing project into the workspace, the source never modified: a standalone Angular CLI, Ionic/Capacitor or Flutter app as apps/<name>, or the Angular, Ionic and Flutter projects of an Nx 15-22 workspace at their own paths. With rollback=<name>, undo a migration.",
|
|
7
7
|
"type": "object",
|
|
8
8
|
"properties": {
|
|
9
9
|
"source": {
|
|
@@ -8,4 +8,9 @@ export declare const DEFAULT_LINT_SCRIPT = "nx run-many -t lint";
|
|
|
8
8
|
* `--fix` or `-- <args>`. Anything more (`npm run lint && x`, `npm run lint:all`) is not matched.
|
|
9
9
|
*/
|
|
10
10
|
export declare function isRecursiveLintCommand(command: string): boolean;
|
|
11
|
+
/**
|
|
12
|
+
* Nx and the lint stack for a new workspace on this Angular major: the major's Nx pin (Nx 18 from
|
|
13
|
+
* Angular 17), and from Nx 18 typescript-eslint 7 with eslint-plugin-unused-imports 3 (its peer).
|
|
14
|
+
*/
|
|
15
|
+
export declare function alignWorkspaceStack(tree: Tree, angularMajor: number): void;
|
|
11
16
|
export default function presetGenerator(tree: Tree, options: PresetGeneratorSchema): Promise<void>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isRecursiveLintCommand = exports.DEFAULT_LINT_SCRIPT = void 0;
|
|
3
|
+
exports.alignWorkspaceStack = exports.isRecursiveLintCommand = exports.DEFAULT_LINT_SCRIPT = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const path = tslib_1.__importStar(require("path"));
|
|
6
6
|
const devkit_1 = require("@nx/devkit");
|
|
@@ -8,7 +8,9 @@ const context_1 = require("../../cli/context");
|
|
|
8
8
|
const versions_1 = require("../../cli/versions");
|
|
9
9
|
const config_1 = require("../../lib/env-encryption/config");
|
|
10
10
|
const workspace_1 = require("../../lib/env-encryption/workspace");
|
|
11
|
+
const pins_1 = require("../../lib/upgrade/pins");
|
|
11
12
|
const angular_deps_1 = require("../../lib/utils/angular-deps");
|
|
13
|
+
const dependencies_1 = require("../../lib/utils/dependencies");
|
|
12
14
|
const lint_staged_1 = require("../../lib/utils/lint-staged");
|
|
13
15
|
const quality_1 = require("../../lib/utils/quality");
|
|
14
16
|
const llm_block_1 = require("../../lib/utils/llm-block");
|
|
@@ -26,6 +28,34 @@ function isRecursiveLintCommand(command) {
|
|
|
26
28
|
return /^\s*(npm\s+run(-script)?|yarn|pnpm(\s+run)?)\s+lint(\s+--fix|\s+--\s.*)?\s*$/.test(command);
|
|
27
29
|
}
|
|
28
30
|
exports.isRecursiveLintCommand = isRecursiveLintCommand;
|
|
31
|
+
/**
|
|
32
|
+
* Nx and the lint stack for a new workspace on this Angular major: the major's Nx pin (Nx 18 from
|
|
33
|
+
* Angular 17), and from Nx 18 typescript-eslint 7 with eslint-plugin-unused-imports 3 (its peer).
|
|
34
|
+
*/
|
|
35
|
+
function alignWorkspaceStack(tree, angularMajor) {
|
|
36
|
+
const nx = `~${pins_1.ANGULAR_PINS[angularMajor].nx}`;
|
|
37
|
+
const tsEslint = (0, dependencies_1.typescriptEslintVersion)(nx);
|
|
38
|
+
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
39
|
+
const dev = json.devDependencies ?? {};
|
|
40
|
+
for (const name of ['nx', '@nx/devkit', '@nx/eslint', '@nx/eslint-plugin']) {
|
|
41
|
+
if (dev[name] !== undefined)
|
|
42
|
+
dev[name] = nx;
|
|
43
|
+
}
|
|
44
|
+
for (const name of ['@typescript-eslint/eslint-plugin', '@typescript-eslint/parser']) {
|
|
45
|
+
if (dev[name] !== undefined)
|
|
46
|
+
dev[name] = tsEslint;
|
|
47
|
+
}
|
|
48
|
+
json.devDependencies = dev;
|
|
49
|
+
return json;
|
|
50
|
+
});
|
|
51
|
+
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
52
|
+
if (json.devDependencies?.['eslint-plugin-unused-imports'] !== undefined) {
|
|
53
|
+
json.devDependencies['eslint-plugin-unused-imports'] = (0, quality_1.unusedImportsVersion)(tree);
|
|
54
|
+
}
|
|
55
|
+
return json;
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
exports.alignWorkspaceStack = alignWorkspaceStack;
|
|
29
59
|
async function presetGenerator(tree, options) {
|
|
30
60
|
const { npmScope = 'mouryaamit', baseBranch = 'master', ci = '', infra, llm = '', projectDescription = '', lintCommand = 'npm run lint', skipFormat = false, } = options;
|
|
31
61
|
// Validated up front so a bad --infra, --ci or --llm fails before anything is generated.
|
|
@@ -73,6 +103,7 @@ async function presetGenerator(tree, options) {
|
|
|
73
103
|
if (!angular_deps_1.GENERATOR_ANGULAR_MAJORS.includes(options.angular)) {
|
|
74
104
|
throw new Error(`preset: --angular must be one of ${angular_deps_1.GENERATOR_ANGULAR_MAJORS.join(', ')} (got ${options.angular}).`);
|
|
75
105
|
}
|
|
106
|
+
alignWorkspaceStack(tree, options.angular);
|
|
76
107
|
(0, angular_deps_1.ensureAngularDependencies)(tree, { major: options.angular });
|
|
77
108
|
}
|
|
78
109
|
// Repo docs, CI (replaces the old --ci templates), quality checks, upgrade workflow. Its install
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/preset/generator.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAE7B,uCAA0E;AAE1E,+CAAwE;AACxE,iDAAmE;AACnE,4DAA6E;AAC7E,kEAA6E;AAC7E,+DAAmG;AACnG,6DAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/preset/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export interface PresetGeneratorSchema {
|
|
|
15
15
|
lintCommand?: string;
|
|
16
16
|
skipFormat?: boolean;
|
|
17
17
|
skipInstall?: boolean;
|
|
18
|
-
/** Angular major to add now (15 or
|
|
18
|
+
/** Angular major to add now (15, 16 or 17); without it Angular 15 is added by the first Angular app. */
|
|
19
19
|
angular?: number;
|
|
20
20
|
/** nx-polystack version to pin in the generated package.json (default: this plugin's version). */
|
|
21
21
|
pluginVersion?: string;
|
|
@@ -7,6 +7,11 @@ export declare const ANGULAR_MAJOR = 15;
|
|
|
7
7
|
* fill in packages for a workspace on one of them. One major is added per public release.
|
|
8
8
|
*/
|
|
9
9
|
export declare const GENERATOR_ANGULAR_MAJORS: readonly number[];
|
|
10
|
+
/**
|
|
11
|
+
* From this major, generated apps provide HttpClient with `provideHttpClient(withInterceptorsFromDi())`
|
|
12
|
+
* (Angular 18 deprecates HttpClientModule; its own migration writes the same providers).
|
|
13
|
+
*/
|
|
14
|
+
export declare const PROVIDE_HTTP_CLIENT_MAJOR = 18;
|
|
10
15
|
/** Versions the generators add for one Angular major (only where a package is missing). */
|
|
11
16
|
export interface AngularGeneratorVersions {
|
|
12
17
|
angular: string;
|
|
@@ -23,6 +28,8 @@ export declare function angularGeneratorVersions(major: number): AngularGenerato
|
|
|
23
28
|
* 15 when there is none or the major is not one the generators support.
|
|
24
29
|
*/
|
|
25
30
|
export declare function workspaceGeneratorVersions(tree: Tree): AngularGeneratorVersions;
|
|
31
|
+
/** The workspace's Angular major when the generators support it, else 15 (the default). */
|
|
32
|
+
export declare function workspaceGeneratorMajor(tree: Tree): number;
|
|
26
33
|
export interface EnsureAngularOptions {
|
|
27
34
|
/** Also add the runtime packages the generated app imports (used by `pstack app`). */
|
|
28
35
|
includeRuntime?: boolean;
|
|
@@ -34,7 +41,7 @@ export interface EnsureAngularOptions {
|
|
|
34
41
|
* never upgraded:
|
|
35
42
|
* - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
|
|
36
43
|
* and @types/node;
|
|
37
|
-
* - a generator major installed (15
|
|
44
|
+
* - a generator major installed (15–18) → missing build/lint packages at the installed Angular
|
|
38
45
|
* version (plus the imported runtime packages when `includeRuntime`);
|
|
39
46
|
* - another Angular major → nothing; warns which build/lint packages are missing.
|
|
40
47
|
*/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ngPackagrDependencies = exports.ensureAngularDependencies = exports.workspaceGeneratorVersions = exports.angularGeneratorVersions = exports.GENERATOR_ANGULAR_MAJORS = exports.ANGULAR_MAJOR = exports.ANGULAR_VERSION = void 0;
|
|
3
|
+
exports.ngPackagrDependencies = exports.ensureAngularDependencies = exports.workspaceGeneratorMajor = exports.workspaceGeneratorVersions = exports.angularGeneratorVersions = exports.PROVIDE_HTTP_CLIENT_MAJOR = exports.GENERATOR_ANGULAR_MAJORS = exports.ANGULAR_MAJOR = exports.ANGULAR_VERSION = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const pins_1 = require("../upgrade/pins");
|
|
6
6
|
const dependencies_1 = require("./dependencies");
|
|
@@ -11,10 +11,25 @@ exports.ANGULAR_MAJOR = 15;
|
|
|
11
11
|
* Angular majors the generators write for: `pstack new --angular=<major>`, and `pstack app` / `:lib`
|
|
12
12
|
* fill in packages for a workspace on one of them. One major is added per public release.
|
|
13
13
|
*/
|
|
14
|
-
exports.GENERATOR_ANGULAR_MAJORS = [15, 16];
|
|
15
|
-
|
|
14
|
+
exports.GENERATOR_ANGULAR_MAJORS = [15, 16, 17, 18];
|
|
15
|
+
/**
|
|
16
|
+
* From this major, generated apps provide HttpClient with `provideHttpClient(withInterceptorsFromDi())`
|
|
17
|
+
* (Angular 18 deprecates HttpClientModule; its own migration writes the same providers).
|
|
18
|
+
*/
|
|
19
|
+
exports.PROVIDE_HTTP_CLIENT_MAJOR = 18;
|
|
20
|
+
const ZONE_JS = {
|
|
21
|
+
15: '~0.12.0',
|
|
22
|
+
16: '~0.13.0',
|
|
23
|
+
17: '~0.14.0',
|
|
24
|
+
18: '~0.14.0',
|
|
25
|
+
};
|
|
16
26
|
/** @types/node the major's TypeScript can parse (a latest one uses newer syntax: TS1139). */
|
|
17
|
-
const TYPES_NODE = {
|
|
27
|
+
const TYPES_NODE = {
|
|
28
|
+
15: '~18.16.9',
|
|
29
|
+
16: '~20.10.0',
|
|
30
|
+
17: '~20.10.0',
|
|
31
|
+
18: '~20.10.0',
|
|
32
|
+
};
|
|
18
33
|
function angularGeneratorVersions(major) {
|
|
19
34
|
if (major === 15) {
|
|
20
35
|
// Kept as released: angular-eslint 15.x works with any Angular 15.x.
|
|
@@ -48,10 +63,15 @@ exports.angularGeneratorVersions = angularGeneratorVersions;
|
|
|
48
63
|
* 15 when there is none or the major is not one the generators support.
|
|
49
64
|
*/
|
|
50
65
|
function workspaceGeneratorVersions(tree) {
|
|
51
|
-
|
|
52
|
-
return angularGeneratorVersions(major !== undefined && exports.GENERATOR_ANGULAR_MAJORS.includes(major) ? major : exports.ANGULAR_MAJOR);
|
|
66
|
+
return angularGeneratorVersions(workspaceGeneratorMajor(tree));
|
|
53
67
|
}
|
|
54
68
|
exports.workspaceGeneratorVersions = workspaceGeneratorVersions;
|
|
69
|
+
/** The workspace's Angular major when the generators support it, else 15 (the default). */
|
|
70
|
+
function workspaceGeneratorMajor(tree) {
|
|
71
|
+
const major = (0, dependencies_1.majorOf)((0, dependencies_1.declaredVersion)(tree, '@angular/core') ?? '');
|
|
72
|
+
return major !== undefined && exports.GENERATOR_ANGULAR_MAJORS.includes(major) ? major : exports.ANGULAR_MAJOR;
|
|
73
|
+
}
|
|
74
|
+
exports.workspaceGeneratorMajor = workspaceGeneratorMajor;
|
|
55
75
|
/** Full runtime set for a workspace that has no Angular yet. */
|
|
56
76
|
const RUNTIME_ALL = [
|
|
57
77
|
'@angular/animations',
|
|
@@ -100,7 +120,7 @@ function typeScriptPackages(v) {
|
|
|
100
120
|
* never upgraded:
|
|
101
121
|
* - no @angular/core → the whole set for `major` (default 15): runtime, build, lint, TypeScript
|
|
102
122
|
* and @types/node;
|
|
103
|
-
* - a generator major installed (15
|
|
123
|
+
* - a generator major installed (15–18) → missing build/lint packages at the installed Angular
|
|
104
124
|
* version (plus the imported runtime packages when `includeRuntime`);
|
|
105
125
|
* - another Angular major → nothing; warns which build/lint packages are missing.
|
|
106
126
|
*/
|
|
@@ -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,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"angular-deps.js","sourceRoot":"","sources":["../../../../src/lib/utils/angular-deps.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,9 +25,13 @@ export interface AngularTargetOptions {
|
|
|
25
25
|
envLayout?: EnvLayout;
|
|
26
26
|
/** Dev-server port. */
|
|
27
27
|
port?: number;
|
|
28
|
+
/** The workspace's Angular major: from 17, serve and extract-i18n name `buildTarget`. */
|
|
29
|
+
angularMajor?: number;
|
|
28
30
|
}
|
|
31
|
+
/** Angular 17 renamed the dev-server and extract-i18n `browserTarget` option to `buildTarget`. */
|
|
32
|
+
export declare const BUILD_TARGET_OPTION_MAJOR = 17;
|
|
29
33
|
export declare function angularBuildTarget(name: string, root?: string, layout?: EnvLayout): Record<string, unknown>;
|
|
30
|
-
export declare function angularServeTarget(name: string, port?: number): Record<string, unknown>;
|
|
34
|
+
export declare function angularServeTarget(name: string, port?: number, angularMajor?: number): Record<string, unknown>;
|
|
31
35
|
export declare function angularReleaseTarget(name: string, root?: string): Record<string, unknown>;
|
|
32
36
|
export declare const CLEAN_EXECUTOR = "@mouryaamit/nx-polystack:clean";
|
|
33
37
|
/**
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ionicProjectTargets = exports.CAPACITOR_EXECUTOR = exports.angularProjectTargets = exports.cleanTarget = exports.CLEAN_EXECUTOR = exports.angularReleaseTarget = exports.angularServeTarget = exports.angularBuildTarget = exports.PER_ENV_ROOT_FILE = exports.ENV_LAYOUTS = exports.withReleaseHardening = exports.RELEASE_HARDENING = exports.RELEASE_CONFIGURATIONS = exports.POLYSTACK_BUILD_EXECUTOR = void 0;
|
|
3
|
+
exports.ionicProjectTargets = exports.CAPACITOR_EXECUTOR = exports.angularProjectTargets = exports.cleanTarget = exports.CLEAN_EXECUTOR = exports.angularReleaseTarget = exports.angularServeTarget = exports.angularBuildTarget = exports.BUILD_TARGET_OPTION_MAJOR = exports.PER_ENV_ROOT_FILE = exports.ENV_LAYOUTS = exports.withReleaseHardening = exports.RELEASE_HARDENING = exports.RELEASE_CONFIGURATIONS = exports.POLYSTACK_BUILD_EXECUTOR = void 0;
|
|
4
4
|
const options_1 = require("../hardening/options");
|
|
5
5
|
const quality_1 = require("./quality");
|
|
6
6
|
exports.POLYSTACK_BUILD_EXECUTOR = '@mouryaamit/nx-polystack:build';
|
|
@@ -32,6 +32,11 @@ const budgets = [
|
|
|
32
32
|
exports.ENV_LAYOUTS = ['default', 'per-env'];
|
|
33
33
|
/** The file a per-env app imports; each build configuration replaces it with the app's file. */
|
|
34
34
|
exports.PER_ENV_ROOT_FILE = 'environments/environment.ts';
|
|
35
|
+
/** Angular 17 renamed the dev-server and extract-i18n `browserTarget` option to `buildTarget`. */
|
|
36
|
+
exports.BUILD_TARGET_OPTION_MAJOR = 17;
|
|
37
|
+
function buildTargetKey(angularMajor) {
|
|
38
|
+
return (angularMajor ?? 15) >= exports.BUILD_TARGET_OPTION_MAJOR ? 'buildTarget' : 'browserTarget';
|
|
39
|
+
}
|
|
35
40
|
function envReplacement(name, envFile, layout) {
|
|
36
41
|
return {
|
|
37
42
|
replace: layout === 'per-env' ? exports.PER_ENV_ROOT_FILE : `environments/${name}/environment.ts`,
|
|
@@ -81,14 +86,15 @@ function angularBuildTarget(name, root = `apps/${name}`, layout = 'default') {
|
|
|
81
86
|
};
|
|
82
87
|
}
|
|
83
88
|
exports.angularBuildTarget = angularBuildTarget;
|
|
84
|
-
function angularServeTarget(name, port) {
|
|
89
|
+
function angularServeTarget(name, port, angularMajor) {
|
|
90
|
+
const key = buildTargetKey(angularMajor);
|
|
85
91
|
return {
|
|
86
92
|
executor: '@angular-devkit/build-angular:dev-server',
|
|
87
93
|
...(port !== undefined ? { options: { port } } : {}),
|
|
88
94
|
configurations: {
|
|
89
|
-
production: {
|
|
90
|
-
uat: {
|
|
91
|
-
development: {
|
|
95
|
+
production: { [key]: `${name}:build:production` },
|
|
96
|
+
uat: { [key]: `${name}:build:uat` },
|
|
97
|
+
development: { [key]: `${name}:build:development` },
|
|
92
98
|
},
|
|
93
99
|
defaultConfiguration: 'development',
|
|
94
100
|
};
|
|
@@ -127,7 +133,7 @@ exports.cleanTarget = cleanTarget;
|
|
|
127
133
|
function angularProjectTargets(name, root = `apps/${name}`, opts = {}) {
|
|
128
134
|
return {
|
|
129
135
|
build: angularBuildTarget(name, root, opts.envLayout ?? 'default'),
|
|
130
|
-
serve: angularServeTarget(name, opts.port),
|
|
136
|
+
serve: angularServeTarget(name, opts.port, opts.angularMajor),
|
|
131
137
|
release: angularReleaseTarget(name, root),
|
|
132
138
|
clean: cleanTarget(root),
|
|
133
139
|
typecheck: (0, quality_1.typecheckTarget)(`${root}/tsconfig.app.json`),
|
|
@@ -138,7 +144,7 @@ function angularProjectTargets(name, root = `apps/${name}`, opts = {}) {
|
|
|
138
144
|
},
|
|
139
145
|
'extract-i18n': {
|
|
140
146
|
executor: '@angular-devkit/build-angular:extract-i18n',
|
|
141
|
-
options: {
|
|
147
|
+
options: { [buildTargetKey(opts.angularMajor)]: `${name}:build` },
|
|
142
148
|
},
|
|
143
149
|
};
|
|
144
150
|
}
|