From f60dcdfcbe6041e15e60e0b2d5ab9f2e097d605f Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Thu, 9 May 2024 11:27:25 +0900 Subject: [PATCH 01/10] chore(deps): update --- shiki-604-cloudflare/package.json | 7 +++--- shiki-604-cloudflare/pnpm-lock.yaml | 33 ++++++++++++++++------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/shiki-604-cloudflare/package.json b/shiki-604-cloudflare/package.json index ed064f6a..1cafd5ad 100644 --- a/shiki-604-cloudflare/package.json +++ b/shiki-604-cloudflare/package.json @@ -12,14 +12,15 @@ "cf-release": "wrangler deploy" }, "dependencies": { - "@hiogawa/vite-plugin-ssr-middleware": "latest", - "shiki": "^1.4.0", - "vite": "latest", + "@shikijs/core": "^1.5.0", + "shiki": "^1.5.0", "vue": "^3.4.27" }, "devDependencies": { "@hattip/adapter-node": "^0.0.45", + "@hiogawa/vite-plugin-ssr-middleware": "^0.0.3", "@types/node": "^20.12.10", + "vite": "^5.2.11", "wrangler": "^3.53.1" }, "packageManager": "pnpm@9.0.6+sha512.f6d863130973207cb7a336d6b439a242a26ac8068077df530d6a86069419853dc1ffe64029ec594a9c505a3a410d19643c870aba6776330f5cfddcf10a9c1617" diff --git a/shiki-604-cloudflare/pnpm-lock.yaml b/shiki-604-cloudflare/pnpm-lock.yaml index 52923c41..676110a0 100644 --- a/shiki-604-cloudflare/pnpm-lock.yaml +++ b/shiki-604-cloudflare/pnpm-lock.yaml @@ -8,15 +8,12 @@ importers: .: dependencies: - '@hiogawa/vite-plugin-ssr-middleware': - specifier: latest - version: 0.0.3(vite@5.2.11(@types/node@20.12.10)) + '@shikijs/core': + specifier: ^1.5.0 + version: 1.5.0 shiki: - specifier: ^1.4.0 - version: 1.4.0 - vite: - specifier: latest - version: 5.2.11(@types/node@20.12.10) + specifier: ^1.5.0 + version: 1.5.0 vue: specifier: ^3.4.27 version: 3.4.27 @@ -24,9 +21,15 @@ importers: '@hattip/adapter-node': specifier: ^0.0.45 version: 0.0.45 + '@hiogawa/vite-plugin-ssr-middleware': + specifier: ^0.0.3 + version: 0.0.3(vite@5.2.11(@types/node@20.12.10)) '@types/node': specifier: ^20.12.10 version: 20.12.10 + vite: + specifier: ^5.2.11 + version: 5.2.11(@types/node@20.12.10) wrangler: specifier: ^3.53.1 version: 3.53.1 @@ -486,8 +489,8 @@ packages: cpu: [x64] os: [win32] - '@shikijs/core@1.4.0': - resolution: {integrity: sha512-CxpKLntAi64h3j+TwWqVIQObPTED0FyXLHTTh3MKXtqiQNn2JGcMQQ362LftDbc9kYbDtrksNMNoVmVXzKFYUQ==} + '@shikijs/core@1.5.0': + resolution: {integrity: sha512-tdYjQu+jnvlPbJg4OjgCQ16zAfHlLk+RzA9o025aeaIyUww6W/Vd9TQ2t+gdZgK1fox29/L2yyqXLU6ErzYA0w==} '@types/estree@1.0.5': resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} @@ -777,8 +780,8 @@ packages: resolution: {integrity: sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==} engines: {node: '>=10'} - shiki@1.4.0: - resolution: {integrity: sha512-5WIn0OL8PWm7JhnTwRWXniy6eEDY234mRrERVlFa646V2ErQqwIFd2UML7e0Pq9eqSKLoMa3Ke+xbsF+DAuy+Q==} + shiki@1.5.0: + resolution: {integrity: sha512-AMax9zrUW8u8bnvNhnmAD9mHzk244mWCDBZm+zh4Ir3lzncF/sGUcVd5gpy0IlWvOKBUUJ8uu/BFpusGJ/PdVw==} source-map-js@1.2.0: resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} @@ -1173,7 +1176,7 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.17.2': optional: true - '@shikijs/core@1.4.0': {} + '@shikijs/core@1.5.0': {} '@types/estree@1.0.5': {} @@ -1532,9 +1535,9 @@ snapshots: '@types/node-forge': 1.3.11 node-forge: 1.3.1 - shiki@1.4.0: + shiki@1.5.0: dependencies: - '@shikijs/core': 1.4.0 + '@shikijs/core': 1.5.0 source-map-js@1.2.0: {} From 997801244bcc5161138ad17515441598c4a4d58b Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Thu, 9 May 2024 11:32:49 +0900 Subject: [PATCH 02/10] chore: patch shiki loadWasm and setup alias --- shiki-604-cloudflare/package.json | 7 ++++++- .../patches/@shikijs__core@1.5.0.patch | 19 +++++++++++++++++++ shiki-604-cloudflare/pnpm-lock.yaml | 11 ++++++++--- shiki-604-cloudflare/src/app.tsx | 9 +-------- shiki-604-cloudflare/vite.config.ts | 5 +++++ 5 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch diff --git a/shiki-604-cloudflare/package.json b/shiki-604-cloudflare/package.json index 1cafd5ad..a5b4a273 100644 --- a/shiki-604-cloudflare/package.json +++ b/shiki-604-cloudflare/package.json @@ -23,5 +23,10 @@ "vite": "^5.2.11", "wrangler": "^3.53.1" }, - "packageManager": "pnpm@9.0.6+sha512.f6d863130973207cb7a336d6b439a242a26ac8068077df530d6a86069419853dc1ffe64029ec594a9c505a3a410d19643c870aba6776330f5cfddcf10a9c1617" + "packageManager": "pnpm@9.0.6+sha512.f6d863130973207cb7a336d6b439a242a26ac8068077df530d6a86069419853dc1ffe64029ec594a9c505a3a410d19643c870aba6776330f5cfddcf10a9c1617", + "pnpm": { + "patchedDependencies": { + "@shikijs/core@1.5.0": "patches/@shikijs__core@1.5.0.patch" + } + } } diff --git a/shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch b/shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch new file mode 100644 index 00000000..7bd20bea --- /dev/null +++ b/shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch @@ -0,0 +1,19 @@ +diff --git a/dist/index.mjs b/dist/index.mjs +index b5138caf105a39be021ce5eaaa1874a388f73322..06da21ac26661f535ceb79da2f905f8a622478d8 100644 +--- a/dist/index.mjs ++++ b/dist/index.mjs +@@ -4979,7 +4979,13 @@ function loadWasm(options) { + else if (isArrayBuffer(instance)) { + instance = await _makeArrayBufferLoader(instance)(info); + } +- } ++ // else if (instance instanceof WebAssembly.Module) { ++ // instance = await _makeArrayBufferLoader(instance)(info); ++ // } ++ else if (instance.default instanceof WebAssembly.Module) { ++ instance = await _makeArrayBufferLoader(instance.default)(info); ++ } ++ } + if ('instance' in instance) + instance = instance.instance; + if ('exports' in instance) diff --git a/shiki-604-cloudflare/pnpm-lock.yaml b/shiki-604-cloudflare/pnpm-lock.yaml index 676110a0..9eef1b79 100644 --- a/shiki-604-cloudflare/pnpm-lock.yaml +++ b/shiki-604-cloudflare/pnpm-lock.yaml @@ -4,13 +4,18 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +patchedDependencies: + '@shikijs/core@1.5.0': + hash: 3ltqp5ujvj7kfclkimeiy43cbe + path: patches/@shikijs__core@1.5.0.patch + importers: .: dependencies: '@shikijs/core': specifier: ^1.5.0 - version: 1.5.0 + version: 1.5.0(patch_hash=3ltqp5ujvj7kfclkimeiy43cbe) shiki: specifier: ^1.5.0 version: 1.5.0 @@ -1176,7 +1181,7 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.17.2': optional: true - '@shikijs/core@1.5.0': {} + '@shikijs/core@1.5.0(patch_hash=3ltqp5ujvj7kfclkimeiy43cbe)': {} '@types/estree@1.0.5': {} @@ -1537,7 +1542,7 @@ snapshots: shiki@1.5.0: dependencies: - '@shikijs/core': 1.5.0 + '@shikijs/core': 1.5.0(patch_hash=3ltqp5ujvj7kfclkimeiy43cbe) source-map-js@1.2.0: {} diff --git a/shiki-604-cloudflare/src/app.tsx b/shiki-604-cloudflare/src/app.tsx index da7a1723..a566a290 100644 --- a/shiki-604-cloudflare/src/app.tsx +++ b/shiki-604-cloudflare/src/app.tsx @@ -4,14 +4,7 @@ import { getHighlighterCore, loadWasm, type HighlighterCore } from "shiki/core"; let highlighter: HighlighterCore; export const App = defineComponent(async () => { - await loadWasm(async (info) => { - if (import.meta.env.VITE_BUILD_CF) { - const mod = await import("shiki/onig.wasm" as string); - return WebAssembly.instantiate(mod.default, info); - } else { - return import("shiki/wasm"); - } - }); + await loadWasm(import("shiki/wasm")); highlighter ??= await getHighlighterCore({ themes: [import("shiki/themes/vitesse-light.mjs")], diff --git a/shiki-604-cloudflare/vite.config.ts b/shiki-604-cloudflare/vite.config.ts index 1973e149..1217a3c7 100644 --- a/shiki-604-cloudflare/vite.config.ts +++ b/shiki-604-cloudflare/vite.config.ts @@ -23,6 +23,11 @@ export default defineConfig((env) => ({ apply: (_config, env) => !!env.isSsrBuild, config() { return { + resolve: { + alias: { + "shiki/wasm": "shiki/onig.wasm", + }, + }, build: { rollupOptions: { external: [/\.wasm$/], From f499f62a01cba023f7dcff99f04144e0ea6b15d9 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Thu, 9 May 2024 11:34:05 +0900 Subject: [PATCH 03/10] chore: update patch --- shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch | 8 ++++---- shiki-604-cloudflare/pnpm-lock.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch b/shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch index 7bd20bea..6745068d 100644 --- a/shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch +++ b/shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch @@ -1,5 +1,5 @@ diff --git a/dist/index.mjs b/dist/index.mjs -index b5138caf105a39be021ce5eaaa1874a388f73322..06da21ac26661f535ceb79da2f905f8a622478d8 100644 +index b5138caf105a39be021ce5eaaa1874a388f73322..9e1d0a8ed8837789c7e9a3a51fcb1d7f23dfcd18 100644 --- a/dist/index.mjs +++ b/dist/index.mjs @@ -4979,7 +4979,13 @@ function loadWasm(options) { @@ -7,9 +7,9 @@ index b5138caf105a39be021ce5eaaa1874a388f73322..06da21ac26661f535ceb79da2f905f8a instance = await _makeArrayBufferLoader(instance)(info); } - } -+ // else if (instance instanceof WebAssembly.Module) { -+ // instance = await _makeArrayBufferLoader(instance)(info); -+ // } ++ else if (instance instanceof WebAssembly.Module) { ++ instance = await _makeArrayBufferLoader(instance)(info); ++ } + else if (instance.default instanceof WebAssembly.Module) { + instance = await _makeArrayBufferLoader(instance.default)(info); + } diff --git a/shiki-604-cloudflare/pnpm-lock.yaml b/shiki-604-cloudflare/pnpm-lock.yaml index 9eef1b79..86b7dac2 100644 --- a/shiki-604-cloudflare/pnpm-lock.yaml +++ b/shiki-604-cloudflare/pnpm-lock.yaml @@ -6,7 +6,7 @@ settings: patchedDependencies: '@shikijs/core@1.5.0': - hash: 3ltqp5ujvj7kfclkimeiy43cbe + hash: dnuqxidmhu3pxsbbhbz3istmte path: patches/@shikijs__core@1.5.0.patch importers: @@ -15,7 +15,7 @@ importers: dependencies: '@shikijs/core': specifier: ^1.5.0 - version: 1.5.0(patch_hash=3ltqp5ujvj7kfclkimeiy43cbe) + version: 1.5.0(patch_hash=dnuqxidmhu3pxsbbhbz3istmte) shiki: specifier: ^1.5.0 version: 1.5.0 @@ -1181,7 +1181,7 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.17.2': optional: true - '@shikijs/core@1.5.0(patch_hash=3ltqp5ujvj7kfclkimeiy43cbe)': {} + '@shikijs/core@1.5.0(patch_hash=dnuqxidmhu3pxsbbhbz3istmte)': {} '@types/estree@1.0.5': {} @@ -1542,7 +1542,7 @@ snapshots: shiki@1.5.0: dependencies: - '@shikijs/core': 1.5.0(patch_hash=3ltqp5ujvj7kfclkimeiy43cbe) + '@shikijs/core': 1.5.0(patch_hash=dnuqxidmhu3pxsbbhbz3istmte) source-map-js@1.2.0: {} From d18503fe2e5ef51dae0da897c9accf72ebbc0b5e Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Thu, 9 May 2024 11:35:08 +0900 Subject: [PATCH 04/10] chore: node build --- shiki-604-cloudflare/vite.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shiki-604-cloudflare/vite.config.ts b/shiki-604-cloudflare/vite.config.ts index 1217a3c7..3e604d7b 100644 --- a/shiki-604-cloudflare/vite.config.ts +++ b/shiki-604-cloudflare/vite.config.ts @@ -18,7 +18,7 @@ export default defineConfig((env) => ({ : "/src/adapters/node", preview: path.resolve("./dist/server/index.js"), }), - { + !!process.env["VITE_BUILD_CF"] && { name: "wrangler-wasm", apply: (_config, env) => !!env.isSsrBuild, config() { From e90c754a314b6d56f3d39150c325f88052db656b Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Thu, 9 May 2024 11:54:21 +0900 Subject: [PATCH 05/10] chore: unused --- shiki-604-cloudflare/vite.config.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/shiki-604-cloudflare/vite.config.ts b/shiki-604-cloudflare/vite.config.ts index 3e604d7b..336db2ee 100644 --- a/shiki-604-cloudflare/vite.config.ts +++ b/shiki-604-cloudflare/vite.config.ts @@ -7,9 +7,6 @@ import { defineConfig } from "vite"; export default defineConfig((env) => ({ clearScreen: false, - define: { - "import.meta.env.VITE_BUILD_CF": !!process.env["VITE_BUILD_CF"], - }, plugins: [ vitePluginLogger(), vitePluginSsrMiddleware({ From b60b47c27a267138663b07daadd949f3abab02fa Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Thu, 9 May 2024 11:54:51 +0900 Subject: [PATCH 06/10] chore: comment --- shiki-604-cloudflare/src/app.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/shiki-604-cloudflare/src/app.tsx b/shiki-604-cloudflare/src/app.tsx index a566a290..e8a4d6db 100644 --- a/shiki-604-cloudflare/src/app.tsx +++ b/shiki-604-cloudflare/src/app.tsx @@ -4,6 +4,7 @@ import { getHighlighterCore, loadWasm, type HighlighterCore } from "shiki/core"; let highlighter: HighlighterCore; export const App = defineComponent(async () => { + // setup vite alias to `shiki/onig.wasm` during cf build await loadWasm(import("shiki/wasm")); highlighter ??= await getHighlighterCore({ From af427016c1fe79a51c8582375eb358878a655658 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Thu, 9 May 2024 14:02:46 +0900 Subject: [PATCH 07/10] chore: simplify --- shiki-604-cloudflare/src/app.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/shiki-604-cloudflare/src/app.tsx b/shiki-604-cloudflare/src/app.tsx index e8a4d6db..41163855 100644 --- a/shiki-604-cloudflare/src/app.tsx +++ b/shiki-604-cloudflare/src/app.tsx @@ -1,15 +1,14 @@ import { defineComponent } from "vue"; -import { getHighlighterCore, loadWasm, type HighlighterCore } from "shiki/core"; +import { getHighlighterCore, type HighlighterCore } from "shiki/core"; let highlighter: HighlighterCore; export const App = defineComponent(async () => { - // setup vite alias to `shiki/onig.wasm` during cf build - await loadWasm(import("shiki/wasm")); - highlighter ??= await getHighlighterCore({ themes: [import("shiki/themes/vitesse-light.mjs")], langs: [import("shiki/langs/vue.mjs")], + // setup vite alias to `shiki/onig.wasm` during cf build + loadWasm: import("shiki/wasm"), }); const html = highlighter.codeToHtml(CODE, { From cf54b89190d2f143fd4e3b6c06d21700d9e42514 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Thu, 9 May 2024 17:16:41 +0900 Subject: [PATCH 08/10] chore(deps): update --- shiki-604-cloudflare/package.json | 9 ++------- shiki-604-cloudflare/pnpm-lock.yaml | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/shiki-604-cloudflare/package.json b/shiki-604-cloudflare/package.json index a5b4a273..edaab36a 100644 --- a/shiki-604-cloudflare/package.json +++ b/shiki-604-cloudflare/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@shikijs/core": "^1.5.0", - "shiki": "^1.5.0", + "shiki": "^1.5.1", "vue": "^3.4.27" }, "devDependencies": { @@ -23,10 +23,5 @@ "vite": "^5.2.11", "wrangler": "^3.53.1" }, - "packageManager": "pnpm@9.0.6+sha512.f6d863130973207cb7a336d6b439a242a26ac8068077df530d6a86069419853dc1ffe64029ec594a9c505a3a410d19643c870aba6776330f5cfddcf10a9c1617", - "pnpm": { - "patchedDependencies": { - "@shikijs/core@1.5.0": "patches/@shikijs__core@1.5.0.patch" - } - } + "packageManager": "pnpm@9.0.6+sha512.f6d863130973207cb7a336d6b439a242a26ac8068077df530d6a86069419853dc1ffe64029ec594a9c505a3a410d19643c870aba6776330f5cfddcf10a9c1617" } diff --git a/shiki-604-cloudflare/pnpm-lock.yaml b/shiki-604-cloudflare/pnpm-lock.yaml index 86b7dac2..d45c1f2e 100644 --- a/shiki-604-cloudflare/pnpm-lock.yaml +++ b/shiki-604-cloudflare/pnpm-lock.yaml @@ -4,21 +4,16 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -patchedDependencies: - '@shikijs/core@1.5.0': - hash: dnuqxidmhu3pxsbbhbz3istmte - path: patches/@shikijs__core@1.5.0.patch - importers: .: dependencies: '@shikijs/core': - specifier: ^1.5.0 - version: 1.5.0(patch_hash=dnuqxidmhu3pxsbbhbz3istmte) - shiki: specifier: ^1.5.0 version: 1.5.0 + shiki: + specifier: ^1.5.1 + version: 1.5.1 vue: specifier: ^3.4.27 version: 3.4.27 @@ -497,6 +492,9 @@ packages: '@shikijs/core@1.5.0': resolution: {integrity: sha512-tdYjQu+jnvlPbJg4OjgCQ16zAfHlLk+RzA9o025aeaIyUww6W/Vd9TQ2t+gdZgK1fox29/L2yyqXLU6ErzYA0w==} + '@shikijs/core@1.5.1': + resolution: {integrity: sha512-xjV63pRUBvxA1LsxOUhRKLPh0uUjwBLzAKLdEuYSLIylo71sYuwDcttqNP01Ib1TZlLfO840CXHPlgUUsYFjzg==} + '@types/estree@1.0.5': resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} @@ -785,8 +783,8 @@ packages: resolution: {integrity: sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==} engines: {node: '>=10'} - shiki@1.5.0: - resolution: {integrity: sha512-AMax9zrUW8u8bnvNhnmAD9mHzk244mWCDBZm+zh4Ir3lzncF/sGUcVd5gpy0IlWvOKBUUJ8uu/BFpusGJ/PdVw==} + shiki@1.5.1: + resolution: {integrity: sha512-vx4Ds3M3B9ZEmLeSXqBAB85osBWV8ErZfP69kuFQZozPgHc33m7spLTCUkcjwEjFm3gk3F9IdXMv8kX+v9xDHA==} source-map-js@1.2.0: resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} @@ -1181,7 +1179,9 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.17.2': optional: true - '@shikijs/core@1.5.0(patch_hash=dnuqxidmhu3pxsbbhbz3istmte)': {} + '@shikijs/core@1.5.0': {} + + '@shikijs/core@1.5.1': {} '@types/estree@1.0.5': {} @@ -1540,9 +1540,9 @@ snapshots: '@types/node-forge': 1.3.11 node-forge: 1.3.1 - shiki@1.5.0: + shiki@1.5.1: dependencies: - '@shikijs/core': 1.5.0(patch_hash=dnuqxidmhu3pxsbbhbz3istmte) + '@shikijs/core': 1.5.1 source-map-js@1.2.0: {} From 2060ced5fd24f10f91f5828b2df6516cf97a64a8 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Thu, 9 May 2024 17:18:08 +0900 Subject: [PATCH 09/10] chore: unused --- .../patches/@shikijs__core@1.5.0.patch | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch diff --git a/shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch b/shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch deleted file mode 100644 index 6745068d..00000000 --- a/shiki-604-cloudflare/patches/@shikijs__core@1.5.0.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/dist/index.mjs b/dist/index.mjs -index b5138caf105a39be021ce5eaaa1874a388f73322..9e1d0a8ed8837789c7e9a3a51fcb1d7f23dfcd18 100644 ---- a/dist/index.mjs -+++ b/dist/index.mjs -@@ -4979,7 +4979,13 @@ function loadWasm(options) { - else if (isArrayBuffer(instance)) { - instance = await _makeArrayBufferLoader(instance)(info); - } -- } -+ else if (instance instanceof WebAssembly.Module) { -+ instance = await _makeArrayBufferLoader(instance)(info); -+ } -+ else if (instance.default instanceof WebAssembly.Module) { -+ instance = await _makeArrayBufferLoader(instance.default)(info); -+ } -+ } - if ('instance' in instance) - instance = instance.instance; - if ('exports' in instance) From d58b06c0e0148444317df8be684ffecf91492e83 Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Thu, 9 May 2024 17:20:40 +0900 Subject: [PATCH 10/10] chore: rename --- shiki-604-cloudflare/vite.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shiki-604-cloudflare/vite.config.ts b/shiki-604-cloudflare/vite.config.ts index 336db2ee..c752e7f8 100644 --- a/shiki-604-cloudflare/vite.config.ts +++ b/shiki-604-cloudflare/vite.config.ts @@ -16,7 +16,7 @@ export default defineConfig((env) => ({ preview: path.resolve("./dist/server/index.js"), }), !!process.env["VITE_BUILD_CF"] && { - name: "wrangler-wasm", + name: "shiki-wasm-cloudflare", apply: (_config, env) => !!env.isSsrBuild, config() { return {