Skip to content

[12.x] modules backports #35385

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

[12.x] modules backports #35385

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
75a2cf3
module: package "imports" field
guybedford Jun 28, 2020
f3a328c
module: self referential modules in repl or `-r`
dnlup Jul 16, 2020
39a42b3
module: use cjsCache over esm injection
guybedford Aug 3, 2020
9485ad6
module: custom --conditions flag option
guybedford Aug 5, 2020
7e20df2
module: share CJS/ESM resolver fns, refactoring
guybedford Aug 9, 2020
d6af3ba
module: fix check for package.json at volume root
DerekNonGeneric Aug 2, 2020
56393c1
module: drop `-u` alias for `--conditions`
richardlau Aug 26, 2020
8030eb5
esm: improve error message of ERR_UNSUPPORTED_ESM_URL_SCHEME
lundibundi Aug 16, 2020
96325b1
esm: shorten ERR_UNSUPPORTED_ESM_URL_SCHEME message
Trott Aug 19, 2020
b29b966
esm: better package.json parser errors
guybedford Sep 9, 2020
be78b83
module: use isURLInstance instead of instanceof
aduh95 Aug 27, 2020
0772b5b
module: fix crash on multiline named cjs imports
ctavan Sep 18, 2020
ab60e95
module: exports pattern support
guybedford Aug 12, 2020
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
esm: shorten ERR_UNSUPPORTED_ESM_URL_SCHEME message 
I know it just got modified to include new information, but this
shortens the message a bit without (I hope) losing clarity or meaning.

PR-URL: #34836
Reviewed-By: Guy Bedford <[email protected]>
Reviewed-By: Denys Otrishko <[email protected]>
  • Loading branch information
@Trott @guybedford
Trott authored and guybedford committed Sep 28, 2020
commit 96325b1979b914d980079f0daffd84cd1ffcd7e5
4 changes: 2 additions & 2 deletions lib/internal/errors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1404,8 +1404,8 @@ E('ERR_UNSUPPORTED_DIR_IMPORT', "Directory import '%s' is not supported " +
E('ERR_UNSUPPORTED_ESM_URL_SCHEME', (url) => {
let msg = 'Only file and data URLs are supported by the default ESM loader';
if (isWindows && url.protocol.length === 2) {
msg += '. Absolute Windows paths without prefix are not valid URLs, ' +
"consider using 'file://' prefix";
msg +=
'. On Windows, absolute paths must be valid file:// URLs';
}
msg += `. Received protocol '${url.protocol}'`;
return msg;
Expand Down
4 changes: 2 additions & 2 deletions test/es-module/test-esm-dynamic-import.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ function expectFsNamespace(result) {
if (common.isWindows) {
const msg =
'Only file and data URLs are supported by the default ESM loader. ' +
'Absolute Windows paths without prefix are not valid URLs, ' +
"consider using 'file://' prefix. Received protocol 'c:'";
'On Windows, absolute paths must be valid file:// URLs. ' +
"Received protocol 'c:'";
expectModuleError(import('C:\\example\\foo.mjs'),
'ERR_UNSUPPORTED_ESM_URL_SCHEME',
msg);
Expand Down