From da9ffc680513292292c9a5f73057ead499ea1eac Mon Sep 17 00:00:00 2001
From: karott7 <karott7@gmail.com>
Date: Wed, 31 May 2023 13:58:04 +0800
Subject: [PATCH 1/5] fix(legacy): add test case to ensure correct csp hashes
 in readme.md

---
 packages/plugin-legacy/README.md           |  2 +-
 playground/legacy/__tests__/legacy.spec.ts |  4 ++++
 playground/legacy/index.html               |  1 +
 playground/legacy/main.js                  |  2 ++
 playground/legacy/vite.config.js           | 20 +++++++++++++++++++-
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/packages/plugin-legacy/README.md b/packages/plugin-legacy/README.md
index 5381633aa9a91f..04abcec6a3a4e5 100644
--- a/packages/plugin-legacy/README.md
+++ b/packages/plugin-legacy/README.md
@@ -159,7 +159,7 @@ The legacy plugin requires inline scripts for [Safari 10.1 `nomodule` fix](https
 
 - `sha256-MS6/3FCg4WjP9gwgaBGwLpRCY6fZBgwmhVCdrPrNf3E=`
 - `sha256-tQjf8gvb2ROOMapIxFvFAYBeUJ0v1HCbOcSmDNXGtDo=`
-- `sha256-p7PoC97FO+Lu90RNjGWxhbm13yALSR4xzV8vaDhaQBo=`
+- `sha256-4y/gEB2/KIwZFTfNqwXJq4olzvmQ0S214m9jwKgNXoc=`
 - `sha256-+5XkZFazzJo8n0iOP4ti/cLCMUudTf//Mzkb7xNPXIc=`
 
 <!--
diff --git a/playground/legacy/__tests__/legacy.spec.ts b/playground/legacy/__tests__/legacy.spec.ts
index eb71185f3c8446..8f026036136028 100644
--- a/playground/legacy/__tests__/legacy.spec.ts
+++ b/playground/legacy/__tests__/legacy.spec.ts
@@ -89,6 +89,10 @@ test('asset url', async () => {
   )
 })
 
