Skip to content

loader: fix package resolution for edge case #41218

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

Merged
nodejs-github-bot merged 14 commits into from
Dec 22, 2021
Merged

loader: fix package resolution for edge case #41218

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a149086
loader: fix package resolution for edge case
dygabo Dec 17, 2021
db7a12a
fixup! loader: fix package resolution for edge case
dygabo Dec 17, 2021
6f7d871
rewrite based on review comments and defaultGetFormat implementation
dygabo Dec 17, 2021
435dc9b
review comments, rework tests
dygabo Dec 17, 2021
f9fe067
review comments, test cases added for query and hash export urls
dygabo Dec 17, 2021
0bb04f2
review round
dygabo Dec 17, 2021
a72ad73
refactoring amendFormatToUrl out in moduleResolve + other review comm…
dygabo Dec 18, 2021
05d7f87
refactor to getPackageFormat
dygabo Dec 19, 2021
16f422f
next review round
dygabo Dec 19, 2021
a4c3456
review findings
dygabo Dec 20, 2021
9a45c2b
amendFormatToUrl also if resolve by relative path to module
dygabo Dec 21, 2021
8b741f0
fixup: refactoring
guybedford Dec 21, 2021
01a3abc
fixup: linter errors
dygabo Dec 22, 2021
fdf0d4d
fixup: review findings
dygabo Dec 22, 2021
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
Prev Previous commit
Next Next commit
review findings
  • Loading branch information
@dygabo
dygabo committed Dec 20, 2021
commit a4c345658c63d1d0b0bb3c4b196b5fa0235da2fe
2 changes: 1 addition & 1 deletion lib/internal/modules/esm/get_format.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,6 @@ function defaultGetFormat(url, context) {
module.exports = {
defaultGetFormat,
extensionFormatMap,
getModuleFileFormat,
legacyExtensionFormatMap,
getModuleFileFormat
};
8 changes: 1 addition & 7 deletions lib/internal/modules/esm/resolve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,13 +531,7 @@ function resolvePackageTarget(packageJSONUrl, target, subpath, packageSubpath,
base, pattern, internal, conditions) {
if (typeof target === 'string') {
return resolvePackageTargetString(
target,
subpath,
packageSubpath,
packageJSONUrl,
base,
pattern,
internal,
target, subpath, packageSubpath, packageJSONUrl, base, pattern, internal,
conditions);
} else if (ArrayIsArray(target)) {
if (target.length === 0)
Expand Down
1 change: 1 addition & 0 deletions test/es-module/test-esm-resolve-type.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ try {
[ 'mjs-mod-mod', 'index.js', 'index.mjs', 'module', 'module', 'module'],
[ 'mjs-com-com', 'idx.js', 'idx.mjs', 'commonjs', 'commonjs', 'module'],
[ 'mjs-mod-com', 'index.js', 'imp.mjs', 'module', 'commonjs', 'module'],
Comment thread
dygabo marked this conversation as resolved.
[ 'cjs-mod-mod', 'index.cjs', 'imp.cjs', 'module', 'module', 'commonjs'],
[ 'js-com-com', 'index.js', 'imp.js', 'commonjs', 'commonjs', 'commonjs'],
[ 'js-com-mod', 'index.js', 'imp.js', 'commonjs', 'module', 'module'],
[ 'qmod', 'index.js', 'imp.js', 'commonjs', 'module', 'module', '?k=v'],
Expand Down