diff --git a/packages/bun-types/globals.d.ts b/packages/bun-types/globals.d.ts index a1b875b66b..ae8ab80d51 100644 --- a/packages/bun-types/globals.d.ts +++ b/packages/bun-types/globals.d.ts @@ -1284,7 +1284,7 @@ interface ImportMeta { * ) * ``` */ - readonly main: boolean; + main: boolean; /** Alias of `import.meta.dir`. Exists for Node.js compatibility */ dirname: string; diff --git a/src/sys.zig b/src/sys.zig index acbbb67b24..0e71780d53 100644 --- a/src/sys.zig +++ b/src/sys.zig @@ -4116,7 +4116,7 @@ pub const umask = switch (Environment.os) { .windows => @extern(*const fn (mode: u16) callconv(.c) u16, .{ .name = "_umask" }), }; -pub const File = @import("sys/File.zig"); +pub const File = @import("./sys/File.zig"); const builtin = @import("builtin"); const sys = @This(); // to avoid ambiguous references. @@ -4126,14 +4126,11 @@ const Environment = bun.Environment; const FD = bun.FD; const MAX_PATH_BYTES = bun.MAX_PATH_BYTES; const c = bun.c; // translated c headers -const default_allocator = bun.default_allocator; +const jsc = bun.jsc; const libc_stat = bun.Stat; const assertIsValidWindowsPath = bun.strings.assertIsValidWindowsPath; const darwin_nocancel = bun.darwin.nocancel; -const jsc = bun.jsc; -const SystemError = jsc.SystemError; - const windows = bun.windows; const kernel32 = bun.windows.kernel32; const ntdll = bun.windows.ntdll; diff --git a/src/sys/Error.zig b/src/sys/Error.zig index 639aaca8d0..a5fae58431 100644 --- a/src/sys/Error.zig +++ b/src/sys/Error.zig @@ -326,14 +326,16 @@ pub fn toJS(this: Error, ptr: *jsc.JSGlobalObject) jsc.JSValue { return this.toSystemError().toErrorInstance(ptr); } -const bun = @import("bun"); const std = @import("std"); -const sys = bun.sys; + +const bun = @import("bun"); +const Environment = bun.Environment; const jsc = bun.jsc; -const Environment = bun.Environment; +const SystemError = jsc.SystemError; + +const sys = bun.sys; const E = sys.E; +const SystemErrno = sys.SystemErrno; const coreutils_error_map = sys.coreutils_error_map; const libuv_error_map = sys.libuv_error_map; -const SystemError = jsc.SystemError; -const SystemErrno = sys.SystemErrno; diff --git a/src/sys/File.zig b/src/sys/File.zig index b66e719989..aa0abe7b80 100644 --- a/src/sys/File.zig +++ b/src/sys/File.zig @@ -432,20 +432,21 @@ pub fn toSource(path: anytype, allocator: std.mem.Allocator, opts: ToSourceOptio return toSourceAt(std.fs.cwd(), path, allocator, opts); } -const std = @import("std"); const bun = @import("bun"); -const sys = bun.sys; - -const O = sys.O; -const posix = std.posix; -const windows = bun.windows; -const default_allocator = bun.default_allocator; -const Maybe = bun.sys.Maybe; -const Error = bun.sys.Error; -const SystemErrno = bun.sys.SystemErrno; const Environment = bun.Environment; +const default_allocator = bun.default_allocator; +const windows = bun.windows; + +const sys = bun.sys; +const Error = bun.sys.Error; +const Maybe = bun.sys.Maybe; +const O = sys.O; +const SystemErrno = bun.sys.SystemErrno; const fstat = sys.fstat; -const pread = sys.pread; -const getFileSize = sys.getFileSize; const getFdPath = sys.getFdPath; +const getFileSize = sys.getFileSize; const openatWindowsTMaybeNormalize = sys.openatWindowsTMaybeNormalize; +const pread = sys.pread; + +const std = @import("std"); +const posix = std.posix; diff --git a/src/sys/coreutils_error_map.zig b/src/sys/coreutils_error_map.zig index baa2b56817..78d838d262 100644 --- a/src/sys/coreutils_error_map.zig +++ b/src/sys/coreutils_error_map.zig @@ -263,7 +263,8 @@ pub const coreutils_error_map = brk: { break :brk map; }; -const bun = @import("bun"); const std = @import("std"); + +const bun = @import("bun"); const Environment = bun.Environment; const SystemErrno = bun.sys.SystemErrno; diff --git a/src/sys/libuv_error_map.zig b/src/sys/libuv_error_map.zig index 8fb90aac1d..340dafb988 100644 --- a/src/sys/libuv_error_map.zig +++ b/src/sys/libuv_error_map.zig @@ -102,5 +102,4 @@ pub const libuv_error_map = brk: { const bun = @import("bun"); const std = @import("std"); -const Environment = bun.Environment; const SystemErrno = bun.sys.SystemErrno;