yeoman-environment 4.0.0-beta.5 → 4.0.0-rc.0

package/dist/commit.d.ts

@@ -1,17 +1,12 @@
-/// <reference types="node" resolution-mode="require"/>
-import type { PipelineSource } from 'node:stream';
 import type { InputOutputAdapter } from '@yeoman/types';
 import { type ConflicterOptions } from '@yeoman/conflicter';
 import type { Store } from 'mem-fs';
 import { type MemFsEditorFile } from 'mem-fs-editor';
 /**
  * Commits the MemFs to the disc.
- * @param {Stream} [stream] - files stream, defaults to this.sharedFs.stream().
- * @return {Promise}
  */
-export declare const commitSharedFsTask: ({ adapter, conflicterOptions, sharedFs, stream, }: {
+export declare const commitSharedFsTask: ({ adapter, conflicterOptions, sharedFs, }: {
     adapter: InputOutputAdapter;
     conflicterOptions?: ConflicterOptions | undefined;
     sharedFs: Store<MemFsEditorFile>;
-    stream?: PipelineSource<any> | undefined;
-}) => any;
+}) => Promise<void>;

package/dist/commit.js

@@ -2,24 +2,15 @@ import { createConflicterTransform, createYoResolveTransform, forceYoFiles } fro
 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';
+// eslint-disable-next-line n/file-extension-in-import
+import { isFilePending } from 'mem-fs-editor/state';
 const debug = createdLogger('yeoman:environment:commit');
 /**
  * Commits the MemFs to the disc.
- * @param {Stream} [stream] - files stream, defaults to this.sharedFs.stream().
- * @return {Promise}
  */
-export const commitSharedFsTask = ({ adapter, conflicterOptions, sharedFs, stream, }) => {
+export const commitSharedFsTask = async ({ adapter, conflicterOptions, sharedFs, }) => {
     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);
+    const editor = createMemFsEditor(sharedFs);
+    await sharedFs.pipeline({ filter: (file) => isFilePending(file) || file.path.endsWith('.yo-resolve') }, createYoResolveTransform(), forceYoFiles(), createConflicterTransform(adapter, conflicterOptions), createCommitTransform());
 };

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.
@@ -613,7 +610,7 @@ export default class EnvironmentBase extends EventEmitter {
                 // Conflicter can change files add listener before commit task.
                 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();
                 }

package/dist/environment-full.js

@@ -164,8 +164,7 @@ class FullEnvironment extends EnvironmentBase {
     async requireGenerator(namespace) {
         if (namespace === undefined) {
             try {
-                // @ts-expect-error yeoman-generator type maybe missing
-                // eslint-disable-next-line @typescript-eslint/naming-convention
+                // eslint-disable-next-line @typescript-eslint/naming-convention, import/no-extraneous-dependencies
                 const { default: Generator } = await import('yeoman-generator');
                 return Generator;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-rc.0",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "keywords": [
     "development",
@@ -57,52 +57,63 @@
     "doc_path": "./yeoman-environment-doc"
   },
   "dependencies": {
-    "@yeoman/adapter": "^1.1.0",
-    "@yeoman/conflicter": "^1.0.10",
+    "@yeoman/adapter": "^1.4.0",
+    "@yeoman/conflicter": "^2.0.0-alpha.2",
     "@yeoman/namespace": "^1.0.0",
     "@yeoman/transform": "^1.2.0",
     "arrify": "^3.0.0",
-    "chalk": "^5.2.0",
-    "commander": "^11.0.0",
+    "chalk": "^5.3.0",
+    "commander": "^11.1.0",
     "debug": "^4.3.4",
     "execa": "^8.0.1",
-    "fly-import": "^0.3.0",
-    "globby": "^13.1.4",
+    "fly-import": "^0.3.1",
+    "globby": "^13.2.2",
     "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",
+    "mem-fs-editor": "^11.0.0",
+    "semver": "^7.5.4",
+    "slash": "^5.1.0",
     "untildify": "^5.0.0",
     "which-package-manager": "^0.0.1"
   },
   "devDependencies": {
-    "@types/debug": "^4.1.8",
-    "@types/lodash-es": "^4.17.7",
-    "@types/semver": "^7.5.0",
-    "c8": "^8.0.0",
+    "@types/debug": "^4.1.9",
+    "@types/lodash-es": "^4.17.9",
+    "@types/semver": "^7.5.3",
+    "c8": "^8.0.1",
     "cpy-cli": "^5.0.0",
     "esmocha": "^1.0.1",
     "fs-extra": "^11.1.1",
-    "inquirer": "^9.2.6",
+    "inquirer": "^9.2.11",
     "jsdoc": "^4.0.2",
     "prettier": "3.0.3",
-    "prettier-plugin-packagejson": "^2.4.3",
-    "rimraf": "^5.0.0",
-    "sinon": "^15.0.4",
+    "prettier-plugin-packagejson": "^2.4.6",
+    "rimraf": "^5.0.5",
+    "sinon": "^16.1.0",
     "sinon-test": "^3.1.5",
-    "strip-ansi": "^7.0.1",
+    "strip-ansi": "^7.1.0",
     "typescript": "5.2.2",
     "xo": "0.56.0",
     "yeoman-assert": "^3.1.1",
-    "yeoman-generator": "^5.9.0",
-    "yeoman-test": "^8.0.0-rc.1"
+    "yeoman-environment": "file:.",
+    "yeoman-generator-2": "npm:yeoman-generator@^2.0.5",
+    "yeoman-generator-4": "npm:yeoman-generator@^4.13.0",
+    "yeoman-generator-5": "npm:yeoman-generator@^5.9.0",
+    "yeoman-generator-6": "npm:yeoman-generator@^6.0.1",
+    "yeoman-test": "^8.1.0"
+  },
+  "overrides": {
+    "yeoman-generator-5": {
+      "yeoman-environment": "file:."
+    },
+    "yeoman-generator-6": {
+      "yeoman-environment": "file:."
+    }
   },
   "peerDependencies": {
-    "@yeoman/types": "^1.0.1",
-    "mem-fs": "^3.0.0"
+    "@yeoman/types": "^1.1.1",
+    "mem-fs": "^4.0.0"
   },
   "engines": {
     "node": "^18.17.0 || >=20.5.0"