From 0dc3a315bf11d12c69ac431e8f96ea9acfa584c2 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Thu, 20 Jun 2024 16:18:01 -0400 Subject: [PATCH] Remove extra stuff --- .../components/_ServerIslandRenderer.astro | 28 ------------------- packages/astro/package.json | 1 - packages/astro/src/core/dev/container.ts | 2 -- .../src/core/server-islands/component.astro | 0 .../astro/src/core/server-islands/config.ts | 10 ------- packages/astro/src/runtime/server/endpoint.ts | 1 + .../src/vite-plugin-astro-server/pipeline.ts | 1 - 7 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 packages/astro/components/_ServerIslandRenderer.astro delete mode 100644 packages/astro/src/core/server-islands/component.astro delete mode 100644 packages/astro/src/core/server-islands/config.ts diff --git a/packages/astro/components/_ServerIslandRenderer.astro b/packages/astro/components/_ServerIslandRenderer.astro deleted file mode 100644 index 76e388dafc..0000000000 --- a/packages/astro/components/_ServerIslandRenderer.astro +++ /dev/null @@ -1,28 +0,0 @@ ---- -export const prerender = false; -export const partial = true; - -// @ts-ignore -import { islands } from 'astro:internal/server-islands'; - -type RenderOptions = { - componentPath: string; // TODO remove - componentExport: string; - props: Record; - slot: Record; -} - -const { method } = Astro.request; -if(method !== 'POST') { - // TODO return error -} - -const json = await Astro.request.text(); -const options: RenderOptions = JSON.parse(json); - -const module = await islands[options.componentPath](); -const Island = module[options.componentExport]; - -// TODO check auth ---- - diff --git a/packages/astro/package.json b/packages/astro/package.json index 8b004d8cb8..74b64e6258 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -80,7 +80,6 @@ "types": "./dist/core/middleware/index.d.ts", "default": "./dist/core/middleware/index.js" }, - "./server-islands/endpoint": "./dist/core/server-islands/endpoint.js", "./virtual-modules/*": "./dist/virtual-modules/*" }, "imports": { diff --git a/packages/astro/src/core/dev/container.ts b/packages/astro/src/core/dev/container.ts index 81d80566c0..58962de0f7 100644 --- a/packages/astro/src/core/dev/container.ts +++ b/packages/astro/src/core/dev/container.ts @@ -14,7 +14,6 @@ import { import { createVite } from '../create-vite.js'; import type { Logger } from '../logger/core.js'; import { apply as applyPolyfill } from '../polyfill.js'; -import { injectServerIslandEndpoint } from '../server-islands/config.js'; export interface Container { fs: typeof nodeFs; @@ -52,7 +51,6 @@ export async function createContainer({ }); settings = injectImageEndpoint(settings, 'dev'); - settings = injectServerIslandEndpoint(settings); const { base, diff --git a/packages/astro/src/core/server-islands/component.astro b/packages/astro/src/core/server-islands/component.astro deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/astro/src/core/server-islands/config.ts b/packages/astro/src/core/server-islands/config.ts deleted file mode 100644 index 3c33d2657d..0000000000 --- a/packages/astro/src/core/server-islands/config.ts +++ /dev/null @@ -1,10 +0,0 @@ -import type { AstroSettings } from '../../@types/astro.js'; - -export function injectServerIslandEndpoint(settings: AstroSettings) { - /*settings.injectedRoutes.push({ - pattern: '/_server-islands/[name]', - entrypoint: 'astro/components/_ServerIslandRenderer.astro', - });*/ - - return settings; -} diff --git a/packages/astro/src/runtime/server/endpoint.ts b/packages/astro/src/runtime/server/endpoint.ts index 8cd6763912..d1d4afbebb 100644 --- a/packages/astro/src/runtime/server/endpoint.ts +++ b/packages/astro/src/runtime/server/endpoint.ts @@ -26,6 +26,7 @@ export async function renderEndpoint( ); } if (handler === undefined) { + logger.warn( 'router', `No API Route handler exists for the method "${method}" for the route "${url.pathname}".\n` + diff --git a/packages/astro/src/vite-plugin-astro-server/pipeline.ts b/packages/astro/src/vite-plugin-astro-server/pipeline.ts index ad2cf90af2..cd0271f155 100644 --- a/packages/astro/src/vite-plugin-astro-server/pipeline.ts +++ b/packages/astro/src/vite-plugin-astro-server/pipeline.ts @@ -160,7 +160,6 @@ export class DevPipeline extends Pipeline { // First check built-in routes for(const route of this.defaultRoutes) { if(route.matchesComponent(filePath)) { - debugger; return route.instance; } }