fix: keep resolved as absolute path (#1580)

yeoman · Dec 12, 2024 · 97a3bd6 · 97a3bd6
1 parent 6b70b9f
commit 97a3bd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/actions/lifecycle.ts b/src/actions/lifecycle.ts
@@ -610,7 +610,7 @@ export abstract class TasksMixin {
     }
     const generatorNamespace = this.env.namespace(resolved);
     const findGenerator = async () => {
-      const generatorImport = await import(resolved);
+      const generatorImport = await import(pathToFileURL(resolved).href);
       const getFactory = (module: any) =>
         module.createGenerator ?? module.default?.createGenerator ?? module.default?.default?.createGenerator;
       const factory = getFactory(generatorImport);
@@ -649,7 +649,7 @@ export abstract class TasksMixin {
     if (!generatorResolvedFile) {
       // Resolve the generator file.
       // Use import.resolve when stable.
-      generatorResolvedFile = pathToFileURL(createRequire(import.meta.url).resolve(generatorFile)).href;
+      generatorResolvedFile = createRequire(import.meta.url).resolve(generatorFile);
     }
 
     return generatorResolvedFile;

diff --git a/test/base.test.ts b/test/base.test.ts
@@ -2,7 +2,7 @@
 import fs, { mkdirSync, rmSync } from 'node:fs';
 import os from 'node:os';
 import path, { dirname } from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
+import { fileURLToPath } from 'node:url';
 import { createRequire } from 'node:module';
 import process from 'node:process';
 import { Buffer } from 'node:buffer';
@@ -897,7 +897,7 @@ describe('Base', () => {
       assert.equal(spy.firstCall.thisValue.options.namespace, 'mocha');
       assert.equal(
         spy.firstCall.thisValue.options.resolved,
-        pathToFileURL(createRequire(import.meta.url).resolve(stubPath)).href,
+        createRequire(import.meta.url).resolve(stubPath),
       );
     });
 
@@ -950,7 +950,7 @@ describe('Base', () => {
         spy = sinonSpy();
         dummy.resolved = _filename;
         stubPath = './fixtures/generator-mocha';
-        resolvedStub = pathToFileURL(require.resolve(stubPath)).href;
+        resolvedStub = require.resolve(stubPath);
         const module = await import(resolvedStub);
         LocalDummy = module.default;
         LocalDummy.prototype.exec = spy;