From c110fe1c6b9b8d6e6ac8b78b46fd00a57f09cd1e Mon Sep 17 00:00:00 2001 From: daishi Date: Sun, 29 Sep 2024 07:42:53 +0900 Subject: [PATCH] refactor: hono app.use usage --- packages/waku/src/cli.ts | 6 +++--- packages/waku/src/lib/builder/serve-partykit.ts | 2 +- .../waku/src/lib/plugins/vite-plugin-deploy-aws-lambda.ts | 4 ++-- .../waku/src/lib/plugins/vite-plugin-deploy-cloudflare.ts | 2 +- packages/waku/src/lib/plugins/vite-plugin-deploy-deno.ts | 4 ++-- packages/waku/src/lib/plugins/vite-plugin-deploy-netlify.ts | 2 +- packages/waku/src/lib/plugins/vite-plugin-deploy-vercel.ts | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/waku/src/cli.ts b/packages/waku/src/cli.ts index 1cd93b7ad..ed895267b 100644 --- a/packages/waku/src/cli.ts +++ b/packages/waku/src/cli.ts @@ -103,7 +103,7 @@ async function runDev() { if (values['experimental-compress']) { app.use(compress()); } - app.use('*', runner({ cmd: 'dev', config, env: process.env as any })); + app.use(runner({ cmd: 'dev', config, env: process.env as any })); app.notFound((c) => { // FIXME can we avoid hardcoding the public path? const file = path.join('public', '404.html'); @@ -151,8 +151,8 @@ async function runStart() { if (values['experimental-compress']) { app.use(compress()); } - app.use('*', serveStatic({ root: path.join(distDir, DIST_PUBLIC) })); - app.use('*', runner({ cmd: 'start', loadEntries, env: process.env as any })); + app.use(serveStatic({ root: path.join(distDir, DIST_PUBLIC) })); + app.use(runner({ cmd: 'start', loadEntries, env: process.env as any })); app.notFound((c) => { // FIXME better implementation using node stream? const file = path.join(distDir, DIST_PUBLIC, '404.html'); diff --git a/packages/waku/src/lib/builder/serve-partykit.ts b/packages/waku/src/lib/builder/serve-partykit.ts index ac8b02c04..53dd63df2 100644 --- a/packages/waku/src/lib/builder/serve-partykit.ts +++ b/packages/waku/src/lib/builder/serve-partykit.ts @@ -6,7 +6,7 @@ const loadEntries = () => import(import.meta.env.WAKU_ENTRIES_FILE!); let serveWaku: ReturnType | undefined; const app = new Hono(); -app.use('*', (c, next) => serveWaku!(c, next)); +app.use((c, next) => serveWaku!(c, next)); app.notFound(async (c) => { // @ts-expect-error partykit's types aren't available const assetsFetcher = c.env.assets as { diff --git a/packages/waku/src/lib/plugins/vite-plugin-deploy-aws-lambda.ts b/packages/waku/src/lib/plugins/vite-plugin-deploy-aws-lambda.ts index cddcf08c3..da3c9242c 100644 --- a/packages/waku/src/lib/plugins/vite-plugin-deploy-aws-lambda.ts +++ b/packages/waku/src/lib/plugins/vite-plugin-deploy-aws-lambda.ts @@ -28,8 +28,8 @@ const publicDir = '${distPublic}'; const loadEntries = () => import('${srcEntriesFile}'); const app = new Hono(); -app.use('*', serveStatic({ root: distDir + '/' + publicDir })); -app.use('*', runner({ cmd: 'start', loadEntries, env: process.env })); +app.use(serveStatic({ root: distDir + '/' + publicDir })); +app.use(runner({ cmd: 'start', loadEntries, env: process.env })); app.notFound(async (c) => { const file = path.join(distDir, publicDir, '404.html'); if (existsSync(file)) { diff --git a/packages/waku/src/lib/plugins/vite-plugin-deploy-cloudflare.ts b/packages/waku/src/lib/plugins/vite-plugin-deploy-cloudflare.ts index 2e39fcc44..2ccded73e 100644 --- a/packages/waku/src/lib/plugins/vite-plugin-deploy-cloudflare.ts +++ b/packages/waku/src/lib/plugins/vite-plugin-deploy-cloudflare.ts @@ -25,7 +25,7 @@ const loadEntries = () => import('${srcEntriesFile}'); let serveWaku; const app = new Hono(); -app.use('*', (c, next) => serveWaku(c, next)); +app.use((c, next) => serveWaku(c, next)); app.notFound(async (c) => { const assetsFetcher = c.env.ASSETS; const url = new URL(c.req.raw.url); diff --git a/packages/waku/src/lib/plugins/vite-plugin-deploy-deno.ts b/packages/waku/src/lib/plugins/vite-plugin-deploy-deno.ts index 40eb68602..bc2192e1b 100644 --- a/packages/waku/src/lib/plugins/vite-plugin-deploy-deno.ts +++ b/packages/waku/src/lib/plugins/vite-plugin-deploy-deno.ts @@ -21,8 +21,8 @@ const loadEntries = () => import('${srcEntriesFile}'); const env = Deno.env.toObject(); const app = new Hono(); -app.use('*', serveStatic({ root: distDir + '/' + publicDir })); -app.use('*', runner({ cmd: 'start', loadEntries, env })); +app.use(serveStatic({ root: distDir + '/' + publicDir })); +app.use(runner({ cmd: 'start', loadEntries, env })); app.notFound(async (c) => { const file = distDir + '/' + publicDir + '/404.html'; try { diff --git a/packages/waku/src/lib/plugins/vite-plugin-deploy-netlify.ts b/packages/waku/src/lib/plugins/vite-plugin-deploy-netlify.ts index 10e82e1e5..6e8937100 100644 --- a/packages/waku/src/lib/plugins/vite-plugin-deploy-netlify.ts +++ b/packages/waku/src/lib/plugins/vite-plugin-deploy-netlify.ts @@ -16,7 +16,7 @@ const { Hono } = await importHono(); const loadEntries = () => import('${srcEntriesFile}'); const app = new Hono(); -app.use('*', runner({ cmd: 'start', loadEntries, env: process.env })); +app.use(runner({ cmd: 'start', loadEntries, env: process.env })); app.notFound((c) => { const notFoundHtml = globalThis.__WAKU_NOT_FOUND_HTML__; if (typeof notFoundHtml === 'string') { diff --git a/packages/waku/src/lib/plugins/vite-plugin-deploy-vercel.ts b/packages/waku/src/lib/plugins/vite-plugin-deploy-vercel.ts index a259201bb..bf4f19646 100644 --- a/packages/waku/src/lib/plugins/vite-plugin-deploy-vercel.ts +++ b/packages/waku/src/lib/plugins/vite-plugin-deploy-vercel.ts @@ -25,7 +25,7 @@ const publicDir = '${distPublic}'; const loadEntries = () => import('${srcEntriesFile}'); const app = new Hono(); -app.use('*', runner({ cmd: 'start', loadEntries, env: process.env })); +app.use(runner({ cmd: 'start', loadEntries, env: process.env })); app.notFound((c) => { // FIXME better implementation using node stream? const file = path.join(distDir, publicDir, '404.html');