miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(core): handle symbol in migration path and infer angular material and cdk migration type correctly (#16538)

Browse Source
This commit is contained in:
Leosvel Pérez Espinosa 2023-04-25 17:09:30 +01:00 committed by GitHub
parent 4e0df09fac
commit 85366d5cbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/nx/src/command-line/migrate.ts
View File

@ -1543,8 +1543,12 @@ async function runNxMigration(
collection: MigrationsJson,
name: string
) {
const implPath = getImplementationPath(collection, collectionPath, name);
const fn = require(implPath).default;
const { path: implPath, fnSymbol } = getImplementationPath(
collection,
collectionPath,
name
);
const fn = require(implPath)[fnSymbol];
const host = new FsTree(root, false);
await fn(host, {});
host.lock();
@ -1598,14 +1602,16 @@ function getImplementationPath(
collection: MigrationsJson,
collectionPath: string,
name: string
) {
): { path: string; fnSymbol: string } {
const g = collection.generators?.[name] || collection.schematics?.[name];
if (!g) {
throw new Error(
`Unable to determine implementation path for "${collectionPath}:${name}"`
);
}
const implRelativePath = g.implementation || g.factory;
const implRelativePathAndMaybeSymbol = g.implementation || g.factory;
const [implRelativePath, fnSymbol = 'default'] =
implRelativePathAndMaybeSymbol.split('#');
let implPath: string;
@ -1620,7 +1626,7 @@ function getImplementationPath(
);
}
return implPath;
return { path: implPath, fnSymbol };
}
// TODO (v17): This should just become something like:
@ -1643,7 +1649,7 @@ function isAngularMigration(
const shouldBeNg = !!collection.schematics?.[name];
let useAngularDevkitToRunMigration = false;
const implementationPath = getImplementationPath(
const { path: implementationPath } = getImplementationPath(
collection,
collectionPath,
name
@ -1651,6 +1657,7 @@ function isAngularMigration(
const implStringContents = readFileSync(implementationPath, 'utf-8');
// TODO (v17): Remove this check and the cli property access - it is only here for backwards compatibility.
if (
['@angular/material', '@angular/cdk'].includes(collection.name) ||
[
"import('@angular-devkit",
'import("@angular-devkit',