yeoman-environment 5.0.0 → 5.1.1

package/dist/environment-base.d.ts

@@ -19,13 +19,14 @@ export type EnvironmentLookupOptions = LookupOptions & {
     /** Customize the namespace to be registered */
     customizeNamespace?: (ns?: string) => string | undefined;
 };
-export type EnvironmentOptions = BaseEnvironmentOptions & Omit<TerminalAdapterOptions, 'promptModule'> & {
+export type EnvironmentOptions = ConflicterOptions & BaseEnvironmentOptions & Omit<TerminalAdapterOptions, 'promptModule'> & {
     adapter?: InputOutputAdapter;
     logCwd?: string;
     command?: YeomanCommand;
     yeomanRepository?: string;
     arboristRegistry?: string;
     nodePackageManager?: string;
+    generatorLookupOptions?: Pick<EnvironmentLookupOptions, 'customizeNamespace' | 'lookups'>;
 };
 /**
  * Copy and remove null and undefined values
@@ -39,7 +40,8 @@ export default class EnvironmentBase extends EventEmitter implements BaseEnviron
     adapter: QueuedAdapter;
     sharedFs: MemFs<MemFsEditorFile>;
     conflicterOptions?: ConflicterOptions;
-    protected readonly options: EnvironmentOptions;
+    readonly sharedOptions: Record<string, any>;
+    readonly options: EnvironmentOptions;
     protected readonly aliases: Array<{
         match: RegExp;
         value: string;
@@ -49,7 +51,6 @@ export default class EnvironmentBase extends EventEmitter implements BaseEnviron
     protected runLoop: GroupedQueue;
     protected composedStore: ComposedStore;
     protected lookups: string[];
-    protected sharedOptions: Record<string, any>;
     protected repository: FlyRepository;
     protected experimental: boolean;
     protected _rootGenerator?: BaseGenerator;

package/dist/environment-base.js

@@ -91,6 +91,7 @@ export default class EnvironmentBase extends EventEmitter {
     adapter;
     sharedFs;
     conflicterOptions;
+    sharedOptions;
     options;
     aliases = [];
     store;
@@ -98,7 +99,6 @@ export default class EnvironmentBase extends EventEmitter {
     runLoop;
     composedStore;
     lookups;
-    sharedOptions;
     repository;
     experimental;
     _rootGenerator;
@@ -121,7 +121,7 @@ export default class EnvironmentBase extends EventEmitter {
         // Node won't complain about event listeners leaks.
         this.runLoop.setMaxListeners(0);
         this.sharedFs.setMaxListeners(0);
-        this.lookups = defaultLookups;
+        this.lookups = this.options.generatorLookupOptions?.lookups ?? defaultLookups;
         this.sharedOptions = sharedOptions;
         // Create a default sharedData.
         this.sharedOptions.sharedData = this.sharedOptions.sharedData ?? {};
@@ -416,7 +416,7 @@ export default class EnvironmentBase extends EventEmitter {
      * registered as `dummy:yo` generator.
      */
     async lookup(options) {
-        const { registerToScope, customizeNamespace = (ns) => ns, lookups = this.lookups, ...remainingOptions } = options ?? { localOnly: false };
+        const { registerToScope, customizeNamespace = this.options.generatorLookupOptions?.customizeNamespace ?? ((ns) => ns), lookups = this.lookups, ...remainingOptions } = options ?? { localOnly: false };
         options = {
             ...remainingOptions,
             lookups,

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { type EnvironmentOptions } from './environment-base.ts';
 import Environment from './environment-full.ts';
 export { default } from './environment-full.ts';
-export { default as EnvironmentBase } from './environment-base.ts';
+export { default as EnvironmentBase, type EnvironmentOptions } from './environment-base.ts';
 export declare const createEnv: (options?: EnvironmentOptions) => Environment;
 export declare const enforceUpdate: () => void;
 export * from './commands.ts';

package/dist/module-lookup.js

@@ -210,6 +210,9 @@ function getGlobalNpmPaths(filterPaths = true) {
     if (yarnBase) {
         paths.push(resolve(yarnBase, 'node_modules'), resolve(yarnBase, '../link/'));
     }
+    if (process.env.PNPM_HOME) {
+        paths.push(resolve(process.env.PNPM_HOME, 'global/*/node_modules'));
+    }
     // Get npm global prefix and infer the module paths from there
     const globalInstall = execaOutput('npm', ['root', '-g']);
     if (globalInstall) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "5.0.0",
+  "version": "5.1.1",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "keywords": [
     "development",
@@ -58,7 +58,7 @@
   },
   "dependencies": {
     "@yeoman/adapter": "^3.1.0",
-    "@yeoman/conflicter": "^3.0.0",
+    "@yeoman/conflicter": "^4.0.0",
     "@yeoman/namespace": "^1.0.1",
     "@yeoman/transform": "^2.1.0",
     "@yeoman/types": "^1.8.0",
@@ -68,7 +68,7 @@
     "debug": "^4.4.1",
     "execa": "^9.6.0",
     "fly-import": "^1.0.0",
-    "globby": "^14.1.0",
+    "globby": "^16.0.0",
     "grouped-queue": "^2.1.0",
     "locate-path": "^8.0.0",
     "lodash-es": "^4.17.21",