-
Notifications
You must be signed in to change notification settings - Fork 29.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
module: fix inconsistency between load and _findPath
Files with multiple extensions are not handled by require-module system therefore if you have file 'file.foo.bar' and require('./file') it won't be found even while using require.extensions['foo.bar'] but before this commit if you have require.extensions['foo.bar'] and require.extensions['bar'] set then the latter will be called if you do require('./file') but if you remove the former the former ('foo.bar') property it will fail. This commit makes it always fail in such cases. Fixes: #4778 PR-URL: #22382 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: John-David Dalton <john.david.dalton@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
- Loading branch information
1 parent
3c2aa4b
commit 1b92214
Showing
3 changed files
with
70 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
'use strict'; | ||
|
||
// Refs: https://github.com/nodejs/node/issues/4778 | ||
|
||
const common = require('../common'); | ||
const assert = require('assert'); | ||
const fs = require('fs'); | ||
const path = require('path'); | ||
const tmpdir = require('../common/tmpdir'); | ||
const file = path.join(tmpdir.path, 'test-extensions.foo.bar'); | ||
|
||
tmpdir.refresh(); | ||
fs.writeFileSync(file, '', 'utf8'); | ||
|
||
{ | ||
require.extensions['.bar'] = common.mustNotCall(); | ||
require.extensions['.foo.bar'] = common.mustNotCall(); | ||
const modulePath = path.join(tmpdir.path, 'test-extensions'); | ||
assert.throws( | ||
() => require(modulePath), | ||
new Error(`Cannot find module '${modulePath}'`) | ||
); | ||
} | ||
|
||
{ | ||
delete require.extensions['.bar']; | ||
require.extensions['.foo.bar'] = common.mustNotCall(); | ||
const modulePath = path.join(tmpdir.path, 'test-extensions'); | ||
assert.throws( | ||
() => require(modulePath), | ||
new Error(`Cannot find module '${modulePath}'`) | ||
); | ||
assert.throws( | ||
() => require(modulePath + '.foo'), | ||
new Error(`Cannot find module '${modulePath}.foo'`) | ||
); | ||
} | ||
|
||
{ | ||
delete require.extensions['.bar']; | ||
delete require.extensions['.foo.bar']; | ||
const modulePath = path.join(tmpdir.path, 'test-extensions'); | ||
assert.throws( | ||
() => require(modulePath), | ||
new Error(`Cannot find module '${modulePath}'`) | ||
); | ||
} | ||
|
||
{ | ||
delete require.extensions['.foo.bar']; | ||
require.extensions['.bar'] = common.mustCall((module, path) => { | ||
assert.strictEqual(module.id, file); | ||
assert.strictEqual(path, file); | ||
}); | ||
|
||
const modulePath = path.join(tmpdir.path, 'test-extensions.foo'); | ||
require(modulePath); | ||
} |