import everything from "bun" where possible

1 files changed, 28 insertions, 28 deletions

diff --git a/src/bun.js/module_loader.zig b/src/bun.js/module_loader.zig
index 01dbbe1a3..fa938f1ab 100644
--- a/src/bun.js/module_loader.zig
+++ b/src/bun.js/module_loader.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false;
 const StaticExport = @import("./bindings/static_export.zig");
 const c_char = StaticExport.c_char;
-const bun = @import("../global.zig");
+const bun = @import("bun");
 const string = bun.string;
 const Output = bun.Output;
 const Global = bun.Global;
@@ -14,8 +14,8 @@ const default_allocator = bun.default_allocator;
 const StoredFileDescriptorType = bun.StoredFileDescriptorType;
 const Arena = @import("../mimalloc_arena.zig").Arena;
 const C = bun.C;
-const NetworkThread = @import("http").NetworkThread;
-const IO = @import("io");
+const NetworkThread = @import("bun").HTTP.NetworkThread;
+const IO = @import("bun").AsyncIO;
 const Allocator = std.mem.Allocator;
 const IdentityContext = @import("../identity_context.zig").IdentityContext;
 const Fs = @import("../fs.zig");
@@ -24,7 +24,7 @@ const ast = @import("../import_record.zig");
 const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
 const MacroEntryPoint = @import("../bundler.zig").MacroEntryPoint;
 const ParseResult = @import("../bundler.zig").ParseResult;
-const logger = @import("../logger.zig");
+const logger = @import("bun").logger;
 const Api = @import("../api/schema.zig").Api;
 const options = @import("../options.zig");
 const Bundler = @import("../bundler.zig").Bundler;
@@ -38,46 +38,46 @@ const http = @import("../http.zig");
 const NodeFallbackModules = @import("../node_fallbacks.zig");
 const ImportKind = ast.ImportKind;
 const Analytics = @import("../analytics/analytics_thread.zig");
-const ZigString = @import("../jsc.zig").ZigString;
+const ZigString = @import("bun").JSC.ZigString;
 const Runtime = @import("../runtime.zig");
 const Router = @import("./api/filesystem_router.zig");
 const ImportRecord = ast.ImportRecord;
 const DotEnv = @import("../env_loader.zig");
 const PackageJSON = @import("../resolver/package_json.zig").PackageJSON;
 const MacroRemap = @import("../resolver/package_json.zig").MacroMap;
-const WebCore = @import("../jsc.zig").WebCore;
+const WebCore = @import("bun").JSC.WebCore;
 const Request = WebCore.Request;
 const Response = WebCore.Response;
 const Headers = WebCore.Headers;
 const Fetch = WebCore.Fetch;
 const FetchEvent = WebCore.FetchEvent;
-const js = @import("../jsc.zig").C;
-const JSC = @import("../jsc.zig");
+const js = @import("bun").JSC.C;
+const JSC = @import("bun").JSC;
 const JSError = @import("./base.zig").JSError;
 const d = @import("./base.zig").d;
 const MarkedArrayBuffer = @import("./base.zig").MarkedArrayBuffer;
 const getAllocator = @import("./base.zig").getAllocator;
-const JSValue = @import("../jsc.zig").JSValue;
+const JSValue = @import("bun").JSC.JSValue;
 const NewClass = @import("./base.zig").NewClass;
-const Microtask = @import("../jsc.zig").Microtask;
-const JSGlobalObject = @import("../jsc.zig").JSGlobalObject;
-const ExceptionValueRef = @import("../jsc.zig").ExceptionValueRef;
-const JSPrivateDataPtr = @import("../jsc.zig").JSPrivateDataPtr;
-const ZigConsoleClient = @import("../jsc.zig").ZigConsoleClient;
-const Node = @import("../jsc.zig").Node;
-const ZigException = @import("../jsc.zig").ZigException;
-const ZigStackTrace = @import("../jsc.zig").ZigStackTrace;
-const ErrorableResolvedSource = @import("../jsc.zig").ErrorableResolvedSource;
-const ResolvedSource = @import("../jsc.zig").ResolvedSource;
-const JSPromise = @import("../jsc.zig").JSPromise;
-const JSInternalPromise = @import("../jsc.zig").JSInternalPromise;
-const JSModuleLoader = @import("../jsc.zig").JSModuleLoader;
-const JSPromiseRejectionOperation = @import("../jsc.zig").JSPromiseRejectionOperation;
-const Exception = @import("../jsc.zig").Exception;
-const ErrorableZigString = @import("../jsc.zig").ErrorableZigString;
-const ZigGlobalObject = @import("../jsc.zig").ZigGlobalObject;
-const VM = @import("../jsc.zig").VM;
-const JSFunction = @import("../jsc.zig").JSFunction;
+const Microtask = @import("bun").JSC.Microtask;
+const JSGlobalObject = @import("bun").JSC.JSGlobalObject;
+const ExceptionValueRef = @import("bun").JSC.ExceptionValueRef;
+const JSPrivateDataPtr = @import("bun").JSC.JSPrivateDataPtr;
+const ZigConsoleClient = @import("bun").JSC.ZigConsoleClient;
+const Node = @import("bun").JSC.Node;
+const ZigException = @import("bun").JSC.ZigException;
+const ZigStackTrace = @import("bun").JSC.ZigStackTrace;
+const ErrorableResolvedSource = @import("bun").JSC.ErrorableResolvedSource;
+const ResolvedSource = @import("bun").JSC.ResolvedSource;
+const JSPromise = @import("bun").JSC.JSPromise;
+const JSInternalPromise = @import("bun").JSC.JSInternalPromise;
+const JSModuleLoader = @import("bun").JSC.JSModuleLoader;
+const JSPromiseRejectionOperation = @import("bun").JSC.JSPromiseRejectionOperation;
+const Exception = @import("bun").JSC.Exception;
+const ErrorableZigString = @import("bun").JSC.ErrorableZigString;
+const ZigGlobalObject = @import("bun").JSC.ZigGlobalObject;
+const VM = @import("bun").JSC.VM;
+const JSFunction = @import("bun").JSC.JSFunction;
 const Config = @import("./config.zig");
 const URL = @import("../url.zig").URL;
 const Transpiler = @import("./api/transpiler.zig");