yeoman-environment 5.1.1 → 5.1.3

package/dist/module-lookup.js

@@ -211,7 +211,13 @@ function getGlobalNpmPaths(filterPaths = true) {
         paths.push(resolve(yarnBase, 'node_modules'), resolve(yarnBase, '../link/'));
     }
     if (process.env.PNPM_HOME) {
-        paths.push(resolve(process.env.PNPM_HOME, 'global/*/node_modules'));
+        const pnpmHome = process.env.PNPM_HOME;
+        paths.push(...globbySync('global/*/node_modules', {
+            cwd: pnpmHome,
+            onlyDirectories: true,
+            suppressErrors: true,
+            absolute: true,
+        }).map(modulesPath => resolve(modulesPath)));
     }
     // Get npm global prefix and infer the module paths from there
     const globalInstall = execaOutput('npm', ['root', '-g']);

package/dist/store.js

@@ -63,8 +63,11 @@ export default class Store {
                 try {
                     return require(meta.resolved);
                 }
-                catch {
-                    return import(__rewriteRelativeImportExtension(pathToFileURL(meta.resolved).href));
+                catch (error) {
+                    if (error.code === 'ERR_REQUIRE_ESM' || error.code === 'ERR_REQUIRE_ASYNC_MODULE') {
+                        return import(__rewriteRelativeImportExtension(pathToFileURL(meta.resolved).href));
+                    }
+                    throw error;
                 }
             };
         }
@@ -77,8 +80,11 @@ export default class Store {
                     const maybeModule = importModule();
                     if (maybeModule.then) {
                         importPromise = maybeModule;
-                        return maybeModule.then((mod) => {
+                        return maybeModule
+                            .then((mod) => {
                             Generator = mod;
+                        })
+                            .finally(() => {
                             importPromise = undefined;
                         });
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "keywords": [
     "development",