diff --git a/src/js/out/modules/thirdparty/detect-libc.js b/src/js/out/modules/thirdparty/detect-libc.js index 47aaefa5ee..f71b89fe81 100644 --- a/src/js/out/modules/thirdparty/detect-libc.js +++ b/src/js/out/modules/thirdparty/detect-libc.js @@ -1,15 +1,15 @@ function version() { - return libcVersion; -} -function versionAsync() { return Promise.resolve(libcVersion); } -function family() { - return libcFamily; +function versionSync() { + return libcVersion; } -function familyAsync() { +function family() { return Promise.resolve(libcFamily); } +function familySync() { + return libcFamily; +} function isNonGlibcLinux() { return Promise.resolve(libcFamily === "musl"); } @@ -21,11 +21,11 @@ var { family: libcFamily } = globalThis[Symbol.for("Bun.lazy")]("detect-libc"), GLIBC = "glibc", MUSL = "musl"; export { - versionAsync, + versionSync, version, isNonGlibcLinuxSync, isNonGlibcLinux, - familyAsync, + familySync, family, MUSL, GLIBC diff --git a/src/js/thirdparty/detect-libc.js b/src/js/thirdparty/detect-libc.js index 21110cc668..c84ccbf550 100644 --- a/src/js/thirdparty/detect-libc.js +++ b/src/js/thirdparty/detect-libc.js @@ -9,21 +9,21 @@ export const GLIBC = "glibc"; export const MUSL = "musl"; export function version() { - return libcVersion; -} - -export function versionAsync() { return Promise.resolve(libcVersion); } -export function family() { - return libcFamily; +export function versionSync() { + return libcVersion; } -export function familyAsync() { +export function family() { return Promise.resolve(libcFamily); } +export function familySync() { + return libcFamily; +} + export function isNonGlibcLinux() { return Promise.resolve(libcFamily === MUSL); } diff --git a/test/js/first_party/detect-libc.test.ts b/test/js/first_party/detect-libc.test.ts index a5b77994fe..260e0d8698 100644 --- a/test/js/first_party/detect-libc.test.ts +++ b/test/js/first_party/detect-libc.test.ts @@ -1,20 +1,20 @@ import { test, expect } from "bun:test"; // @ts-ignore: @types/detect-libc is not accurate -import { GLIBC, MUSL, version, versionAsync, family, familyAsync, isNonGlibcLinux, isNonGlibcLinuxSync } from "detect-libc"; +import { GLIBC, MUSL, version, versionSync, family, familySync, isNonGlibcLinux, isNonGlibcLinuxSync } from "detect-libc"; test("detect-libc", () => { expect(GLIBC).toBe("glibc"); expect(MUSL).toBe("musl"); if (process.platform === "linux") { - expect(version()).toMatch(/^\d+\.\d+/); - expect(family()).toBe(GLIBC); + expect(versionSync()).toMatch(/^\d+\.\d+/); + expect(familySync()).toBe(GLIBC); expect(isNonGlibcLinuxSync()).toBeFalse(); } else { - expect(version()).toBeNull(); - expect(family()).toBeNull(); + expect(versionSync()).toBeNull(); + expect(familySync()).toBeNull(); expect(isNonGlibcLinuxSync()).toBeFalse(); } - expect(versionAsync()).resolves.toBe(version()); - expect(familyAsync()).resolves.toBe(family()); + expect(version()).resolves.toBe(versionSync()); + expect(family()).resolves.toBe(familySync()); expect(isNonGlibcLinux()).resolves.toBe(isNonGlibcLinuxSync()); });