feat: support maxAge for public assets (#860)

nitrojs · Jan 20, 2023 · 71576c0 · 71576c0
1 parent 3d61ebf
commit 71576c0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/src/nitro.ts b/src/nitro.ts
@@ -2,6 +2,7 @@ import { existsSync } from "node:fs";
 import { resolve } from "pathe";
 import { createHooks, createDebugger } from "hookable";
 import { createUnimport } from "unimport";
+import defu from "defu";
 import consola from "consola";
 import type { NitroConfig, Nitro } from "./types";
 import { loadOptions } from "./options";
@@ -61,7 +62,17 @@ export async function createNitro(config: NitroConfig = {}): Promise<Nitro> {
     asset.baseURL = asset.baseURL || "/";
     const isTopLevel = asset.baseURL === "/";
     asset.fallthrough = asset.fallthrough ?? isTopLevel;
-    asset.maxAge = asset.maxAge ?? (isTopLevel ? 0 : 60);
+    asset.maxAge = asset.maxAge ?? 0;
+    if (asset.maxAge && !asset.fallthrough) {
+      options.routeRules[asset.baseURL + "/**"] = defu(
+        options.routeRules[asset.baseURL + "/**"],
+        {
+          headers: {
+            "cache-control": `public, max-age=${asset.maxAge}, immutable`,
+          },
+        }
+      );
+    }
   }
 
   // Server assets

diff --git a/src/options.ts b/src/options.ts
@@ -285,10 +285,9 @@ export async function loadOptions(
     app: {
       baseURL: options.baseURL,
     },
-    nitro: {
-      routeRules: options.routeRules,
-    },
+    nitro: {},
   });
+  options.runtimeConfig.nitro.routeRules = options.routeRules;
 
   for (const publicAsset of options.publicAssets) {
     publicAsset.dir = resolve(options.srcDir, publicAsset.dir);

diff --git a/src/runtime/static.ts b/src/runtime/static.ts
@@ -96,11 +96,5 @@ export default eventHandler((event) => {
     event.node.res.setHeader("Content-Length", asset.size);
   }
 
-  // TODO: Asset dir cache control
-  // if (isBuildAsset) {
-  // const TWO_DAYS = 2 * 60 * 60 * 24
-  // event.node.res.setHeader('Cache-Control', `max-age=${TWO_DAYS}, immutable`)
-  // }
-
   return readAsset(id);
 });
diff --git a/test/fixture/nitro.config.ts b/test/fixture/nitro.config.ts
@@ -18,12 +18,13 @@ export default defineNitroConfig({
     {
       baseName: "files",
       dir: "files",
-    }
+    },
   ],
   publicAssets: [
     {
       baseURL: "build",
       dir: "public/build",
+      maxAge: 3600,
     },
   ],
   nodeModulesDirs: ["./_/node_modules"],