rework commitSharedFsTask for mem-fs@4

Author: mshima

package-lock.json

@@ -58,7 +58,7 @@
   },
   "dependencies": {
     "@yeoman/adapter": "^1.4.0",
-    "@yeoman/conflicter": "^1.1.0",
+    "@yeoman/conflicter": "^2.0.0-alpha.1",
     "@yeoman/namespace": "^1.0.0",
     "@yeoman/transform": "^1.2.0",
     "arrify": "^3.0.0",
@@ -71,7 +71,6 @@
     "grouped-queue": "^2.0.0",
     "locate-path": "^7.2.0",
     "lodash-es": "^4.17.21",
-    "mem-fs": "^3.0.0",
     "mem-fs-editor": "^10.0.1",
     "semver": "^7.5.0",
     "slash": "^5.0.1",
@@ -98,13 +97,10 @@
     "xo": "0.56.0",
     "yeoman-assert": "^3.1.1",
     "yeoman-generator": "^5.9.0",
-    "yeoman-test": "^8.0.0-rc.1"
+    "yeoman-test": "^8.1.0-beta.0"
   },
   "peerDependencies": {
-    "@yeoman/types": "^1.1.0",
-    "mem-fs": "^3.0.0"
-  },
-  "acceptDependencies": {
+    "@yeoman/types": "^1.1.1",
     "mem-fs": "^4.0.0-beta.1"
   },
   "engines": {

package.json

@@ -1,4 +1,4 @@
-import type { PipelineSource } from 'node:stream';
+import { Duplex, type PipelineSource } from 'node:stream';
 import type { InputOutputAdapter } from '@yeoman/types';
 import { type ConflicterOptions, createConflicterTransform, createYoResolveTransform, forceYoFiles } from '@yeoman/conflicter';
 import createdLogger from 'debug';
@@ -14,7 +14,7 @@ const debug = createdLogger('yeoman:environment:commit');
  * @param {Stream} [stream] - files stream, defaults to this.sharedFs.stream().
  * @return {Promise}
  */
-export const commitSharedFsTask = ({
+export const commitSharedFsTask = async ({
   adapter,
   conflicterOptions,
   sharedFs,
@@ -26,7 +26,17 @@ export const commitSharedFsTask = ({
   stream?: PipelineSource<any>;
 }) => {
   debug('Running commitSharedFsTask');
-  const fs = createMemFsEditor(sharedFs);
-  stream = stream ?? fs.store.stream({ filter: file => isFilePending(file) });
-  return fs.commit([createYoResolveTransform(), forceYoFiles(), createConflicterTransform(adapter, conflicterOptions)], stream);
+  const editor = createMemFsEditor(sharedFs);
+  await sharedFs.pipeline(
+    { filter: (file: MemFsEditorFile) => isFilePending(file) || file.path.endsWith('.yo-resolve') },
+    createYoResolveTransform(),
+    forceYoFiles(),
+    createConflicterTransform(adapter, conflicterOptions),
+    Duplex.from(async function* (source: AsyncGenerator<MemFsEditorFile>) {
+      for await (const file of source) {
+        await editor.commitFileAsync(file);
+        yield file;
+      }
+    }),
+  );
 };

src/commit.ts

@@ -872,7 +872,7 @@ export default class EnvironmentBase extends EventEmitter implements BaseEnviron
           this.sharedFs.once('change', queueCommit);
 
           debug('Running conflicts');
-          const { customCommitTask = () => commitSharedFsTask(this) } = this.composedStore;
+          const { customCommitTask = async () => commitSharedFsTask(this) } = this.composedStore;
           if (typeof customCommitTask === 'function') {
             await customCommitTask();
           } else {