wip

packages/astro/test/ssr-adapter-build-config.test.js

@@ -23,20 +23,22 @@ describe('Integration buildConfig hook', () => {
 							vite: {
 								plugins: [
 									{
-										resolveId(id) {
-											if (id === '@my-ssr') {
-												return id;
-											} else if (id === 'astro/app') {
-												const viteId = viteID(
-													new URL('../dist/core/app/index.js', import.meta.url),
-												);
-												return viteId;
-											}
+										// TODO: check if @my-ssr check is useful
+										resolveId: {
+											filter: {
+												id: /^astro\/app$/,
+											},
+											handler() {
+												return viteID(new URL('../dist/core/app/index.js', import.meta.url));
+											},
 										},
-										load(id) {
-											if (id === '@my-ssr') {
+										load: {
+											filter: {
+												id: /^@my-ssr$/,
+											},
+											handler() {
 												return `import { App } from 'astro/app';export function createExports(manifest) { return { manifest, createApp: () => new App(manifest) }; }`;
-											}
+											},
 										},
 									},
 								],

packages/astro/test/test-adapter.js

@@ -34,16 +34,20 @@ export default function ({
 					vite: {
 						plugins: [
 							{
-								resolveId(id) {
-									if (id === '@my-ssr') {
-										return id;
-									} else if (id === 'astro/app') {
-										const viteId = viteID(new URL('../dist/core/app/index.js', import.meta.url));
-										return viteId;
-									}
+								// TODO: check if @my-ssr check is useful
+								resolveId: {
+									filter: {
+										id: /^astro\/app$/,
+									},
+									handler() {
+										return viteID(new URL('../dist/core/app/index.js', import.meta.url));
+									},
 								},
-								load(id) {
-									if (id === '@my-ssr') {
+								load: {
+									filter: {
+										id: /^@my-ssr$/,
+									},
+									handler() {
 										return {
 											code: `
 											import { App, AppPipeline } from 'astro/app';
@@ -102,7 +106,7 @@ export default function ({
 											}
 										`,
 										};
-									}
+									},
 								},
 							},
 						],

packages/integrations/alpinejs/src/index.ts

@@ -54,13 +54,19 @@ function virtualEntrypoint(options?: Options): Plugin {
 					: options.entrypoint;
 			}
 		},
-		resolveId(id) {
-			if (id === virtualModuleId) {
+		resolveId: {
+			filter: {
+				id: new RegExp(`^${virtualModuleId}$`),
+			},
+			handler() {
 				return resolvedVirtualModuleId;
-			}
+			},
 		},
-		load(id) {
-			if (id === resolvedVirtualModuleId) {
+		load: {
+			filter: {
+				id: new RegExp(`^${resolvedVirtualModuleId}$`),
+			},
+			handler() {
 				if (entrypoint) {
 					return `\
 import * as mod from ${JSON.stringify(entrypoint)};
@@ -80,7 +86,7 @@ export const setup = (Alpine) => {
 }`;
 				}
 				return `export const setup = () => {};`;
-			}
+			},
 		},
 	};
 }