diff options
| author |  fehnomenal <fehnomenal@fehn.systems>
| 2023-09-11 17:49:57 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-09-11 08:49:57 -0700 |
| commit | b55b511f685d0520ba2110b1182980ac80a7b3b7 (patch) | |
| tree | 2545e9d5fd10df649259f3a810e93ab35efca4ac | |
| parent | 49b9306dce8df8d3c036326c48409ff87847473b (diff) | |
| download | bun-b55b511f685d0520ba2110b1182980ac80a7b3b7.tar.gz bun-b55b511f685d0520ba2110b1182980ac80a7b3b7.tar.zst bun-b55b511f685d0520ba2110b1182980ac80a7b3b7.zip | |
Make detect-libc package match the upstream api (#4910)
| -rw-r--r-- | src/js/out/InternalModuleRegistryConstants.h | 12 | ||||
| -rw-r--r-- | src/js/thirdparty/detect-libc.js | 8 | ||||
| -rw-r--r-- | src/js/thirdparty/detect-libc.linux.js | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/js/out/InternalModuleRegistryConstants.h b/src/js/out/InternalModuleRegistryConstants.h index 031ec585b..0baa2b5fa 100644 --- a/src/js/out/InternalModuleRegistryConstants.h +++ b/src/js/out/InternalModuleRegistryConstants.h @@ -218,11 +218,11 @@ static constexpr ASCIILiteral ThirdpartyDepdCode = "(function (){\"use strict\"; // // -static constexpr ASCIILiteral ThirdpartyDetectLibcCode = "(function (){\"use strict\";// src/js/out/tmp/thirdparty/detect-libc.ts\nvar family = function() {\n return Promise.resolve(familySync());\n}, familySync = function() {\n return null;\n}, versionAsync = function() {\n return Promise.resolve(version());\n}, version = function() {\n return null;\n}, isNonGlibcLinuxSync = function() {\n return !1;\n}, isNonGlibcLinux = function() {\n return Promise.resolve(isNonGlibcLinuxSync());\n}, $, GLIBC = \"glibc\", MUSL = \"musl\";\n$ = {\n GLIBC,\n MUSL,\n family,\n familySync,\n isNonGlibcLinux,\n isNonGlibcLinuxSync,\n version,\n versionAsync\n};\nreturn $})\n"_s; +static constexpr ASCIILiteral ThirdpartyDetectLibcCode = "(function (){\"use strict\";// src/js/out/tmp/thirdparty/detect-libc.ts\nvar family = function() {\n return Promise.resolve(familySync());\n}, familySync = function() {\n return null;\n}, version = function() {\n return Promise.resolve(versionSync());\n}, versionSync = function() {\n return null;\n}, isNonGlibcLinuxSync = function() {\n return !1;\n}, isNonGlibcLinux = function() {\n return Promise.resolve(isNonGlibcLinuxSync());\n}, $, GLIBC = \"glibc\", MUSL = \"musl\";\n$ = {\n GLIBC,\n MUSL,\n family,\n familySync,\n isNonGlibcLinux,\n isNonGlibcLinuxSync,\n version,\n versionSync\n};\nreturn $})\n"_s; // // -static constexpr ASCIILiteral ThirdpartyDetectLibcLinuxCode = "(function (){\"use strict\";// src/js/out/tmp/thirdparty/detect-libc.linux.ts\nvar family = function() {\n return Promise.resolve(familySync());\n}, familySync = function() {\n return GLIBC;\n}, versionAsync = function() {\n return Promise.resolve(version());\n}, version = function() {\n return \"2.29\";\n}, isNonGlibcLinuxSync = function() {\n return !1;\n}, isNonGlibcLinux = function() {\n return Promise.resolve(isNonGlibcLinuxSync());\n}, $, GLIBC = \"glibc\", MUSL = \"musl\";\n$ = {\n GLIBC,\n MUSL,\n family,\n familySync,\n isNonGlibcLinux,\n isNonGlibcLinuxSync,\n version,\n versionAsync\n};\nreturn $})\n"_s; +static constexpr ASCIILiteral ThirdpartyDetectLibcLinuxCode = "(function (){\"use strict\";// src/js/out/tmp/thirdparty/detect-libc.linux.ts\nvar family = function() {\n return Promise.resolve(familySync());\n}, familySync = function() {\n return GLIBC;\n}, version = function() {\n return Promise.resolve(versionSync());\n}, versionSync = function() {\n return \"2.29\";\n}, isNonGlibcLinuxSync = function() {\n return !1;\n}, isNonGlibcLinux = function() {\n return Promise.resolve(isNonGlibcLinuxSync());\n}, $, GLIBC = \"glibc\", MUSL = \"musl\";\n$ = {\n GLIBC,\n MUSL,\n family,\n familySync,\n isNonGlibcLinux,\n isNonGlibcLinuxSync,\n version,\n versionSync\n};\nreturn $})\n"_s; // // @@ -459,11 +459,11 @@ static constexpr ASCIILiteral ThirdpartyDepdCode = "(function (){\"use strict\"; // // -static constexpr ASCIILiteral ThirdpartyDetectLibcCode = "(function (){\"use strict\";// src/js/out/tmp/thirdparty/detect-libc.ts\nvar family = function() {\n return Promise.resolve(familySync());\n}, familySync = function() {\n return null;\n}, versionAsync = function() {\n return Promise.resolve(version());\n}, version = function() {\n return null;\n}, isNonGlibcLinuxSync = function() {\n return !1;\n}, isNonGlibcLinux = function() {\n return Promise.resolve(isNonGlibcLinuxSync());\n}, $, GLIBC = \"glibc\", MUSL = \"musl\";\n$ = {\n GLIBC,\n MUSL,\n family,\n familySync,\n isNonGlibcLinux,\n isNonGlibcLinuxSync,\n version,\n versionAsync\n};\nreturn $})\n"_s; +static constexpr ASCIILiteral ThirdpartyDetectLibcCode = "(function (){\"use strict\";// src/js/out/tmp/thirdparty/detect-libc.ts\nvar family = function() {\n return Promise.resolve(familySync());\n}, familySync = function() {\n return null;\n}, version = function() {\n return Promise.resolve(versionSync());\n}, versionSync = function() {\n return null;\n}, isNonGlibcLinuxSync = function() {\n return !1;\n}, isNonGlibcLinux = function() {\n return Promise.resolve(isNonGlibcLinuxSync());\n}, $, GLIBC = \"glibc\", MUSL = \"musl\";\n$ = {\n GLIBC,\n MUSL,\n family,\n familySync,\n isNonGlibcLinux,\n isNonGlibcLinuxSync,\n version,\n versionSync\n};\nreturn $})\n"_s; // // -static constexpr ASCIILiteral ThirdpartyDetectLibcLinuxCode = "(function (){\"use strict\";// src/js/out/tmp/thirdparty/detect-libc.linux.ts\nvar family = function() {\n return Promise.resolve(familySync());\n}, familySync = function() {\n return GLIBC;\n}, versionAsync = function() {\n return Promise.resolve(version());\n}, version = function() {\n return \"2.29\";\n}, isNonGlibcLinuxSync = function() {\n return !1;\n}, isNonGlibcLinux = function() {\n return Promise.resolve(isNonGlibcLinuxSync());\n}, $, GLIBC = \"glibc\", MUSL = \"musl\";\n$ = {\n GLIBC,\n MUSL,\n family,\n familySync,\n isNonGlibcLinux,\n isNonGlibcLinuxSync,\n version,\n versionAsync\n};\nreturn $})\n"_s; +static constexpr ASCIILiteral ThirdpartyDetectLibcLinuxCode = "(function (){\"use strict\";// src/js/out/tmp/thirdparty/detect-libc.linux.ts\nvar family = function() {\n return Promise.resolve(familySync());\n}, familySync = function() {\n return GLIBC;\n}, version = function() {\n return Promise.resolve(versionSync());\n}, versionSync = function() {\n return \"2.29\";\n}, isNonGlibcLinuxSync = function() {\n return !1;\n}, isNonGlibcLinux = function() {\n return Promise.resolve(isNonGlibcLinuxSync());\n}, $, GLIBC = \"glibc\", MUSL = \"musl\";\n$ = {\n GLIBC,\n MUSL,\n family,\n familySync,\n isNonGlibcLinux,\n isNonGlibcLinuxSync,\n version,\n versionSync\n};\nreturn $})\n"_s; // // @@ -701,11 +701,11 @@ static constexpr ASCIILiteral ThirdpartyDepdCode = "(function (){\"use strict\"; // // -static constexpr ASCIILiteral ThirdpartyDetectLibcCode = "(function (){\"use strict\";// src/js/out/tmp/thirdparty/detect-libc.ts\nvar family = function() {\n return Promise.resolve(familySync());\n}, familySync = function() {\n return null;\n}, versionAsync = function() {\n return Promise.resolve(version());\n}, version = function() {\n return null;\n}, isNonGlibcLinuxSync = function() {\n return !1;\n}, isNonGlibcLinux = function() {\n return Promise.resolve(isNonGlibcLinuxSync());\n}, $, GLIBC = \"glibc\", MUSL = \"musl\";\n$ = {\n GLIBC,\n MUSL,\n family,\n familySync,\n isNonGlibcLinux,\n isNonGlibcLinuxSync,\n version,\n versionAsync\n};\nreturn $})\n"_s; +static constexpr ASCIILiteral ThirdpartyDetectLibcCode = "(function (){\"use strict\";// src/js/out/tmp/thirdparty/detect-libc.ts\nvar family = function() {\n return Promise.resolve(familySync());\n}, familySync = function() {\n return null;\n}, version = function() {\n return Promise.resolve(versionSync());\n}, versionSync = function() {\n return null;\n}, isNonGlibcLinuxSync = function() {\n return !1;\n}, isNonGlibcLinux = function() {\n return Promise.resolve(isNonGlibcLinuxSync());\n}, $, GLIBC = \"glibc\", MUSL = \"musl\";\n$ = {\n GLIBC,\n MUSL,\n family,\n familySync,\n isNonGlibcLinux,\n isNonGlibcLinuxSync,\n version,\n versionSync\n};\nreturn $})\n"_s; // // -static constexpr ASCIILiteral ThirdpartyDetectLibcLinuxCode = "(function (){\"use strict\";// src/js/out/tmp/thirdparty/detect-libc.linux.ts\nvar family = function() {\n return Promise.resolve(familySync());\n}, familySync = function() {\n return GLIBC;\n}, versionAsync = function() {\n return Promise.resolve(version());\n}, version = function() {\n return \"2.29\";\n}, isNonGlibcLinuxSync = function() {\n return !1;\n}, isNonGlibcLinux = function() {\n return Promise.resolve(isNonGlibcLinuxSync());\n}, $, GLIBC = \"glibc\", MUSL = \"musl\";\n$ = {\n GLIBC,\n MUSL,\n family,\n familySync,\n isNonGlibcLinux,\n isNonGlibcLinuxSync,\n version,\n versionAsync\n};\nreturn $})\n"_s; +static constexpr ASCIILiteral ThirdpartyDetectLibcLinuxCode = "(function (){\"use strict\";// src/js/out/tmp/thirdparty/detect-libc.linux.ts\nvar family = function() {\n return Promise.resolve(familySync());\n}, familySync = function() {\n return GLIBC;\n}, version = function() {\n return Promise.resolve(versionSync());\n}, versionSync = function() {\n return \"2.29\";\n}, isNonGlibcLinuxSync = function() {\n return !1;\n}, isNonGlibcLinux = function() {\n return Promise.resolve(isNonGlibcLinuxSync());\n}, $, GLIBC = \"glibc\", MUSL = \"musl\";\n$ = {\n GLIBC,\n MUSL,\n family,\n familySync,\n isNonGlibcLinux,\n isNonGlibcLinuxSync,\n version,\n versionSync\n};\nreturn $})\n"_s; // // diff --git a/src/js/thirdparty/detect-libc.js b/src/js/thirdparty/detect-libc.js index 1a6f97e79..83b6a1d4a 100644 --- a/src/js/thirdparty/detect-libc.js +++ b/src/js/thirdparty/detect-libc.js @@ -10,11 +10,11 @@ function familySync() { const GLIBC = "glibc"; const MUSL = "musl"; -function versionAsync() { - return Promise.resolve(version()); +function version() { + return Promise.resolve(versionSync()); } -function version() { +function versionSync() { return null; } @@ -34,5 +34,5 @@ export default { isNonGlibcLinux, isNonGlibcLinuxSync, version, - versionAsync, + versionSync, }; diff --git a/src/js/thirdparty/detect-libc.linux.js b/src/js/thirdparty/detect-libc.linux.js index 2866b18c0..1c17acb86 100644 --- a/src/js/thirdparty/detect-libc.linux.js +++ b/src/js/thirdparty/detect-libc.linux.js @@ -10,11 +10,11 @@ function familySync() { const GLIBC = "glibc"; const MUSL = "musl"; -function versionAsync() { - return Promise.resolve(version()); +function version() { + return Promise.resolve(versionSync()); } -function version() { +function versionSync() { return "2.29"; } @@ -34,5 +34,5 @@ export default { isNonGlibcLinux, isNonGlibcLinuxSync, version, - versionAsync, + versionSync, }; |