summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorGuy Bedford <guybedford@gmail.com>2020-09-27 21:24:44 -0700
committerGuy Bedford <guybedford@gmail.com>2020-09-29 18:20:28 -0700
commitee9e3e75aad9ac13b34f7a1aaaa7f05ad4e57004 (patch)
tree7417435be4f45e7847926df6e43e3783abd174fa /test
parent606df7c4e79324b9725bfcfe019a8b75bfa04c3f (diff)
downloadnode-new-ee9e3e75aad9ac13b34f7a1aaaa7f05ad4e57004.tar.gz
esm: use "node:" namespace for builtins
PR-URL: https://github.com/nodejs/node/pull/35387 Reviewed-By: Michaƫl Zasso <targos@protonmail.com> Reviewed-By: Bradley Farias <bradley.meck@gmail.com> Reviewed-By: Jan Krems <jan.krems@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/es-module/test-esm-dynamic-import.js4
-rw-r--r--test/fixtures/es-module-loaders/builtin-named-exports-loader.mjs6
-rw-r--r--test/fixtures/es-module-loaders/example-loader.mjs4
-rw-r--r--test/fixtures/es-module-loaders/loader-unknown-builtin-module.mjs4
-rw-r--r--test/fixtures/es-module-loaders/not-found-assert-loader.mjs2
-rw-r--r--test/parallel/test-loaders-unknown-builtin-module.mjs2
6 files changed, 11 insertions, 11 deletions
diff --git a/test/es-module/test-esm-dynamic-import.js b/test/es-module/test-esm-dynamic-import.js
index 0cb56dff2c..6f8757da1b 100644
--- a/test/es-module/test-esm-dynamic-import.js
+++ b/test/es-module/test-esm-dynamic-import.js
@@ -48,9 +48,9 @@ function expectFsNamespace(result) {
expectFsNamespace(import('fs'));
expectFsNamespace(eval('import("fs")'));
expectFsNamespace(eval('import("fs")'));
- expectFsNamespace(import('nodejs:fs'));
+ expectFsNamespace(import('node:fs'));
- expectModuleError(import('nodejs:unknown'),
+ expectModuleError(import('node:unknown'),
'ERR_UNKNOWN_BUILTIN_MODULE');
expectModuleError(import('./not-an-existing-module.mjs'),
'ERR_MODULE_NOT_FOUND');
diff --git a/test/fixtures/es-module-loaders/builtin-named-exports-loader.mjs b/test/fixtures/es-module-loaders/builtin-named-exports-loader.mjs
index f476c676cd..f06e9e90ff 100644
--- a/test/fixtures/es-module-loaders/builtin-named-exports-loader.mjs
+++ b/test/fixtures/es-module-loaders/builtin-named-exports-loader.mjs
@@ -15,7 +15,7 @@ export function getGlobalPreloadCode() {
export function resolve(specifier, context, defaultResolve) {
const def = defaultResolve(specifier, context);
- if (def.url.startsWith('nodejs:')) {
+ if (def.url.startsWith('node:')) {
return {
url: `custom-${def.url}`,
};
@@ -24,7 +24,7 @@ export function resolve(specifier, context, defaultResolve) {
}
export function getSource(url, context, defaultGetSource) {
- if (url.startsWith('custom-nodejs:')) {
+ if (url.startsWith('custom-node:')) {
const urlObj = new URL(url);
return {
source: generateBuiltinModule(urlObj.pathname),
@@ -35,7 +35,7 @@ export function getSource(url, context, defaultGetSource) {
}
export function getFormat(url, context, defaultGetFormat) {
- if (url.startsWith('custom-nodejs:')) {
+ if (url.startsWith('custom-node:')) {
return { format: 'module' };
}
return defaultGetFormat(url, context, defaultGetFormat);
diff --git a/test/fixtures/es-module-loaders/example-loader.mjs b/test/fixtures/es-module-loaders/example-loader.mjs
index 1ed18bda51..be48087380 100644
--- a/test/fixtures/es-module-loaders/example-loader.mjs
+++ b/test/fixtures/es-module-loaders/example-loader.mjs
@@ -11,7 +11,7 @@ baseURL.pathname = process.cwd() + '/';
export function resolve(specifier, { parentURL = baseURL }, defaultResolve) {
if (builtinModules.includes(specifier)) {
return {
- url: 'nodejs:' + specifier
+ url: 'node:' + specifier
};
}
if (/^\.{1,2}[/]/.test(specifier) !== true && !specifier.startsWith('file:')) {
@@ -27,7 +27,7 @@ export function resolve(specifier, { parentURL = baseURL }, defaultResolve) {
}
export function getFormat(url, context, defaultGetFormat) {
- if (url.startsWith('nodejs:') && builtinModules.includes(url.slice(7))) {
+ if (url.startsWith('node:') && builtinModules.includes(url.slice(5))) {
return {
format: 'builtin'
};
diff --git a/test/fixtures/es-module-loaders/loader-unknown-builtin-module.mjs b/test/fixtures/es-module-loaders/loader-unknown-builtin-module.mjs
index e976343e47..4ef089fd6e 100644
--- a/test/fixtures/es-module-loaders/loader-unknown-builtin-module.mjs
+++ b/test/fixtures/es-module-loaders/loader-unknown-builtin-module.mjs
@@ -1,14 +1,14 @@
export async function resolve(specifier, { parentURL }, defaultResolve) {
if (specifier === 'unknown-builtin-module') {
return {
- url: 'nodejs:unknown-builtin-module'
+ url: 'node:unknown-builtin-module'
};
}
return defaultResolve(specifier, {parentURL}, defaultResolve);
}
export async function getFormat(url, context, defaultGetFormat) {
- if (url === 'nodejs:unknown-builtin-module') {
+ if (url === 'node:unknown-builtin-module') {
return {
format: 'builtin'
};
diff --git a/test/fixtures/es-module-loaders/not-found-assert-loader.mjs b/test/fixtures/es-module-loaders/not-found-assert-loader.mjs
index 2130bad5f5..9a2cd735a2 100644
--- a/test/fixtures/es-module-loaders/not-found-assert-loader.mjs
+++ b/test/fixtures/es-module-loaders/not-found-assert-loader.mjs
@@ -14,7 +14,7 @@ export async function resolve(specifier, { parentURL }, defaultResolve) {
catch (e) {
assert.strictEqual(e.code, 'ERR_MODULE_NOT_FOUND');
return {
- url: 'nodejs:fs'
+ url: 'node:fs'
};
}
assert.fail(`Module resolution for ${specifier} should be throw ERR_MODULE_NOT_FOUND`);
diff --git a/test/parallel/test-loaders-unknown-builtin-module.mjs b/test/parallel/test-loaders-unknown-builtin-module.mjs
index 464dbeb22a..85181a2b73 100644
--- a/test/parallel/test-loaders-unknown-builtin-module.mjs
+++ b/test/parallel/test-loaders-unknown-builtin-module.mjs
@@ -2,7 +2,7 @@
import { expectsError, mustCall } from '../common/index.mjs';
import assert from 'assert';
-const unknownBuiltinModule = 'unknown-builtin-module';
+const unknownBuiltinModule = 'node:unknown-builtin-module';
import(unknownBuiltinModule)
.then(assert.fail, expectsError({