From fe386fe8a10439635b1f7f89ac6c67bf5eb1a365 Mon Sep 17 00:00:00 2001
From: lsdsjy <lsdsjy@163.com>
Date: Fri, 17 Nov 2023 20:08:55 +0800
Subject: [PATCH 1/4] fix(legacy): preserve async generator function invocation

---
 packages/plugin-legacy/README.md       | 4 ++--
 packages/plugin-legacy/src/snippets.ts | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/plugin-legacy/README.md b/packages/plugin-legacy/README.md
index c2cfa4c45ef659..f1e875ee9ca206 100644
--- a/packages/plugin-legacy/README.md
+++ b/packages/plugin-legacy/README.md
@@ -156,8 +156,8 @@ The legacy plugin requires inline scripts for [Safari 10.1 `nomodule` fix](https
 
 - `sha256-MS6/3FCg4WjP9gwgaBGwLpRCY6fZBgwmhVCdrPrNf3E=`
 - `sha256-tQjf8gvb2ROOMapIxFvFAYBeUJ0v1HCbOcSmDNXGtDo=`
-- `sha256-8uUkKieevHiD3yYtzjkRvyDZWt+uZkBLuGEQWNiV3+c=`
-- `sha256-+5XkZFazzJo8n0iOP4ti/cLCMUudTf//Mzkb7xNPXIc=`
+- `sha256-BoFUHKsYhJ9tbsHugtNQCmnkBbZ11pcW6kZguu+T+EU=`
+- `sha256-A18HC3jLpyEc9B8oyxq/NBFCyFBJFSsRLt0gmT9kft8=`
 
 <!--
 Run `node --input-type=module -e "import {cspHashes} from '@vitejs/plugin-legacy'; console.log(cspHashes.map(h => 'sha256-'+h))"` to retrieve the value.
diff --git a/packages/plugin-legacy/src/snippets.ts b/packages/plugin-legacy/src/snippets.ts
index 0b7838e09d1a9f..c0b49d7ae2b95d 100644
--- a/packages/plugin-legacy/src/snippets.ts
+++ b/packages/plugin-legacy/src/snippets.ts
@@ -7,8 +7,7 @@ export const legacyEntryId = 'vite-legacy-entry'
 export const systemJSInlineCode = `System.import(document.getElementById('${legacyEntryId}').getAttribute('data-src'))`
 
 const detectModernBrowserVarName = '__vite_is_modern_browser'
-export const detectModernBrowserDetector =
-  'import.meta.url;import("_").catch(()=>1);(async function* g(){})();'
+export const detectModernBrowserDetector = `import.meta.url;import("_").catch(()=>1);(async function*(){})().next()`
 export const detectModernBrowserCode = `${detectModernBrowserDetector}if(location.protocol!="file:"){window.${detectModernBrowserVarName}=true}`
 export const dynamicFallbackInlineCode = `!function(){if(window.${detectModernBrowserVarName})return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("${legacyPolyfillId}"),n=document.createElement("script");n.src=e.src,n.onload=function(){${systemJSInlineCode}},document.body.appendChild(n)}();`
 

From c339377a7aa1a9dfc7215dea42ad3fc7eb450e19 Mon Sep 17 00:00:00 2001
From: lsdsjy <lsdsjy@163.com>
Date: Mon, 20 Nov 2023 20:21:28 +0800
Subject: [PATCH 2/4] fix: csp hashes

---
 packages/plugin-legacy/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/plugin-legacy/README.md b/packages/plugin-legacy/README.md
index f1e875ee9ca206..b73a4afb31be8b 100644
--- a/packages/plugin-legacy/README.md
+++ b/packages/plugin-legacy/README.md
@@ -156,8 +156,8 @@ The legacy plugin requires inline scripts for [Safari 10.1 `nomodule` fix](https
 
 - `sha256-MS6/3FCg4WjP9gwgaBGwLpRCY6fZBgwmhVCdrPrNf3E=`
 - `sha256-tQjf8gvb2ROOMapIxFvFAYBeUJ0v1HCbOcSmDNXGtDo=`
-- `sha256-BoFUHKsYhJ9tbsHugtNQCmnkBbZ11pcW6kZguu+T+EU=`
-- `sha256-A18HC3jLpyEc9B8oyxq/NBFCyFBJFSsRLt0gmT9kft8=`
+- `sha256-6gxDO54HJkJNWi7H6ipFpWWSkWSRpyuZYMGDyG6bcNE=`
+- `sha256-+5XkZFazzJo8n0iOP4ti/cLCMUudTf//Mzkb7xNPXIc=`
 
 <!--
 Run `node --input-type=module -e "import {cspHashes} from '@vitejs/plugin-legacy'; console.log(cspHashes.map(h => 'sha256-'+h))"` to retrieve the value.

From c326e1a95f37e9f145811e4041a0f92173fe11d3 Mon Sep 17 00:00:00 2001
From: lsdsjy <lsdsjy@163.com>
Date: Tue, 21 Nov 2023 10:56:35 +0800
Subject: [PATCH 3/4] chore: add test

---
 playground/legacy/__tests__/legacy.spec.ts | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/playground/legacy/__tests__/legacy.spec.ts b/playground/legacy/__tests__/legacy.spec.ts
index 405c61f47e2700..b90b3e09c8aad4 100644
--- a/playground/legacy/__tests__/legacy.spec.ts
+++ b/playground/legacy/__tests__/legacy.spec.ts
@@ -120,11 +120,13 @@ describe.runIf(isBuild)('build', () => {
     const terserPattern = /^(?:!function|System.register)/
 
     expect(findAssetFile(/chunk-async-legacy/)).toMatch(terserPattern)
-    expect(findAssetFile(/chunk-async\./)).not.toMatch(terserPattern)
+    expect(findAssetFile(/chunk-async(?!-legacy)/)).not.toMatch(terserPattern)
     expect(findAssetFile(/immutable-chunk-legacy/)).toMatch(terserPattern)
-    expect(findAssetFile(/immutable-chunk\./)).not.toMatch(terserPattern)
+    expect(findAssetFile(/immutable-chunk(?!-legacy)/)).not.toMatch(
+      terserPattern,
+    )
     expect(findAssetFile(/index-legacy/)).toMatch(terserPattern)
-    expect(findAssetFile(/index\./)).not.toMatch(terserPattern)
+    expect(findAssetFile(/index(?!-legacy)/)).not.toMatch(terserPattern)
     expect(findAssetFile(/polyfills-legacy/)).toMatch(terserPattern)
   })
 
@@ -149,4 +151,11 @@ describe.runIf(isBuild)('build', () => {
       ),
     ).toBeFalsy()
   })
