upload chunks and runtime build files

Author: danielcondemarin

packages/s3-static-assets/dist/index.js

@@ -42,6 +42,18 @@ const uploadStaticAssets = (options) => __awaiter(void 0, void 0, void 0, functi
             cacheControl: constants_1.IMMUTABLE_CACHE_CONTROL_HEADER
         });
     }));
+    const buildManifest = yield fs_extra_1.default.readJson(path_1.default.join(dotNextDirectory, "build-manifest.json"));
+    const buildManifestFileUploads = Object.values(buildManifest.pages)
+        .reduce((acc, pageBuildFiles) => {
+        return acc.concat(pageBuildFiles);
+    }, [])
+        .map(relativeFilePath => {
+        return s3.uploadFile({
+            s3Key: `_next/${relativeFilePath}`,
+            filePath: path_1.default.join(dotNextDirectory, relativeFilePath),
+            cacheControl: constants_1.IMMUTABLE_CACHE_CONTROL_HEADER
+        });
+    });
     const pagesManifest = yield fs_extra_1.default.readJSON(path_1.default.join(dotNextDirectory, "serverless/pages-manifest.json"));
     const htmlPageUploads = Object.values(pagesManifest)
         .filter(pageFile => pageFile.endsWith(".html"))
@@ -67,6 +79,7 @@ const uploadStaticAssets = (options) => __awaiter(void 0, void 0, void 0, functi
     const staticDirUploads = yield uploadPublicOrStaticDirectory("static");
     const allUploads = [
         ...nextBuildFileUploads,
+        ...buildManifestFileUploads,
         ...htmlPageUploads,
         ...publicDirUploads,
         ...staticDirUploads

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

@@ -13,6 +13,12 @@ type UploadStaticAssetsOptions = {
   credentials: Credentials;
 };
 
+type NextBuildManifest = {
+  pages: {
+    [pageRoute: string]: string[];
+  };
+};
+
 const uploadStaticAssets = async (
   options: UploadStaticAssetsOptions
 ): Promise<AWS.S3.ManagedUpload.SendData[]> => {
@@ -49,6 +55,22 @@ const uploadStaticAssets = async (
       });
     });
 
+  const buildManifest: NextBuildManifest = await fse.readJson(
+    path.join(dotNextDirectory, "build-manifest.json")
+  );
+
+  const buildManifestFileUploads = Object.values(buildManifest.pages)
+    .reduce((acc, pageBuildFiles) => {
+      return acc.concat(pageBuildFiles);
+    }, [])
+    .map(relativeFilePath => {
+      return s3.uploadFile({
+        s3Key: `_next/${relativeFilePath}`,
+        filePath: path.join(dotNextDirectory, relativeFilePath),
+        cacheControl: IMMUTABLE_CACHE_CONTROL_HEADER
+      });
+    });
+
   const pagesManifest = await fse.readJSON(
     path.join(dotNextDirectory, "serverless/pages-manifest.json")
   );
@@ -94,10 +116,11 @@ const uploadStaticAssets = async (
   const staticDirUploads = await uploadPublicOrStaticDirectory("static");
 
   const allUploads = [
-    ...nextBuildFileUploads,
-    ...htmlPageUploads,
-    ...publicDirUploads,
-    ...staticDirUploads
+    ...nextBuildFileUploads, // .next/static/BUILD_ID/*
+    ...buildManifestFileUploads, // .next/static/runtime/x.js, //.next/static/chunks/y.js ... as specified in build-manifest.json
+    ...htmlPageUploads, // prerendered HTML pages
+    ...publicDirUploads, // app public dir
+    ...staticDirUploads // app static dir
   ];
 
   return Promise.all(allUploads);

packages/s3-static-assets/tests/fixtures/app-no-public-dir/.next/build-manifest.json

@@ -0,0 +1,3 @@
+{
+  "pages": {}
+}

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

@@ -0,0 +1,6 @@
+{
+  "pages": {
+    "/": ["static/runtime/runtime1.js"],
+    "/foo": ["static/chunks/chunk1.js"]
+  }
+}

packages/s3-static-assets/tests/fixtures/basic-next-app/.next/static/chunks/chunk1.js

@@ -157,6 +157,24 @@ describe("Upload tests", () => {
     );
   });
 
+  it("uploads files specified in the build-manifest.json", async () => {
+    await upload();
+
+    expect(mockUpload).toBeCalledWith(
+      expect.objectContaining({
+        Key: "_next/static/chunks/chunk1.js",
+        CacheControl: IMMUTABLE_CACHE_CONTROL_HEADER
+      })
+    );
+
+    expect(mockUpload).toBeCalledWith(
+      expect.objectContaining({
+        Key: "_next/static/runtime/runtime1.js",
+        CacheControl: IMMUTABLE_CACHE_CONTROL_HEADER
+      })
+    );
+  });
+
   describe("when no public or static directory exists", () => {
     it("upload does not crash", () => upload("./fixtures/app-no-public-dir"));
   });

packages/s3-static-assets/tests/fixtures/basic-next-app/.next/static/runtime/runtime1.js

@@ -0,0 +1,3 @@
+{
+  "pages": {}
+}

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

@@ -0,0 +1,3 @@
+{
+  "pages": {}
+}