fix: return status and other info for ssr

roxiness · Jul 23, 2023 · f45edf9 · f45edf9
1 parent 829aadd
commit f45edf9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/lib/extra/tools/ssr.js b/lib/extra/tools/ssr.js
@@ -1,5 +1,5 @@
 import { SvelteComponentDev } from 'svelte/internal'
-import { preloadUrl } from '../../runtime'
+import { preloadUrl } from '../../runtime/index.js'
 
 const polyfillFetch = async () => {
     const fetch = await import('node-fetch')
@@ -18,7 +18,15 @@ const polyfillFetch = async () => {
  * Returns a statically rendered Routify app
  * @param {(SvelteComponentDev|{default: SvelteComponentDev}) & {load: (url:string)=>Promise<any>}} module App.svelte
  * @param {string | string[] | import('../../runtime').PreloadOptions=} urlOrOptions one or multiple urls separated by ";<routerName>="
- * @returns
+ *  @returns {Promise<{
+ *   html: string,
+ *   css: { code: string, map: string },
+ *   head: '',
+ *   error: string,
+ *   maxage: number,
+ *   props: Object.<string, string>,
+ *   redirect: string
+ * }>}
  */
 export const renderModule = async (module, urlOrOptions) => {
     await polyfillFetch()
@@ -27,6 +35,7 @@ export const renderModule = async (module, urlOrOptions) => {
     const url = urlOrOptions.url || urlOrOptions
     const load = module.load ? await module.load(url) : {}
 
-    await preloadUrl(urlOrOptions)
-    return { status: 200, ...(await render()), ...load }
+    const preloadUrlLoad = await preloadUrl(urlOrOptions)
+
+    return { status: 200, ...(await render()), ...load, ...preloadUrlLoad?.flat()[0] }
 }
diff --git a/lib/extra/vite-plugin/assets/esmRenderer.js b/lib/extra/vite-plugin/assets/esmRenderer.js
@@ -19,7 +19,15 @@ const template = readFileSync(new URL('./index.html', import.meta.url), 'utf-8')
 /**
  * Renders a given path to HTML
  * @param {string} path
- * @returns {Promise<{html: string, load: any}>}
+ * @returns {Promise<{
+ *   html: string,
+ *   css: { code: string, map: string },
+ *   head: '',
+ *   error: string,
+ *   maxage: number,
+ *   props: Object.<string, string>,
+ *   redirect: string
+ * }>}
  */
 export const render = async (path = '/') => {
     const output = await _render(path)

diff --git a/lib/runtime/helpers/preload.js b/lib/runtime/helpers/preload.js
@@ -80,6 +80,7 @@ export const preloadUrlFromUrlPairs = async (urlPairs, routesMap) => {
     const routers = await Promise.all(routerPromises)
 
     await Promise.all(routers.map(router => router && router.ready()))
+    return routers.map(router => router.activeRoute.get().load)
 }
 
 /**