diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2021-10-18 19:36:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-18 19:36:28 +0200 |
commit | 617eeabe8369d7bfca7951d1cd55ac58ede1f9fb (patch) | |
tree | 61cfd7b8a5a0230528ed9547c12fcd7183125c6a /cli/tests | |
parent | 5a48d41bddf599b14dd9019ff49821c436ce4542 (diff) |
feat(unstable): Node CJS and ESM resolvers for compat mode (#12424)
This commit adds CJS and ESM Node resolvers to the "--compat" mode.
The functionality is spread across "cli/compat" module and Node compatibility
layer in "deno_std/node"; this stems from the fact that ES module resolution
can only be implemented in Rust as it needs to directly integrated with
"deno_core"; however "deno_std/node" already provided CJS module resolution.
Currently this resolution is only active when running a files using
"deno run --compat --unstable <filename>", and is not available in other
subcommands, which will be changed in follow up commits.
Diffstat (limited to 'cli/tests')
-rw-r--r-- | cli/tests/integration/compat_tests.rs | 10 | ||||
-rw-r--r-- | cli/tests/testdata/compat/existing_import_map.json | 5 | ||||
-rw-r--r-- | cli/tests/testdata/compat/existing_import_map.out | 7 | ||||
-rw-r--r-- | cli/tests/testdata/compat/fs_promises.mjs (renamed from cli/tests/testdata/compat/fs_promises.js) | 0 | ||||
-rw-r--r-- | cli/tests/testdata/compat/globals.out | 4 | ||||
-rw-r--r-- | cli/tests/testdata/compat/node_fs_promises.mjs (renamed from cli/tests/testdata/compat/node_fs_promises.js) | 0 |
6 files changed, 5 insertions, 21 deletions
diff --git a/cli/tests/integration/compat_tests.rs b/cli/tests/integration/compat_tests.rs index 6b6ab81b5..17388a78e 100644 --- a/cli/tests/integration/compat_tests.rs +++ b/cli/tests/integration/compat_tests.rs @@ -9,21 +9,15 @@ itest!(globals { }); itest!(fs_promises { - args: "run --compat --unstable -A compat/fs_promises.js", + args: "run --compat --unstable -A compat/fs_promises.mjs", output: "compat/fs_promises.out", }); itest!(node_prefix_fs_promises { - args: "run --compat --unstable -A compat/node_fs_promises.js", + args: "run --compat --unstable -A compat/node_fs_promises.mjs", output: "compat/fs_promises.out", }); -itest!(existing_import_map { - args: "run --compat --unstable --import-map compat/existing_import_map.json compat/fs_promises.js", - output: "compat/existing_import_map.out", - exit_code: 1, -}); - #[test] fn globals_in_repl() { let (out, _err) = util::run_and_collect_output_with_args( diff --git a/cli/tests/testdata/compat/existing_import_map.json b/cli/tests/testdata/compat/existing_import_map.json deleted file mode 100644 index db59c0cc2..000000000 --- a/cli/tests/testdata/compat/existing_import_map.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "imports": { - "fs/promises": "./non_existent_file.js" - } -} diff --git a/cli/tests/testdata/compat/existing_import_map.out b/cli/tests/testdata/compat/existing_import_map.out deleted file mode 100644 index 46125d411..000000000 --- a/cli/tests/testdata/compat/existing_import_map.out +++ /dev/null @@ -1,7 +0,0 @@ -[WILDCARD] -Some Node built-ins were not added to the import map: - - "fs/promises" already exists and is mapped to "file://[WILDCARD]/non_existent_file.js" -If you want to use Node built-ins provided by Deno remove listed specifiers from "imports" mapping in the import map file. -[WILDCARD] -error: Cannot load module "file://[WILDCARD]/non_existent_file.js". - at file://[WILDCARD]/fs_promises.js:1:16 diff --git a/cli/tests/testdata/compat/fs_promises.js b/cli/tests/testdata/compat/fs_promises.mjs index 3f7b4c935..3f7b4c935 100644 --- a/cli/tests/testdata/compat/fs_promises.js +++ b/cli/tests/testdata/compat/fs_promises.mjs diff --git a/cli/tests/testdata/compat/globals.out b/cli/tests/testdata/compat/globals.out index 0bc09137b..32230fda3 100644 --- a/cli/tests/testdata/compat/globals.out +++ b/cli/tests/testdata/compat/globals.out @@ -2,6 +2,8 @@ process { [WILDCARD] } -[Function: Buffer] +[Function: Buffer] { +[WILDCARD] +} [Function: setImmediate] [Function: clearTimeout] diff --git a/cli/tests/testdata/compat/node_fs_promises.js b/cli/tests/testdata/compat/node_fs_promises.mjs index b2174b22b..b2174b22b 100644 --- a/cli/tests/testdata/compat/node_fs_promises.js +++ b/cli/tests/testdata/compat/node_fs_promises.mjs |