Added support for public/static folder cache control

Author: Daniel Balogh

package-lock.json

@@ -35,7 +35,8 @@
     "aws-sdk": "^2.664.0",
     "fs-extra": "^9.0.0",
     "klaw": "^3.0.0",
-    "mime-types": "^2.1.27"
+    "mime-types": "^2.1.27",
+    "regex-parser": "^2.2.10"
   },
   "devDependencies": {
     "@types/fs-extra": "^8.1.0",

packages/s3-static-assets/package-lock.json

@@ -6,21 +6,29 @@ import filterOutDirectories from "./lib/filterOutDirectories";
 import { IMMUTABLE_CACHE_CONTROL_HEADER } from "./lib/constants";
 import S3ClientFactory, { Credentials } from "./lib/s3";
 import pathToPosix from "./lib/pathToPosix";
+import getPublicAssetCacheControl, {
+  PublicAssetCacheControl
+} from "./lib/getPublicAssetCacheControl";
+
+type Options = {
+  publicAssetCache?: PublicAssetCacheControl;
+};
 
 type UploadStaticAssetsOptions = {
   bucketName: string;
   nextConfigDir: string;
   nextStaticDir?: string;
   credentials: Credentials;
+  options: Options;
 };
 
 const uploadStaticAssets = async (
-  options: UploadStaticAssetsOptions
+  config: UploadStaticAssetsOptions
 ): Promise<AWS.S3.ManagedUpload.SendData[]> => {
-  const { bucketName, nextConfigDir, nextStaticDir = nextConfigDir } = options;
+  const { bucketName, nextConfigDir, nextStaticDir = nextConfigDir } = config;
   const s3 = await S3ClientFactory({
     bucketName,
-    credentials: options.credentials
+    credentials: config.credentials
   });
 
   const dotNextDirectory = path.join(nextConfigDir, ".next");
@@ -66,7 +74,8 @@ const uploadStaticAssets = async (
     });
 
   const uploadPublicOrStaticDirectory = async (
-    directory: "public" | "static"
+    directory: "public" | "static",
+    options: Options
   ): Promise<Promise<AWS.S3.ManagedUpload.SendData>[]> => {
     const directoryPath = path.join(nextStaticDir, directory);
     if (!(await fse.pathExists(directoryPath))) {
@@ -80,13 +89,23 @@ const uploadStaticAssets = async (
         filePath: fileItem.path,
         s3Key: pathToPosix(
           path.relative(path.resolve(nextStaticDir), fileItem.path)
+        ),
+        cacheControl: getPublicAssetCacheControl(
+          fileItem.path,
+          options.publicAssetCache
         )
       })
     );
   };
 
-  const publicDirUploads = await uploadPublicOrStaticDirectory("public");
-  const staticDirUploads = await uploadPublicOrStaticDirectory("static");
+  const publicDirUploads = await uploadPublicOrStaticDirectory(
+    "public",
+    config.options
+  );
+  const staticDirUploads = await uploadPublicOrStaticDirectory(
+    "static",
+    config.options
+  );
 
   const allUploads = [
     ...buildStaticFileUploads, // .next/static

packages/s3-static-assets/package.json

@@ -1,2 +1,5 @@
 export const IMMUTABLE_CACHE_CONTROL_HEADER =
   "public, max-age=31536000, immutable";
+
+export const DEFAULT_ASSET_CACHE_CONTROL_HEADER = "public, max-age=31536000, must-revalidate";
+export const DEFAULT_ASSET_CACHE_REGEX = /\.(gif|jpe?g|jp2|tiff|png|webp|bmp|svg)$/i;

packages/s3-static-assets/src/index.ts

@@ -0,0 +1,43 @@
+import path from "path";
+import regexParser from "regex-parser";
+import {
+  DEFAULT_ASSET_CACHE_CONTROL_HEADER,
+  DEFAULT_ASSET_CACHE_REGEX
+} from "./constants";
+
+export type PublicAssetCacheControl =
+  | boolean
+  | {
+      test?: string;
+      value?: string;
+    };
+
+const getPublicAssetCacheControl = (
+  filePath: string,
+  options?: PublicAssetCacheControl
+): string | undefined => {
+  if (!options) {
+    return undefined;
+  }
+
+  let value: string = DEFAULT_ASSET_CACHE_CONTROL_HEADER;
+  let test: RegExp = DEFAULT_ASSET_CACHE_REGEX;
+
+  if (typeof options === "object") {
+    if (options.value) {
+      value = options.value;
+    }
+
+    if (options.test) {
+      test = regexParser(options.test);
+    }
+  }
+
+  if (test.test(path.basename(filePath))) {
+    return value;
+  }
+
+  return undefined;
+};
+
+export default getPublicAssetCacheControl;

packages/s3-static-assets/src/lib/constants.ts

@@ -0,0 +1,4 @@
+{
+  "/todos/terms": "pages/todos/terms.html",
+  "/todos/terms/[section]": "pages/todos/terms/[section].html"
+}