Merge branch 'jarred/webkit-upgrade-may-17'

21 files changed, 53 insertions, 33 deletions

diff --git a/.prettierignore b/.prettierignore
index e48c19844..2b1e85e80 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -11,4 +11,3 @@ test/snapshots-no-hmr
 test/js/deno/*.test.ts
 test/js/deno/**/*.test.ts
 bench/react-hello-world/react-hello-world.node.js
-
diff --git a/bun.lockb b/bun.lockb
index 9e58bd81e..26e672ec2 100755
--- a/bun.lockb
+++ b/bun.lockb
diff --git a/package.json b/package.json
index edd7d8003..dedc399a4 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "@types/react": "^18.0.25",
     "@typescript-eslint/eslint-plugin": "^5.31.0",
     "@typescript-eslint/parser": "^5.31.0",
-    "bun-webkit": "0.0.1-6bd997e38e30f50b3114b178f4d5e2fc5da6da25"
+    "bun-webkit": "0.0.1-eb1570290ba3e8555feb53b2a0feb68d2df65569"
   },
   "version": "0.0.0",
   "prettier": "./.prettierrc.cjs"
diff --git a/src/build-id b/src/build-id
index d00491fd7..0cfbf0888 100644
--- a/src/build-id
+++ b/src/build-id
@@ -1 +1 @@
-1
+2
diff --git a/src/bun.js/WebKit b/src/bun.js/WebKit
-Subproject a310140b2d16813a5b321cb88a3c48e14939bb2
+Subproject eb1570290ba3e8555feb53b2a0feb68d2df6556
diff --git a/src/bun.js/bindings/BunJSCModule.cpp b/src/bun.js/bindings/BunJSCModule.cpp
index 384882883..63721a878 100644
--- a/src/bun.js/bindings/BunJSCModule.cpp
+++ b/src/bun.js/bindings/BunJSCModule.cpp
@@ -16,7 +16,6 @@
 #include "JavaScriptCore/CallFrameInlines.h"
 #include "JavaScriptCore/ClassInfo.h"
 #include "JavaScriptCore/CodeBlock.h"
-#include "JavaScriptCore/CodeCache.h"
 #include "JavaScriptCore/Completion.h"
 #include "JavaScriptCore/Error.h"
 #include "JavaScriptCore/ErrorInstance.h"
diff --git a/src/bun.js/bindings/JSBundlerPlugin.cpp b/src/bun.js/bindings/JSBundlerPlugin.cpp
index 279673afb..e93556963 100644
--- a/src/bun.js/bindings/JSBundlerPlugin.cpp
+++ b/src/bun.js/bindings/JSBundlerPlugin.cpp
@@ -49,9 +49,8 @@ void BundlerPlugin::NamespaceList::append(JSC::VM& vm, JSC::RegExp* filter, Stri
 
     Yarr::RegularExpression regex(
         StringView(filter->pattern()),
-        filter->flags().contains(Yarr::Flags::IgnoreCase) ? Yarr::TextCaseSensitivity::TextCaseInsensitive : Yarr::TextCaseSensitivity::TextCaseInsensitive,
-        filter->multiline() ? Yarr::MultilineMode::MultilineEnabled : Yarr::MultilineMode::MultilineDisabled,
-        filter->eitherUnicode() ? Yarr::UnicodeMode::UnicodeAwareMode : Yarr::UnicodeMode::UnicodeUnawareMode);
+        filter->flags());
+
     nsGroup->append(WTFMove(regex));
 }
 
diff --git a/src/bun.js/bindings/JSCInlines.h b/src/bun.js/bindings/JSCInlines.h
index 30e8b4133..7c18714da 100644
--- a/src/bun.js/bindings/JSCInlines.h
+++ b/src/bun.js/bindings/JSCInlines.h
@@ -46,7 +46,7 @@
 #include "JavaScriptCore/JSFunctionInlines.h"
 #include "JavaScriptCore/JSGlobalObjectInlines.h"
 #include "JavaScriptCore/JSObjectInlines.h"
