Skip to content

Commit 97a3bd6

Browse files
authored
fix: keep resolved as absolute path (#1580)
1 parent 6b70b9f commit 97a3bd6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/actions/lifecycle.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ export abstract class TasksMixin {
610610
}
611611
const generatorNamespace = this.env.namespace(resolved);
612612
const findGenerator = async () => {
613-
const generatorImport = await import(resolved);
613+
const generatorImport = await import(pathToFileURL(resolved).href);
614614
const getFactory = (module: any) =>
615615
module.createGenerator ?? module.default?.createGenerator ?? module.default?.default?.createGenerator;
616616
const factory = getFactory(generatorImport);
@@ -649,7 +649,7 @@ export abstract class TasksMixin {
649649
if (!generatorResolvedFile) {
650650
// Resolve the generator file.
651651
// Use import.resolve when stable.
652-
generatorResolvedFile = pathToFileURL(createRequire(import.meta.url).resolve(generatorFile)).href;
652+
generatorResolvedFile = createRequire(import.meta.url).resolve(generatorFile);
653653
}
654654

655655
return generatorResolvedFile;

test/base.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import fs, { mkdirSync, rmSync } from 'node:fs';
33
import os from 'node:os';
44
import path, { dirname } from 'node:path';
5-
import { fileURLToPath, pathToFileURL } from 'node:url';
5+
import { fileURLToPath } from 'node:url';
66
import { createRequire } from 'node:module';
77
import process from 'node:process';
88
import { Buffer } from 'node:buffer';
@@ -897,7 +897,7 @@ describe('Base', () => {
897897
assert.equal(spy.firstCall.thisValue.options.namespace, 'mocha');
898898
assert.equal(
899899
spy.firstCall.thisValue.options.resolved,
900-
pathToFileURL(createRequire(import.meta.url).resolve(stubPath)).href,
900+
createRequire(import.meta.url).resolve(stubPath),
901901
);
902902
});
903903

@@ -950,7 +950,7 @@ describe('Base', () => {
950950
spy = sinonSpy();
951951
dummy.resolved = _filename;
952952
stubPath = './fixtures/generator-mocha';
953-
resolvedStub = pathToFileURL(require.resolve(stubPath)).href;
953+
resolvedStub = require.resolve(stubPath);
954954
const module = await import(resolvedStub);
955955
LocalDummy = module.default;
956956
LocalDummy.prototype.exec = spy;

0 commit comments

Comments
 (0)