fix(@angular-devkit/schematics): use NodeWorkflow root to resolve collections

Author: clydin

etc/api/angular_devkit/schematics/tools/index.d.ts

@@ -105,7 +105,7 @@ export declare class InvalidCollectionJsonException extends BaseException {
 }
 
 export declare class NodeModulesEngineHost extends FileSystemEngineHostBase {
-    constructor();
+    constructor(paths?: string[] | undefined);
     protected _resolveCollectionPath(name: string): string;
     protected _resolveReferenceString(refString: string, parentPath: string): {
         ref: RuleFactory<{}>;
@@ -136,6 +136,7 @@ export declare class NodeWorkflow extends workflow.BaseWorkflow {
         root?: Path;
         packageManager?: string;
         registry?: schema.CoreSchemaRegistry;
+        resolvePaths?: string[];
     });
 }
 

packages/angular/cli/commands/update-impl.ts

@@ -50,6 +50,9 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
       {
         packageManager: this.packageManager,
         root: normalize(this.workspace.root),
+        // __dirname -> favor @schematics/update from this package
+        // Otherwise, use packages from the active workspace (migrations)
+        resolvePaths: [__dirname, this.workspace.root],
       },
     );
     this.workflow.engineHost.registerOptionsTransform(

packages/angular/cli/models/schematic-command.ts

@@ -253,6 +253,11 @@ export abstract class SchematicCommand<
       packageManager: await getPackageManager(this.workspace.root),
       root: normalize(this.workspace.root),
       registry: new schema.CoreSchemaRegistry(formats.standardFormats),
+      resolvePaths: !!this.workspace.configFile
+        // Workspace
+        ? [process.cwd(), this.workspace.root]
+        // Global
+        : [__dirname, process.cwd()],
     });
     workflow.engineHost.registerContextTransform(context => {
       // This is run by ALL schematics, so if someone uses `externalSchematics(...)` which

packages/angular_devkit/schematics/tools/node-module-engine-host.ts

@@ -37,7 +37,7 @@ export class NodePackageDoesNotSupportSchematics extends BaseException {
  * A simple EngineHost that uses NodeModules to resolve collections.
  */
 export class NodeModulesEngineHost extends FileSystemEngineHostBase {
-  constructor() { super(); }
+  constructor(private readonly paths?: string[]) { super(); }
 
   protected _resolveCollectionPath(name: string): string {
     let collectionPath: string | undefined = undefined;
@@ -47,9 +47,9 @@ export class NodeModulesEngineHost extends FileSystemEngineHostBase {
 
     if (extname(name)) {
       // When having an extension let's just resolve the provided path.
-      collectionPath = require.resolve(name);
+      collectionPath = require.resolve(name, { paths: this.paths });
     } else {
-      const packageJsonPath = require.resolve(join(name, 'package.json'));
+      const packageJsonPath = require.resolve(join(name, 'package.json'), { paths: this.paths });
       const { schematics } = require(packageJsonPath);
 
       if (!schematics || typeof schematics !== 'string') {

packages/angular_devkit/schematics/tools/workflow/node-workflow.ts

@@ -25,9 +25,10 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
       root?: Path;
       packageManager?: string;
       registry?: schema.CoreSchemaRegistry;
+      resolvePaths?: string[],
     },
   ) {
-    const engineHost = new NodeModulesEngineHost();
+    const engineHost = new NodeModulesEngineHost(options.resolvePaths);
     super({
       host,
       engineHost,