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. --- ext/node/polyfills/_process/process.ts | 8 ++++---- ext/node/polyfills/_process/streams.mjs | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'ext/node/polyfills/_process') diff --git a/ext/node/polyfills/_process/process.ts b/ext/node/polyfills/_process/process.ts index 24a4ae1a2..3bcf6dcf9 100644 --- a/ext/node/polyfills/_process/process.ts +++ b/ext/node/polyfills/_process/process.ts @@ -4,10 +4,10 @@ // The following are all the process APIs that don't depend on the stream module // They have to be split this way to prevent a circular dependency -import { build } from "internal:runtime/js/01_build.js"; -import { nextTick as _nextTick } from "internal:deno_node/polyfills/_next_tick.ts"; -import { _exiting } from "internal:deno_node/polyfills/_process/exiting.ts"; -import * as fs from "internal:runtime/js/30_fs.js"; +import { build } from "internal:runtime/01_build.js"; +import { nextTick as _nextTick } from "internal:deno_node/_next_tick.ts"; +import { _exiting } from "internal:deno_node/_process/exiting.ts"; +import * as fs from "internal:runtime/30_fs.js"; /** Returns the operating system CPU architecture for which the Deno binary was compiled */ export function arch(): string { diff --git a/ext/node/polyfills/_process/streams.mjs b/ext/node/polyfills/_process/streams.mjs index b27f75e2d..da6895dbb 100644 --- a/ext/node/polyfills/_process/streams.mjs +++ b/ext/node/polyfills/_process/streams.mjs @@ -1,17 +1,17 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license. -import { Buffer } from "internal:deno_node/polyfills/buffer.ts"; +import { Buffer } from "internal:deno_node/buffer.ts"; import { clearLine, clearScreenDown, cursorTo, moveCursor, -} from "internal:deno_node/polyfills/internal/readline/callbacks.mjs"; -import { Duplex, Readable, Writable } from "internal:deno_node/polyfills/stream.ts"; -import { isWindows } from "internal:deno_node/polyfills/_util/os.ts"; -import { fs as fsConstants } from "internal:deno_node/polyfills/internal_binding/constants.ts"; -import * as files from "internal:runtime/js/40_files.js"; +} from "internal:deno_node/internal/readline/callbacks.mjs"; +import { Duplex, Readable, Writable } from "internal:deno_node/stream.ts"; +import { isWindows } from "internal:deno_node/_util/os.ts"; +import { fs as fsConstants } from "internal:deno_node/internal_binding/constants.ts"; +import * as files from "internal:runtime/40_files.js"; // https://github.com/nodejs/node/blob/00738314828074243c9a52a228ab4c68b04259ef/lib/internal/bootstrap/switches/is_main_thread.js#L41 export function createWritableStdioStream(writer, name) { -- cgit v1.2.3