fix(isr): small fixes

eneajaho · eneajaho · commit 02506d17d9a6 · 2024-08-31T20:02:05.000+02:00
diff --git a/apps/docs/docs/isr/cache-hooks.md b/apps/docs/docs/isr/cache-hooks.md
@@ -33,7 +33,6 @@ server.get(
       },
     }),
 
-  // Server side render the page and add to cache if needed
   const isr = new ISRHandler({
     indexHtml,
     invalidateSecretToken: 'MY_TOKEN', // replace with env secret key ex. process.env.REVALIDATE_SECRET_TOKEN
@@ -48,7 +47,7 @@ server.get(
     // cache: fsCacheHandler,
   });
 
-
+// Server side render the page and add to cache if needed
   async (req, res, next) => await isr.render(req, res, next),
 );
 ```
diff --git a/apps/ssr-isr/server.ts b/apps/ssr-isr/server.ts
@@ -1,5 +1,5 @@
 import { CommonEngine } from '@angular/ssr';
-import { modifyHtmlCallbackFn } from '@rx-angular/isr/models';
+import { ModifyHtmlCallbackFn } from '@rx-angular/isr/models';
 import { ISRHandler } from '@rx-angular/isr/server';
 import express, { Request } from 'express';
 import { dirname, join, resolve } from 'node:path';
@@ -31,7 +31,7 @@ export function app(): express.Express {
     browserDistFolder,
     bootstrap,
     commonEngine,
-    modifyGeneratedHtml: customModifyGeneratedHtml,
+    modifyGeneratedHtml: defaultModifyGeneratedHtml,
     // cache: fsCacheHandler,
   });
 
@@ -48,33 +48,24 @@ export function app(): express.Express {
   // Example Express Rest API endpoints
   // server.get('/api/**', (req, res) => { });
   // Serve static files from /browser
-  server.get(
-    '*.*',
-    express.static(browserDistFolder, {
-      maxAge: '1y',
-    }),
-  );
+  server.get('*.*', express.static(browserDistFolder, { maxAge: '1y' }));
 
   server.get(
     '*',
     // Serve page if it exists in cache
     async (req, res, next) => await isr.serveFromCache(req, res, next),
+
     // Server side render the page and add to cache if needed
     async (req, res, next) =>
       await isr.render(req, res, next, {
-        providers: [
-          {
-            provide: RESPONSE,
-            useValue: res,
-          },
-        ],
+        providers: [{ provide: RESPONSE, useValue: res }],
       }),
   );
 
   return server;
 }
 
-const customModifyGeneratedHtml: modifyHtmlCallbackFn = (
+const defaultModifyGeneratedHtml: ModifyHtmlCallbackFn = (
   req: Request,
   html: string,
   revalidateTime?: number | null,
diff --git a/libs/isr/models/src/index.ts b/libs/isr/models/src/index.ts
@@ -9,7 +9,7 @@ export {
 export {
   InvalidateConfig,
   ISRHandlerConfig,
-  modifyHtmlCallbackFn,
+  ModifyHtmlCallbackFn,
   RenderConfig,
   RouteISRConfig,
   ServeFromCacheConfig,
diff --git a/libs/isr/models/src/isr-handler-config.ts b/libs/isr/models/src/isr-handler-config.ts
@@ -112,7 +112,7 @@ export interface ISRHandlerConfig {
    * If null, it will use `defaultModifyGeneratedHtml` function,
    * which only add commented text to the html to indicate when it was generated.
    */
-  modifyGeneratedHtml?: modifyHtmlCallbackFn;
+  modifyGeneratedHtml?: ModifyHtmlCallbackFn;
 }
 
 export interface ServeFromCacheConfig {
@@ -133,7 +133,7 @@ export interface InvalidateConfig {
   providers?: Provider[];
 }
 
-export type modifyHtmlCallbackFn = (
+export type ModifyHtmlCallbackFn = (
   req: Request,
   html: string,
   revalidateTime?: number | null,
diff --git a/libs/isr/server/src/modify-generated-html.ts b/libs/isr/server/src/modify-generated-html.ts
@@ -1,7 +1,7 @@
-import { modifyHtmlCallbackFn } from '@rx-angular/isr/models';
 import { Request } from 'express';
+import { ModifyHtmlCallbackFn } from '../../models/src';
 
-export const defaultModifyGeneratedHtml: modifyHtmlCallbackFn = (
+export const defaultModifyGeneratedHtml: ModifyHtmlCallbackFn = (
   req: Request,
   html: string,
   revalidateTime?: number | null,
