Skip to content

module: revert checking for package.json before extensions#15015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bmeck wants to merge 3 commits into from
Closed

module: revert checking for package.json before extensions #15015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a43f20
module: check file ext before dir as documented
bmeck Aug 24, 2017
39f51aa
fixup: address linter & test issue
BridgeAR Feb 17, 2018
c3e5b81
fixup: remove added new line
BridgeAR Feb 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions lib/module.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,9 @@ Module._findPath = function(request, paths, isMain) {
var exts;
var trailingSlash = request.length > 0 &&
request.charCodeAt(request.length - 1) === CHAR_FORWARD_SLASH;
if (!trailingSlash) {
trailingSlash = /(?:^|\/)\.?\.$/.test(request);
}

// For each path
for (var i = 0; i < paths.length; i++) {
Expand All@@ -232,10 +235,6 @@ Module._findPath = function(request, paths, isMain) {
} else {
filename = toRealPath(basePath);
}
} else if (rc === 1) { // Directory.
if (exts === undefined)
exts = Object.keys(Module._extensions);
filename = tryPackage(basePath, exts, isMain);
}

@jdaltonjdaltonJan 22, 2018•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👆 at the moment because the trailing slash check is for forward-slash-only, on Windows paths ending in a backslash hit that code path (which is removed in this PR). This means it will now fall through to the tryExtensions call on line 234, instead of the tryPackage call on line 243.

Note: Assumes a fixed #18299


if (!filename) {
Expand All@@ -247,11 +246,13 @@ Module._findPath = function(request, paths, isMain) {
}

if (!filename && rc === 1) { // Directory.
// try it with each of the extensions at "index"
if (exts === undefined)
exts = Object.keys(Module._extensions);
filename = tryPackage(basePath, exts, isMain) ||
// try it with each of the extensions at "index"
tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
filename = tryPackage(basePath, exts, isMain);
if (!filename) {
filename = tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
}
}

if (filename) {
Expand Down
1 change: 1 addition & 0 deletions test/fixtures/module-extension-over-directory/inner.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
module.exports = {};
3 changes: 3 additions & 0 deletions test/fixtures/module-extension-over-directory/inner/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"main": "./package.json"
}
30 changes: 30 additions & 0 deletions test/parallel/test-require-extension-over-directory.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use strict';
// fixes regression from v4
require('../common');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const path = require('path');

const fixturesRequire = require(
fixtures.path('module-extension-over-directory', 'inner'));

assert.strictEqual(
fixturesRequire,
require(fixtures.path('module-extension-over-directory', 'inner.js')),
'test-require-extension-over-directory failed to import fixture' +
' requirements'

@BridgeARBridgeARDec 5, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a new eslint rule in place that prevents messages without dynamic content (or it is at least planned). I do see that it makes sense to have a individual message here, so we should either explicitly accept the message here or maybe just change the inner.js export content to contain a property with a string, remove the message and use deepStrictEqual. With the latter the error message should be explicit enough.

@TrottTrottDec 5, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BridgeAR If that rule ever comes to pass, we can always disable it with a comment for the instances where a string literal makes sense. So this can stay as is, if the proposed lint rule is the only motivation for changing it.

);

const fakePath = [
fixtures.path('module-extension-over-directory', 'inner'),
'fake',
'..'
].join(path.sep);
const fixturesRequireDir = require(fakePath);

assert.strictEqual(
fixturesRequireDir,
require(fixtures.path('module-extension-over-directory', 'inner/')),
'test-require-extension-over-directory failed to import fixture' +
' requirements'
);
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
module: revert checking for package.json before extensions by bmeck · Pull Request #15015 · nodejs/node · GitHub
Skip to content
module: revert checking for package.json before extensions#15015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bmeck
wants to merge
3
commits into

from

 Closed


module: revert checking for package.json before extensions
#15015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
9a43f20

module: check file ext before dir as documented


bmeck Aug 24, 2017
39f51aa

fixup: address linter & test issue


BridgeAR Feb 17, 2018
c3e5b81

fixup: remove added new line


BridgeAR Feb 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 8 additions & 7 deletions
lib/module.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,9 @@ Module._findPath = function(request, paths, isMain) {
 var exts;
 var trailingSlash = request.length > 0 &&
 request.charCodeAt(request.length - 1) === CHAR_FORWARD_SLASH;
 if (!trailingSlash) {
 trailingSlash = /(?:^|\/)\.?\.$/.test(request);
 }

 // For each path
 for (var i = 0; i < paths.length; i++) {
Expand All@@ -232,10 +235,6 @@ Module._findPath = function(request, paths, isMain) {
 } else {
 filename = toRealPath(basePath);
 }
 } else if (rc === 1) { // Directory.
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain);
 }
@jdaltonjdaltonJan 22, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👆 at the moment because the trailing slash check is for forward-slash-only, on Windows paths ending in a backslash hit that code path (which is removed in this PR). This means it will now fall through to the tryExtensions call on line 234, instead of the tryPackage call on line 243.
Note: Assumes a fixed #18299

 if (!filename) {
Expand All@@ -247,11 +246,13 @@ Module._findPath = function(request, paths, isMain) {
 }

 if (!filename && rc === 1) { // Directory.
 // try it with each of the extensions at "index"
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain) ||
 // try it with each of the extensions at "index"
 tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 filename = tryPackage(basePath, exts, isMain);
 if (!filename) {
 filename = tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 }
 }

 if (filename) {
Expand Down

1 change: 1 addition & 0 deletions
test/fixtures/module-extension-over-directory/inner.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
module.exports = {};

3 changes: 3 additions & 0 deletions
test/fixtures/module-extension-over-directory/inner/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "main": "./package.json"
}

30 changes: 30 additions & 0 deletions
test/parallel/test-require-extension-over-directory.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use strict';
// fixes regression from v4
require('../common');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const path = require('path');

const fixturesRequire = require(
 fixtures.path('module-extension-over-directory', 'inner'));

assert.strictEqual(
 fixturesRequire,
 require(fixtures.path('module-extension-over-directory', 'inner.js')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
@BridgeARBridgeARDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a new eslint rule in place that prevents messages without dynamic content (or it is at least planned). I do see that it makes sense to have a individual message here, so we should either explicitly accept the message here or maybe just change the inner.js export content to contain a property with a string, remove the message and use deepStrictEqual. With the latter the error message should be explicit enough.
@TrottTrottDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BridgeAR If that rule ever comes to pass, we can always disable it with a comment for the instances where a string literal makes sense. So this can stay as is, if the proposed lint rule is the only motivation for changing it.
);

const fakePath = [
 fixtures.path('module-extension-over-directory', 'inner'),
 'fake',
 '..'
].join(path.sep);
const fixturesRequireDir = require(fakePath);

assert.strictEqual(
 fixturesRequireDir,
 require(fixtures.path('module-extension-over-directory', 'inner/')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
);

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
module: revert checking for package.json before extensions by bmeck · Pull Request #15015 · nodejs/node · GitHub
Skip to content
module: revert checking for package.json before extensions#15015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bmeck
wants to merge
3
commits into

from

 Closed


module: revert checking for package.json before extensions
#15015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
9a43f20

module: check file ext before dir as documented


bmeck Aug 24, 2017
39f51aa

fixup: address linter & test issue


BridgeAR Feb 17, 2018
c3e5b81

fixup: remove added new line


BridgeAR Feb 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 8 additions & 7 deletions
lib/module.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,9 @@ Module._findPath = function(request, paths, isMain) {
 var exts;
 var trailingSlash = request.length > 0 &&
 request.charCodeAt(request.length - 1) === CHAR_FORWARD_SLASH;
 if (!trailingSlash) {
 trailingSlash = /(?:^|\/)\.?\.$/.test(request);
 }

 // For each path
 for (var i = 0; i < paths.length; i++) {
Expand All@@ -232,10 +235,6 @@ Module._findPath = function(request, paths, isMain) {
 } else {
 filename = toRealPath(basePath);
 }
 } else if (rc === 1) { // Directory.
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain);
 }
@jdaltonjdaltonJan 22, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👆 at the moment because the trailing slash check is for forward-slash-only, on Windows paths ending in a backslash hit that code path (which is removed in this PR). This means it will now fall through to the tryExtensions call on line 234, instead of the tryPackage call on line 243.
Note: Assumes a fixed #18299

 if (!filename) {
Expand All@@ -247,11 +246,13 @@ Module._findPath = function(request, paths, isMain) {
 }

 if (!filename && rc === 1) { // Directory.
 // try it with each of the extensions at "index"
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain) ||
 // try it with each of the extensions at "index"
 tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 filename = tryPackage(basePath, exts, isMain);
 if (!filename) {
 filename = tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 }
 }

 if (filename) {
Expand Down

1 change: 1 addition & 0 deletions
test/fixtures/module-extension-over-directory/inner.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
module.exports = {};

3 changes: 3 additions & 0 deletions
test/fixtures/module-extension-over-directory/inner/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "main": "./package.json"
}

30 changes: 30 additions & 0 deletions
test/parallel/test-require-extension-over-directory.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use strict';
// fixes regression from v4
require('../common');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const path = require('path');

const fixturesRequire = require(
 fixtures.path('module-extension-over-directory', 'inner'));

assert.strictEqual(
 fixturesRequire,
 require(fixtures.path('module-extension-over-directory', 'inner.js')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
@BridgeARBridgeARDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a new eslint rule in place that prevents messages without dynamic content (or it is at least planned). I do see that it makes sense to have a individual message here, so we should either explicitly accept the message here or maybe just change the inner.js export content to contain a property with a string, remove the message and use deepStrictEqual. With the latter the error message should be explicit enough.
@TrottTrottDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BridgeAR If that rule ever comes to pass, we can always disable it with a comment for the instances where a string literal makes sense. So this can stay as is, if the proposed lint rule is the only motivation for changing it.
);

const fakePath = [
 fixtures.path('module-extension-over-directory', 'inner'),
 'fake',
 '..'
].join(path.sep);
const fixturesRequireDir = require(fakePath);

assert.strictEqual(
 fixturesRequireDir,
 require(fixtures.path('module-extension-over-directory', 'inner/')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
);

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
module: revert checking for package.json before extensions by bmeck · Pull Request #15015 · nodejs/node · GitHub
Skip to content
module: revert checking for package.json before extensions#15015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bmeck
wants to merge
3
commits into

from

 Closed


module: revert checking for package.json before extensions
#15015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
9a43f20

module: check file ext before dir as documented


bmeck Aug 24, 2017
39f51aa

fixup: address linter & test issue


BridgeAR Feb 17, 2018
c3e5b81

fixup: remove added new line


BridgeAR Feb 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 8 additions & 7 deletions
lib/module.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,9 @@ Module._findPath = function(request, paths, isMain) {
 var exts;
 var trailingSlash = request.length > 0 &&
 request.charCodeAt(request.length - 1) === CHAR_FORWARD_SLASH;
 if (!trailingSlash) {
 trailingSlash = /(?:^|\/)\.?\.$/.test(request);
 }

 // For each path
 for (var i = 0; i < paths.length; i++) {
Expand All@@ -232,10 +235,6 @@ Module._findPath = function(request, paths, isMain) {
 } else {
 filename = toRealPath(basePath);
 }
 } else if (rc === 1) { // Directory.
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain);
 }
@jdaltonjdaltonJan 22, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👆 at the moment because the trailing slash check is for forward-slash-only, on Windows paths ending in a backslash hit that code path (which is removed in this PR). This means it will now fall through to the tryExtensions call on line 234, instead of the tryPackage call on line 243.
Note: Assumes a fixed #18299

 if (!filename) {
Expand All@@ -247,11 +246,13 @@ Module._findPath = function(request, paths, isMain) {
 }

 if (!filename && rc === 1) { // Directory.
 // try it with each of the extensions at "index"
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain) ||
 // try it with each of the extensions at "index"
 tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 filename = tryPackage(basePath, exts, isMain);
 if (!filename) {
 filename = tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 }
 }

 if (filename) {
Expand Down

1 change: 1 addition & 0 deletions
test/fixtures/module-extension-over-directory/inner.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
module.exports = {};

3 changes: 3 additions & 0 deletions
test/fixtures/module-extension-over-directory/inner/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "main": "./package.json"
}

30 changes: 30 additions & 0 deletions
test/parallel/test-require-extension-over-directory.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use strict';
// fixes regression from v4
require('../common');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const path = require('path');

const fixturesRequire = require(
 fixtures.path('module-extension-over-directory', 'inner'));

assert.strictEqual(
 fixturesRequire,
 require(fixtures.path('module-extension-over-directory', 'inner.js')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
@BridgeARBridgeARDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a new eslint rule in place that prevents messages without dynamic content (or it is at least planned). I do see that it makes sense to have a individual message here, so we should either explicitly accept the message here or maybe just change the inner.js export content to contain a property with a string, remove the message and use deepStrictEqual. With the latter the error message should be explicit enough.
@TrottTrottDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BridgeAR If that rule ever comes to pass, we can always disable it with a comment for the instances where a string literal makes sense. So this can stay as is, if the proposed lint rule is the only motivation for changing it.
);

const fakePath = [
 fixtures.path('module-extension-over-directory', 'inner'),
 'fake',
 '..'
].join(path.sep);
const fixturesRequireDir = require(fakePath);

assert.strictEqual(
 fixturesRequireDir,
 require(fixtures.path('module-extension-over-directory', 'inner/')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
);

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
module: revert checking for package.json before extensions by bmeck · Pull Request #15015 · nodejs/node · GitHub
Skip to content
module: revert checking for package.json before extensions#15015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bmeck
wants to merge
3
commits into

from

 Closed


module: revert checking for package.json before extensions
#15015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
9a43f20

module: check file ext before dir as documented


bmeck Aug 24, 2017
39f51aa

fixup: address linter & test issue


BridgeAR Feb 17, 2018
c3e5b81

fixup: remove added new line


BridgeAR Feb 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 8 additions & 7 deletions
lib/module.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,9 @@ Module._findPath = function(request, paths, isMain) {
 var exts;
 var trailingSlash = request.length > 0 &&
 request.charCodeAt(request.length - 1) === CHAR_FORWARD_SLASH;
 if (!trailingSlash) {
 trailingSlash = /(?:^|\/)\.?\.$/.test(request);
 }

 // For each path
 for (var i = 0; i < paths.length; i++) {
Expand All@@ -232,10 +235,6 @@ Module._findPath = function(request, paths, isMain) {
 } else {
 filename = toRealPath(basePath);
 }
 } else if (rc === 1) { // Directory.
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain);
 }
@jdaltonjdaltonJan 22, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👆 at the moment because the trailing slash check is for forward-slash-only, on Windows paths ending in a backslash hit that code path (which is removed in this PR). This means it will now fall through to the tryExtensions call on line 234, instead of the tryPackage call on line 243.
Note: Assumes a fixed #18299

 if (!filename) {
Expand All@@ -247,11 +246,13 @@ Module._findPath = function(request, paths, isMain) {
 }

 if (!filename && rc === 1) { // Directory.
 // try it with each of the extensions at "index"
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain) ||
 // try it with each of the extensions at "index"
 tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 filename = tryPackage(basePath, exts, isMain);
 if (!filename) {
 filename = tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 }
 }

 if (filename) {
Expand Down

1 change: 1 addition & 0 deletions
test/fixtures/module-extension-over-directory/inner.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
module.exports = {};

3 changes: 3 additions & 0 deletions
test/fixtures/module-extension-over-directory/inner/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "main": "./package.json"
}

30 changes: 30 additions & 0 deletions
test/parallel/test-require-extension-over-directory.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use strict';
// fixes regression from v4
require('../common');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const path = require('path');

const fixturesRequire = require(
 fixtures.path('module-extension-over-directory', 'inner'));

assert.strictEqual(
 fixturesRequire,
 require(fixtures.path('module-extension-over-directory', 'inner.js')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
@BridgeARBridgeARDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a new eslint rule in place that prevents messages without dynamic content (or it is at least planned). I do see that it makes sense to have a individual message here, so we should either explicitly accept the message here or maybe just change the inner.js export content to contain a property with a string, remove the message and use deepStrictEqual. With the latter the error message should be explicit enough.
@TrottTrottDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BridgeAR If that rule ever comes to pass, we can always disable it with a comment for the instances where a string literal makes sense. So this can stay as is, if the proposed lint rule is the only motivation for changing it.
);

const fakePath = [
 fixtures.path('module-extension-over-directory', 'inner'),
 'fake',
 '..'
].join(path.sep);
const fixturesRequireDir = require(fakePath);

assert.strictEqual(
 fixturesRequireDir,
 require(fixtures.path('module-extension-over-directory', 'inner/')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
);

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
module: revert checking for package.json before extensions by bmeck · Pull Request #15015 · nodejs/node · GitHub
Skip to content
module: revert checking for package.json before extensions#15015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bmeck
wants to merge
3
commits into

from

 Closed


module: revert checking for package.json before extensions
#15015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
9a43f20

module: check file ext before dir as documented


bmeck Aug 24, 2017
39f51aa

fixup: address linter & test issue


BridgeAR Feb 17, 2018
c3e5b81

fixup: remove added new line


BridgeAR Feb 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 8 additions & 7 deletions
lib/module.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,9 @@ Module._findPath = function(request, paths, isMain) {
 var exts;
 var trailingSlash = request.length > 0 &&
 request.charCodeAt(request.length - 1) === CHAR_FORWARD_SLASH;
 if (!trailingSlash) {
 trailingSlash = /(?:^|\/)\.?\.$/.test(request);
 }

 // For each path
 for (var i = 0; i < paths.length; i++) {
Expand All@@ -232,10 +235,6 @@ Module._findPath = function(request, paths, isMain) {
 } else {
 filename = toRealPath(basePath);
 }
 } else if (rc === 1) { // Directory.
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain);
 }
@jdaltonjdaltonJan 22, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👆 at the moment because the trailing slash check is for forward-slash-only, on Windows paths ending in a backslash hit that code path (which is removed in this PR). This means it will now fall through to the tryExtensions call on line 234, instead of the tryPackage call on line 243.
Note: Assumes a fixed #18299

 if (!filename) {
Expand All@@ -247,11 +246,13 @@ Module._findPath = function(request, paths, isMain) {
 }

 if (!filename && rc === 1) { // Directory.
 // try it with each of the extensions at "index"
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain) ||
 // try it with each of the extensions at "index"
 tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 filename = tryPackage(basePath, exts, isMain);
 if (!filename) {
 filename = tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 }
 }

 if (filename) {
Expand Down

1 change: 1 addition & 0 deletions
test/fixtures/module-extension-over-directory/inner.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
module.exports = {};

3 changes: 3 additions & 0 deletions
test/fixtures/module-extension-over-directory/inner/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "main": "./package.json"
}

30 changes: 30 additions & 0 deletions
test/parallel/test-require-extension-over-directory.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use strict';
// fixes regression from v4
require('../common');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const path = require('path');

const fixturesRequire = require(
 fixtures.path('module-extension-over-directory', 'inner'));

assert.strictEqual(
 fixturesRequire,
 require(fixtures.path('module-extension-over-directory', 'inner.js')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
@BridgeARBridgeARDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a new eslint rule in place that prevents messages without dynamic content (or it is at least planned). I do see that it makes sense to have a individual message here, so we should either explicitly accept the message here or maybe just change the inner.js export content to contain a property with a string, remove the message and use deepStrictEqual. With the latter the error message should be explicit enough.
@TrottTrottDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BridgeAR If that rule ever comes to pass, we can always disable it with a comment for the instances where a string literal makes sense. So this can stay as is, if the proposed lint rule is the only motivation for changing it.
);

const fakePath = [
 fixtures.path('module-extension-over-directory', 'inner'),
 'fake',
 '..'
].join(path.sep);
const fixturesRequireDir = require(fakePath);

assert.strictEqual(
 fixturesRequireDir,
 require(fixtures.path('module-extension-over-directory', 'inner/')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
);

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
module: revert checking for package.json before extensions by bmeck · Pull Request #15015 · nodejs/node · GitHub
Skip to content
module: revert checking for package.json before extensions#15015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bmeck
wants to merge
3
commits into

from

 Closed


module: revert checking for package.json before extensions
#15015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
9a43f20

module: check file ext before dir as documented


bmeck Aug 24, 2017
39f51aa

fixup: address linter & test issue


BridgeAR Feb 17, 2018
c3e5b81

fixup: remove added new line


BridgeAR Feb 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 8 additions & 7 deletions
lib/module.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,9 @@ Module._findPath = function(request, paths, isMain) {
 var exts;
 var trailingSlash = request.length > 0 &&
 request.charCodeAt(request.length - 1) === CHAR_FORWARD_SLASH;
 if (!trailingSlash) {
 trailingSlash = /(?:^|\/)\.?\.$/.test(request);
 }

 // For each path
 for (var i = 0; i < paths.length; i++) {
Expand All@@ -232,10 +235,6 @@ Module._findPath = function(request, paths, isMain) {
 } else {
 filename = toRealPath(basePath);
 }
 } else if (rc === 1) { // Directory.
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain);
 }
@jdaltonjdaltonJan 22, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👆 at the moment because the trailing slash check is for forward-slash-only, on Windows paths ending in a backslash hit that code path (which is removed in this PR). This means it will now fall through to the tryExtensions call on line 234, instead of the tryPackage call on line 243.
Note: Assumes a fixed #18299

 if (!filename) {
Expand All@@ -247,11 +246,13 @@ Module._findPath = function(request, paths, isMain) {
 }

 if (!filename && rc === 1) { // Directory.
 // try it with each of the extensions at "index"
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain) ||
 // try it with each of the extensions at "index"
 tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 filename = tryPackage(basePath, exts, isMain);
 if (!filename) {
 filename = tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 }
 }

 if (filename) {
Expand Down

1 change: 1 addition & 0 deletions
test/fixtures/module-extension-over-directory/inner.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
module.exports = {};

3 changes: 3 additions & 0 deletions
test/fixtures/module-extension-over-directory/inner/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "main": "./package.json"
}

30 changes: 30 additions & 0 deletions
test/parallel/test-require-extension-over-directory.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use strict';
// fixes regression from v4
require('../common');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const path = require('path');

const fixturesRequire = require(
 fixtures.path('module-extension-over-directory', 'inner'));

assert.strictEqual(
 fixturesRequire,
 require(fixtures.path('module-extension-over-directory', 'inner.js')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
@BridgeARBridgeARDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a new eslint rule in place that prevents messages without dynamic content (or it is at least planned). I do see that it makes sense to have a individual message here, so we should either explicitly accept the message here or maybe just change the inner.js export content to contain a property with a string, remove the message and use deepStrictEqual. With the latter the error message should be explicit enough.
@TrottTrottDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BridgeAR If that rule ever comes to pass, we can always disable it with a comment for the instances where a string literal makes sense. So this can stay as is, if the proposed lint rule is the only motivation for changing it.
);

const fakePath = [
 fixtures.path('module-extension-over-directory', 'inner'),
 'fake',
 '..'
].join(path.sep);
const fixturesRequireDir = require(fakePath);

assert.strictEqual(
 fixturesRequireDir,
 require(fixtures.path('module-extension-over-directory', 'inner/')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
);

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
module: revert checking for package.json before extensions by bmeck · Pull Request #15015 · nodejs/node · GitHub
Skip to content
module: revert checking for package.json before extensions#15015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bmeck
wants to merge
3
commits into

from

 Closed


module: revert checking for package.json before extensions
#15015
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
9a43f20

module: check file ext before dir as documented


bmeck Aug 24, 2017
39f51aa

fixup: address linter & test issue


BridgeAR Feb 17, 2018
c3e5b81

fixup: remove added new line


BridgeAR Feb 17, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


15 changes: 8 additions & 7 deletions
lib/module.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,9 @@ Module._findPath = function(request, paths, isMain) {
 var exts;
 var trailingSlash = request.length > 0 &&
 request.charCodeAt(request.length - 1) === CHAR_FORWARD_SLASH;
 if (!trailingSlash) {
 trailingSlash = /(?:^|\/)\.?\.$/.test(request);
 }

 // For each path
 for (var i = 0; i < paths.length; i++) {
Expand All@@ -232,10 +235,6 @@ Module._findPath = function(request, paths, isMain) {
 } else {
 filename = toRealPath(basePath);
 }
 } else if (rc === 1) { // Directory.
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain);
 }
@jdaltonjdaltonJan 22, 2018•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👆 at the moment because the trailing slash check is for forward-slash-only, on Windows paths ending in a backslash hit that code path (which is removed in this PR). This means it will now fall through to the tryExtensions call on line 234, instead of the tryPackage call on line 243.
Note: Assumes a fixed #18299

 if (!filename) {
Expand All@@ -247,11 +246,13 @@ Module._findPath = function(request, paths, isMain) {
 }

 if (!filename && rc === 1) { // Directory.
 // try it with each of the extensions at "index"
 if (exts === undefined)
 exts = Object.keys(Module._extensions);
 filename = tryPackage(basePath, exts, isMain) ||
 // try it with each of the extensions at "index"
 tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 filename = tryPackage(basePath, exts, isMain);
 if (!filename) {
 filename = tryExtensions(path.resolve(basePath, 'index'), exts, isMain);
 }
 }

 if (filename) {
Expand Down

1 change: 1 addition & 0 deletions
test/fixtures/module-extension-over-directory/inner.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
module.exports = {};

3 changes: 3 additions & 0 deletions
test/fixtures/module-extension-over-directory/inner/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "main": "./package.json"
}

30 changes: 30 additions & 0 deletions
test/parallel/test-require-extension-over-directory.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use strict';
// fixes regression from v4
require('../common');
const assert = require('assert');
const fixtures = require('../common/fixtures');
const path = require('path');

const fixturesRequire = require(
 fixtures.path('module-extension-over-directory', 'inner'));

assert.strictEqual(
 fixturesRequire,
 require(fixtures.path('module-extension-over-directory', 'inner.js')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
@BridgeARBridgeARDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a new eslint rule in place that prevents messages without dynamic content (or it is at least planned). I do see that it makes sense to have a individual message here, so we should either explicitly accept the message here or maybe just change the inner.js export content to contain a property with a string, remove the message and use deepStrictEqual. With the latter the error message should be explicit enough.
@TrottTrottDec 5, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BridgeAR If that rule ever comes to pass, we can always disable it with a comment for the instances where a string literal makes sense. So this can stay as is, if the proposed lint rule is the only motivation for changing it.
);

const fakePath = [
 fixtures.path('module-extension-over-directory', 'inner'),
 'fake',
 '..'
].join(path.sep);
const fixturesRequireDir = require(fakePath);

assert.strictEqual(
 fixturesRequireDir,
 require(fixtures.path('module-extension-over-directory', 'inner/')),
 'test-require-extension-over-directory failed to import fixture' +
 ' requirements'
);