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/internal/fs/utils.mjs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'ext/node/polyfills/internal/fs/utils.mjs') diff --git a/ext/node/polyfills/internal/fs/utils.mjs b/ext/node/polyfills/internal/fs/utils.mjs index 9d74c5eee..567212e17 100644 --- a/ext/node/polyfills/internal/fs/utils.mjs +++ b/ext/node/polyfills/internal/fs/utils.mjs @@ -1,7 +1,7 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. "use strict"; -import { Buffer } from "internal:deno_node/polyfills/buffer.ts"; +import { Buffer } from "internal:deno_node/buffer.ts"; import { ERR_FS_EISDIR, ERR_FS_INVALID_SYMLINK_TYPE, @@ -10,17 +10,17 @@ import { ERR_OUT_OF_RANGE, hideStackFrames, uvException, -} from "internal:deno_node/polyfills/internal/errors.ts"; +} from "internal:deno_node/internal/errors.ts"; import { isArrayBufferView, isBigUint64Array, isDate, isUint8Array, -} from "internal:deno_node/polyfills/internal/util/types.ts"; -import { once } from "internal:deno_node/polyfills/internal/util.mjs"; -import { deprecate } from "internal:deno_node/polyfills/util.ts"; -import { toPathIfFileURL } from "internal:deno_node/polyfills/internal/url.ts"; +} from "internal:deno_node/internal/util/types.ts"; +import { once } from "internal:deno_node/internal/util.mjs"; +import { deprecate } from "internal:deno_node/util.ts"; +import { toPathIfFileURL } from "internal:deno_node/internal/url.ts"; import { validateAbortSignal, validateBoolean, @@ -29,20 +29,20 @@ import { validateInteger, validateObject, validateUint32, -} from "internal:deno_node/polyfills/internal/validators.mjs"; -import pathModule from "internal:deno_node/polyfills/path.ts"; +} from "internal:deno_node/internal/validators.mjs"; +import pathModule from "internal:deno_node/path.ts"; const kType = Symbol("type"); const kStats = Symbol("stats"); -import assert from "internal:deno_node/polyfills/internal/assert.mjs"; -import { lstat, lstatSync } from "internal:deno_node/polyfills/_fs/_fs_lstat.ts"; -import { stat, statSync } from "internal:deno_node/polyfills/_fs/_fs_stat.ts"; -import { isWindows } from "internal:deno_node/polyfills/_util/os.ts"; -import process from "internal:deno_node/polyfills/process.ts"; +import assert from "internal:deno_node/internal/assert.mjs"; +import { lstat, lstatSync } from "internal:deno_node/_fs/_fs_lstat.ts"; +import { stat, statSync } from "internal:deno_node/_fs/_fs_stat.ts"; +import { isWindows } from "internal:deno_node/_util/os.ts"; +import process from "internal:deno_node/process.ts"; import { fs as fsConstants, os as osConstants, -} from "internal:deno_node/polyfills/internal_binding/constants.ts"; +} from "internal:deno_node/internal_binding/constants.ts"; const { F_OK = 0, W_OK = 0, -- cgit v1.2.3