fix(@angular-devkit/core): fix bootstrap-local for custom resolve

hansl · hansl · commit 96022c63f434 · 2018-06-05T17:55:14.000-07:00
diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
@@ -94,9 +94,9 @@ require.extensions['.ejs'] = function (m, filename) {
 };
 
 
+const packages = require('./packages').packages;
 // If we're running locally, meaning npm linked. This is basically "developer mode".
 if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
-  const packages = require('./packages').packages;
 
   // We mock the module loader so that we can fake our packages when running locally.
   const Module = require('module');
@@ -107,7 +107,7 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
     if (request in packages) {
       return packages[request].main;
     } else {
-      let match = Object.keys(packages).find(pkgName => request.startsWith(pkgName + '/'));
+      const match = Object.keys(packages).find(pkgName => request.startsWith(pkgName + '/'));
       if (match) {
         const p = path.join(packages[match].root, request.substr(match.length));
         return oldResolve.call(this, p, parent);
@@ -117,3 +117,29 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
     }
   };
 }
+
+
+// Set the resolve hook to allow resolution of packages from a local dev environment.
+require('@angular-devkit/core/node/resolve').setResolveHook(function(request, options) {
+  try {
+    if (request in packages) {
+      if (options.resolvePackageJson) {
+        return path.join(packages[request].root, 'package.json');
+      } else {
+        return packages[request].main;
+      }
+    } else {
+      const match = Object.keys(packages).find(function(pkgName) {
+        return request.startsWith(pkgName + '/');
+      });
+
+      if (match) {
+        return path.join(packages[match].root, request.substr(match[0].length));
+      } else {
+        return null;
+      }
+    }
+  } catch (_) {
+    return null;
+  }
+});
diff --git a/packages/angular_devkit/core/node/index.ts b/packages/angular_devkit/core/node/index.ts
@@ -8,6 +8,6 @@
 import * as fs from './fs';
 
 export * from './cli-logger';
-export * from './resolve';
+export { ModuleNotFoundException, ResolveOptions, resolve } from './resolve';
 
 export { fs };
diff --git a/packages/angular_devkit/core/node/resolve.ts b/packages/angular_devkit/core/node/resolve.ts
@@ -108,6 +108,15 @@ export interface ResolveOptions {
   resolvePackageJson?: boolean;
 }
 
+
+let _resolveHook: ((x: string, options: ResolveOptions) => string | null) | null = null;
+export function setResolveHook(
+  hook: ((x: string, options: ResolveOptions) => string | null) | null,
+) {
+  _resolveHook = hook;
+}
+
+
 /**
  * Resolve a package using a logic similar to npm require.resolve, but with more options.
  * @param x The package name to resolve.
@@ -117,6 +126,13 @@ export interface ResolveOptions {
  * @throws {ModuleNotFoundException} If no module with that name was found anywhere.
  */
 export function resolve(x: string, options: ResolveOptions): string {
+  if (_resolveHook) {
+    const maybe = _resolveHook(x, options);
+    if (maybe) {
+      return maybe;
+    }
+  }
+
   const readFileSync = fs.readFileSync;
 
   const extensions: string[] = options.extensions || Object.keys(require.extensions);
