refactor(ext/node): remove polyfills/_core.ts (denoland#18766)

fanbaby · Apr 20, 2023 · f520284 · f520284
1 parent 02da57e
commit f520284
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 89 deletions.
diff --git a/ext/node/lib.rs b/ext/node/lib.rs
@@ -269,7 +269,6 @@ deno_core::extension!(deno_node,
  "00_globals.js",
  "01_require.js",
  "02_init.js",
- "_core.ts",
  "_events.mjs",
  "_fs/_fs_access.ts",
  "_fs/_fs_appendFile.ts",

diff --git a/ext/node/polyfills/_core.ts b/ext/node/polyfills/_core.ts
diff --git a/ext/node/polyfills/_next_tick.ts b/ext/node/polyfills/_next_tick.ts
@@ -1,11 +1,12 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // Copyright Joyent, Inc. and other Node contributors.
 
-import { core } from "ext:deno_node/_core.ts";
 import { validateFunction } from "ext:deno_node/internal/validators.mjs";
 import { _exiting } from "ext:deno_node/_process/exiting.ts";
 import { FixedQueue } from "ext:deno_node/internal/fixed_queue.ts";
 
+const { core } = globalThis.__bootstrap;
+
 interface Tock {
  callback: (...args: Array<unknown>) => void;
  args: Array<unknown>;

diff --git a/ext/node/polyfills/async_hooks.ts b/ext/node/polyfills/async_hooks.ts
@@ -5,7 +5,8 @@
 // https://github.com/cloudflare/workerd/blob/77fd0ed6ddba184414f0216508fc62b06e716cab/src/workerd/api/node/async-hooks.c++#L9
 
 import { validateFunction } from "ext:deno_node/internal/validators.mjs";
-import { core } from "ext:deno_node/_core.ts";
+
+const { core } = globalThis.__bootstrap;
 
 function assert(cond: boolean) {
  if (!cond) throw new Error("Assertion failed");

diff --git a/ext/node/polyfills/child_process.ts b/ext/node/polyfills/child_process.ts
@@ -2,7 +2,6 @@
 
 // This module implements 'child_process' module of Node.JS API.
 // ref: https://nodejs.org/api/child_process.html
-import { core } from "ext:deno_node/_core.ts";
 import {
  ChildProcess,
  ChildProcessOptions,
@@ -44,6 +43,8 @@ import {
  kEmptyObject,
 } from "ext:deno_node/internal/util.mjs";
 
+const { core } = globalThis.__bootstrap;
+
 const MAX_BUFFER = 1024 * 1024;
 
 type ForkOptions = ChildProcessOptions;

diff --git a/ext/node/polyfills/internal_binding/types.ts b/ext/node/polyfills/internal_binding/types.ts
@@ -21,7 +21,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import { core } from "ext:deno_node/_core.ts";
+const { core } = globalThis.__bootstrap;
 
 // https://tc39.es/ecma262/#sec-object.prototype.tostring
 const _toString = Object.prototype.toString;

diff --git a/ext/node/polyfills/process.ts b/ext/node/polyfills/process.ts
@@ -2,7 +2,7 @@
 // Copyright Joyent, Inc. and Node.js contributors. All rights reserved. MIT license.
 
 const internals = globalThis.__bootstrap.internals;
-import { core } from "ext:deno_node/_core.ts";
+const { core } = globalThis.__bootstrap;
 import { notImplemented, warnNotImplemented } from "ext:deno_node/_utils.ts";
 import { EventEmitter } from "ext:deno_node/events.ts";
 import { validateString } from "ext:deno_node/internal/validators.mjs";