@analogjs/vite-plugin-nitro 2.4.0-beta.9 → 3.0.0-alpha.10

package/src/lib/options.d.ts

@@ -1,121 +1,129 @@
-import { PrerenderRoute } from 'nitropack';
+import type { PrerenderRoute } from "nitro/types";
+import type { UserConfig } from "vite";
 export interface Options {
-    ssr?: boolean;
-    ssrBuildDir?: string;
-    /**
-     * Prerender the static pages without producing the server output.
-     */
-    static?: boolean;
-    prerender?: PrerenderOptions;
-    entryServer?: string;
-    index?: string;
-    /**
-     * Relative path to source files. Default is 'src'.
-     */
-    sourceRoot?: string;
-    /**
-     * Absolute path to workspace root. Default is 'process.cwd()'
-     */
-    workspaceRoot?: string;
-    /**
-     * Additional page paths to include
-     */
-    additionalPagesDirs?: string[];
-    /**
-     * Additional API paths to include
-     */
-    additionalAPIDirs?: string[];
-    apiPrefix?: string;
-    /**
-     * Toggles internal API middleware.
-     * If disabled, a proxy request is used to route /api
-     * requests to / in the production server build.
-     *
-     * @deprecated
-     * Use the src/server/routes/api folder
-     * for API routes.
-     */
-    useAPIMiddleware?: boolean;
+	ssr?: boolean;
+	ssrBuildDir?: string;
+	/**
+	* Prerender the static pages without producing the server output.
+	*/
+	static?: boolean;
+	prerender?: PrerenderOptions;
+	entryServer?: string;
+	index?: string;
+	/**
+	* Relative path to source files. Default is 'src'.
+	*/
+	sourceRoot?: string;
+	/**
+	* Absolute path to workspace root. Default is 'process.cwd()'
+	*/
+	workspaceRoot?: string;
+	/**
+	* Additional page paths to include
+	*/
+	additionalPagesDirs?: string[];
+	/**
+	* Additional API paths to include
+	*/
+	additionalAPIDirs?: string[];
+	apiPrefix?: string;
+	/**
+	* Toggles internal API middleware.
+	* If disabled, a proxy request is used to route /api
+	* requests to / in the production server build.
+	*
+	* @deprecated
+	* Use the src/server/routes/api folder
+	* for API routes.
+	*/
+	useAPIMiddleware?: boolean;
+	/**
+	* Vite-native build passthrough. Rolldown-only options such as
+	* `build.rolldownOptions.output.codeSplitting` are forwarded when present.
+	*/
+	vite?: {
+		build?: UserConfig["build"];
+	};
 }
 export interface PrerenderOptions {
-    /**
-     * Add additional routes to prerender through crawling page links.
-     */
-    discover?: boolean;
-    /**
-     * List of routes to prerender resolved statically or dynamically.
-     */
-    routes?: (string | PrerenderContentDir | PrerenderRouteConfig)[] | (() => Promise<(string | PrerenderContentDir | PrerenderRouteConfig | undefined)[]>);
-    sitemap?: SitemapConfig;
-    /** List of functions that run for each route after pre-rendering is complete. */
-    postRenderingHooks?: ((routes: PrerenderRoute) => Promise<void>)[];
+	/**
+	* Add additional routes to prerender through crawling page links.
+	*/
+	discover?: boolean;
+	/**
+	* List of routes to prerender resolved statically or dynamically.
+	*/
+	routes?: (string | PrerenderContentDir | PrerenderRouteConfig)[] | (() => Promise<(string | PrerenderContentDir | PrerenderRouteConfig | undefined)[]>);
+	sitemap?: SitemapConfig;
+	/** List of functions that run for each route after pre-rendering is complete. */
+	postRenderingHooks?: ((routes: PrerenderRoute) => Promise<void>)[];
 }
 export interface SitemapConfig {
-    host: string;
+	host: string;
 }
 export interface PrerenderContentDir {
-    /**
-     * The directory where files should be grabbed from.
-     * @example `/src/contents/blog`
-     */
-    contentDir: string;
-    /**
-     * Transform the matching content files path into a route.
-     * The function is called for each matching content file within the specified contentDir.
-     * @param file information of the matching file (`path`, `name`, `extension`, `attributes`, `content`)
-     * @returns a string with the route should be returned (e. g. `/blog/<slug>`) or the value `false`, when the route should not be prerendered.
-     */
-    transform: (file: PrerenderContentFile) => string | false;
-    /**
-     * Customize the sitemap definition for the prerendered route
-     *
-     * https://www.sitemaps.org/protocol.html#xmlTagDefinitions
-     */
-    sitemap?: PrerenderSitemapConfig | ((file: PrerenderContentFile) => PrerenderSitemapConfig);
-    /**
-     * Output the source markdown content alongside the prerendered route.
-     * The source file will be accessible at the route path with a .md extension.
-     * @param file information of the matching file including its content
-     * @returns the markdown content string to output, or `false` to skip outputting for this file
-     */
-    outputSourceFile?: (file: PrerenderContentFile) => string | false;
+	/**
+	* The directory where files should be grabbed from.
+	* @example `/src/contents/blog`
+	*/
+	contentDir: string;
+	/**
+	* Transform the matching content files path into a route.
+	* The function is called for each matching content file within the specified contentDir.
+	* @param file information of the matching file (`path`, `name`, `extension`, `attributes`, `content`)
+	* @returns a string with the route should be returned (e. g. `/blog/<slug>`) or the value `false`, when the route should not be prerendered.
+	*/
+	transform: (file: PrerenderContentFile) => string | false;
+	/**
+	* Customize the sitemap definition for the prerendered route
+	*
+	* https://www.sitemaps.org/protocol.html#xmlTagDefinitions
+	*/
+	sitemap?: PrerenderSitemapConfig | ((file: PrerenderContentFile) => PrerenderSitemapConfig);
+	/**
+	* Output the source markdown content alongside the prerendered route.
+	* The source file will be accessible at the route path with a .md extension.
+	* @param file information of the matching file including its content
+	* @returns the markdown content string to output, or `false` to skip outputting for this file
+	*/
+	outputSourceFile?: (file: PrerenderContentFile) => string | false;
 }
 /**
- * @param path the path to the content file
- * @param name the basename of the matching content file without the file extension
- * @param extension the file extension
- * @param attributes the frontmatter attributes extracted from the frontmatter section of the file
- * @param content the raw file content including frontmatter
- * @returns a string with the route should be returned (e. g. `/blog/<slug>`) or the value `false`, when the route should not be prerendered.
- */
+* @param path the path to the content file
+* @param name the basename of the matching content file without the file extension
+* @param extension the file extension
+* @param attributes the frontmatter attributes extracted from the frontmatter section of the file
+* @param content the raw file content including frontmatter
+* @returns a string with the route should be returned (e. g. `/blog/<slug>`) or the value `false`, when the route should not be prerendered.
+*/
 export interface PrerenderContentFile {
-    path: string;
-    attributes: Record<string, any>;
-    name: string;
-    extension: string;
-    content: string;
+	path: string;
+	attributes: Record<string, any>;
+	name: string;
+	extension: string;
+	content: string;
 }
 export interface PrerenderSitemapConfig {
-    lastmod?: string;
-    changefreq?: 'always' | 'hourly' | 'daily' | 'weekly' | 'monthly' | 'yearly' | 'never';
-    priority?: string;
+	lastmod?: string;
+	changefreq?: "always" | "hourly" | "daily" | "weekly" | "monthly" | "yearly" | "never";
+	priority?: string;
 }
 export interface PrerenderRouteConfig {
-    route: string;
-    /**
-     * Customize the sitemap definition for the prerendered route
-     *
-     * https://www.sitemaps.org/protocol.html#xmlTagDefinitions
-     */
-    sitemap?: PrerenderSitemapConfig | (() => PrerenderSitemapConfig);
-    /**
-     * Prerender static data for the prerendered route
-     */
-    staticData?: boolean;
-    /**
-     * Path to the source markdown file to output alongside the prerendered route.
-     * The source file will be accessible at the route path with a .md extension.
-     * @example 'src/content/overview.md'
-     */
-    outputSourceFile?: string;
+	route: string;
+	/**
+	* Customize the sitemap definition for the prerendered route
+	*
+	* https://www.sitemaps.org/protocol.html#xmlTagDefinitions
+	*/
+	sitemap?: PrerenderSitemapConfig | (() => PrerenderSitemapConfig);
+	/**
+	* Prerender static data for the prerendered route
+	*/
+	staticData?: boolean;
+	/**
+	* Path to the source markdown file to output alongside the prerendered route.
+	* The source file will be accessible at the route path with a .md extension.
+	* @example 'src/content/overview.md'
+	*/
+	outputSourceFile?: string;
 }

