@mouryaamit/nx-polystack 1.15.1 → 1.17.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/dist/src/cli/commands/ionic-standalone.d.ts +32 -4
- package/dist/src/cli/commands/ionic-standalone.js +185 -44
- package/dist/src/cli/commands/ionic-standalone.js.map +1 -1
- package/dist/src/cli/commands/reexport-modules.d.ts +36 -0
- package/dist/src/cli/commands/reexport-modules.js +375 -0
- package/dist/src/cli/commands/reexport-modules.js.map +1 -0
- package/dist/src/cli/commands/upgrade-standalone.js +36 -10
- package/dist/src/cli/commands/upgrade-standalone.js.map +1 -1
- package/dist/src/cli/commands/upgrade.js +10 -0
- package/dist/src/cli/commands/upgrade.js.map +1 -1
- package/dist/src/cli/help.js +4 -4
- package/dist/src/generators/app/generator.js +1 -1
- package/dist/src/generators/app/generator.js.map +1 -1
- package/dist/src/generators/migrate/adapters/angular-cli.js +3 -0
- package/dist/src/generators/migrate/adapters/angular-cli.js.map +1 -1
- package/dist/src/generators/migrate/adapters/angular-workspace.js +3 -0
- package/dist/src/generators/migrate/adapters/angular-workspace.js.map +1 -1
- package/dist/src/generators/migrate/adapters/types.d.ts +10 -0
- package/dist/src/generators/migrate/adapters/types.js.map +1 -1
- package/dist/src/generators/migrate/angular-project-json.js +11 -0
- package/dist/src/generators/migrate/angular-project-json.js.map +1 -1
- package/dist/src/generators/migrate/ionic/shape.d.ts +10 -0
- package/dist/src/generators/migrate/ionic/shape.js +53 -2
- package/dist/src/generators/migrate/ionic/shape.js.map +1 -1
- package/dist/src/generators/migrate/report.js +13 -0
- package/dist/src/generators/migrate/report.js.map +1 -1
- package/dist/src/lib/utils/angular-project.d.ts +3 -1
- package/dist/src/lib/utils/angular-project.js +9 -6
- package/dist/src/lib/utils/angular-project.js.map +1 -1
- package/dist/src/lib/utils/karma-ci.d.ts +7 -0
- package/dist/src/lib/utils/karma-ci.js +26 -1
- package/dist/src/lib/utils/karma-ci.js.map +1 -1
- package/dist/src/lib/utils/llm-block.js +20 -0
- package/dist/src/lib/utils/llm-block.js.map +1 -1
- package/dist/src/lib/utils/quality.js +41 -1
- package/dist/src/lib/utils/quality.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,375 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.aliasCrossProjectImports = exports.inlineReexportModules = exports.findReexportModules = 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 standalone_providers_1 = require("./standalone-providers");
|
|
8
|
+
const upgrade_standalone_1 = require("./upgrade-standalone");
|
|
9
|
+
const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
|
|
10
|
+
/** TypeScript files of a folder, spec files included (TestBed imports modules too). */
|
|
11
|
+
function sourceFiles(dir) {
|
|
12
|
+
const out = [];
|
|
13
|
+
const walk = (d) => {
|
|
14
|
+
if (!fs.existsSync(d))
|
|
15
|
+
return;
|
|
16
|
+
for (const e of fs.readdirSync(d, { withFileTypes: true })) {
|
|
17
|
+
if (e.name === 'node_modules' || e.name.startsWith('.'))
|
|
18
|
+
continue;
|
|
19
|
+
const p = path.join(d, e.name);
|
|
20
|
+
if (e.isDirectory())
|
|
21
|
+
walk(p);
|
|
22
|
+
else if (e.name.endsWith('.ts') && !e.name.endsWith('.d.ts'))
|
|
23
|
+
out.push(p);
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
walk(dir);
|
|
27
|
+
return out;
|
|
28
|
+
}
|
|
29
|
+
function decoratorCall(ts, cls, name) {
|
|
30
|
+
const decorators = ts.getDecorators?.(cls) ??
|
|
31
|
+
(cls.decorators || []);
|
|
32
|
+
for (const d of decorators) {
|
|
33
|
+
const e = d.expression;
|
|
34
|
+
if (ts.isCallExpression(e) &&
|
|
35
|
+
ts.isIdentifier(e.expression) &&
|
|
36
|
+
e.expression.text === name &&
|
|
37
|
+
e.arguments.length === 1 &&
|
|
38
|
+
ts.isObjectLiteralExpression(e.arguments[0])) {
|
|
39
|
+
return e.arguments[0];
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return undefined;
|
|
43
|
+
}
|
|
44
|
+
function prop(ts, obj, name) {
|
|
45
|
+
for (const p of obj.properties) {
|
|
46
|
+
if (ts.isPropertyAssignment(p) &&
|
|
47
|
+
(ts.isIdentifier(p.name) || ts.isStringLiteral(p.name)) &&
|
|
48
|
+
p.name.text === name) {
|
|
49
|
+
return p.initializer;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return undefined;
|
|
53
|
+
}
|
|
54
|
+
const emptyArray = (ts, e) => e === undefined || (ts.isArrayLiteralExpression(e) && e.elements.length === 0);
|
|
55
|
+
/** Resolves a relative import to a .ts file (x.ts or x/index.ts). */
|
|
56
|
+
function resolveTs(from, spec) {
|
|
57
|
+
const base = path.resolve(path.dirname(from), spec);
|
|
58
|
+
for (const f of [base, `${base}.ts`, path.join(base, 'index.ts')]) {
|
|
59
|
+
if (fs.existsSync(f) && fs.statSync(f).isFile())
|
|
60
|
+
return f;
|
|
61
|
+
}
|
|
62
|
+
return undefined;
|
|
63
|
+
}
|
|
64
|
+
/** The workspace's tsconfig paths, alias → absolute files. */
|
|
65
|
+
function aliasFiles(root) {
|
|
66
|
+
const out = new Map();
|
|
67
|
+
for (const name of ['tsconfig.base.json', 'tsconfig.json']) {
|
|
68
|
+
let json;
|
|
69
|
+
try {
|
|
70
|
+
json = JSON.parse(fs.readFileSync(path.join(root, name), 'utf8'));
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
continue;
|
|
74
|
+
}
|
|
75
|
+
const co = json['compilerOptions'];
|
|
76
|
+
if (!isObject(co) || !isObject(co['paths']))
|
|
77
|
+
continue;
|
|
78
|
+
for (const [alias, targets] of Object.entries(co['paths'])) {
|
|
79
|
+
if (alias.includes('*') || !Array.isArray(targets) || typeof targets[0] !== 'string')
|
|
80
|
+
continue;
|
|
81
|
+
out.set(alias, path.join(root, targets[0]));
|
|
82
|
+
}
|
|
83
|
+
break;
|
|
84
|
+
}
|
|
85
|
+
return out;
|
|
86
|
+
}
|
|
87
|
+
/** The files an entry file re-exports (`export * from` / `export { … } from`), one level. */
|
|
88
|
+
function reexportedFiles(entry) {
|
|
89
|
+
const out = new Map();
|
|
90
|
+
let text;
|
|
91
|
+
try {
|
|
92
|
+
text = fs.readFileSync(entry, 'utf8');
|
|
93
|
+
}
|
|
94
|
+
catch {
|
|
95
|
+
return out;
|
|
96
|
+
}
|
|
97
|
+
for (const m of text.matchAll(/export\s*(\*|\{([^}]*)\})\s*from\s*['"]([^'"]+)['"]/g)) {
|
|
98
|
+
const file = m[3].startsWith('.') ? resolveTs(entry, m[3]) : undefined;
|
|
99
|
+
if (!file)
|
|
100
|
+
continue;
|
|
101
|
+
const names = m[1] === '*'
|
|
102
|
+
? '*'
|
|
103
|
+
: m[2]
|
|
104
|
+
.split(',')
|
|
105
|
+
.map((n) => n
|
|
106
|
+
.trim()
|
|
107
|
+
.split(/\s+as\s+/)
|
|
108
|
+
.pop() ?? '')
|
|
109
|
+
.filter(Boolean);
|
|
110
|
+
out.set(file, names);
|
|
111
|
+
}
|
|
112
|
+
return out;
|
|
113
|
+
}
|
|
114
|
+
/** Whether `name`, declared in `file`, is exported by the entry file (itself or one level down). */
|
|
115
|
+
function entryExports(entry, file, name) {
|
|
116
|
+
if (path.resolve(entry) === path.resolve(file))
|
|
117
|
+
return true;
|
|
118
|
+
const names = reexportedFiles(entry).get(path.resolve(file));
|
|
119
|
+
return names === '*' || (Array.isArray(names) && names.includes(name));
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
* NgModules under `scope` that only re-export standalone classes: no declarations, providers or
|
|
123
|
+
* bootstrap, and every export a standalone component, directive or pipe of the workspace.
|
|
124
|
+
*/
|
|
125
|
+
function findReexportModules(ts, files, scope, angularMajor) {
|
|
126
|
+
const standalone = new Map();
|
|
127
|
+
const modules = [];
|
|
128
|
+
for (const file of files) {
|
|
129
|
+
const text = fs.readFileSync(file, 'utf8');
|
|
130
|
+
if (!/@(Component|Directive|Pipe|NgModule)\s*\(/.test(text))
|
|
131
|
+
continue;
|
|
132
|
+
const sf = ts.createSourceFile(file, text, ts.ScriptTarget.Latest, true);
|
|
133
|
+
for (const st of sf.statements) {
|
|
134
|
+
if (!ts.isClassDeclaration(st) || !st.name)
|
|
135
|
+
continue;
|
|
136
|
+
for (const kind of ['Component', 'Directive', 'Pipe']) {
|
|
137
|
+
const obj = decoratorCall(ts, st, kind);
|
|
138
|
+
if (!obj)
|
|
139
|
+
continue;
|
|
140
|
+
const flag = prop(ts, obj, 'standalone');
|
|
141
|
+
const isStandalone = flag?.kind === ts.SyntaxKind.TrueKeyword || (flag === undefined && angularMajor >= 19);
|
|
142
|
+
if (isStandalone)
|
|
143
|
+
standalone.set(st.name.text, [...(standalone.get(st.name.text) ?? []), file]);
|
|
144
|
+
}
|
|
145
|
+
const mod = decoratorCall(ts, st, 'NgModule');
|
|
146
|
+
if (!mod)
|
|
147
|
+
continue;
|
|
148
|
+
const exp = prop(ts, mod, 'exports');
|
|
149
|
+
if (!emptyArray(ts, prop(ts, mod, 'declarations')) ||
|
|
150
|
+
!emptyArray(ts, prop(ts, mod, 'providers')) ||
|
|
151
|
+
prop(ts, mod, 'bootstrap') !== undefined ||
|
|
152
|
+
!exp ||
|
|
153
|
+
!ts.isArrayLiteralExpression(exp) ||
|
|
154
|
+
exp.elements.length === 0 ||
|
|
155
|
+
!exp.elements.every((e) => ts.isIdentifier(e))) {
|
|
156
|
+
continue;
|
|
157
|
+
}
|
|
158
|
+
modules.push({
|
|
159
|
+
name: st.name.text,
|
|
160
|
+
file,
|
|
161
|
+
exports: exp.elements.map((e) => e.text),
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
const inScope = (f) => scope.some((s) => {
|
|
166
|
+
const rel = path.relative(s, f);
|
|
167
|
+
return !rel.startsWith('..') && !path.isAbsolute(rel);
|
|
168
|
+
});
|
|
169
|
+
return modules.filter((m) => inScope(m.file) && m.exports.every((e) => standalone.get(e)?.length === 1));
|
|
170
|
+
}
|
|
171
|
+
exports.findReexportModules = findReexportModules;
|
|
172
|
+
/**
|
|
173
|
+
* Replaces re-exporting NgModules in the `imports` arrays of the workspace's modules and
|
|
174
|
+
* components with the classes they export (see the file comment). Writes the files.
|
|
175
|
+
*/
|
|
176
|
+
function inlineReexportModules(ts, root, projects, scope, angularMajor) {
|
|
177
|
+
const files = [...new Set(projects.flatMap((p) => sourceFiles(path.join(root, p.root))))];
|
|
178
|
+
const absScope = scope.map((s) => path.resolve(root, s));
|
|
179
|
+
const modules = findReexportModules(ts, files, absScope, angularMajor);
|
|
180
|
+
const result = { changed: [], done: [], notes: [] };
|
|
181
|
+
if (modules.length === 0)
|
|
182
|
+
return result;
|
|
183
|
+
const rel = (f) => path.relative(root, f).split(path.sep).join('/');
|
|
184
|
+
const aliases = aliasFiles(root);
|
|
185
|
+
// Where each exported class is declared.
|
|
186
|
+
const classFile = new Map();
|
|
187
|
+
for (const file of files) {
|
|
188
|
+
const text = fs.readFileSync(file, 'utf8');
|
|
189
|
+
for (const m of text.matchAll(/export\s+(?:default\s+)?class\s+(\w+)/g)) {
|
|
190
|
+
if (!classFile.has(m[1]))
|
|
191
|
+
classFile.set(m[1], file);
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
for (const file of files) {
|
|
195
|
+
let text = fs.readFileSync(file, 'utf8');
|
|
196
|
+
const touched = modules.filter((m) => m.file !== file && new RegExp(`\\b${m.name}\\b`).test(text));
|
|
197
|
+
if (touched.length === 0)
|
|
198
|
+
continue;
|
|
199
|
+
const sf = ts.createSourceFile(file, text, ts.ScriptTarget.Latest, true);
|
|
200
|
+
const edits = [];
|
|
201
|
+
const imports = [];
|
|
202
|
+
for (const m of touched) {
|
|
203
|
+
// The import of the module, and where it comes from.
|
|
204
|
+
let spec;
|
|
205
|
+
for (const st of sf.statements) {
|
|
206
|
+
if (!ts.isImportDeclaration(st) || !ts.isStringLiteral(st.moduleSpecifier))
|
|
207
|
+
continue;
|
|
208
|
+
const nb = st.importClause?.namedBindings;
|
|
209
|
+
if (!nb || !ts.isNamedImports(nb))
|
|
210
|
+
continue;
|
|
211
|
+
if (nb.elements.some((e) => !e.propertyName && e.name.text === m.name)) {
|
|
212
|
+
spec = st.moduleSpecifier.text;
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
if (spec === undefined)
|
|
216
|
+
continue;
|
|
217
|
+
const target = spec.startsWith('.') ? resolveTs(file, spec) : aliases.get(spec);
|
|
218
|
+
if (!target)
|
|
219
|
+
continue;
|
|
220
|
+
const fromModuleFile = path.resolve(target) === path.resolve(m.file);
|
|
221
|
+
if (!fromModuleFile && !entryExports(target, m.file, m.name))
|
|
222
|
+
continue;
|
|
223
|
+
// Every use must sit in a decorator's imports array.
|
|
224
|
+
const uses = [];
|
|
225
|
+
let other = false;
|
|
226
|
+
const visit = (n) => {
|
|
227
|
+
if (ts.isImportDeclaration(n))
|
|
228
|
+
return;
|
|
229
|
+
if (ts.isIdentifier(n) && n.text === m.name) {
|
|
230
|
+
const arr = n.parent;
|
|
231
|
+
const okArray = ts.isArrayLiteralExpression(arr) &&
|
|
232
|
+
ts.isPropertyAssignment(arr.parent) &&
|
|
233
|
+
ts.isIdentifier(arr.parent.name) &&
|
|
234
|
+
arr.parent.name.text === 'imports';
|
|
235
|
+
if (okArray)
|
|
236
|
+
uses.push(n);
|
|
237
|
+
else
|
|
238
|
+
other = true;
|
|
239
|
+
}
|
|
240
|
+
ts.forEachChild(n, visit);
|
|
241
|
+
};
|
|
242
|
+
visit(sf);
|
|
243
|
+
if (other || uses.length === 0) {
|
|
244
|
+
if (other) {
|
|
245
|
+
result.notes.push(`${rel(file)}: ${m.name} is used outside an imports array; left (Angular's prune may drop it)`);
|
|
246
|
+
}
|
|
247
|
+
continue;
|
|
248
|
+
}
|
|
249
|
+
// Where the exported classes come from: the same path when it exports them, else their files.
|
|
250
|
+
const byFrom = new Map();
|
|
251
|
+
let unresolved;
|
|
252
|
+
for (const e of m.exports) {
|
|
253
|
+
const declared = classFile.get(e);
|
|
254
|
+
if (!declared) {
|
|
255
|
+
unresolved = e;
|
|
256
|
+
break;
|
|
257
|
+
}
|
|
258
|
+
let from;
|
|
259
|
+
if (!fromModuleFile && entryExports(target, declared, e))
|
|
260
|
+
from = spec;
|
|
261
|
+
else {
|
|
262
|
+
let r = path.relative(path.dirname(file), declared).split(path.sep).join('/');
|
|
263
|
+
r = r.replace(/\.ts$/, '');
|
|
264
|
+
from = r.startsWith('.') ? r : `./${r}`;
|
|
265
|
+
if (!spec.startsWith('.')) {
|
|
266
|
+
unresolved = e;
|
|
267
|
+
break;
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
byFrom.set(from, [...(byFrom.get(from) ?? []), e]);
|
|
271
|
+
}
|
|
272
|
+
if (unresolved) {
|
|
273
|
+
result.notes.push(`${rel(file)}: ${m.name} left (${unresolved} is not exported where it is imported from)`);
|
|
274
|
+
continue;
|
|
275
|
+
}
|
|
276
|
+
const clash = m.exports.find((e) => new RegExp(`\\b${e}\\b`).test(text) &&
|
|
277
|
+
![...byFrom.entries()].some(([from, names]) => names.includes(e) &&
|
|
278
|
+
new RegExp(`import\\s*\\{[^}]*\\b${e}\\b[^}]*\\}\\s*from\\s*['"]${from.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&')}['"]`).test(text)));
|
|
279
|
+
if (clash) {
|
|
280
|
+
result.notes.push(`${rel(file)}: ${m.name} left (${clash} is already a name in the file)`);
|
|
281
|
+
continue;
|
|
282
|
+
}
|
|
283
|
+
for (const id of uses) {
|
|
284
|
+
const arr = id.parent;
|
|
285
|
+
const present = new Set(arr.elements.filter((x) => ts.isIdentifier(x)).map((x) => x.text));
|
|
286
|
+
const add = m.exports.filter((e) => !present.has(e));
|
|
287
|
+
edits.push({ start: id.getStart(sf), end: id.getEnd(), text: add.join(', ') });
|
|
288
|
+
if (add.length === 0) {
|
|
289
|
+
// Remove the element and its comma.
|
|
290
|
+
const i = arr.elements.indexOf(id);
|
|
291
|
+
const next = arr.elements[i + 1];
|
|
292
|
+
const prev = arr.elements[i - 1];
|
|
293
|
+
edits[edits.length - 1] = next
|
|
294
|
+
? { start: id.getStart(sf), end: next.getStart(sf), text: '' }
|
|
295
|
+
: prev
|
|
296
|
+
? { start: prev.getEnd(), end: id.getEnd(), text: '' }
|
|
297
|
+
: { start: id.getStart(sf), end: id.getEnd(), text: '' };
|
|
298
|
+
}
|
|
299
|
+
}
|
|
300
|
+
for (const [from, names] of byFrom)
|
|
301
|
+
imports.push({ names, from, drop: m.name, spec });
|
|
302
|
+
result.done.push(`${rel(file)}: imports ${m.exports.join(', ')} instead of ${m.name} (Angular's prune drops the module, not what it exported)`);
|
|
303
|
+
}
|
|
304
|
+
if (edits.length === 0)
|
|
305
|
+
continue;
|
|
306
|
+
for (const e of edits.sort((a, b) => b.start - a.start)) {
|
|
307
|
+
text = text.slice(0, e.start) + e.text + text.slice(e.end);
|
|
308
|
+
}
|
|
309
|
+
for (const i of imports)
|
|
310
|
+
text = (0, standalone_providers_1.addNamedImports)(text, i.names, i.from);
|
|
311
|
+
for (const i of imports)
|
|
312
|
+
text = (0, upgrade_standalone_1.dropUnusedNamedImport)(text, i.drop, i.spec);
|
|
313
|
+
fs.writeFileSync(file, text);
|
|
314
|
+
result.changed.push(rel(file));
|
|
315
|
+
}
|
|
316
|
+
return result;
|
|
317
|
+
}
|
|
318
|
+
exports.inlineReexportModules = inlineReexportModules;
|
|
319
|
+
/**
|
|
320
|
+
* Angular's standalone schematic imports a class it moves into a component from the file that
|
|
321
|
+
* declares it, also across projects (`../../../../libs/feed/src/lib/feed/feed.page`): Nx's
|
|
322
|
+
* enforce-module-boundaries rule rejects that. Such an import goes back to the library's tsconfig
|
|
323
|
+
* path when that path exports every name it imports (merged into an existing import from the
|
|
324
|
+
* path). Writes the files; returns one line per file changed.
|
|
325
|
+
*/
|
|
326
|
+
function aliasCrossProjectImports(root, projects) {
|
|
327
|
+
const aliases = aliasFiles(root);
|
|
328
|
+
if (aliases.size === 0)
|
|
329
|
+
return [];
|
|
330
|
+
const within = (f, p) => {
|
|
331
|
+
const r = path.relative(path.join(root, p.root), f);
|
|
332
|
+
return !r.startsWith('..') && !path.isAbsolute(r);
|
|
333
|
+
};
|
|
334
|
+
const owner = (f) => projects.filter((p) => within(f, p)).sort((a, b) => b.root.length - a.root.length)[0];
|
|
335
|
+
const done = [];
|
|
336
|
+
for (const p of projects) {
|
|
337
|
+
for (const file of sourceFiles(path.join(root, p.root))) {
|
|
338
|
+
if (owner(file) !== p)
|
|
339
|
+
continue;
|
|
340
|
+
let text = fs.readFileSync(file, 'utf8');
|
|
341
|
+
const before = text;
|
|
342
|
+
const moved = [];
|
|
343
|
+
for (const m of [
|
|
344
|
+
...text.matchAll(/import\s*\{([^}]*)\}\s*from\s*['"](\.[^'"]*)['"];?[ \t]*\n?/g),
|
|
345
|
+
]) {
|
|
346
|
+
const target = resolveTs(file, m[2]);
|
|
347
|
+
if (!target)
|
|
348
|
+
continue;
|
|
349
|
+
const other = owner(target);
|
|
350
|
+
if (!other || other === p)
|
|
351
|
+
continue;
|
|
352
|
+
const names = m[1]
|
|
353
|
+
.split(',')
|
|
354
|
+
.map((n) => n.trim())
|
|
355
|
+
.filter(Boolean);
|
|
356
|
+
if (names.length === 0 || names.some((n) => /\s+as\s+|^type\s/.test(n)))
|
|
357
|
+
continue;
|
|
358
|
+
const alias = [...aliases.entries()].find(([, entry]) => within(entry, other) && names.every((n) => entryExports(entry, target, n)))?.[0];
|
|
359
|
+
if (!alias)
|
|
360
|
+
continue;
|
|
361
|
+
text = text.replace(m[0], '');
|
|
362
|
+
text = (0, standalone_providers_1.addNamedImports)(text, names, alias);
|
|
363
|
+
moved.push(`${names.join(', ')} from ${alias}`);
|
|
364
|
+
}
|
|
365
|
+
if (text === before)
|
|
366
|
+
continue;
|
|
367
|
+
fs.writeFileSync(file, text);
|
|
368
|
+
done.push(`${path.relative(root, file).split(path.sep).join('/')}: imports ${moved.join('; ')} ` +
|
|
369
|
+
'(not by a relative path into another project)');
|
|
370
|
+
}
|
|
371
|
+
}
|
|
372
|
+
return done;
|
|
373
|
+
}
|
|
374
|
+
exports.aliasCrossProjectImports = aliasCrossProjectImports;
|
|
375
|
+
//# sourceMappingURL=reexport-modules.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reexport-modules.js","sourceRoot":"","sources":["../../../../src/cli/commands/reexport-modules.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const args_1 = require("../args");
|
|
|
10
10
|
const context_1 = require("../context");
|
|
11
11
|
const types_1 = require("../types");
|
|
12
12
|
const ionic_standalone_1 = require("./ionic-standalone");
|
|
13
|
+
const reexport_modules_1 = require("./reexport-modules");
|
|
13
14
|
const standalone_providers_1 = require("./standalone-providers");
|
|
14
15
|
const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
|
|
15
16
|
exports.STANDALONE_MODES = [
|
|
@@ -376,10 +377,15 @@ async function runUpgradeStandalone(ctx, deps) {
|
|
|
376
377
|
? selected.filter((p) => (bootstrapApps.includes(p) || standaloneMain(root, p) !== undefined) &&
|
|
377
378
|
(0, ionic_standalone_1.isIonicApp)(root, p))
|
|
378
379
|
: [];
|
|
379
|
-
|
|
380
|
-
|
|
380
|
+
// Ionic libraries on IonicModule convert in the same step, when no project left on IonicModule
|
|
381
|
+
// uses them.
|
|
382
|
+
const ionicLibs = ionic ? selected.filter((p) => (0, ionic_standalone_1.isIonicLib)(root, p)) : [];
|
|
383
|
+
if (ionic && ionicApps.length === 0 && ionicLibs.length === 0) {
|
|
384
|
+
deps.log('--ionic: no Ionic app or library on IonicModule in the selected projects; ' +
|
|
385
|
+
'no ionic-standalone step.');
|
|
381
386
|
}
|
|
382
|
-
|
|
387
|
+
const ionicStep = ionicApps.length > 0 || ionicLibs.length > 0;
|
|
388
|
+
if (targets.length === 0 && providerApps.length === 0 && !ionicStep) {
|
|
383
389
|
deps.log('No NgModules in the selected projects; nothing to do.');
|
|
384
390
|
return 0;
|
|
385
391
|
}
|
|
@@ -389,17 +395,19 @@ async function runUpgradeStandalone(ctx, deps) {
|
|
|
389
395
|
? exports.STANDALONE_MODES.filter((m) => m !== 'standalone-bootstrap' || bootstrapApps.length > 0)
|
|
390
396
|
: []),
|
|
391
397
|
...(providerApps.length > 0 ? [PROVIDERS_STEP] : []),
|
|
392
|
-
...(
|
|
398
|
+
...(ionicStep ? [IONIC_STEP] : []),
|
|
393
399
|
];
|
|
394
400
|
const check = !(0, args_1.flagBoolean)(ctx.flags, 'skipCheck');
|
|
395
401
|
const commit = !(0, args_1.flagBoolean)(ctx.flags, 'noCommit');
|
|
396
|
-
const names = [
|
|
402
|
+
const names = [
|
|
403
|
+
...new Set([...targets, ...providerApps, ...ionicApps, ...ionicLibs].map((p) => p.name)),
|
|
404
|
+
];
|
|
397
405
|
deps.log(`Standalone migration (Angular ${core}) of ${names.join(', ')}:`);
|
|
398
406
|
modes.forEach((m, i) => {
|
|
399
407
|
const where = m === PROVIDERS_STEP
|
|
400
408
|
? providerApps.map((p) => `${p.root}/src`)
|
|
401
409
|
: m === IONIC_STEP
|
|
402
|
-
? ionicApps.map((p) => `${p.root}/src`)
|
|
410
|
+
? [...ionicApps.map((p) => `${p.root}/src`), ...ionicLibs.map((p) => p.root)]
|
|
403
411
|
: paths;
|
|
404
412
|
deps.log(` ${i + 1}. ${m}: ${MODE_TITLE[m]} (${where.join(', ')})`);
|
|
405
413
|
});
|
|
@@ -439,11 +447,25 @@ async function runUpgradeStandalone(ctx, deps) {
|
|
|
439
447
|
}
|
|
440
448
|
if (mode === IONIC_STEP) {
|
|
441
449
|
const libs = projects.filter((p) => !p.app);
|
|
442
|
-
const changed = (0, ionic_standalone_1.runIonicStep)(root, ionicApps, libs, major, say, deps.log
|
|
450
|
+
const changed = (0, ionic_standalone_1.runIonicStep)(root, ionicApps, libs, major, say, deps.log, {
|
|
451
|
+
ionicLibs,
|
|
452
|
+
workspace: projects,
|
|
453
|
+
});
|
|
443
454
|
if (changed.length === 0)
|
|
444
455
|
continue;
|
|
445
456
|
tidyMains(root, changed.filter((f) => f.endsWith('.ts')), deps, say);
|
|
446
457
|
}
|
|
458
|
+
if (mode === 'prune-ng-modules') {
|
|
459
|
+
// Angular's prune drops re-exporting NgModules without importing what they export.
|
|
460
|
+
const ts = (0, standalone_providers_1.loadTypescript)(root);
|
|
461
|
+
const r = ts
|
|
462
|
+
? (0, reexport_modules_1.inlineReexportModules)(ts, root, projects, paths, major)
|
|
463
|
+
: { changed: [], done: [], notes: [] };
|
|
464
|
+
for (const d of r.done)
|
|
465
|
+
say(d);
|
|
466
|
+
for (const n of r.notes)
|
|
467
|
+
deps.log(` ${n}`);
|
|
468
|
+
}
|
|
447
469
|
for (const p of mode === PROVIDERS_STEP || mode === IONIC_STEP ? [] : paths) {
|
|
448
470
|
say(`nx g @angular/core:standalone --path=${p} --mode=${mode}`);
|
|
449
471
|
deps.exec('npx', [
|
|
@@ -455,6 +477,10 @@ async function runUpgradeStandalone(ctx, deps) {
|
|
|
455
477
|
'--interactive=false',
|
|
456
478
|
], root);
|
|
457
479
|
}
|
|
480
|
+
if (mode !== PROVIDERS_STEP && mode !== IONIC_STEP) {
|
|
481
|
+
for (const d of (0, reexport_modules_1.aliasCrossProjectImports)(root, projects))
|
|
482
|
+
say(d);
|
|
483
|
+
}
|
|
458
484
|
if (mode === lastMode) {
|
|
459
485
|
for (const p of targets) {
|
|
460
486
|
if (enablePreferStandalone(path.join(root, p.root, '.eslintrc.json'))) {
|
|
@@ -522,9 +548,9 @@ async function runUpgradeStandalone(ctx, deps) {
|
|
|
522
548
|
deps.exec('git', ['commit', '-m', `chore: ${mode} (pstack upgrade standalone)`], root);
|
|
523
549
|
}
|
|
524
550
|
}
|
|
525
|
-
if (!ionic && selected.some((p) => (0, ionic_standalone_1.isIonicApp)(root, p))) {
|
|
526
|
-
deps.log("\nIonic apps keep IonicModule (Ionic's lazy build works with standalone
|
|
527
|
-
"Run again with --ionic to move them to Ionic's standalone components " +
|
|
551
|
+
if (!ionic && selected.some((p) => (0, ionic_standalone_1.isIonicApp)(root, p) || (0, ionic_standalone_1.isIonicLib)(root, p))) {
|
|
552
|
+
deps.log("\nIonic apps and libraries keep IonicModule (Ionic's lazy build works with standalone " +
|
|
553
|
+
"components). Run again with --ionic to move them to Ionic's standalone components " +
|
|
528
554
|
'(provideIonicAngular, Ion* imports, addIcons).');
|
|
529
555
|
}
|
|
530
556
|
deps.log('\n✔ Standalone migration done.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-standalone.js","sourceRoot":"","sources":["../../../../src/cli/commands/upgrade-standalone.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upgrade-standalone.js","sourceRoot":"","sources":["../../../../src/cli/commands/upgrade-standalone.ts"],"names":[],"mappings":"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"}
|
|
@@ -158,6 +158,16 @@ function buildPackageSpecs(pkg, major, pins) {
|
|
|
158
158
|
if (packagr !== undefined && (0, pins_1.majorOfSpec)(packagr) !== major) {
|
|
159
159
|
out.push(`ng-packagr@^${major}.0.0`);
|
|
160
160
|
}
|
|
161
|
+
// @angular-builders/* (custom-webpack, jest, …) follow Angular's major: an older builder
|
|
162
|
+
// rejects options the new Angular writes (polyfills as a list from 15).
|
|
163
|
+
const all = { ...pkg['dependencies'], ...pkg['devDependencies'] };
|
|
164
|
+
for (const name of Object.keys(all)
|
|
165
|
+
.filter((n) => n.startsWith('@angular-builders/'))
|
|
166
|
+
.sort()) {
|
|
167
|
+
const has = declared(pkg, name);
|
|
168
|
+
if (has !== undefined && (0, pins_1.majorOfSpec)(has) !== major)
|
|
169
|
+
out.push(`${name}@^${major}.0.0`);
|
|
170
|
+
}
|
|
161
171
|
const ts = declared(pkg, 'typescript');
|
|
162
172
|
if (ts !== undefined && ts.replace(/^[~^]/, '') !== pins.typescript) {
|
|
163
173
|
out.push(`typescript@~${pins.typescript}`);
|