fix tests on CI and refactor

Author: danielcondemarin

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

@@ -4,38 +4,16 @@ import fse from "fs-extra";
 import readDirectoryFiles from "./lib/readDirectoryFiles";
 import filterOutDirectories from "./lib/filterOutDirectories";
 import { IMMUTABLE_CACHE_CONTROL_HEADER } from "./lib/constants";
-import S3ClientFactory, { S3Client } from "./lib/s3";
+import S3ClientFactory from "./lib/s3";
 
 type UploadStaticAssetsOptions = {
   bucketName: string;
   nextConfigDir: string;
 };
 
-const uploadPublicOrStaticDirectory = async (
-  s3: S3Client,
-  directory: "public" | "static",
-  nextConfigDir: string
-): Promise<Promise<AWS.S3.ManagedUpload.SendData>[]> => {
-  const files = await readDirectoryFiles(path.join(nextConfigDir, directory));
-
-  return files.filter(filterOutDirectories).map(fileItem =>
-    s3.uploadFile({
-      filePath: fileItem.path,
-      s3Key: path.posix.relative(path.resolve(nextConfigDir), fileItem.path)
-    })
-  );
-};
-
-const filePathToS3Key = (filePath: string): string => {
-  const relevantFilePathPart = filePath.substring(
-    filePath.indexOf(".next" + path.sep)
-  );
-  return relevantFilePathPart.replace(".next", "_next");
-};
-
 const uploadStaticAssets = async (
   options: UploadStaticAssetsOptions
-): Promise<AWS.S3.ManagedUpload.SendData> => {
+): Promise<AWS.S3.ManagedUpload.SendData[]> => {
   const { bucketName, nextConfigDir } = options;
 
   const s3 = S3ClientFactory({
@@ -55,7 +33,9 @@ const uploadStaticAssets = async (
   const nextBuildFileUploads = buildStaticFiles
     .filter(filterOutDirectories)
     .map(async fileItem => {
-      const s3Key = filePathToS3Key(fileItem.path);
+      const s3Key = path
+        .relative(path.resolve(nextConfigDir), fileItem.path)
+        .replace(/^.next/, "_next");
 
       return s3.uploadFile({
         s3Key,
@@ -77,22 +57,29 @@ const uploadStaticAssets = async (
       );
 
       return s3.uploadFile({
-        s3Key: `static-pages/${relativePageFilePath.replace(/^pages\//, "")}`,
+        s3Key: `static-pages/${(relativePageFilePath as string).replace(
+          /^pages\//,
+          ""
+        )}`,
         filePath: pageFilePath
       });
     });
 
-  const publicDirUploads = await uploadPublicOrStaticDirectory(
-    s3,
-    "public",
-    nextConfigDir
-  );
+  const uploadPublicOrStaticDirectory = async (
+    directory: "public" | "static"
+  ): Promise<Promise<AWS.S3.ManagedUpload.SendData>[]> => {
+    const files = await readDirectoryFiles(path.join(nextConfigDir, directory));
 
-  const staticDirUploads = await uploadPublicOrStaticDirectory(
-    s3,
-    "static",
-    nextConfigDir
-  );
+    return files.filter(filterOutDirectories).map(fileItem =>
+      s3.uploadFile({
+        filePath: fileItem.path,
+        s3Key: path.posix.relative(path.resolve(nextConfigDir), fileItem.path)
+      })
+    );
+  };
+
+  const publicDirUploads = await uploadPublicOrStaticDirectory("public");
+  const staticDirUploads = await uploadPublicOrStaticDirectory("static");
 
   const allUploads = [
     ...nextBuildFileUploads,

packages/s3-static-assets/tests/.gitignore

@@ -0,0 +1 @@
+!fixtures/**/*

packages/s3-static-assets/tests/fixtures/basic-next-app/.next/BUILD_ID

@@ -0,0 +1 @@
+a_test_build_id

packages/s3-static-assets/tests/fixtures/basic-next-app/.next/serverless/pages-manifest.json

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