From c826ebd06cc5c1cec27be68d043d4d7922a0276f Mon Sep 17 00:00:00 2001
From: daishi <daishi@axlight.com>
Date: Sat, 28 Sep 2024 12:09:02 +0900
Subject: [PATCH] follow the #911 change

---
 .../lib/plugins/vite-plugin-deploy-partykit.ts   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/waku/src/lib/plugins/vite-plugin-deploy-partykit.ts b/packages/waku/src/lib/plugins/vite-plugin-deploy-partykit.ts
index b87906577..d7cfc3348 100644
--- a/packages/waku/src/lib/plugins/vite-plugin-deploy-partykit.ts
+++ b/packages/waku/src/lib/plugins/vite-plugin-deploy-partykit.ts
@@ -9,21 +9,16 @@ import { DIST_PUBLIC } from '../builder/constants.js';
 const SERVE_JS = 'serve-partykit.js';
 
 const getServeJsContent = (srcEntriesFile: string) => `
-import { runner, importHono } from 'waku/unstable_hono';
+import { runner, importHono, importHonoContextStorage } from 'waku/unstable_hono';
 
 const { Hono } = await importHono();
-let contextStorage;
-try {
- ({ contextStorage } = await import('hono/context-storage'));
-} catch {}
+const { contextStorage } = await importHonoContextStorage();
 
 const loadEntries = () => import('${srcEntriesFile}');
 let serveWaku;
 
 const app = new Hono();
-if (contextStorage) {
-  app.use(contextStorage());
-}
+app.use(contextStorage());
 app.use('*', (c, next) => serveWaku(c, next));
 app.notFound(async (c) => {
   const assetsFetcher = c.env.assets;
@@ -74,6 +69,11 @@ export function deployPartykitPlugin(opts: {
       rootDir = config.root;
       entriesFile = `${rootDir}/${opts.srcDir}/${SRC_ENTRIES}`;
       const { deploy, unstable_phase } = platformObject.buildOptions || {};
+      if (deploy === 'partykit' && Array.isArray(config.ssr.external)) {
+        config.ssr.external = config.ssr.external.filter(
+          (item) => item !== 'hono/context-storage',
+        );
+      }
       if (
         (unstable_phase !== 'buildServerBundle' &&
           unstable_phase !== 'buildSsrBundle') ||