+test('correct CSP hashes in README.md', async () => {
+  await untilUpdated(() => page.textContent('#csp-hashes'), 'true', true)
+})
+
 describe.runIf(isBuild)('build', () => {
   test('should generate correct manifest', async () => {
     const manifest = readManifest()
diff --git a/playground/legacy/index.html b/playground/legacy/index.html
index d5a73323a20e77..1829cbfcc53a38 100644
--- a/playground/legacy/index.html
+++ b/playground/legacy/index.html
@@ -11,4 +11,5 @@ <h1 id="app"></h1>
 <p>## worker message:</p>
 <div class="worker-message"></div>
 <div id="asset-path"></div>
+<div id="csp-hashes"></div>
 <script type="module" src="./main.js"></script>
diff --git a/playground/legacy/main.js b/playground/legacy/main.js
index 7a42c3cf23a138..249be2fd8b9af0 100644
--- a/playground/legacy/main.js
+++ b/playground/legacy/main.js
@@ -72,6 +72,8 @@ document
 
 text('#asset-path', viteSvgPath)
 
+text('#csp-hashes', __CORRECT_CSP_HASHES_IN_README__)
+
 function text(el, text) {
   document.querySelector(el).textContent = text
 }
diff --git a/playground/legacy/vite.config.js b/playground/legacy/vite.config.js
index 3c4ec787809fee..b0a53454a796f0 100644
--- a/playground/legacy/vite.config.js
+++ b/playground/legacy/vite.config.js
@@ -1,8 +1,21 @@
 import fs from 'node:fs'
 import path from 'node:path'
-import legacy from '@vitejs/plugin-legacy'
+import legacy, { cspHashes } from '@vitejs/plugin-legacy'
 import { defineConfig } from 'vite'
 
+function isCorrectCspHashesInReadme() {
+  const readme = fs
+    .readFileSync(
+      path.resolve(__dirname, 'node_modules/@vitejs/plugin-legacy/README.md'),
+    )
+    .toString()
+  const hashesInDoc = [...readme.matchAll(/`sha256-(.+)`/g)].map(
+    (match) => match[1],
+  )
+
+  return cspHashes.every((hash, index) => hash === hashesInDoc[index])
+}
+
 export default defineConfig({
   base: './',
   plugins: [
@@ -11,6 +24,11 @@ export default defineConfig({
       modernPolyfills: true,
     }),
   ],
+  define: {
+    __CORRECT_CSP_HASHES_IN_README__: JSON.stringify(
+      isCorrectCspHashesInMarkdown(),
+    ),
+  },
 
   build: {
     cssCodeSplit: false,

From 900fa1de81155a7dba3150b951c727f05b4400e0 Mon Sep 17 00:00:00 2001
From: karott7 <karott7@gmail.com>
Date: Wed, 31 May 2023 14:02:36 +0800
Subject: [PATCH 2/5] fix(legacy): correct function name

---
 playground/legacy/vite.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playground/legacy/vite.config.js b/playground/legacy/vite.config.js
index b0a53454a796f0..955120d1c85409 100644
--- a/playground/legacy/vite.config.js
+++ b/playground/legacy/vite.config.js
@@ -26,7 +26,7 @@ export default defineConfig({
   ],
   define: {
     __CORRECT_CSP_HASHES_IN_README__: JSON.stringify(
-      isCorrectCspHashesInMarkdown(),
+      isCorrectCspHashesInReadme(),
     ),
   },
 

From 925e99b088c995f83abda0287adf12e8b61beb87 Mon Sep 17 00:00:00 2001
From: karott7 <karott7@gmail.com>
Date: Thu, 1 Jun 2023 09:37:59 +0800
Subject: [PATCH 3/5] docs(legacy): move test case

---
 .../src/__tests__/snippets.spec.ts             | 16 ++++++++++++++++
 playground/legacy/__tests__/legacy.spec.ts     |  4 ----
 playground/legacy/index.html                   |  1 -
 playground/legacy/main.js                      |  2 --
 playground/legacy/vite.config.js               | 18 ------------------
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/packages/plugin-legacy/src/__tests__/snippets.spec.ts b/packages/plugin-legacy/src/__tests__/snippets.spec.ts
index 65376ef102d023..1cf5211d6c2522 100644
--- a/packages/plugin-legacy/src/__tests__/snippets.spec.ts
+++ b/packages/plugin-legacy/src/__tests__/snippets.spec.ts
@@ -1,7 +1,10 @@
+import fs from 'node:fs'
+import path from 'node:path'
 import { expect, test } from 'vitest'
 import type { ecmaVersion } from 'acorn'
 import { parse } from 'acorn'
 import { detectModernBrowserDetector } from '../snippets'
+import { cspHashes } from '..'
 
 const shouldFailVersions: ecmaVersion[] = []
 for (let v = 2015; v <= 2019; v++) {
@@ -34,3 +37,16 @@ for (const version of shouldPassVersions) {
     }).not.toThrow()
   })
 }
+
+test('CSP hashes in README.md should be correct', () => {
+  const readme = fs
+    .readFileSync(path.resolve(__dirname, '../../README.md'))
+    .toString()
+  const hashesInDoc = [...readme.matchAll(/`sha256-(.+)`/g)].map(
+    (match) => match[1],
+  )
+
+  expect(
+    cspHashes.every((hash, index) => hash === hashesInDoc[index]),
+  ).toBeTruthy()
+})
diff --git a/playground/legacy/__tests__/legacy.spec.ts b/playground/legacy/__tests__/legacy.spec.ts
index 8f026036136028..eb71185f3c8446 100644
--- a/playground/legacy/__tests__/legacy.spec.ts
+++ b/playground/legacy/__tests__/legacy.spec.ts
@@ -89,10 +89,6 @@ test('asset url', async () => {
   )
 })
 
-test('correct CSP hashes in README.md', async () => {
-  await untilUpdated(() => page.textContent('#csp-hashes'), 'true', true)
-})
-
 describe.runIf(isBuild)('build', () => {
   test('should generate correct manifest', async () => {
     const manifest = readManifest()
diff --git a/playground/legacy/index.html b/playground/legacy/index.html
index 1829cbfcc53a38..d5a73323a20e77 100644
--- a/playground/legacy/index.html
+++ b/playground/legacy/index.html
@@ -11,5 +11,4 @@ <h1 id="app"></h1>
 <p>## worker message:</p>
 <div class="worker-message"></div>
 <div id="asset-path"></div>
-<div id="csp-hashes"></div>
 <script type="module" src="./main.js"></script>
diff --git a/playground/legacy/main.js b/playground/legacy/main.js
index 249be2fd8b9af0..7a42c3cf23a138 100644
--- a/playground/legacy/main.js
+++ b/playground/legacy/main.js
@@ -72,8 +72,6 @@ document
 
 text('#asset-path', viteSvgPath)
 
-text('#csp-hashes', __CORRECT_CSP_HASHES_IN_README__)
-
 function text(el, text) {
   document.querySelector(el).textContent = text
 }
diff --git a/playground/legacy/vite.config.js b/playground/legacy/vite.config.js
index 955120d1c85409..6a1c48c8873c8e 100644
--- a/playground/legacy/vite.config.js
+++ b/playground/legacy/vite.config.js
@@ -3,19 +3,6 @@ import path from 'node:path'
 import legacy, { cspHashes } from '@vitejs/plugin-legacy'
 import { defineConfig } from 'vite'
 
-function isCorrectCspHashesInReadme() {
-  const readme = fs
-    .readFileSync(
-      path.resolve(__dirname, 'node_modules/@vitejs/plugin-legacy/README.md'),
-    )
-    .toString()
-  const hashesInDoc = [...readme.matchAll(/`sha256-(.+)`/g)].map(
-    (match) => match[1],
-  )
-
-  return cspHashes.every((hash, index) => hash === hashesInDoc[index])
-}
-
 export default defineConfig({
   base: './',
   plugins: [
@@ -24,11 +11,6 @@ export default defineConfig({
       modernPolyfills: true,
     }),
   ],
-  define: {
-    __CORRECT_CSP_HASHES_IN_README__: JSON.stringify(
-      isCorrectCspHashesInReadme(),
-    ),
-  },
 
   build: {
     cssCodeSplit: false,

From a9c5618c5de4f28618d7a61b6233eee7c98ce5a7 Mon Sep 17 00:00:00 2001
From: karott7 <karott7@gmail.com>
Date: Thu, 1 Jun 2023 09:39:31 +0800
Subject: [PATCH 4/5] docs(legacy): remove unused code

---
 playground/legacy/vite.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playground/legacy/vite.config.js b/playground/legacy/vite.config.js
index 6a1c48c8873c8e..3c4ec787809fee 100644
--- a/playground/legacy/vite.config.js
+++ b/playground/legacy/vite.config.js
@@ -1,6 +1,6 @@
 import fs from 'node:fs'
 import path from 'node:path'
-import legacy, { cspHashes } from '@vitejs/plugin-legacy'
+import legacy from '@vitejs/plugin-legacy'
 import { defineConfig } from 'vite'
 
 export default defineConfig({

From 64c25d7bd93f96547204b92b572d43d7dd03fcaf Mon Sep 17 00:00:00 2001
From: sapphi-red <49056869+sapphi-red@users.noreply.github.com>
Date: Thu, 1 Jun 2023 15:58:02 +0900
Subject: [PATCH 5/5] refactor: misc changes

---
 .../plugin-legacy/src/__tests__/readme.spec.ts   | 16 ++++++++++++++++
 .../plugin-legacy/src/__tests__/snippets.spec.ts | 16 ----------------
 2 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 packages/plugin-legacy/src/__tests__/readme.spec.ts

diff --git a/packages/plugin-legacy/src/__tests__/readme.spec.ts b/packages/plugin-legacy/src/__tests__/readme.spec.ts
new file mode 100644
index 00000000000000..e74c428dc628e8
--- /dev/null
+++ b/packages/plugin-legacy/src/__tests__/readme.spec.ts
@@ -0,0 +1,16 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import { expect, test } from 'vitest'
+import { cspHashes } from '..'
+
+test('CSP hashes in README.md should be correct', () => {
+  const readme = fs.readFileSync(
+    path.resolve(__dirname, '../../README.md'),
+    'utf-8',
+  )
+  const hashesInDoc = [...readme.matchAll(/`sha256-(.+)`/g)].map(
+    (match) => match[1],
+  )
+
+  expect(hashesInDoc).toStrictEqual(cspHashes)
+})
diff --git a/packages/plugin-legacy/src/__tests__/snippets.spec.ts b/packages/plugin-legacy/src/__tests__/snippets.spec.ts
index 1cf5211d6c2522..65376ef102d023 100644
--- a/packages/plugin-legacy/src/__tests__/snippets.spec.ts
+++ b/packages/plugin-legacy/src/__tests__/snippets.spec.ts
@@ -1,10 +1,7 @@
-import fs from 'node:fs'
-import path from 'node:path'
 import { expect, test } from 'vitest'
 import type { ecmaVersion } from 'acorn'
 import { parse } from 'acorn'
 import { detectModernBrowserDetector } from '../snippets'
-import { cspHashes } from '..'
 
 const shouldFailVersions: ecmaVersion[] = []
 for (let v = 2015; v <= 2019; v++) {
@@ -37,16 +34,3 @@ for (const version of shouldPassVersions) {
     }).not.toThrow()
   })
 }
-
-test('CSP hashes in README.md should be correct', () => {
-  const readme = fs
-    .readFileSync(path.resolve(__dirname, '../../README.md'))
-    .toString()
-  const hashesInDoc = [...readme.matchAll(/`sha256-(.+)`/g)].map(
-    (match) => match[1],
-  )
-
-  expect(
-    cspHashes.every((hash, index) => hash === hashesInDoc[index]),
-  ).toBeTruthy()
-})