From 5305402034711333de3d6abf5a88a4233bff01cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E4=B8=B9=E8=90=8D?= <fengdanping@bytedance.com>
Date: Wed, 6 Sep 2023 15:10:42 +0800
Subject: [PATCH 1/3] fix(loader): fix the requestConfig type definition in
 beforeLoad

---
 packages/loader/src/index.ts | 2 +-
 packages/loader/src/utils.ts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/loader/src/index.ts b/packages/loader/src/index.ts
index e949f7740..9798b3fd8 100644
--- a/packages/loader/src/index.ts
+++ b/packages/loader/src/index.ts
@@ -87,7 +87,7 @@ export class Loader {
     beforeLoad: new SyncWaterfallHook<{
       url: string;
       scope: string;
-      requestConfig: ResponseInit;
+      requestConfig: RequestInit;
     }>('beforeLoad'),
     fetch: new AsyncHook<[string, RequestInit], Response | void | false>(
       'fetch',
diff --git a/packages/loader/src/utils.ts b/packages/loader/src/utils.ts
index a22630f08..64019f4ae 100644
--- a/packages/loader/src/utils.ts
+++ b/packages/loader/src/utils.ts
@@ -38,5 +38,6 @@ export function copyResult(result) {
 export function mergeConfig(loader: Loader, url: string) {
   const extra = loader.requestConfig;
   const config = typeof extra === 'function' ? extra(url) : extra;
-  return { mode: 'cors', ...config } as RequestInit;
+  const mode: RequestMode = 'cors';
+  return { mode, ...config };
 }

From cd5d9f51290e34bfdd306c596e967752bb7ff984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E4=B8=B9=E8=90=8D?= <fengdanping@bytedance.com>
Date: Wed, 24 Jan 2024 11:08:03 +0800
Subject: [PATCH 2/3] feat: add @garfish/bridge-react support react v18

---
 packages/bridge-react/src/reactBridge.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/bridge-react/src/reactBridge.ts b/packages/bridge-react/src/reactBridge.ts
index a77532d16..3c3649641 100644
--- a/packages/bridge-react/src/reactBridge.ts
+++ b/packages/bridge-react/src/reactBridge.ts
@@ -69,7 +69,7 @@ export function reactBridge(this: any, userOptions: Options) {
   }
   if (!checkReactVersion(opts.React)) {
     throw Error(
-      'Please make sure than the react version is higher than or equal to v16 and lower than v18.',
+      'Please make sure than the react version is between v16 and v18.',
     );
   }
 
@@ -185,7 +185,7 @@ function checkReactVersion(React: typeReact) {
     const majorVersionString = React.version.split('.')[0];
     try {
       return (
-        Number(majorVersionString) >= 16 && Number(majorVersionString) < 18
+        Number(majorVersionString) >= 16 && Number(majorVersionString) <= 18
       );
     } catch (err) {
       return false;

From 5030228efe8e851f21d97584500d97776a1e4297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E4=B8=B9=E8=90=8D?= <fengdanping@bytedance.com>
Date: Wed, 24 Jan 2024 11:35:23 +0800
Subject: [PATCH 3/3] feat: fix unit test

---
 packages/bridge-react/__tests__/reactBridge.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/bridge-react/__tests__/reactBridge.spec.ts b/packages/bridge-react/__tests__/reactBridge.spec.ts
index c49f7bf1e..12bd597ce 100644
--- a/packages/bridge-react/__tests__/reactBridge.spec.ts
+++ b/packages/bridge-react/__tests__/reactBridge.spec.ts
@@ -94,7 +94,7 @@ describe('react-bridge', () => {
     ).toThrow();
   });
 
-  it('throws an error when react version is higher or equal than react v18', async () => {
+  it('will not throws the error when react version is higher or equal than react v18', async () => {
     expect(() =>
       reactBridge({
         React: {
@@ -104,7 +104,7 @@ describe('react-bridge', () => {
         ReactDOM,
         rootComponent,
       }),
-    ).toThrow();
+    ).not.toThrow();
   });
 
   it('do not throws an error when react version is v16 or v17', async () => {