Skip to content

esm: Add support for pjson cache and main without extensions #18728

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
guybedford wants to merge 13 commits into from
Closed

esm: Add support for pjson cache and main without extensions #18728

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f14420e
esm: support main without extension and pjson cache
guybedford Feb 12, 2018
adfe1ac
pr feedback
guybedford Feb 12, 2018
ebdb3cb
explicit isMain checks
guybedford Feb 12, 2018
5855e5c
loader setup promise tweaks
guybedford Feb 12, 2018
05c9941
further tweaks
guybedford Feb 12, 2018
2d6d4e6
c++ feedback
guybedford Feb 12, 2018
a06db2d
better todo for JSON parse failure
guybedford Feb 12, 2018
081aab4
invalid json handling todo
guybedford Feb 12, 2018
ed9df8a
naming adjustments, simplifications
guybedford Feb 12, 2018
8b4d85f
move PackageConfig into loader namespace
guybedford Feb 12, 2018
4468e2c
make PackageConfig consts
guybedford Feb 12, 2018
b4dc802
clean up emplace logic a little
guybedford Feb 13, 2018
9f7aabd
boolean aliasing
guybedford Feb 14, 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
Prev Previous commit
Next Next commit
explicit isMain checks
  • Loading branch information
@guybedford
guybedford committed Feb 12, 2018
commit ebdb3cbcbbee88c06e1dd7b1f6bc95045d2e2f83
3 changes: 2 additions & 1 deletion lib/internal/loader/DefaultResolve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ function resolve(specifier, parentURL) {

let format = extensionFormatMap[ext];
if (!format) {
if (parentURL === undefined)
const isMain = parentURL === undefined;
if (isMain)
format = 'cjs';
else
throw new errors.Error('ERR_UNKNOWN_FILE_EXTENSION', url.pathname);
Expand Down
3 changes: 2 additions & 1 deletion lib/internal/loader/Loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ class Loader {
}

async resolve(specifier, parentURL) {
if (parentURL !== undefined && typeof parentURL !== 'string')
const isMain = parentURL === undefined;
if (!isMain && typeof parentURL !== 'string')
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'parentURL', 'string');

const { url, format } =
Expand Down