Skip to content

Commit c1a6de3

Browse files
committed
fixup! fixup! module: run require.resolve through module.registerHooks()
1 parent 75ec142 commit c1a6de3

5 files changed

+10
-5
lines changed

test/module-hooks/test-module-hooks-resolve-require-resolve-consistency.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require('../common');
77
const assert = require('assert');
88
const { registerHooks } = require('module');
99
const fixtures = require('../common/fixtures');
10+
const { pathToFileURL } = require('url');
1011

1112
const redirectedPath = fixtures.path('module-hooks', 'redirected-assert.js');
1213

@@ -16,7 +17,7 @@ const hook = registerHooks({
1617
if (specifier === 'test-consistency-target') {
1718
resolvedSpecifiers.push(specifier);
1819
return {
19-
url: `file://${redirectedPath}`,
20+
url: pathToFileURL(redirectedPath).href,
2021
shortCircuit: true,
2122
};
2223
}

test/module-hooks/test-module-hooks-resolve-require-resolve-create-require.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ require('../common');
88
const assert = require('assert');
99
const { registerHooks, createRequire } = require('module');
1010
const fixtures = require('../common/fixtures');
11+
const { pathToFileURL } = require('url');
1112

1213
const redirectedPath = fixtures.path('module-hooks', 'redirected-assert.js');
1314

1415
const hook = registerHooks({
1516
resolve(specifier, context, nextResolve) {
1617
if (specifier === 'test-create-require-resolve-target') {
1718
return {
18-
url: `file://${redirectedPath}`,
19+
url: pathToFileURL(redirectedPath).href,
1920
shortCircuit: true,
2021
};
2122
}

test/module-hooks/test-module-hooks-resolve-require-resolve-imported-cjs.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ const common = require('../common');
77
const assert = require('assert');
88
const { registerHooks } = require('module');
99
const fixtures = require('../common/fixtures');
10+
const { pathToFileURL } = require('url');
1011

1112
const redirectedPath = fixtures.path('module-hooks', 'redirected-assert.js');
1213

1314
const hook = registerHooks({
1415
resolve: common.mustCall((specifier, context, nextResolve) => {
1516
if (specifier === 'test-require-resolve-hook-target') {
1617
return {
17-
url: `file://${redirectedPath}`,
18+
url: pathToFileURL(redirectedPath).href,
1819
shortCircuit: true,
1920
};
2021
}

test/module-hooks/test-module-hooks-resolve-require-resolve-loaded-with-source.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const common = require('../common');
99
const assert = require('assert');
1010
const { register, registerHooks } = require('module');
1111
const fixtures = require('../common/fixtures');
12+
const { pathToFileURL } = require('url');
1213

1314
const redirectedPath = fixtures.path('module-hooks', 'redirected-assert.js');
1415

@@ -20,7 +21,7 @@ const hook = registerHooks({
2021
resolve: common.mustCall((specifier, context, nextResolve) => {
2122
if (specifier === 'test-require-resolve-hook-target') {
2223
return {
23-
url: `file://${redirectedPath}`,
24+
url: pathToFileURL(redirectedPath).href,
2425
shortCircuit: true,
2526
};
2627
}

test/module-hooks/test-module-hooks-resolve-require-resolve-redirect.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ require('../common');
77
const assert = require('assert');
88
const { registerHooks } = require('module');
99
const fixtures = require('../common/fixtures');
10+
const { pathToFileURL } = require('url');
1011

1112
const redirectedPath = fixtures.path('module-hooks', 'redirected-assert.js');
1213

1314
const hook = registerHooks({
1415
resolve(specifier, context, nextResolve) {
1516
if (specifier === 'test-resolve-target') {
1617
return {
17-
url: `file://${redirectedPath}`,
18+
url: pathToFileURL(redirectedPath).href,
1819
shortCircuit: true,
1920
};
2021
}

0 commit comments

Comments
 (0)