-#include "JavaScriptCore/JSProxy.h"
+#include "JavaScriptCore/JSGlobalProxy.h"
 #include "JavaScriptCore/JSString.h"
 #include "JavaScriptCore/Operations.h"
 #include "JavaScriptCore/SlotVisitorInlines.h"
diff --git a/src/bun.js/bindings/JSDOMGlobalObject.h b/src/bun.js/bindings/JSDOMGlobalObject.h
index b22700d7d..0249362d9 100644
--- a/src/bun.js/bindings/JSDOMGlobalObject.h
+++ b/src/bun.js/bindings/JSDOMGlobalObject.h
@@ -22,8 +22,8 @@ JSClass* toJSDOMGlobalObject(JSC::VM& vm, JSC::JSValue value)
     // static_assert(std::is_base_of_v<JSDOMGlobalObject, JSClass>);
 
     if (auto* object = value.getObject()) {
-        if (object->type() == JSC::PureForwardingProxyType)
-            return JSC::jsDynamicCast<JSClass*>(JSC::jsCast<JSC::JSProxy*>(object)->target());
+        if (object->type() == JSC::GlobalProxyType)
+            return JSC::jsDynamicCast<JSClass*>(JSC::jsCast<JSC::JSGlobalProxy*>(object)->target());
         if (object->inherits<JSClass>())
             return JSC::jsCast<JSClass*>(object);
     }
diff --git a/src/bun.js/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp
index d5ab41d71..d35132c8b 100644
--- a/src/bun.js/bindings/ZigGlobalObject.cpp
+++ b/src/bun.js/bindings/ZigGlobalObject.cpp
@@ -9,7 +9,6 @@
 #include "JavaScriptCore/CallFrameInlines.h"
 #include "JavaScriptCore/ClassInfo.h"
 #include "JavaScriptCore/CodeBlock.h"
-#include "JavaScriptCore/CodeCache.h"
 #include "JavaScriptCore/Completion.h"
 #include "JavaScriptCore/Error.h"
 #include "JavaScriptCore/ErrorInstance.h"
@@ -992,11 +991,7 @@ static JSC_DEFINE_HOST_FUNCTION(functionATOB,
         return JSC::JSValue::encode(JSC::jsEmptyString(vm));
     }
 
