html pages now upload

Author: danielcondemarin

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

@@ -6,7 +6,7 @@ import AWS from "aws-sdk";
 
 type UploadStaticAssetsOptions = {
   bucketName: string;
-  nextAppDir: string;
+  nextConfigDir: string;
 };
 const filePathToS3Key = (filePath: string): string => {
   const relevantFilePathPart = filePath.substring(
@@ -29,11 +29,11 @@ const readDirectoryFiles = (directory: string): Promise<Array<Item>> => {
 const uploadStaticAssets = async (
   options: UploadStaticAssetsOptions
 ): Promise<void> => {
-  const { bucketName, nextAppDir } = options;
+  const { bucketName, nextConfigDir } = options;
 
   const s3 = new AWS.S3();
 
-  const dotNextDirectory = path.join(nextAppDir, ".next");
+  const dotNextDirectory = path.join(nextConfigDir, ".next");
 
   const BUILD_ID = fse
     .readFileSync(path.join(dotNextDirectory, "BUILD_ID"))
@@ -63,6 +63,30 @@ const uploadStaticAssets = async (
         .promise();
     });
 
+  const pagesManifest = await fse.readJSON(
+    path.join(dotNextDirectory, "serverless/pages-manifest.json")
+  );
+
+  const htmlPageUploadTasks = Object.values(pagesManifest)
+    .filter(pageFile => (pageFile as string).endsWith(".html"))
+    .map(async pageFile => {
+      const fileBody = await fse.readFile(
+        path.join(dotNextDirectory, `serverless/${pageFile}`)
+      );
+
+      return s3
+        .upload({
+          Bucket: bucketName,
+          Key: `static-pages/${(pageFile as string).replace(/^pages\//, "")}`,
+          Body: fileBody,
+          ContentType: "text/html",
+          CacheControl: undefined
+        })
+        .promise();
+    });
+
+  uploadTasks.concat(htmlPageUploadTasks);
+
   await Promise.all(uploadTasks);
   // read public/ folder and upload files
   // read static/ folder and upload files

packages/s3-static-assets/tests/upload-assets.test.ts

@@ -11,7 +11,7 @@ describe("Upload assets tests", () => {
   beforeEach(async () => {
     await uploadStaticAssets({
       bucketName: "test-bucket-name",
-      nextAppDir: path.join(__dirname, "./fixtures/basic-next-app")
+      nextConfigDir: path.join(__dirname, "./fixtures/basic-next-app")
     });
   });
 
@@ -36,17 +36,21 @@ describe("Upload assets tests", () => {
   });
 
   it("uploads prerendered HTML pages specified in pages manifest", async () => {
-    expect(mockUpload).toBeCalledWith({
-      Key: "static-pages/todos/terms.html",
-      ContentType: "text/html",
-      CacheControl: undefined
-    });
+    expect(mockUpload).toBeCalledWith(
+      expect.objectContaining({
+        Key: "static-pages/todos/terms.html",
+        ContentType: "text/html",
+        CacheControl: undefined
+      })
+    );
 
-    expect(mockUpload).toBeCalledWith({
-      Key: "static-pages/todos/terms/[section].html",
-      Body: expect.any(Buffer),
-      ContentType: "text/html",
-      CacheControl: undefined
-    });
+    expect(mockUpload).toBeCalledWith(
+      expect.objectContaining({
+        Key: "static-pages/todos/terms/[section].html",
+        Body: expect.any(Buffer),
+        ContentType: "text/html",
+        CacheControl: undefined
+      })
+    );
   });
 });