yeoman-environment 2.3.4 → 2.4.0

package/lib/resolver.js

@@ -28,11 +28,19 @@ const resolver = module.exports;
  * So this index file `node_modules/generator-dummy/lib/generators/yo/index.js` would be
  * registered as `dummy:yo` generator.
  *
+ * @param {boolean} [localOnly = false] - Set trueto skip lookups of
+ *                                        globally-installed generators.
  * @param {function} cb - Callback called once the lookup is done. Take err as first
  *                        parameter.
  */
-resolver.lookup = function (cb) {
-  const generatorsModules = this.findGeneratorsIn(this.getNpmPaths().reverse());
+resolver.lookup = function (localOnly = false, cb) {
+  // Resolve signature where localOnly is omitted.
+  if (typeof localOnly === 'function') {
+    cb = localOnly;
+    localOnly = false;
+  }
+
+  const generatorsModules = this.findGeneratorsIn(this.getNpmPaths(localOnly).reverse());
   const patterns = [];
 
   for (const lookup of this.lookups) {
@@ -123,9 +131,50 @@ resolver._tryRegistering = function (generatorReference) {
 
 /**
  * Get the npm lookup directories (`node_modules/`)
+ * @param {boolean} [localOnly = false] - Set true to exclude global lookup
+ *                                        directories.
+ * @return {Array} lookup paths
+ */
+resolver.getNpmPaths = function (localOnly = false) {
+  // Start with the local paths.
+  let paths = this._getLocalNpmPaths();
+
+  // Append global paths, unless they should be excluded.
+  if (!localOnly) {
+    paths = paths.concat(this._getGlobalNpmPaths());
+  }
+
+  return _.uniq(paths);
+};
+
+/**
+ * Get the local npm lookup directories
+ * @private
  * @return {Array} lookup paths
  */
-resolver.getNpmPaths = function () {
+resolver._getLocalNpmPaths = function () {
+  const paths = [];
+
+  // Walk up the CWD and add `node_modules/` folder lookup on each level
+  process.cwd().split(path.sep).forEach((part, i, parts) => {
+    let lookup = path.join(...parts.slice(0, i + 1), 'node_modules');
+
+    if (!win32) {
+      lookup = `/${lookup}`;
+    }
+
+    paths.push(lookup);
+  });
+
+  return _.uniq(paths.reverse());
+};
+
+/**
+ * Get the global npm lookup directories
+ * @private
+ * @return {Array} lookup paths
+ */
+resolver._getGlobalNpmPaths = function () {
   let paths = [];
 
   // Default paths for each system
@@ -167,7 +216,8 @@ resolver.getNpmPaths = function () {
   const testNpm = spawn.sync('npm', ['-g', 'prefix'], {encoding: 'utf8'});
   if (!testNpm.error) {
     const npmBase = testNpm.stdout.trim();
-    paths.push(path.resolve(npmBase, 'lib/node_modules'));
+    const globalInstall = win32 ? `${npmBase}/node_modules` : `${npmBase}/lib/node_modules`;
+    paths.push(path.resolve(globalInstall));
   }
 
   // Adds support for generator resolving when yeoman-generator has been linked
@@ -175,17 +225,6 @@ resolver.getNpmPaths = function () {
     paths.push(path.join(path.dirname(process.argv[1]), '../..'));
   }
 
-  // Walk up the CWD and add `node_modules/` folder lookup on each level
-  process.cwd().split(path.sep).forEach((part, i, parts) => {
-    let lookup = path.join(...parts.slice(0, i + 1), 'node_modules');
-
-    if (!win32) {
-      lookup = `/${lookup}`;
-    }
-
-    paths.push(lookup);
-  });
-
   return _.uniq(paths.reverse());
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",