feat(app-webpack): SSR/webserver -> returned fn from serveStaticConte…

…nt can now be async too
quasarframework · Aug 2, 2024 · 95712f8 · 95712f8
1 parent 3395c22
commit 95712f8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/app-webpack/templates/entry/ssr-prod-webserver.js b/app-webpack/templates/entry/ssr-prod-webserver.js
@@ -72,11 +72,11 @@ export async function startServer () {
 
   <% if (ssr.pwa) { %>
   // serve the service worker with no cache
-  serveStatic({ urlPath: '/<%= pwa.swFilename %>', pathToServe: '<%= pwa.swFilename %>', opts: { maxAge: 0 } })
+  await serveStatic({ urlPath: '/<%= pwa.swFilename %>', pathToServe: '<%= pwa.swFilename %>', opts: { maxAge: 0 } })
   <% } %>
 
   // serve "client" folder (includes the "public" folder)
-  serveStatic({ urlPath: '/', pathToServe: '.' })
+  await serveStatic({ urlPath: '/', pathToServe: '.' })
 
   await injectMiddlewares(middlewareParams)
 

diff --git a/app-webpack/templates/ssr/default/server.js b/app-webpack/templates/ssr/default/server.js
@@ -87,6 +87,9 @@ const maxAge = process.env.DEV
  * to serve static content at "urlPath" from "pathToServe" folder/file.
  *
  * Notice resolve.urlPath(urlPath) and resolve.public(pathToServe) usages.
+ *
+ * Can be async: ssrServeStaticContent(async ({ app, resolve }) => {
+ * Can return an async function: return async ({ urlPath = '/', pathToServe = '.', opts = {} }) => {
  */
 export const serveStaticContent = ssrServeStaticContent(({ app, resolve }) => {
   return ({ urlPath = '/', pathToServe = '.', opts = {} }) => {

diff --git a/app-webpack/templates/ssr/ts/server.ts b/app-webpack/templates/ssr/ts/server.ts
@@ -85,6 +85,9 @@ const maxAge = process.env.DEV ? 0 : 1000 * 60 * 60 * 24 * 30;
  * to serve static content at "urlPath" from "pathToServe" folder/file.
  *
  * Notice resolve.urlPath(urlPath) and resolve.public(pathToServe) usages.
+ *
+ * Can be async: ssrServeStaticContent(async ({ app, resolve }) => {
+ * Can return an async function: return async ({ urlPath = '/', pathToServe = '.', opts = {} }) => {
  */
 export const serveStaticContent = ssrServeStaticContent(({ app, resolve }) => {
   return ({ urlPath = '/', pathToServe = '.', opts = {} }) => {

diff --git a/app-webpack/types/ssrmiddleware.d.ts b/app-webpack/types/ssrmiddleware.d.ts
@@ -82,7 +82,7 @@ interface SsrServeStaticFnParams {
   opts?: ServeStaticOptions<Response>;
 }
 
-type SsrServeStaticFn = (params: SsrServeStaticFnParams) => void;
+type SsrServeStaticFn = (params: SsrServeStaticFnParams) => void | Promise<void>;
 
 export type SsrServeStaticContentCallback = (
   params: ssrServeStaticContentParams