-    auto decodedData = WTF::base64Decode(encodedString, {
-                                                            WTF::Base64DecodeOptions::ValidatePadding,
-                                                            WTF::Base64DecodeOptions::IgnoreSpacesAndNewLines,
-                                                            WTF::Base64DecodeOptions::DiscardVerticalTab,
-                                                        });
+    auto decodedData = WTF::base64Decode(encodedString, Base64DecodeMode::DefaultValidatePaddingAndIgnoreWhitespace);
     if (!decodedData) {
         auto scope = DECLARE_THROW_SCOPE(globalObject->vm());
         throwException(globalObject, scope, createDOMException(globalObject, ExceptionCode::InvalidCharacterError));
diff --git a/src/bun.js/bindings/ZigSourceProvider.cpp b/src/bun.js/bindings/ZigSourceProvider.cpp
index 3a313a0c1..7b3a8ffbc 100644
--- a/src/bun.js/bindings/ZigSourceProvider.cpp
+++ b/src/bun.js/bindings/ZigSourceProvider.cpp
@@ -5,7 +5,6 @@
 #include "ZigSourceProvider.h"
 
 #include "JavaScriptCore/BytecodeCacheError.h"
-#include "JavaScriptCore/CodeCache.h"
 
 #include "JavaScriptCore/Completion.h"
 #include "wtf/Scope.h"
diff --git a/src/bun.js/bindings/bindings.zig b/src/bun.js/bindings/bindings.zig
index 772165458..5254748f8 100644
--- a/src/bun.js/bindings/bindings.zig
+++ b/src/bun.js/bindings/bindings.zig
@@ -2894,7 +2894,7 @@ pub const JSValue = enum(JSValueReprInt) {
         BooleanObject,
         NumberObject,
         ErrorInstance,
-        PureForwardingProxy,
+        GlobalProxy,
         DirectArguments,
         ScopedArguments,
         ClonedArguments,
diff --git a/src/bun.js/bindings/exports.zig b/src/bun.js/bindings/exports.zig
index 6ed97f4b9..1fb5a1029 100644
--- a/src/bun.js/bindings/exports.zig
+++ b/src/bun.js/bindings/exports.zig
@@ -1377,7 +1377,7 @@ pub const ZigConsoleClient = struct {
                     };
                 }
 
-                if (js_type == .PureForwardingProxy) {
+                if (js_type == .GlobalProxy) {
                     return Tag.get(
                         JSC.JSValue.c(JSC.C.JSObjectGetProxyTarget(value.asObjectRef())),
                         globalThis,
diff --git a/src/bun.js/bindings/header-gen.zig b/src/bun.js/bindings/header-gen.zig
index 65ee15786..089506a8f 100644
--- a/src/bun.js/bindings/header-gen.zig
+++ b/src/bun.js/bindings/header-gen.zig
@@ -621,7 +621,16 @@ pub fn HeaderGen(comptime first_import: type, comptime second_import: type, comp
             const Generator = C_Generator;
             validateGenerator(Generator);
             var file_writer = file.writer();
-            file_writer.print("// clang-format off\n//-- AUTOGENERATED FILE -- {d}\n", .{std.time.timestamp()}) catch unreachable;
+            file_writer.writeAll("// clang-format off\n" ++
+                \\//-- GENERATED FILE. Do not edit --
+                \\//
+                \\//   To regenerate this file, run:
+                \\//   
+                \\//      make headers
+                \\// 
+                \\//-- GENERATED FILE. Do not edit --
+                \\
+            ) catch unreachable;
             file.writeAll(
                 \\#pragma once
                 \\
@@ -652,7 +661,16 @@ pub fn HeaderGen(comptime first_import: type, comptime second_import: type, comp
                 \\
             ) catch {};
 
-            impl.writer().print("//-- AUTOGENERATED FILE -- {d}\n// clang-format off\n", .{std.time.timestamp()}) catch unreachable;
+            impl.writer().writeAll("// clang-format off\n" ++
+                \\//-- GENERATED FILE. Do not edit --
+                \\//
+                \\//   To regenerate this file, run:
+                \\//   
+                \\//      make headers
+                \\// 
+                \\//-- GENERATED FILE. Do not edit --
+                \\
+            ) catch unreachable;
             impl.writer().writeAll(
                 \\#pragma once
                 \\
diff --git a/src/bun.js/bindings/headers-cpp.h b/src/bun.js/bindings/headers-cpp.h
index 553d0ae36..0ccc2fa8c 100644
--- a/src/bun.js/bindings/headers-cpp.h
+++ b/src/bun.js/bindings/headers-cpp.h
@@ -1,5 +1,11 @@
-//-- AUTOGENERATED FILE -- 1683691290
 // clang-format off
+//-- GENERATED FILE. Do not edit --
+//
+//   To regenerate this file, run:
+//   
+//      make headers
+// 
+//-- GENERATED FILE. Do not edit --
 #pragma once
 
 #include <stddef.h>
diff --git a/src/bun.js/bindings/headers.h b/src/bun.js/bindings/headers.h
index c8c374b7f..c7612938c 100644
--- a/src/bun.js/bindings/headers.h
+++ b/src/bun.js/bindings/headers.h
@@ -1,5 +1,11 @@
 // clang-format off
-//-- AUTOGENERATED FILE -- 1683691290
+//-- GENERATED FILE. Do not edit --
+//
+//   To regenerate this file, run:
+//   
+//      make headers
+// 
+//-- GENERATED FILE. Do not edit --
 #pragma once
 
 #include <stddef.h>
diff --git a/src/bun.js/bindings/napi.cpp b/src/bun.js/bindings/napi.cpp
index 7b8963b2c..33ef5e286 100644
--- a/src/bun.js/bindings/napi.cpp
+++ b/src/bun.js/bindings/napi.cpp
@@ -21,7 +21,6 @@
 #include "JavaScriptCore/CallFrameInlines.h"
 #include "JavaScriptCore/ClassInfo.h"
 #include "JavaScriptCore/CodeBlock.h"
-#include "JavaScriptCore/CodeCache.h"
 #include "JavaScriptCore/Completion.h"
 #include "JavaScriptCore/Error.h"
 #include "JavaScriptCore/ErrorInstance.h"
@@ -61,7 +60,7 @@ namespace Napi {
 
 JSC::SourceCode generateSourceCode(WTF::String keyString, JSC::VM& vm, JSC::JSObject* object, JSC::JSGlobalObject* globalObject)
 {
-    JSC::JSArray* exportKeys = ownPropertyKeys(globalObject, object, PropertyNameMode::StringsAndSymbols, DontEnumPropertiesMode::Include, std::nullopt);
+    JSC::JSArray* exportKeys = ownPropertyKeys(globalObject, object, PropertyNameMode::StringsAndSymbols, DontEnumPropertiesMode::Include);
     JSC::Identifier ident = JSC::Identifier::fromString(vm, "__BunTemporaryGlobal"_s);
     WTF::StringBuilder sourceCodeBuilder = WTF::StringBuilder();
     // TODO: handle symbol collision
@@ -268,7 +267,7 @@ static void defineNapiProperty(Zig::GlobalObject* globalObject, JSC::JSObject* t
         if (getterProperty) {
             JSC::JSNativeStdFunction* getterFunction = JSC::JSNativeStdFunction::create(
                 globalObject->vm(), globalObject, 0, String(), [getterProperty](JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame) -> JSC::EncodedJSValue {
-                    JSC::MarkedArgumentBufferWithSize values;
+                    JSC::MarkedArgumentBuffer values;
                     values.append(callFrame->thisValue());
                     return getterProperty(globalObject, callFrame);
                 });
@@ -284,7 +283,7 @@ static void defineNapiProperty(Zig::GlobalObject* globalObject, JSC::JSObject* t
         if (setterProperty) {
             JSC::JSNativeStdFunction* setterFunction = JSC::JSNativeStdFunction::create(
                 globalObject->vm(), globalObject, 1, String(), [setterProperty](JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame) -> JSC::EncodedJSValue {
-                    JSC::MarkedArgumentBufferWithSize values;
+                    JSC::MarkedArgumentBuffer values;
                     values.append(callFrame->thisValue());
                     values.append(callFrame->uncheckedArgument(0));
                     return setterProperty(globalObject, callFrame);
@@ -1348,7 +1347,7 @@ extern "C" napi_status napi_get_all_property_names(
         return NAPI_OBJECT_EXPECTED;
     }
 
-    JSC::JSArray* exportKeys = ownPropertyKeys(globalObject, object, jsc_property_mode, jsc_key_mode, std::nullopt);
+    JSC::JSArray* exportKeys = ownPropertyKeys(globalObject, object, jsc_property_mode, jsc_key_mode);
     // TODO: filter
     *result = toNapi(JSC::JSValue::encode(exportKeys));
     return napi_ok;
@@ -1455,7 +1454,7 @@ extern "C" napi_status napi_get_property_names(napi_env env, napi_value object,
 
     auto scope = DECLARE_CATCH_SCOPE(vm);
     JSC::EnsureStillAliveScope ensureStillAlive(jsValue);
-    JSC::JSValue value = JSC::ownPropertyKeys(globalObject, jsValue.getObject(), PropertyNameMode::Strings, DontEnumPropertiesMode::Include, std::nullopt);
+    JSC::JSValue value = JSC::ownPropertyKeys(globalObject, jsValue.getObject(), PropertyNameMode::Strings, DontEnumPropertiesMode::Include);
     if (UNLIKELY(scope.exception())) {
         *result = reinterpret_cast<napi_value>(JSC::JSValue::encode(JSC::jsUndefined()));
         return napi_generic_failure;
diff --git a/src/bun.js/bindings/node_util_types.cpp b/src/bun.js/bindings/node_util_types.cpp
index d53cb1786..0c75662cf 100644
--- a/src/bun.js/bindings/node_util_types.cpp
+++ b/src/bun.js/bindings/node_util_types.cpp
@@ -202,7 +202,7 @@ JSC_DEFINE_HOST_FUNCTION(jsFunctionIsSharedArrayBuffer, (JSC::JSGlobalObject * g
 JSC_DEFINE_HOST_FUNCTION(jsFunctionIsProxy, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callframe))
 {
     GET_FIRST_CELL
-    return JSValue::encode(jsBoolean(cell->type() == PureForwardingProxyType || cell->type() == ProxyObjectType));
+    return JSValue::encode(jsBoolean(cell->type() == GlobalProxyType || cell->type() == ProxyObjectType));
 }
 JSC_DEFINE_HOST_FUNCTION(jsFunctionIsModuleNamespaceObject, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callframe))
 {
diff --git a/src/bun.js/bindings/sqlite/JSSQLStatement.cpp b/src/bun.js/bindings/sqlite/JSSQLStatement.cpp
index 46d8a2442..a561057fe 100644
--- a/src/bun.js/bindings/sqlite/JSSQLStatement.cpp
+++ b/src/bun.js/bindings/sqlite/JSSQLStatement.cpp
@@ -1505,7 +1505,7 @@ JSC_DEFINE_CUSTOM_GETTER(jsSqlStatementGetColumnNames, (JSGlobalObject * lexical
     }
     JSC::JSArray* array;
     if (castedThis->columnNames->size() > 0) {
-        array = ownPropertyKeys(lexicalGlobalObject, castedThis->_prototype.get(), PropertyNameMode::Strings, DontEnumPropertiesMode::Exclude, CachedPropertyNamesKind::Keys);
+        array = ownPropertyKeys(lexicalGlobalObject, castedThis->_prototype.get(), PropertyNameMode::Strings, DontEnumPropertiesMode::Exclude);
     } else {
         array = JSC::constructEmptyArray(lexicalGlobalObject, nullptr, 0);
     }
diff --git a/src/bun.js/javascript_core_c_api.zig b/src/bun.js/javascript_core_c_api.zig
index 46ff94eba..37f9df15d 100644
--- a/src/bun.js/javascript_core_c_api.zig
+++ b/src/bun.js/javascript_core_c_api.zig
@@ -438,7 +438,7 @@ pub const CellType = enum(u8) {
     BooleanObjectType = 28,
     NumberObjectType = 29,
     ErrorInstanceType = 30,
-    PureForwardingProxyType = 31,
+    GlobalProxyType = 31,
     DirectArgumentsType = 32,
     ScopedArgumentsType = 33,
     ClonedArgumentsType = 34,
diff --git a/src/bun.js/test/pretty_format.zig b/src/bun.js/test/pretty_format.zig
index 2f48570c4..355fd7191 100644
--- a/src/bun.js/test/pretty_format.zig
+++ b/src/bun.js/test/pretty_format.zig
@@ -443,7 +443,7 @@ pub const JestPrettyFormat = struct {
                     };
                 }
 
-                if (js_type == .PureForwardingProxy) {
+                if (js_type == .GlobalProxy) {
                     return Tag.get(
                         JSC.JSValue.c(JSC.C.JSObjectGetProxyTarget(value.asObjectRef())),
                         globalThis,