diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2023-02-14 16:48:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-14 16:48:27 +0100 |
commit | 1d00bbe47e2ca14e2d2151518e02b2324461a065 (patch) | |
tree | e099d0b4d872fe1af979842e1dcf929246836e77 /cli | |
parent | b3c85c3548ac3c56f0cf0f3ace36a6f3de3bf823 (diff) |
fix: loading built-in Node modules embedded in the binary (#17777)
Fixes bug introduced in ed3a7ce2f719e64e59cfebb3d131a05a1694523b that
caused errors when loading built-in Node modules, when using "deno_graph".
Diffstat (limited to 'cli')
-rw-r--r-- | cli/proc_state.rs | 5 | ||||
-rw-r--r-- | cli/tests/testdata/run/node_builtin_modules/mod.js | 2 | ||||
-rw-r--r-- | cli/tests/testdata/run/node_builtin_modules/mod.js.out | 1 | ||||
-rw-r--r-- | cli/tests/testdata/run/node_builtin_modules/mod.ts | 2 | ||||
-rw-r--r-- | cli/tests/testdata/run/node_builtin_modules/mod.ts.out | 1 |
5 files changed, 11 insertions, 0 deletions
diff --git a/cli/proc_state.rs b/cli/proc_state.rs index a146f24f4..0ab6b3754 100644 --- a/cli/proc_state.rs +++ b/cli/proc_state.rs @@ -534,6 +534,11 @@ impl ProcState { match maybe_resolved { Some((found_referrer, Resolution::Ok(resolved))) => { let specifier = &resolved.specifier; + + if specifier.scheme() == "node" { + return node::resolve_builtin_node_module(specifier.path()); + } + if let Ok(reference) = NpmPackageReference::from_specifier(specifier) { if !self.options.unstable() diff --git a/cli/tests/testdata/run/node_builtin_modules/mod.js b/cli/tests/testdata/run/node_builtin_modules/mod.js index 70e39be56..4d3f48695 100644 --- a/cli/tests/testdata/run/node_builtin_modules/mod.js +++ b/cli/tests/testdata/run/node_builtin_modules/mod.js @@ -1,2 +1,4 @@ +import { createRequire } from "node:module"; +console.log(createRequire); import process from "node:process"; console.log(process.version); diff --git a/cli/tests/testdata/run/node_builtin_modules/mod.js.out b/cli/tests/testdata/run/node_builtin_modules/mod.js.out index 9dc2247f4..d49dbb321 100644 --- a/cli/tests/testdata/run/node_builtin_modules/mod.js.out +++ b/cli/tests/testdata/run/node_builtin_modules/mod.js.out @@ -1 +1,2 @@ +[Function: createRequire] v[WILDCARD].[WILDCARD].[WILDCARD] diff --git a/cli/tests/testdata/run/node_builtin_modules/mod.ts b/cli/tests/testdata/run/node_builtin_modules/mod.ts index 70e39be56..4d3f48695 100644 --- a/cli/tests/testdata/run/node_builtin_modules/mod.ts +++ b/cli/tests/testdata/run/node_builtin_modules/mod.ts @@ -1,2 +1,4 @@ +import { createRequire } from "node:module"; +console.log(createRequire); import process from "node:process"; console.log(process.version); diff --git a/cli/tests/testdata/run/node_builtin_modules/mod.ts.out b/cli/tests/testdata/run/node_builtin_modules/mod.ts.out index 9dc2247f4..d49dbb321 100644 --- a/cli/tests/testdata/run/node_builtin_modules/mod.ts.out +++ b/cli/tests/testdata/run/node_builtin_modules/mod.ts.out @@ -1 +1,2 @@ +[Function: createRequire] v[WILDCARD].[WILDCARD].[WILDCARD] |