yeoman-environment 4.0.0-beta.4 → 4.0.0-beta.6

package/dist/commit.js

@@ -3,8 +3,6 @@ import createdLogger from 'debug';
 import { create as createMemFsEditor } from 'mem-fs-editor';
 // eslint-disable-next-line n/file-extension-in-import
 import { isFilePending } from 'mem-fs-editor/state';
-// eslint-disable-next-line n/file-extension-in-import
-import { createCommitTransform } from 'mem-fs-editor/transform';
 const debug = createdLogger('yeoman:environment:commit');
 /**
  * Commits the MemFs to the disc.
@@ -15,11 +13,5 @@ export const commitSharedFsTask = ({ adapter, conflicterOptions, sharedFs, strea
     debug('Running commitSharedFsTask');
     const fs = createMemFsEditor(sharedFs);
     stream = stream ?? fs.store.stream({ filter: file => isFilePending(file) });
-    return fs.commit([
-        createYoResolveTransform(),
-        forceYoFiles(),
-        createConflicterTransform(adapter, conflicterOptions),
-        // Use custom commit transform due to out of order transform.
-        createCommitTransform(fs),
-    ], stream);
+    return fs.commit([createYoResolveTransform(), forceYoFiles(), createConflicterTransform(adapter, conflicterOptions)], stream);
 };

package/dist/environment-base.d.ts

@@ -3,7 +3,7 @@ import EventEmitter from 'node:events';
 import { QueuedAdapter, type TerminalAdapterOptions } from '@yeoman/adapter';
 import type { ApplyTransformsOptions, BaseEnvironment, BaseEnvironmentOptions, BaseGenerator, BaseGeneratorConstructor, BaseGeneratorMeta, ComposeOptions, GeneratorMeta, GetGeneratorConstructor, InputOutputAdapter, InstantiateOptions, LookupGeneratorMeta } from '@yeoman/types';
 import { type Store as MemFs } from 'mem-fs';
-import { type MemFsEditor, type MemFsEditorFile } from 'mem-fs-editor';
+import { type MemFsEditorFile } from 'mem-fs-editor';
 import { FlyRepository } from 'fly-import';
 import GroupedQueue from 'grouped-queue';
 import { type FilePipelineTransform } from '@yeoman/transform';
@@ -29,10 +29,10 @@ export type EnvironmentOptions = BaseEnvironmentOptions & Omit<TerminalAdapterOp
 export declare function removePropertiesWithNullishValues(object: Record<string, any>): Record<string, any>;
 export default class EnvironmentBase extends EventEmitter implements BaseEnvironment {
     cwd: string;
+    logCwd: string;
     adapter: QueuedAdapter;
     sharedFs: MemFs<MemFsEditorFile>;
     conflicterOptions?: ConflicterOptions;
-    protected logCwd: string;
     protected readonly options: EnvironmentOptions;
     protected readonly aliases: Array<{
         match: RegExp;
@@ -42,7 +42,6 @@ export default class EnvironmentBase extends EventEmitter implements BaseEnviron
     protected command?: YeomanCommand;
     protected runLoop: GroupedQueue;
     protected composedStore: ComposedStore;
-    protected fs: MemFsEditor;
     protected lookups: string[];
     protected sharedOptions: Record<string, any>;
     protected repository: FlyRepository;

package/dist/environment-base.js

@@ -5,7 +5,6 @@ import process from 'node:process';
 import { realpathSync } from 'node:fs';
 import { QueuedAdapter } from '@yeoman/adapter';
 import { create as createMemFs } from 'mem-fs';
-import { create as createMemFsEditor } from 'mem-fs-editor';
 import { FlyRepository } from 'fly-import';
 import createdLogger from 'debug';
 // @ts-expect-error grouped-queue don't have types
@@ -88,17 +87,16 @@ export function removePropertiesWithNullishValues(object) {
 // eslint-disable-next-line unicorn/prefer-event-target
 export default class EnvironmentBase extends EventEmitter {
     cwd;
+    logCwd;
     adapter;
     sharedFs;
     conflicterOptions;
-    logCwd;
     options;
     aliases = [];
     store;
     command;
     runLoop;
     composedStore;
-    fs;
     lookups;
     sharedOptions;
     repository;
@@ -122,7 +120,6 @@ export default class EnvironmentBase extends EventEmitter {
         // Node won't complain about event listeners leaks.
         this.runLoop.setMaxListeners(0);
         this.sharedFs.setMaxListeners(0);
-        this.fs = createMemFsEditor(sharedFs);
         this.lookups = defaultLookups;
         this.sharedOptions = sharedOptions;
         // Create a default sharedData.
@@ -609,6 +606,9 @@ export default class EnvironmentBase extends EventEmitter {
         const queueCommit = () => {
             debug('Queueing conflicts task');
             this.queueTask('environment:conflicts', async () => {
+                debug('Adding queueCommit listener');
+                // Conflicter can change files add listener before commit task.
+                this.sharedFs.once('change', queueCommit);
                 debug('Running conflicts');
                 const { customCommitTask = () => commitSharedFsTask(this) } = this.composedStore;
                 if (typeof customCommitTask === 'function') {
@@ -617,8 +617,6 @@ export default class EnvironmentBase extends EventEmitter {
                 else {
                     debug('Ignoring commit, custom commit was provided');
                 }
-                debug('Adding queueCommit listener');
-                this.sharedFs.once('change', queueCommit);
             }, {
                 once: 'write memory fs to disk',
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.6",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "keywords": [
     "development",
@@ -57,8 +57,8 @@
     "doc_path": "./yeoman-environment-doc"
   },
   "dependencies": {
-    "@yeoman/adapter": "^1.1.0",
-    "@yeoman/conflicter": "^1.0.7",
+    "@yeoman/adapter": "^1.4.0",
+    "@yeoman/conflicter": "^1.1.0",
     "@yeoman/namespace": "^1.0.0",
     "@yeoman/transform": "^1.2.0",
     "arrify": "^3.0.0",
@@ -101,10 +101,13 @@
     "yeoman-test": "^8.0.0-rc.1"
   },
   "peerDependencies": {
-    "@yeoman/types": "^1.0.1",
+    "@yeoman/types": "^1.1.0",
     "mem-fs": "^3.0.0"
   },
+  "acceptDependencies": {
+    "mem-fs": "^4.0.0-beta.1"
+  },
   "engines": {
-    "node": "^16.13.0 || >=18.12.0"
+    "node": "^18.17.0 || >=20.5.0"
   }
 }