Merge branch 'main' into jarred/esm-conditionsjarred/esm-conditions

1 files changed, 12 insertions, 7 deletions

diff --git a/test/js/node/disabled-module.test.js b/test/js/node/disabled-module.test.js
index d02a6b6df..bb707a122 100644
--- a/test/js/node/disabled-module.test.js
+++ b/test/js/node/disabled-module.test.js
@@ -1,15 +1,16 @@
 import { expect, test } from "bun:test";
+import { AsyncResource, AsyncLocalStorage } from "async_hooks";
+import * as worker_threads from "worker_threads";
+import worker_threads_default from "worker_threads";
 
 test("not implemented yet module masquerades as undefined and throws an error", () => {
-  const worker_threads = import.meta.require("worker_threads");
-
-  expect(typeof worker_threads).toBe("undefined");
+  expect(typeof worker_threads.default).toBe("undefined");
+  expect(typeof worker_threads_default).toBe("undefined");
   expect(typeof worker_threads.getEnvironmentData).toBe("undefined");
+  expect(typeof worker_threads_default.getEnvironmentData).toBe("undefined");
 });
 
 test("AsyncLocalStorage polyfill", () => {
-  const { AsyncLocalStorage } = import.meta.require("async_hooks");
-
   const store = new AsyncLocalStorage();
   var called = false;
   expect(store.getStore()).toBe(null);
@@ -22,8 +23,6 @@ test("AsyncLocalStorage polyfill", () => {
 });
 
 test("AsyncResource polyfill", () => {
-  const { AsyncResource } = import.meta.require("async_hooks");
-
   const resource = new AsyncResource("prisma-client-request");
   var called = false;
   resource.runInAsyncScope(
@@ -36,3 +35,9 @@ test("AsyncResource polyfill", () => {
   );
   expect(called).toBe(true);
 });
+
+test("esbuild functions with worker_threads stub", async () => {
+  const esbuild = await import("esbuild");
+  const result = await esbuild.transform('console . log( "hello world" )', { minify: true });
+  expect(result.code).toBe('console.log("hello world");\n');
+});