summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Bedford <guybedford@gmail.com>2018-11-11 21:03:45 +0200
committerGuy Bedford <guybedford@gmail.com>2018-11-11 21:22:00 +0200
commit719edb703fe156031935c26dca2007b0377d74ed (patch)
treefbc31452508358abb7df83af6ac06840a96e9c49
parentdf0ae0ce22d0e0f4299995907446cd5fe11e8db7 (diff)
downloadnode-new-jkrems/feature/esm-resolver-spec/resource-resolver.tar.gz
-rw-r--r--doc/api/esm.md4
-rw-r--r--lib/internal/errors.js1
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/api/esm.md b/doc/api/esm.md
index 61520a1cc9..e6c63ee6ee 100644
--- a/doc/api/esm.md
+++ b/doc/api/esm.md
@@ -166,7 +166,7 @@ _ESM_RESOLVE_:
> 1. Set _resolvedURL_ to the result of parsing and reserializing
> _specifier_ as a URL.
> 1. Otherwise, if _specifier_ starts with _"/"_, _"./"_ or _"../"_ then,
-> 1. Set _resolvedURL_ to the URL resolution of _specifier_ to _parentURL_.
+> 1. Set _resolvedURL_ to the URL resolution of _specifier_ relative to _parentURL_.
> 1. Otherwise,
> 1. Note: _specifier_ is now a bare specifier.
> 1. Set _resolvedURL_ the result of
@@ -178,7 +178,7 @@ _ESM_RESOLVE_:
**PACKAGE_RESOLVE**(_packageSpecifier_, _parentURL_)
> 1. Assert: _packageSpecifier_ is a bare specifier.
> 1. If _packageSpecifier_ is a Node.js builtin module then,
-> 1. Return _"node:${packageName}"_.
+> 1. Return _"node:${packageSpecifier}"_.
> 1. Set _parentURL_ to the parent folder URL of _parentURL_.
> 1. While _parentURL_ contains a non-empty _pathname_,
> 1. Let _packageURL_ be the URL resolution of
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index 368a3d39e3..c17cb713a8 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -900,6 +900,7 @@ E('ERR_UNHANDLED_ERROR',
if (err === undefined) return msg;
return `${msg} (${err})`;
}, Error);
+// This should probably be a `TypeError`.
E('ERR_UNKNOWN_CREDENTIAL', '%s identifier does not exist: %s', Error);
E('ERR_UNKNOWN_ENCODING', 'Unknown encoding: %s', TypeError);