From 238ebd5fb9e13bf033e14493a392c18f8840ee4e Mon Sep 17 00:00:00 2001 From: jhmaster2000 <32803471+jhmaster2000@users.noreply.github.com> Date: Fri, 29 Sep 2023 16:55:06 -0300 Subject: [PATCH] "fix" importmeta.resolve type conflict --- packages/bun-polyfills/src/global/importmeta.ts | 1 + packages/bun-polyfills/src/modules/bun.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/bun-polyfills/src/global/importmeta.ts b/packages/bun-polyfills/src/global/importmeta.ts index 6776fb668d..9731c95c47 100644 --- a/packages/bun-polyfills/src/global/importmeta.ts +++ b/packages/bun-polyfills/src/global/importmeta.ts @@ -19,6 +19,7 @@ export default function polyfillImportMeta(metaIn: ImportMeta) { dir: path.dirname(metapath), file: path.basename(metapath), require: require2, + // @ts-expect-error conflict with @types/node async resolve(id: string, parent?: string) { return this.resolveSync(id, parent); }, diff --git a/packages/bun-polyfills/src/modules/bun.ts b/packages/bun-polyfills/src/modules/bun.ts index 22063e2b88..fe4993091b 100644 --- a/packages/bun-polyfills/src/modules/bun.ts +++ b/packages/bun-polyfills/src/modules/bun.ts @@ -32,8 +32,8 @@ import openEditor from 'open-editor'; export const main = path.resolve(process.cwd(), process.argv[1] ?? 'repl') satisfies typeof Bun.main; //? These are automatically updated on build by tools/updateversions.ts, do not edit manually. -export const version = '0.7.4' satisfies typeof Bun.version; -export const revision = '56816a3ec845a4b9fc40ade34dbe5c0033433d51' satisfies typeof Bun.revision; +export const version = '1.0.4' satisfies typeof Bun.version; +export const revision = '776af14918d9a895facd1ad60e83ee837bb7193a' satisfies typeof Bun.revision; export const gc = (globalThis.gc ? (() => (globalThis.gc!(), process.memoryUsage().heapUsed)) : (() => { const err = new Error('[bun-polyfills] Garbage collection polyfills are only available when Node.js is ran with the --expose-gc flag.');