From 51d13e2f6ce3a9e03c33d80af6716847f6a78061 Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Tue, 15 Oct 2024 15:07:18 +0100
Subject: [PATCH] feat: accept `URL` for entry points (#12226)

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
---
 .changeset/eighty-donkeys-fly.md                   | 14 ++++++++++++++
 packages/astro/src/core/client-directive/build.ts  |  6 +++++-
 packages/astro/src/core/preview/index.ts           |  2 +-
 packages/astro/src/core/render/renderer.ts         |  2 +-
 packages/astro/src/core/routing/manifest/create.ts |  2 +-
 packages/astro/src/integrations/hooks.ts           |  4 +++-
 packages/astro/src/runtime/server/hydration.ts     |  4 +++-
 .../astro/src/toolbar/vite-plugin-dev-toolbar.ts   |  4 ++--
 packages/astro/src/types/public/integrations.ts    | 14 +++++++-------
 packages/astro/src/types/public/toolbar.ts         |  2 +-
 packages/astro/src/virtual-modules/container.ts    |  2 +-
 .../vite-plugin-integrations-container/index.ts    |  2 +-
 .../middleware-no-user-middleware/astro.config.mjs |  5 +++++
 .../integration-middleware-url.js                  |  9 +++++++++
 .../src/pages/url.astro                            |  0
 .../multiple-renderers/renderers/two/index.mjs     |  2 +-
 .../reuse-injected-entrypoint/astro.config.mjs     |  9 +++++++--
 packages/astro/test/middleware.test.js             |  6 ++++++
 .../astro/test/reuse-injected-entrypoint.test.js   |  6 ++++++
 19 files changed, 74 insertions(+), 21 deletions(-)
 create mode 100644 .changeset/eighty-donkeys-fly.md
 create mode 100644 packages/astro/test/fixtures/middleware-no-user-middleware/integration-middleware-url.js
 create mode 100644 packages/astro/test/fixtures/middleware-no-user-middleware/src/pages/url.astro

diff --git a/.changeset/eighty-donkeys-fly.md b/.changeset/eighty-donkeys-fly.md
new file mode 100644
index 0000000000..8cec462363
--- /dev/null
+++ b/.changeset/eighty-donkeys-fly.md
@@ -0,0 +1,14 @@
+---
+'astro': minor
+---
+
+The following renderer fields and integration fields now accept `URL` as a type:
+
+**Renderers**:
+- `AstroRenderer.clientEntrpoint`
+- `AstroRenderer.serverEntrypoint`
+
+**Integrations**:
+- `InjectedRoute.entrypoint`
+- `AstroIntegrationMiddleware.entrypoint`
+- `DevToolbarAppEntry.entrypoint`
diff --git a/packages/astro/src/core/client-directive/build.ts b/packages/astro/src/core/client-directive/build.ts
index e618a9e8a9..eafd07c3ce 100644
--- a/packages/astro/src/core/client-directive/build.ts
+++ b/packages/astro/src/core/client-directive/build.ts
@@ -4,7 +4,11 @@ import { build } from 'esbuild';
 /**
  * Build a client directive entrypoint into code that can directly run in a `<script>` tag.
  */
-export async function buildClientDirectiveEntrypoint(name: string, entrypoint: string, root: URL) {
+export async function buildClientDirectiveEntrypoint(
+	name: string,
+	entrypoint: string | URL,
+	root: URL,
+) {
 	const stringifiedName = JSON.stringify(name);
 	const stringifiedEntrypoint = JSON.stringify(entrypoint);
 
diff --git a/packages/astro/src/core/preview/index.ts b/packages/astro/src/core/preview/index.ts
index 4d1aaba989..dbaf102300 100644
--- a/packages/astro/src/core/preview/index.ts
+++ b/packages/astro/src/core/preview/index.ts
@@ -67,7 +67,7 @@ export default async function preview(inlineConfig: AstroInlineConfig): Promise<
 	// preview entrypoint of the integration package, relative to the user's project root.
 	const require = createRequire(settings.config.root);
 	const previewEntrypointUrl = pathToFileURL(
-		require.resolve(settings.adapter.previewEntrypoint),
+		require.resolve(settings.adapter.previewEntrypoint.toString()),
 	).href;
 
 	const previewModule = (await import(previewEntrypointUrl)) as Partial<PreviewModule>;
diff --git a/packages/astro/src/core/render/renderer.ts b/packages/astro/src/core/render/renderer.ts
index 8daec8d53e..8db3799e96 100644
--- a/packages/astro/src/core/render/renderer.ts
+++ b/packages/astro/src/core/render/renderer.ts
@@ -6,7 +6,7 @@ export async function loadRenderer(
 	renderer: AstroRenderer,
 	moduleLoader: ModuleLoader,
 ): Promise<SSRLoadedRenderer | undefined> {
-	const mod = await moduleLoader.import(renderer.serverEntrypoint);
+	const mod = await moduleLoader.import(renderer.serverEntrypoint.toString());
 	if (typeof mod.default !== 'undefined') {
 		return {
 			...renderer,
diff --git a/packages/astro/src/core/routing/manifest/create.ts b/packages/astro/src/core/routing/manifest/create.ts
index 38794b771c..33b5216998 100644
--- a/packages/astro/src/core/routing/manifest/create.ts
+++ b/packages/astro/src/core/routing/manifest/create.ts
@@ -281,7 +281,7 @@ function createInjectedRoutes({ settings, cwd }: CreateRouteManifestParams): Rou
 
 	for (const injectedRoute of settings.injectedRoutes) {
 		const { pattern: name, entrypoint, prerender: prerenderInjected } = injectedRoute;
-		const { resolved, component } = resolveInjectedRoute(entrypoint, config.root, cwd);
+		const { resolved, component } = resolveInjectedRoute(entrypoint.toString(), config.root, cwd);
 
 		const segments = removeLeadingForwardSlash(name)
 			.split(path.posix.sep)
diff --git a/packages/astro/src/integrations/hooks.ts b/packages/astro/src/integrations/hooks.ts
index 7d8fe6e019..4c1d4a1ae2 100644
--- a/packages/astro/src/integrations/hooks.ts
+++ b/packages/astro/src/integrations/hooks.ts
@@ -236,7 +236,9 @@ export async function runHookConfigSetup({
 							order === 'pre' ? 'before' : 'after'
 						} any application middleware you define.`,
 					);
-					updatedSettings.middlewares[order].push(entrypoint);
+					updatedSettings.middlewares[order].push(
+						typeof entrypoint === 'string' ? entrypoint : fileURLToPath(entrypoint),
+					);
 				},
 				createCodegenDir: () => {
 					const codegenDir = new URL(normalizeCodegenDir(integration.name), settings.dotAstroDir);
diff --git a/packages/astro/src/runtime/server/hydration.ts b/packages/astro/src/runtime/server/hydration.ts
index 982ff9977e..1a678a81a7 100644
--- a/packages/astro/src/runtime/server/hydration.ts
+++ b/packages/astro/src/runtime/server/hydration.ts
@@ -158,7 +158,9 @@ export async function generateHydrateScript(
 	// Add renderer url
 	if (renderer.clientEntrypoint) {
 		island.props['component-export'] = componentExport.value;
-		island.props['renderer-url'] = await result.resolve(decodeURI(renderer.clientEntrypoint));
+		island.props['renderer-url'] = await result.resolve(
+			decodeURI(renderer.clientEntrypoint.toString()),
+		);
 		island.props['props'] = escapeHTML(serializeProps(props, metadata));
 	}
 
diff --git a/packages/astro/src/toolbar/vite-plugin-dev-toolbar.ts b/packages/astro/src/toolbar/vite-plugin-dev-toolbar.ts
index d4d0510e69..e26df2c550 100644
--- a/packages/astro/src/toolbar/vite-plugin-dev-toolbar.ts
+++ b/packages/astro/src/toolbar/vite-plugin-dev-toolbar.ts
@@ -66,9 +66,9 @@ export default function astroDevToolbar({ settings, logger }: AstroPluginOptions
 									`safeLoadPlugin(${JSON.stringify(
 										plugin,
 									)}, async () => (await import(${JSON.stringify(
-										typeof plugin === 'string' ? plugin : plugin.entrypoint,
+										typeof plugin === 'string' ? plugin : plugin.entrypoint.toString(),
 									)})).default, ${JSON.stringify(
-										typeof plugin === 'string' ? plugin : plugin.entrypoint,
+										typeof plugin === 'string' ? plugin : plugin.entrypoint.toString(),
 									)})`,
 							)
 							.join(',')}]));
diff --git a/packages/astro/src/types/public/integrations.ts b/packages/astro/src/types/public/integrations.ts
index d31a1651f9..4d0709fab4 100644
--- a/packages/astro/src/types/public/integrations.ts
+++ b/packages/astro/src/types/public/integrations.ts
@@ -49,16 +49,16 @@ export type ClientDirective = (
 
 export interface ClientDirectiveConfig {
 	name: string;
-	entrypoint: string;
+	entrypoint: string | URL;
 }
 
 export interface AstroRenderer {
 	/** Name of the renderer. */
 	name: string;
 	/** Import entrypoint for the client/browser renderer. */
-	clientEntrypoint?: string;
+	clientEntrypoint?: string | URL;
 	/** Import entrypoint for the server/build/ssr renderer. */
-	serverEntrypoint: string;
+	serverEntrypoint: string | URL;
 }
 
 export type AdapterSupportsKind =
@@ -84,8 +84,8 @@ export interface AstroAdapterFeatures {
 
 export interface AstroAdapter {
 	name: string;
-	serverEntrypoint?: string;
-	previewEntrypoint?: string;
+	serverEntrypoint?: string | URL;
+	previewEntrypoint?: string | URL;
 	exports?: string[];
 	args?: any;
 	adapterFeatures?: AstroAdapterFeatures;
@@ -140,7 +140,7 @@ export type InjectedScriptStage = 'before-hydration' | 'head-inline' | 'page' |
 
 export interface InjectedRoute {
 	pattern: string;
-	entrypoint: string;
+	entrypoint: string | URL;
 	prerender?: boolean;
 }
 
@@ -155,7 +155,7 @@ export interface InjectedType {
 
 export type AstroIntegrationMiddleware = {
 	order: 'pre' | 'post';
-	entrypoint: string;
+	entrypoint: string | URL;
 };
 
 export type HookParameters<
diff --git a/packages/astro/src/types/public/toolbar.ts b/packages/astro/src/types/public/toolbar.ts
index 00dc67fba4..21b1db6b72 100644
--- a/packages/astro/src/types/public/toolbar.ts
+++ b/packages/astro/src/types/public/toolbar.ts
@@ -45,7 +45,7 @@ type DevToolbarAppMeta = {
 
 // The param passed to `addDevToolbarApp` in the integration
 export type DevToolbarAppEntry = DevToolbarAppMeta & {
-	entrypoint: string;
+	entrypoint: string | URL;
 };
 
 // Public API for the dev toolbar
diff --git a/packages/astro/src/virtual-modules/container.ts b/packages/astro/src/virtual-modules/container.ts
index 3efc626d9f..4908f06079 100644
--- a/packages/astro/src/virtual-modules/container.ts
+++ b/packages/astro/src/virtual-modules/container.ts
@@ -18,7 +18,7 @@ import type { SSRLoadedRenderer } from '../types/public/internal.js';
 export async function loadRenderers(renderers: AstroRenderer[]) {
 	const loadedRenderers = await Promise.all(
 		renderers.map(async (renderer) => {
-			const mod = await import(renderer.serverEntrypoint);
+			const mod = await import(renderer.serverEntrypoint.toString());
 			if (typeof mod.default !== 'undefined') {
 				return {
 					...renderer,
diff --git a/packages/astro/src/vite-plugin-integrations-container/index.ts b/packages/astro/src/vite-plugin-integrations-container/index.ts
index 22623284ec..0af181e39c 100644
--- a/packages/astro/src/vite-plugin-integrations-container/index.ts
+++ b/packages/astro/src/vite-plugin-integrations-container/index.ts
@@ -35,7 +35,7 @@ async function resolveEntryPoint(
 	this: PluginContext,
 	route: InjectedRoute,
 ): Promise<ResolvedInjectedRoute> {
-	const resolvedId = await this.resolve(route.entrypoint)
+	const resolvedId = await this.resolve(route.entrypoint.toString())
 		.then((res) => res?.id)
 		.catch(() => undefined);
 	if (!resolvedId) return route;
diff --git a/packages/astro/test/fixtures/middleware-no-user-middleware/astro.config.mjs b/packages/astro/test/fixtures/middleware-no-user-middleware/astro.config.mjs
index 8888f456d6..701ece3247 100644
--- a/packages/astro/test/fixtures/middleware-no-user-middleware/astro.config.mjs
+++ b/packages/astro/test/fixtures/middleware-no-user-middleware/astro.config.mjs
@@ -16,6 +16,11 @@ export default defineConfig({
 						entrypoint: fileURLToPath(new URL('./integration-middleware-post.js', import.meta.url)),
 						order: 'post'
 					});
+
+					addMiddleware({
+						entrypoint: new URL('./integration-middleware-url.js', import.meta.url),
+						order: 'post'
+					});
 				}
 			}
 		}
diff --git a/packages/astro/test/fixtures/middleware-no-user-middleware/integration-middleware-url.js b/packages/astro/test/fixtures/middleware-no-user-middleware/integration-middleware-url.js
new file mode 100644
index 0000000000..afcdb3e4f0
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-no-user-middleware/integration-middleware-url.js
@@ -0,0 +1,9 @@
+import { defineMiddleware } from 'astro:middleware';
+
+export const onRequest = defineMiddleware((context, next) => {
+	if (context.url.pathname === '/url') {
+		return Response.json({ post: 'works' });
+	}
+
+	return next();
+});
diff --git a/packages/astro/test/fixtures/middleware-no-user-middleware/src/pages/url.astro b/packages/astro/test/fixtures/middleware-no-user-middleware/src/pages/url.astro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/astro/test/fixtures/multiple-renderers/renderers/two/index.mjs b/packages/astro/test/fixtures/multiple-renderers/renderers/two/index.mjs
index 9662e8a5cf..ac3a1d7b28 100644
--- a/packages/astro/test/fixtures/multiple-renderers/renderers/two/index.mjs
+++ b/packages/astro/test/fixtures/multiple-renderers/renderers/two/index.mjs
@@ -7,7 +7,7 @@ export default function() {
 				addRenderer({
 					name: 'renderer-two',
 					clientEntrypoint: null,
-					serverEntrypoint: '@test/astro-renderer-two/server.mjs',
+					serverEntrypoint: new URL('server.mjs', import.meta.url),
 				});
 			}
 		}
diff --git a/packages/astro/test/fixtures/reuse-injected-entrypoint/astro.config.mjs b/packages/astro/test/fixtures/reuse-injected-entrypoint/astro.config.mjs
index 266e31c07f..451fceb376 100644
--- a/packages/astro/test/fixtures/reuse-injected-entrypoint/astro.config.mjs
+++ b/packages/astro/test/fixtures/reuse-injected-entrypoint/astro.config.mjs
@@ -6,7 +6,7 @@ export default defineConfig({
 		{
 			name: 'astropi',
 			hooks: {
-				'astro:config:setup': async ({ injectRoute }) => {
+				'astro:config:setup': async ({ injectRoute, config }) => {
 					injectRoute({
 						pattern: `/injected-a`,
 						entrypoint: './src/to-inject.astro',
@@ -27,8 +27,13 @@ export default defineConfig({
 						entrypoint: './src/[id].astro',
 						prerender: true,
 					});
+					injectRoute({
+						pattern: `/dynamic-c/[id]`,
+						entrypoint: new URL('./[id].astro', config.srcDir),
+						prerender: true,
+					})
 				},
 			},
 		},
 	],
-});
\ No newline at end of file
+});
diff --git a/packages/astro/test/middleware.test.js b/packages/astro/test/middleware.test.js
index f7fbc3501c..63c2788bcd 100644
--- a/packages/astro/test/middleware.test.js
+++ b/packages/astro/test/middleware.test.js
@@ -128,6 +128,12 @@ describe('Integration hooks with no user middleware', () => {
 		const json = await res.json();
 		assert.equal(json.post, 'works');
 	});
+
+	it('Integration middleware marked as "url" runs', async () => {
+		const res = await fixture.fetch('/url');
+		const json = await res.json();
+		assert.equal(json.post, 'works');
+	});
 });
 
 describe('Middleware in PROD mode, SSG', () => {
diff --git a/packages/astro/test/reuse-injected-entrypoint.test.js b/packages/astro/test/reuse-injected-entrypoint.test.js
index 10b8e528f8..5593f054ac 100644
--- a/packages/astro/test/reuse-injected-entrypoint.test.js
+++ b/packages/astro/test/reuse-injected-entrypoint.test.js
@@ -43,6 +43,12 @@ const routes = [
 		h1: '[id].astro',
 		p: 'id-2',
 	},
+	{
+		description: 'matches /dynamic-c/id-2 to [id].astro when the route is injected with a URL',
+		url: '/dynamic-c/id-2',
+		h1: '[id].astro',
+		p: 'id-2',
+	},
 ];
 
 function appendForwardSlash(path) {