@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,7 +1,75 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.removeTsPath = exports.addTsPath = void 0;
|
|
3
|
+
exports.removeTsPath = exports.addTsPath = exports.relativizePathsWithoutBaseUrl = exports.workspaceOnTypeScript6 = exports.samePathTarget = exports.relativePathTarget = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
/**
|
|
6
|
+
* A `paths` target as TypeScript needs it when the config has no `baseUrl` (Angular 22 workspaces,
|
|
7
|
+
* TypeScript 6): relative to the config file, with a leading "./" (else error TS5090).
|
|
8
|
+
*/
|
|
9
|
+
function relativePathTarget(target) {
|
|
10
|
+
return /^(\.{1,2}\/|\/|[A-Za-z]:)/.test(target) ? target : `./${target}`;
|
|
11
|
+
}
|
|
12
|
+
exports.relativePathTarget = relativePathTarget;
|
|
13
|
+
/** Two paths targets name the same location ("libs/x" and "./libs/x"). */
|
|
14
|
+
function samePathTarget(a, b) {
|
|
15
|
+
return a.replace(/^\.\//, '') === b.replace(/^\.\//, '');
|
|
16
|
+
}
|
|
17
|
+
exports.samePathTarget = samePathTarget;
|
|
18
|
+
/**
|
|
19
|
+
* The workspace is on TypeScript 6 (declared `typescript` 6+, or Angular 22+, which needs it). Only
|
|
20
|
+
* those workspaces drop baseUrl; older fixtures and workspaces are left as they are.
|
|
21
|
+
*/
|
|
22
|
+
function workspaceOnTypeScript6(tree) {
|
|
23
|
+
try {
|
|
24
|
+
const pkg = JSON.parse(tree.read('package.json', 'utf8') ?? '{}');
|
|
25
|
+
const spec = (name) => pkg.dependencies?.[name] ?? pkg.devDependencies?.[name];
|
|
26
|
+
const major = (v) => Number(/(\d+)/.exec(v ?? '')?.[1] ?? 0);
|
|
27
|
+
return major(spec('typescript')) >= 6 || major(spec('@angular/core')) >= 22;
|
|
28
|
+
}
|
|
29
|
+
catch {
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
exports.workspaceOnTypeScript6 = workspaceOnTypeScript6;
|
|
34
|
+
function hasBaseUrl(json) {
|
|
35
|
+
const opts = json['compilerOptions'];
|
|
36
|
+
return typeof opts?.['baseUrl'] === 'string';
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* In a TypeScript 6 workspace whose tsconfig has no `baseUrl`, gives every non-relative `paths`
|
|
40
|
+
* target a leading "./" (generators and migrations write "libs/…" targets).
|
|
41
|
+
* Returns true when it changed the file.
|
|
42
|
+
*/
|
|
43
|
+
function relativizePathsWithoutBaseUrl(tree, file = 'tsconfig.base.json') {
|
|
44
|
+
if (!tree.exists(file) || !workspaceOnTypeScript6(tree))
|
|
45
|
+
return false;
|
|
46
|
+
let changed = false;
|
|
47
|
+
try {
|
|
48
|
+
(0, devkit_1.updateJson)(tree, file, (json) => {
|
|
49
|
+
if (hasBaseUrl(json))
|
|
50
|
+
return json;
|
|
51
|
+
const opts = json['compilerOptions'];
|
|
52
|
+
const paths = opts?.['paths'];
|
|
53
|
+
if (!paths)
|
|
54
|
+
return json;
|
|
55
|
+
for (const [alias, targets] of Object.entries(paths)) {
|
|
56
|
+
if (!Array.isArray(targets))
|
|
57
|
+
continue;
|
|
58
|
+
const next = targets.map((t) => (typeof t === 'string' ? relativePathTarget(t) : t));
|
|
59
|
+
if (next.some((t, i) => t !== targets[i])) {
|
|
60
|
+
paths[alias] = next;
|
|
61
|
+
changed = true;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return json;
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
catch {
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
70
|
+
return changed;
|
|
71
|
+
}
|
|
72
|
+
exports.relativizePathsWithoutBaseUrl = relativizePathsWithoutBaseUrl;
|
|
5
73
|
function addTsPath(tree, alias, target) {
|
|
6
74
|
(0, devkit_1.updateJson)(tree, 'tsconfig.base.json', (json) => {
|
|
7
75
|
const opts = (json['compilerOptions'] ?? {});
|
|
@@ -9,7 +77,8 @@ function addTsPath(tree, alias, target) {
|
|
|
9
77
|
if (paths[alias]) {
|
|
10
78
|
throw new Error(`addTsPath: alias "${alias}" is already mapped`);
|
|
11
79
|
}
|
|
12
|
-
|
|
80
|
+
const relative = typeof opts['baseUrl'] !== 'string' && workspaceOnTypeScript6(tree);
|
|
81
|
+
paths[alias] = [relative ? relativePathTarget(target) : target];
|
|
13
82
|
opts['paths'] = paths;
|
|
14
83
|
json['compilerOptions'] = opts;
|
|
15
84
|
return json;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts-paths.js","sourceRoot":"","sources":["../../../../src/lib/utils/ts-paths.ts"],"names":[],"mappings":";;;AAAA,uCAA8C;AAE9C,SAAgB,SAAS,CAAC,IAAU,EAAE,KAAa,EAAE,MAAc;IACjE,IAAA,mBAAU,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAA6B,EAAE,EAAE;QACvE,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAA4B,CAAC;QACxE,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAA6B,CAAC;QAChE,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,qBAAqB,KAAK,qBAAqB,CAAC,CAAC;SAClE;QACD,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ts-paths.js","sourceRoot":"","sources":["../../../../src/lib/utils/ts-paths.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mouryaamit/nx-polystack",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.25.0",
|
|
4
4
|
"description": "Nx plugin and pstack CLI that scaffold and build multi-tech monorepos (Angular, Ionic, Flutter) with a hardened release pipeline.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "commonjs",
|
|
@@ -71,9 +71,9 @@
|
|
|
71
71
|
"npm": ">=7.0.0"
|
|
72
72
|
},
|
|
73
73
|
"peerDependencies": {
|
|
74
|
-
"@nx/devkit": ">=17.0.0 <
|
|
74
|
+
"@nx/devkit": ">=17.0.0 <24.0.0",
|
|
75
75
|
"crypto-js": "^4.2.0",
|
|
76
|
-
"nx": ">=17.0.0 <
|
|
76
|
+
"nx": ">=17.0.0 <24.0.0",
|
|
77
77
|
"sharp": "^0.33.0 || ^0.34.0 || ^0.35.0"
|
|
78
78
|
},
|
|
79
79
|
"peerDependenciesMeta": {
|