summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2023-03-04 22:31:38 -0400
committerGitHub <noreply@github.com>2023-03-05 02:31:38 +0000
commitb40086fd7da3729d1d59b312c89ee57747fc66a9 (patch)
tree991583010635feab13fae77e7c8a35fef0a09095 /cli
parent01028fcdf4f379a7285cc15079306e3ac31edcc1 (diff)
refactor(core): include_js_files! 'dir' option doesn't change specifiers (#18019)
This commit changes "include_js_files!" macro from "deno_core" in a way that "dir" option doesn't cause specifiers to be rewritten to include it. Example: ``` include_js_files! { dir "js", "hello.js", } ``` The above definition required embedders to use: `import ... from "internal:<ext_name>/js/hello.js"`. But with this change, the "js" directory in which the files are stored is an implementation detail, which for embedders results in: `import ... from "internal:<ext_name>/hello.js"`. The directory the files are stored in, is an implementation detail and in some cases might result in a significant size difference for the snapshot. As an example, in "deno_node" extension, we store the source code in "polyfills" directory; which resulted in each specifier to look like "internal:deno_node/polyfills/<module_name>", but with this change it's "internal:deno_node/<module_name>". Given that "deno_node" has over 100 files, many of them having several import specifiers to the same extension, this change removes 10 characters from each import specifier.
Diffstat (limited to 'cli')
-rw-r--r--cli/js/40_testing.js6
-rw-r--r--cli/tests/testdata/run/internal_dynamic_import.ts2
-rw-r--r--cli/tests/testdata/run/internal_dynamic_import.ts.out2
-rw-r--r--cli/tests/testdata/run/internal_import.ts2
-rw-r--r--cli/tests/testdata/run/internal_import.ts.out2
-rw-r--r--cli/tests/testdata/run/worker_drop_handle_race.js.out2
-rw-r--r--cli/tests/testdata/test/steps/failing_steps.out8
7 files changed, 12 insertions, 12 deletions
diff --git a/cli/js/40_testing.js b/cli/js/40_testing.js
index 7ea52a5fc..5077af120 100644
--- a/cli/js/40_testing.js
+++ b/cli/js/40_testing.js
@@ -3,9 +3,9 @@
const core = globalThis.Deno.core;
const ops = core.ops;
const internals = globalThis.__bootstrap.internals;
-import { setExitHandler } from "internal:runtime/js/30_os.js";
+import { setExitHandler } from "internal:runtime/30_os.js";
import { Console } from "internal:deno_console/02_console.js";
-import { serializePermissions } from "internal:runtime/js/10_permissions.js";
+import { serializePermissions } from "internal:runtime/10_permissions.js";
import { assert } from "internal:deno_web/00_infra.js";
const primordials = globalThis.__bootstrap.primordials;
const {
@@ -1424,6 +1424,6 @@ internals.testing = {
enableBench,
};
-import { denoNs } from "internal:runtime/js/90_deno_ns.js";
+import { denoNs } from "internal:runtime/90_deno_ns.js";
denoNs.bench = bench;
denoNs.test = test;
diff --git a/cli/tests/testdata/run/internal_dynamic_import.ts b/cli/tests/testdata/run/internal_dynamic_import.ts
index 3fb2791e3..940c22e59 100644
--- a/cli/tests/testdata/run/internal_dynamic_import.ts
+++ b/cli/tests/testdata/run/internal_dynamic_import.ts
@@ -1 +1 @@
-await import("internal:runtime/js/01_build.js");
+await import("internal:runtime/01_build.js");
diff --git a/cli/tests/testdata/run/internal_dynamic_import.ts.out b/cli/tests/testdata/run/internal_dynamic_import.ts.out
index fa98b8733..3f74f9565 100644
--- a/cli/tests/testdata/run/internal_dynamic_import.ts.out
+++ b/cli/tests/testdata/run/internal_dynamic_import.ts.out
@@ -1,4 +1,4 @@
error: Uncaught TypeError: Cannot load internal module from external code
-await import("internal:runtime/js/01_build.js");
+await import("internal:runtime/01_build.js");
^
at [WILDCARD]/internal_dynamic_import.ts:1:1
diff --git a/cli/tests/testdata/run/internal_import.ts b/cli/tests/testdata/run/internal_import.ts
index 666b68769..eb38d973c 100644
--- a/cli/tests/testdata/run/internal_import.ts
+++ b/cli/tests/testdata/run/internal_import.ts
@@ -1 +1 @@
-import "internal:runtime/js/01_build.js";
+import "internal:runtime/01_build.js";
diff --git a/cli/tests/testdata/run/internal_import.ts.out b/cli/tests/testdata/run/internal_import.ts.out
index 142308a38..5fba0dfc0 100644
--- a/cli/tests/testdata/run/internal_import.ts.out
+++ b/cli/tests/testdata/run/internal_import.ts.out
@@ -1,4 +1,4 @@
-error: Unsupported scheme "internal" for module "internal:runtime/js/01_build.js". Supported schemes: [
+error: Unsupported scheme "internal" for module "internal:runtime/01_build.js". Supported schemes: [
"data",
"blob",
"file",
diff --git a/cli/tests/testdata/run/worker_drop_handle_race.js.out b/cli/tests/testdata/run/worker_drop_handle_race.js.out
index c47db83ac..d78535944 100644
--- a/cli/tests/testdata/run/worker_drop_handle_race.js.out
+++ b/cli/tests/testdata/run/worker_drop_handle_race.js.out
@@ -5,4 +5,4 @@ error: Uncaught (in worker "") Error
at Object.action (internal:deno_web/02_timers.js:[WILDCARD])
at handleTimerMacrotask (internal:deno_web/02_timers.js:[WILDCARD])
error: Uncaught (in promise) Error: Unhandled error in child worker.
- at Worker.#pollControl (internal:runtime/js/11_workers.js:[WILDCARD])
+ at Worker.#pollControl (internal:runtime/11_workers.js:[WILDCARD])
diff --git a/cli/tests/testdata/test/steps/failing_steps.out b/cli/tests/testdata/test/steps/failing_steps.out
index 998c70aa2..a63058999 100644
--- a/cli/tests/testdata/test/steps/failing_steps.out
+++ b/cli/tests/testdata/test/steps/failing_steps.out
@@ -37,13 +37,13 @@ failing step in failing test ... FAILED ([WILDCARD])
nested failure => ./test/steps/failing_steps.ts:[WILDCARD]
error: Error: 1 test step failed.
- at runTest (internal:cli/js/40_testing.js:[WILDCARD])
- at async runTests (internal:cli/js/40_testing.js:[WILDCARD])
+ at runTest (internal:cli/40_testing.js:[WILDCARD])
+ at async runTests (internal:cli/40_testing.js:[WILDCARD])
multiple test step failures => ./test/steps/failing_steps.ts:[WILDCARD]
error: Error: 2 test steps failed.
- at runTest (internal:cli/js/40_testing.js:[WILDCARD])
- at async runTests (internal:cli/js/40_testing.js:[WILDCARD])
+ at runTest (internal:cli/40_testing.js:[WILDCARD])
+ at async runTests (internal:cli/40_testing.js:[WILDCARD])
failing step in failing test => ./test/steps/failing_steps.ts:[WILDCARD]
error: Error: Fail test.