package/src/lib/plugins/dev-server-plugin.d.ts

@@ -1,7 +1,7 @@
-import { Plugin } from 'vite';
-import { Options } from '../options.js';
+import { Plugin } from "vite";
+import { Options } from "../options.js";
 type ServerOptions = Options & {
-    routeRules?: Record<string, any> | undefined;
+	routeRules?: Record<string, any> | undefined;
 };
 export declare function devServerPlugin(options: ServerOptions): Plugin;
 export {};

package/src/lib/plugins/dev-server-plugin.js

@@ -1,69 +1,59 @@
-// SSR dev server, middleware and error page source modified from
-// https://github.com/solidjs/solid-start/blob/main/packages/start/dev/server.js
-import { normalizePath, } from 'vite';
-import { resolve } from 'node:path';
-import { readFileSync } from 'node:fs';
-import { createEvent, sendWebResponse } from 'h3';
-import { createRouter as createRadixRouter, toRouteMatcher } from 'radix3';
-import { defu } from 'defu';
-import { registerDevServerMiddleware } from '../utils/register-dev-middleware.js';
-export function devServerPlugin(options) {
-    const workspaceRoot = options?.workspaceRoot || process.cwd();
-    const sourceRoot = options?.sourceRoot ?? 'src';
-    const index = options.index || 'index.html';
-    let config;
-    let root;
-    let isTest = false;
-    return {
-        name: 'analogjs-dev-ssr-plugin',
-        config(userConfig, { mode }) {
-            config = userConfig;
-            root = normalizePath(resolve(workspaceRoot, config.root || '.') || '.');
-            isTest = isTest ? isTest : mode === 'test';
-            return {
-                resolve: {
-                    alias: {
-                        '~analog/entry-server': options.entryServer || `${root}/${sourceRoot}/main.server.ts`,
-                    },
-                },
-            };
-        },
-        configureServer(viteServer) {
-            if (isTest) {
-                return;
-            }
-            return async () => {
-                remove_html_middlewares(viteServer.middlewares);
-                registerDevServerMiddleware(root, sourceRoot, viteServer);
-                viteServer.middlewares.use(async (req, res) => {
-                    let template = readFileSync(resolve(viteServer.config.root, index), 'utf-8');
-                    template = await viteServer.transformIndexHtml(req.originalUrl, template);
-                    const _routeRulesMatcher = toRouteMatcher(createRadixRouter({ routes: options.routeRules }));
-                    const _getRouteRules = (path) => defu({}, ..._routeRulesMatcher.matchAll(path).reverse());
-                    try {
-                        let result;
-                        // Check for route rules explicitly disabling SSR
-                        if (_getRouteRules(req.originalUrl).ssr === false) {
-                            result = template;
-                        }
-                        else {
-                            const entryServer = (await viteServer.ssrLoadModule('~analog/entry-server'))['default'];
-                            result = await entryServer(req.originalUrl, template, {
-                                req,
-                                res,
-                            });
-                        }
-                        if (result instanceof Response) {
-                            sendWebResponse(createEvent(req, res), result);
-                            return;
-                        }
-                        res.setHeader('Content-Type', 'text/html');
-                        res.end(result);
-                    }
-                    catch (e) {
-                        viteServer.ssrFixStacktrace(e);
-                        res.statusCode = 500;
-                        res.end(`
+import { writeWebResponseToNode } from "../utils/node-web-bridge.js";
+import { registerDevServerMiddleware } from "../utils/register-dev-middleware.js";
+import { normalizePath } from "vite";
+import { resolve } from "node:path";
+import { readFileSync } from "node:fs";
+import { createRouter, toRouteMatcher } from "radix3";
+import { defu } from "defu";
+//#region packages/vite-plugin-nitro/src/lib/plugins/dev-server-plugin.ts
+function devServerPlugin(options) {
+	const workspaceRoot = options?.workspaceRoot || process.cwd();
+	const sourceRoot = options?.sourceRoot ?? "src";
+	const index = options.index || "index.html";
+	let config;
+	let root;
+	let isTest = false;
+	return {
+		name: "analogjs-dev-ssr-plugin",
+		config(userConfig, { mode }) {
+			config = userConfig;
+			root = normalizePath(resolve(workspaceRoot, config.root || ".") || ".");
+			isTest = isTest ? isTest : mode === "test";
+			return {
+				appType: "custom",
+				resolve: { alias: { "~analog/entry-server": options.entryServer || `${root}/${sourceRoot}/main.server.ts` } }
+			};
+		},
+		configureServer(viteServer) {
+			if (isTest) return;
+			return async () => {
+				remove_html_middlewares(viteServer.middlewares);
+				registerDevServerMiddleware(root, sourceRoot, viteServer);
+				viteServer.middlewares.use(async (req, res) => {
+					let template = readFileSync(resolve(viteServer.config.root, index), "utf-8");
+					template = await viteServer.transformIndexHtml(req.originalUrl, template);
+					const _routeRulesMatcher = toRouteMatcher(createRouter({ routes: options.routeRules }));
+					const _getRouteRules = (path) => defu({}, ..._routeRulesMatcher.matchAll(path).reverse());
+					try {
+						let result;
+						if (_getRouteRules(req.originalUrl).ssr === false) result = template;
+						else {
+							const entryServer = (await viteServer.ssrLoadModule("~analog/entry-server"))["default"];
+							result = await entryServer(req.originalUrl, template, {
+								req,
+								res
+							});
+						}
+						if (result instanceof Response) {
+							await writeWebResponseToNode(res, result);
+							return;
+						}
+						res.setHeader("Content-Type", "text/html");
+						res.end(result);
+					} catch (e) {
+						viteServer.ssrFixStacktrace(e);
+						res.statusCode = 500;
+						res.end(`
               <!DOCTYPE html>
               <html lang="en">
                 <head>
@@ -71,49 +61,51 @@ export function devServerPlugin(options) {
                   <title>Error</title>
                   <script type="module">
                     import { ErrorOverlay } from '/@vite/client'
-                    document.body.appendChild(new ErrorOverlay(${JSON.stringify(prepareError(req, e)).replace(/</g, '\\u003c')}))
-                  </script>
+                    document.body.appendChild(new ErrorOverlay(${JSON.stringify(prepareError(req, e)).replace(/</g, "\\u003c")}))
+                  <\/script>
                 </head>
                 <body>
                 </body>
               </html>
             `);
-                    }
-                });
-            };
-        },
-    };
+					}
+				});
+			};
+		}
+	};
 }
 /**
- * Removes Vite internal middleware
- *
- * @param server
- */
+* Removes Vite internal middleware
+*
+* @param server
+*/
 function remove_html_middlewares(server) {
-    const html_middlewares = [
-        'viteIndexHtmlMiddleware',
-        'vite404Middleware',
-        'viteSpaFallbackMiddleware',
-    ];
-    for (let i = server.stack.length - 1; i > 0; i--) {
-        const handler = server.stack[i]?.handle;
-        const handlerName = typeof handler === 'function' ? handler.name : undefined;
-        if (handlerName && html_middlewares.includes(handlerName)) {
-            server.stack.splice(i, 1);
-        }
-    }
+	const html_middlewares = [
+		"viteIndexHtmlMiddleware",
+		"vite404Middleware",
+		"viteSpaFallbackMiddleware",
+		"viteHtmlFallbackMiddleware"
+	];
+	for (let i = server.stack.length - 1; i > 0; i--) {
+		const handler = server.stack[i]?.handle;
+		const handlerName = typeof handler === "function" ? handler.name : void 0;
+		if (handlerName && html_middlewares.includes(handlerName)) server.stack.splice(i, 1);
+	}
 }
 /**
- * Formats error for SSR message in error overlay
- * @param req
- * @param error
- * @returns
- */
+* Formats error for SSR message in error overlay
+* @param req
+* @param error
+* @returns
+*/
 function prepareError(req, error) {
-    const e = error;
-    return {
-        message: `An error occured while server rendering ${req.url}:\n\n\t${typeof e === 'string' ? e : e.message} `,
-        stack: typeof e === 'string' ? '' : e.stack,
-    };
+	const e = error;
+	return {
+		message: `An error occured while server rendering ${req.url}:\n\n\t${typeof e === "string" ? e : e.message} `,
+		stack: typeof e === "string" ? "" : e.stack
+	};
 }
+//#endregion
+export { devServerPlugin };
+
 //# sourceMappingURL=dev-server-plugin.js.map

package/src/lib/plugins/dev-server-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev-server-plugin.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-nitro/src/lib/plugins/dev-server-plugin.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,gFAAgF;AAEhF,OAAO,EAKL,aAAa,GACd,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAClD,OAAO,EAAE,YAAY,IAAI,iBAAiB,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAKlF,MAAM,UAAU,eAAe,CAAC,OAAsB;IACpD,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAC9D,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,KAAK,CAAC;IAChD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,YAAY,CAAC;IAC5C,IAAI,MAAkB,CAAC;IACvB,IAAI,IAAY,CAAC;IACjB,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,OAAO;QACL,IAAI,EAAE,yBAAyB;QAC/B,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE;YACzB,MAAM,GAAG,UAAU,CAAC;YACpB,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;YACxE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;YAC3C,OAAO;gBACL,OAAO,EAAE;oBACP,KAAK,EAAE;wBACL,sBAAsB,EACpB,OAAO,CAAC,WAAW,IAAI,GAAG,IAAI,IAAI,UAAU,iBAAiB;qBAChE;iBACF;aACF,CAAC;QACJ,CAAC;QACD,eAAe,CAAC,UAAU;YACxB,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO;YACT,CAAC;YAED,OAAO,KAAK,IAAI,EAAE;gBAChB,uBAAuB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;gBAChD,2BAA2B,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;gBAE1D,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;oBAC5C,IAAI,QAAQ,GAAG,YAAY,CACzB,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,EACtC,OAAO,CACR,CAAC;oBAEF,QAAQ,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAC5C,GAAG,CAAC,WAAqB,EACzB,QAAQ,CACT,CAAC;oBAEF,MAAM,kBAAkB,GAAG,cAAc,CACvC,iBAAiB,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAClD,CAAC;oBACF,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE,CACtC,IAAI,CACF,EAAE,EACF,GAAG,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAC5B,CAAC;oBAEvB,IAAI,CAAC;wBACH,IAAI,MAAyB,CAAC;wBAC9B,iDAAiD;wBACjD,IAAI,cAAc,CAAC,GAAG,CAAC,WAAqB,CAAC,CAAC,GAAG,KAAK,KAAK,EAAE,CAAC;4BAC5D,MAAM,GAAG,QAAQ,CAAC;wBACpB,CAAC;6BAAM,CAAC;4BACN,MAAM,WAAW,GAAG,CAClB,MAAM,UAAU,CAAC,aAAa,CAAC,sBAAsB,CAAC,CACvD,CAAC,SAAS,CAAC,CAAC;4BACb,MAAM,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,EAAE;gCACpD,GAAG;gCACH,GAAG;6BACJ,CAAC,CAAC;wBACL,CAAC;wBAED,IAAI,MAAM,YAAY,QAAQ,EAAE,CAAC;4BAC/B,eAAe,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;4BAC/C,OAAO;wBACT,CAAC;wBACD,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;wBAC3C,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBAClB,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,UAAU,CAAC,gBAAgB,CAAC,CAAU,CAAC,CAAC;wBACxC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;wBACrB,GAAG,CAAC,GAAG,CAAC;;;;;;;;iEAQ6C,IAAI,CAAC,SAAS,CACzD,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,CACrB,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC;;;;;;aAMjC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAAC,MAAoC;IACnE,MAAM,gBAAgB,GAAG;QACvB,yBAAyB;QACzB,mBAAmB;QACnB,2BAA2B;KAC5B,CAAC;IACF,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACjD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;QACxC,MAAM,WAAW,GACf,OAAO,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3D,IAAI,WAAW,IAAI,gBAAgB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC1D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,YAAY,CAAC,GAA4B,EAAE,KAAc;IAChE,MAAM,CAAC,GAAG,KAAc,CAAC;IACzB,OAAO;QACL,OAAO,EAAE,2CAA2C,GAAG,CAAC,GAAG,UACzD,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAChC,GAAG;QACH,KAAK,EAAE,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK;KAC5C,CAAC;AACJ,CAAC"}
+{"version":3,"file":"dev-server-plugin.js","names":[],"sources":["../../../../../../packages/vite-plugin-nitro/src/lib/plugins/dev-server-plugin.ts"],"sourcesContent":["// SSR dev server, middleware and error page source modified from\n// https://github.com/solidjs/solid-start/blob/main/packages/start/dev/server.js\n\nimport {\n  Connect,\n  Plugin,\n  UserConfig,\n  ViteDevServer,\n  normalizePath,\n} from 'vite';\nimport { resolve } from 'node:path';\nimport { readFileSync } from 'node:fs';\nimport { createRouter as createRadixRouter, toRouteMatcher } from 'radix3';\nimport { defu } from 'defu';\nimport type { NitroRouteRules } from 'nitro/types';\n\nimport { registerDevServerMiddleware } from '../utils/register-dev-middleware.js';\nimport { writeWebResponseToNode } from '../utils/node-web-bridge.js';\nimport { Options } from '../options.js';\n\ntype ServerOptions = Options & { routeRules?: Record<string, any> | undefined };\n\nexport function devServerPlugin(options: ServerOptions): Plugin {\n  const workspaceRoot = options?.workspaceRoot || process.cwd();\n  const sourceRoot = options?.sourceRoot ?? 'src';\n  const index = options.index || 'index.html';\n  let config: UserConfig;\n  let root: string;\n  let isTest = false;\n\n  return {\n    name: 'analogjs-dev-ssr-plugin',\n    config(userConfig, { mode }) {\n      config = userConfig;\n      root = normalizePath(resolve(workspaceRoot, config.root || '.') || '.');\n      isTest = isTest ? isTest : mode === 'test';\n      return {\n        appType: 'custom',\n        resolve: {\n          alias: {\n            '~analog/entry-server':\n              options.entryServer || `${root}/${sourceRoot}/main.server.ts`,\n          },\n        },\n      };\n    },\n    configureServer(viteServer) {\n      if (isTest) {\n        return;\n      }\n\n      return async () => {\n        remove_html_middlewares(viteServer.middlewares);\n        registerDevServerMiddleware(root, sourceRoot, viteServer);\n\n        viteServer.middlewares.use(async (req, res) => {\n          let template = readFileSync(\n            resolve(viteServer.config.root, index),\n            'utf-8',\n          );\n\n          template = await viteServer.transformIndexHtml(\n            req.originalUrl as string,\n            template,\n          );\n\n          const _routeRulesMatcher = toRouteMatcher(\n            createRadixRouter({ routes: options.routeRules }),\n          );\n          const _getRouteRules = (path: string) =>\n            defu(\n              {},\n              ..._routeRulesMatcher.matchAll(path).reverse(),\n            ) as NitroRouteRules;\n\n          try {\n            let result: string | Response;\n            // Check for route rules explicitly disabling SSR\n            if (_getRouteRules(req.originalUrl as string).ssr === false) {\n              result = template;\n            } else {\n              const entryServer = (\n                await viteServer.ssrLoadModule('~analog/entry-server')\n              )['default'];\n              result = await entryServer(req.originalUrl, template, {\n                req,\n                res,\n              });\n            }\n\n            if (result instanceof Response) {\n              await writeWebResponseToNode(res, result);\n              return;\n            }\n            res.setHeader('Content-Type', 'text/html');\n            res.end(result);\n          } catch (e) {\n            viteServer.ssrFixStacktrace(e as Error);\n            res.statusCode = 500;\n            res.end(`\n              <!DOCTYPE html>\n              <html lang=\"en\">\n                <head>\n                  <meta charset=\"UTF-8\" />\n                  <title>Error</title>\n                  <script type=\"module\">\n                    import { ErrorOverlay } from '/@vite/client'\n                    document.body.appendChild(new ErrorOverlay(${JSON.stringify(\n                      prepareError(req, e),\n                    ).replace(/</g, '\\\\u003c')}))\n                  </script>\n                </head>\n                <body>\n                </body>\n              </html>\n            `);\n          }\n        });\n      };\n    },\n  };\n}\n\n/**\n * Removes Vite internal middleware\n *\n * @param server\n */\nfunction remove_html_middlewares(server: ViteDevServer['middlewares']) {\n  const html_middlewares = [\n    'viteIndexHtmlMiddleware',\n    'vite404Middleware',\n    'viteSpaFallbackMiddleware',\n    'viteHtmlFallbackMiddleware',\n  ];\n  for (let i = server.stack.length - 1; i > 0; i--) {\n    const handler = server.stack[i]?.handle;\n    const handlerName =\n      typeof handler === 'function' ? handler.name : undefined;\n    if (handlerName && html_middlewares.includes(handlerName)) {\n      server.stack.splice(i, 1);\n    }\n  }\n}\n\n/**\n * Formats error for SSR message in error overlay\n * @param req\n * @param error\n * @returns\n */\nfunction prepareError(req: Connect.IncomingMessage, error: unknown) {\n  const e = error as Error;\n  return {\n    message: `An error occured while server rendering ${req.url}:\\n\\n\\t${\n      typeof e === 'string' ? e : e.message\n    } `,\n    stack: typeof e === 'string' ? '' : e.stack,\n  };\n}\n"],"mappings":";;;;;;;;AAsBA,SAAgB,gBAAgB,SAAgC;CAC9D,MAAM,gBAAgB,SAAS,iBAAiB,QAAQ,KAAK;CAC7D,MAAM,aAAa,SAAS,cAAc;CAC1C,MAAM,QAAQ,QAAQ,SAAS;CAC/B,IAAI;CACJ,IAAI;CACJ,IAAI,SAAS;AAEb,QAAO;EACL,MAAM;EACN,OAAO,YAAY,EAAE,QAAQ;AAC3B,YAAS;AACT,UAAO,cAAc,QAAQ,eAAe,OAAO,QAAQ,IAAI,IAAI,IAAI;AACvE,YAAS,SAAS,SAAS,SAAS;AACpC,UAAO;IACL,SAAS;IACT,SAAS,EACP,OAAO,EACL,wBACE,QAAQ,eAAe,GAAG,KAAK,GAAG,WAAW,kBAChD,EACF;IACF;;EAEH,gBAAgB,YAAY;AAC1B,OAAI,OACF;AAGF,UAAO,YAAY;AACjB,4BAAwB,WAAW,YAAY;AAC/C,gCAA4B,MAAM,YAAY,WAAW;AAEzD,eAAW,YAAY,IAAI,OAAO,KAAK,QAAQ;KAC7C,IAAI,WAAW,aACb,QAAQ,WAAW,OAAO,MAAM,MAAM,EACtC,QACD;AAED,gBAAW,MAAM,WAAW,mBAC1B,IAAI,aACJ,SACD;KAED,MAAM,qBAAqB,eACzB,aAAkB,EAAE,QAAQ,QAAQ,YAAY,CAAC,CAClD;KACD,MAAM,kBAAkB,SACtB,KACE,EAAE,EACF,GAAG,mBAAmB,SAAS,KAAK,CAAC,SAAS,CAC/C;AAEH,SAAI;MACF,IAAI;AAEJ,UAAI,eAAe,IAAI,YAAsB,CAAC,QAAQ,MACpD,UAAS;WACJ;OACL,MAAM,eACJ,MAAM,WAAW,cAAc,uBAAuB,EACtD;AACF,gBAAS,MAAM,YAAY,IAAI,aAAa,UAAU;QACpD;QACA;QACD,CAAC;;AAGJ,UAAI,kBAAkB,UAAU;AAC9B,aAAM,uBAAuB,KAAK,OAAO;AACzC;;AAEF,UAAI,UAAU,gBAAgB,YAAY;AAC1C,UAAI,IAAI,OAAO;cACR,GAAG;AACV,iBAAW,iBAAiB,EAAW;AACvC,UAAI,aAAa;AACjB,UAAI,IAAI;;;;;;;;iEAQ6C,KAAK,UAChD,aAAa,KAAK,EAAE,CACrB,CAAC,QAAQ,MAAM,UAAU,CAAC;;;;;;cAMjC;;MAEJ;;;EAGP;;;;;;;AAQH,SAAS,wBAAwB,QAAsC;CACrE,MAAM,mBAAmB;EACvB;EACA;EACA;EACA;EACD;AACD,MAAK,IAAI,IAAI,OAAO,MAAM,SAAS,GAAG,IAAI,GAAG,KAAK;EAChD,MAAM,UAAU,OAAO,MAAM,IAAI;EACjC,MAAM,cACJ,OAAO,YAAY,aAAa,QAAQ,OAAO,KAAA;AACjD,MAAI,eAAe,iBAAiB,SAAS,YAAY,CACvD,QAAO,MAAM,OAAO,GAAG,EAAE;;;;;;;;;AAW/B,SAAS,aAAa,KAA8B,OAAgB;CAClE,MAAM,IAAI;AACV,QAAO;EACL,SAAS,2CAA2C,IAAI,IAAI,SAC1D,OAAO,MAAM,WAAW,IAAI,EAAE,QAC/B;EACD,OAAO,OAAO,MAAM,WAAW,KAAK,EAAE;EACvC"}

package/src/lib/plugins/page-endpoints.d.ts

@@ -1,7 +1,7 @@
 export declare function pageEndpointsPlugin(): {
-    name: string;
-    transform(_code: string, id: string): Promise<{
-        code: string;
-        map: null;
-    } | undefined>;
+	name: string;
+	transform(_code: string, id: string): Promise<{
+		code: string;
+		map: null;
+	} | undefined>;
 };

package/src/lib/plugins/page-endpoints.js

@@ -1,55 +1,43 @@
-import { buildSync } from 'esbuild';
-import { normalizePath } from 'vite';
-export function pageEndpointsPlugin() {
-    return {
-        name: 'analogjs-vite-plugin-nitro-rollup-page-endpoint',
-        async transform(_code, id) {
-            if (normalizePath(id).includes('/pages/') && id.endsWith('.server.ts')) {
-                const compiled = buildSync({
-                    stdin: {
-                        contents: _code,
-                        sourcefile: id,
-                        loader: 'ts',
-                    },
-                    write: false,
-                    metafile: true,
-                    platform: 'neutral',
-                    format: 'esm',
-                    logLevel: 'silent',
-                });
-                let fileExports = [];
-                for (const key in compiled.metafile?.outputs) {
-                    if (compiled.metafile?.outputs[key].entryPoint) {
-                        fileExports = compiled.metafile?.outputs[key].exports;
-                    }
-                }
-                const code = `
-            import { defineEventHandler } from 'h3';
+import { SERVER_FETCH_FACTORY_SNIPPET } from "../utils/renderers.js";
+import { normalizePath } from "vite";
+import { parseSync } from "oxc-parser";
+//#region packages/vite-plugin-nitro/src/lib/plugins/page-endpoints.ts
+function pageEndpointsPlugin() {
+	return {
+		name: "analogjs-vite-plugin-nitro-rollup-page-endpoint",
+		async transform(_code, id) {
+			if (normalizePath(id).includes("/pages/") && id.endsWith(".server.ts")) {
+				const fileExports = parseSync(id, _code, {
+					sourceType: "module",
+					lang: "ts"
+				}).module.staticExports.flatMap((e) => e.entries.filter((entry) => entry.exportName.name !== null).map((entry) => entry.exportName.name));
+				return {
+					code: `
+            import { defineHandler, fetchWithEvent } from 'nitro/h3';
+            import { createFetch } from 'ofetch';
 
-            ${fileExports.includes('load')
-                    ? _code
-                    : `
+            ${fileExports.includes("load") ? _code : `
                 ${_code}
                 export const load = () => {
                   return {};
                 }`}
 
-            ${fileExports.includes('action')
-                    ? ''
-                    : `
+            ${fileExports.includes("action") ? "" : `
                 export const action = () => {
                   return {};
-                }              
+                }
               `}
 
-            export default defineEventHandler(async(event) => {
+            export default defineHandler(async(event) => {
+              ${SERVER_FETCH_FACTORY_SNIPPET}
+
               if (event.method === 'GET') {
                 try {
                   return await load({
                     params: event.context.params,
-                    req: event.node.req,
-                    res: event.node.res,
-                    fetch: $fetch,
+                    req: event.node?.req,
+                    res: event.node?.res,
+                    fetch: serverFetch,
                     event
                   });
                 } catch(e) {
@@ -60,25 +48,25 @@ export function pageEndpointsPlugin() {
                 try {
                   return await action({
                     params: event.context.params,
-                    req: event.node.req,
-                    res: event.node.res,
-                    fetch: $fetch,
+                    req: event.node?.req,
+                    res: event.node?.res,
+                    fetch: serverFetch,
                     event
                   });
                 } catch(e) {
                   console.error(\` An error occurred: \${e}\`)
                   throw e;
-                }               
+                }
               }
             });
-          `;
-                return {
-                    code,
-                    map: null,
-                };
-            }
-            return;
-        },
-    };
+          `,
+					map: null
+				};
+			}
+		}
+	};
 }
+//#endregion
+export { pageEndpointsPlugin };
+
 //# sourceMappingURL=page-endpoints.js.map