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/streams/add-abort-signal.mjs | 4 ++-- ext/node/polyfills/internal/streams/buffer_list.mjs | 4 ++-- ext/node/polyfills/internal/streams/destroy.mjs | 4 ++-- ext/node/polyfills/internal/streams/duplex.mjs | 2 +- ext/node/polyfills/internal/streams/end-of-stream.mjs | 8 ++++---- ext/node/polyfills/internal/streams/lazy_transform.mjs | 4 ++-- ext/node/polyfills/internal/streams/legacy.mjs | 2 +- ext/node/polyfills/internal/streams/passthrough.mjs | 2 +- ext/node/polyfills/internal/streams/readable.mjs | 2 +- ext/node/polyfills/internal/streams/transform.mjs | 2 +- ext/node/polyfills/internal/streams/writable.mjs | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) (limited to 'ext/node/polyfills/internal/streams') diff --git a/ext/node/polyfills/internal/streams/add-abort-signal.mjs b/ext/node/polyfills/internal/streams/add-abort-signal.mjs index 5d7512f1c..501c20315 100644 --- a/ext/node/polyfills/internal/streams/add-abort-signal.mjs +++ b/ext/node/polyfills/internal/streams/add-abort-signal.mjs @@ -2,8 +2,8 @@ // Copyright Joyent and Node contributors. All rights reserved. MIT license. // deno-lint-ignore-file -import { AbortError, ERR_INVALID_ARG_TYPE } from "internal:deno_node/polyfills/internal/errors.ts"; -import eos from "internal:deno_node/polyfills/internal/streams/end-of-stream.mjs"; +import { AbortError, ERR_INVALID_ARG_TYPE } from "internal:deno_node/internal/errors.ts"; +import eos from "internal:deno_node/internal/streams/end-of-stream.mjs"; // This method is inlined here for readable-stream // It also does not allow for signal to not exist on the stream diff --git a/ext/node/polyfills/internal/streams/buffer_list.mjs b/ext/node/polyfills/internal/streams/buffer_list.mjs index 3016ffba5..546b48a61 100644 --- a/ext/node/polyfills/internal/streams/buffer_list.mjs +++ b/ext/node/polyfills/internal/streams/buffer_list.mjs @@ -2,8 +2,8 @@ // Copyright Joyent and Node contributors. All rights reserved. MIT license. // deno-lint-ignore-file -import { Buffer } from "internal:deno_node/polyfills/buffer.ts"; -import { inspect } from "internal:deno_node/polyfills/internal/util/inspect.mjs"; +import { Buffer } from "internal:deno_node/buffer.ts"; +import { inspect } from "internal:deno_node/internal/util/inspect.mjs"; class BufferList { constructor() { diff --git a/ext/node/polyfills/internal/streams/destroy.mjs b/ext/node/polyfills/internal/streams/destroy.mjs index b065f2119..c4e5c0bb0 100644 --- a/ext/node/polyfills/internal/streams/destroy.mjs +++ b/ext/node/polyfills/internal/streams/destroy.mjs @@ -2,8 +2,8 @@ // Copyright Joyent and Node contributors. All rights reserved. MIT license. // deno-lint-ignore-file -import { aggregateTwoErrors, ERR_MULTIPLE_CALLBACK } from "internal:deno_node/polyfills/internal/errors.ts"; -import * as process from "internal:deno_node/polyfills/_process/process.ts"; +import { aggregateTwoErrors, ERR_MULTIPLE_CALLBACK } from "internal:deno_node/internal/errors.ts"; +import * as process from "internal:deno_node/_process/process.ts"; const kDestroy = Symbol("kDestroy"); const kConstruct = Symbol("kConstruct"); diff --git a/ext/node/polyfills/internal/streams/duplex.mjs b/ext/node/polyfills/internal/streams/duplex.mjs index b2086d467..df62f764d 100644 --- a/ext/node/polyfills/internal/streams/duplex.mjs +++ b/ext/node/polyfills/internal/streams/duplex.mjs @@ -2,7 +2,7 @@ // Copyright Joyent and Node contributors. All rights reserved. MIT license. // deno-lint-ignore-file -import { Duplex } from "internal:deno_node/polyfills/_stream.mjs"; +import { Duplex } from "internal:deno_node/_stream.mjs"; const { from, fromWeb, toWeb } = Duplex; export default Duplex; diff --git a/ext/node/polyfills/internal/streams/end-of-stream.mjs b/ext/node/polyfills/internal/streams/end-of-stream.mjs index b5c380d56..9c9e40cc2 100644 --- a/ext/node/polyfills/internal/streams/end-of-stream.mjs +++ b/ext/node/polyfills/internal/streams/end-of-stream.mjs @@ -2,14 +2,14 @@ // Copyright Joyent and Node contributors. All rights reserved. MIT license. // deno-lint-ignore-file -import { AbortError, ERR_STREAM_PREMATURE_CLOSE } from "internal:deno_node/polyfills/internal/errors.ts"; -import { once } from "internal:deno_node/polyfills/internal/util.mjs"; +import { AbortError, ERR_STREAM_PREMATURE_CLOSE } from "internal:deno_node/internal/errors.ts"; +import { once } from "internal:deno_node/internal/util.mjs"; import { validateAbortSignal, validateFunction, validateObject, -} from "internal:deno_node/polyfills/internal/validators.mjs"; -import * as process from "internal:deno_node/polyfills/_process/process.ts"; +} from "internal:deno_node/internal/validators.mjs"; +import * as process from "internal:deno_node/_process/process.ts"; function isRequest(stream) { return stream.setHeader && typeof stream.abort === "function"; diff --git a/ext/node/polyfills/internal/streams/lazy_transform.mjs b/ext/node/polyfills/internal/streams/lazy_transform.mjs index 2bb93bd91..40ddefea9 100644 --- a/ext/node/polyfills/internal/streams/lazy_transform.mjs +++ b/ext/node/polyfills/internal/streams/lazy_transform.mjs @@ -2,8 +2,8 @@ // Copyright Joyent and Node contributors. All rights reserved. MIT license. // deno-lint-ignore-file -import { getDefaultEncoding } from "internal:deno_node/polyfills/internal/crypto/util.ts"; -import stream from "internal:deno_node/polyfills/stream.ts"; +import { getDefaultEncoding } from "internal:deno_node/internal/crypto/util.ts"; +import stream from "internal:deno_node/stream.ts"; function LazyTransform(options) { this._options = options; diff --git a/ext/node/polyfills/internal/streams/legacy.mjs b/ext/node/polyfills/internal/streams/legacy.mjs index 0de18956f..bb2d30bc4 100644 --- a/ext/node/polyfills/internal/streams/legacy.mjs +++ b/ext/node/polyfills/internal/streams/legacy.mjs @@ -2,7 +2,7 @@ // Copyright Joyent and Node contributors. All rights reserved. MIT license. // deno-lint-ignore-file -import EE from "internal:deno_node/polyfills/events.ts"; +import EE from "internal:deno_node/events.ts"; function Stream(opts) { EE.call(this, opts); diff --git a/ext/node/polyfills/internal/streams/passthrough.mjs b/ext/node/polyfills/internal/streams/passthrough.mjs index 136a0484a..dbaa9b215 100644 --- a/ext/node/polyfills/internal/streams/passthrough.mjs +++ b/ext/node/polyfills/internal/streams/passthrough.mjs @@ -2,6 +2,6 @@ // Copyright Joyent and Node contributors. All rights reserved. MIT license. // deno-lint-ignore-file -import { PassThrough } from "internal:deno_node/polyfills/_stream.mjs"; +import { PassThrough } from "internal:deno_node/_stream.mjs"; export default PassThrough; diff --git a/ext/node/polyfills/internal/streams/readable.mjs b/ext/node/polyfills/internal/streams/readable.mjs index 36133d297..d9e45f4c2 100644 --- a/ext/node/polyfills/internal/streams/readable.mjs +++ b/ext/node/polyfills/internal/streams/readable.mjs @@ -2,7 +2,7 @@ // Copyright Joyent and Node contributors. All rights reserved. MIT license. // deno-lint-ignore-file -import { Readable } from "internal:deno_node/polyfills/_stream.mjs"; +import { Readable } from "internal:deno_node/_stream.mjs"; const { ReadableState, _fromList, from, fromWeb, toWeb, wrap } = Readable; export default Readable; diff --git a/ext/node/polyfills/internal/streams/transform.mjs b/ext/node/polyfills/internal/streams/transform.mjs index 3fc4fa5cd..53e841dd0 100644 --- a/ext/node/polyfills/internal/streams/transform.mjs +++ b/ext/node/polyfills/internal/streams/transform.mjs @@ -2,6 +2,6 @@ // Copyright Joyent and Node contributors. All rights reserved. MIT license. // deno-lint-ignore-file -import { Transform } from "internal:deno_node/polyfills/_stream.mjs"; +import { Transform } from "internal:deno_node/_stream.mjs"; export default Transform; diff --git a/ext/node/polyfills/internal/streams/writable.mjs b/ext/node/polyfills/internal/streams/writable.mjs index 6f4d77960..308009bce 100644 --- a/ext/node/polyfills/internal/streams/writable.mjs +++ b/ext/node/polyfills/internal/streams/writable.mjs @@ -2,7 +2,7 @@ // Copyright Joyent and Node contributors. All rights reserved. MIT license. // deno-lint-ignore-file -import { Writable } from "internal:deno_node/polyfills/_stream.mjs"; +import { Writable } from "internal:deno_node/_stream.mjs"; const { WritableState, fromWeb, toWeb } = Writable; export default Writable; -- cgit v1.2.3