+
+  test('should have only entry files guarded', async () => {
+    const guard = /(import\s*\()|(import.meta)|(async\s*function\*)/
+    expect(findAssetFile(/index(?!-legacy)/)).toMatch(guard)
+    expect(findAssetFile(/polyfills(?!-legacy)/)).toMatch(guard)
+    expect(findAssetFile(/index-legacy/)).not.toMatch(guard)
+  })
 })

From fa6d5340b170e53548c3c97bd86240e23764163a Mon Sep 17 00:00:00 2001
From: lsdsjy <lsdsjy@163.com>
Date: Tue, 21 Nov 2023 18:19:25 +0800
Subject: [PATCH 4/4] chore: test

---
 playground/legacy/__tests__/legacy.spec.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/playground/legacy/__tests__/legacy.spec.ts b/playground/legacy/__tests__/legacy.spec.ts
index b90b3e09c8aad4..b0cc061b289d6c 100644
--- a/playground/legacy/__tests__/legacy.spec.ts
+++ b/playground/legacy/__tests__/legacy.spec.ts
@@ -152,10 +152,12 @@ describe.runIf(isBuild)('build', () => {
     ).toBeFalsy()
   })
 
-  test('should have only entry files guarded', async () => {
+  test('should have only modern entry files guarded', async () => {
     const guard = /(import\s*\()|(import.meta)|(async\s*function\*)/
     expect(findAssetFile(/index(?!-legacy)/)).toMatch(guard)
     expect(findAssetFile(/polyfills(?!-legacy)/)).toMatch(guard)
+
+    expect(findAssetFile(/chunk-async(?!-legacy)/)).not.toMatch(guard)
     expect(findAssetFile(/index-legacy/)).not.toMatch(guard)
   })
 })