From b40086fd7da3729d1d59b312c89ee57747fc66a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sat, 4 Mar 2023 22:31:38 -0400 Subject: 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:/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:/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/", but with this change it's "internal:deno_node/". 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. --- cli/tests/testdata/run/internal_dynamic_import.ts | 2 +- cli/tests/testdata/run/internal_dynamic_import.ts.out | 2 +- cli/tests/testdata/run/internal_import.ts | 2 +- cli/tests/testdata/run/internal_import.ts.out | 2 +- cli/tests/testdata/run/worker_drop_handle_race.js.out | 2 +- cli/tests/testdata/test/steps/failing_steps.out | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'cli/tests/testdata') 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. -- cgit v1.2.3