use new s3 upload package in serverless component

Author: danielcondemarin

package-lock.json

@@ -36,7 +36,8 @@
     "@types/fs-extra": "^8.1.0",
     "@types/node": "^13.13.0",
     "@types/path-to-regexp": "^1.7.0",
-    "ts-loader": "^7.0.0"
+    "ts-loader": "^7.0.0",
+    "typescript": "^3.8.3"
   },
   "peerDependencies": {
     "next-aws-cloudfront": "file:../cloudfront-lambda@edge-compat"

packages/lambda-at-edge/package-lock.json

@@ -0,0 +1,9 @@
+import AWS from "aws-sdk";
+import { Credentials } from "./lib/s3";
+declare type UploadStaticAssetsOptions = {
+    bucketName: string;
+    nextConfigDir: string;
+    credentials: Credentials;
+};
+declare const uploadStaticAssets: (options: UploadStaticAssetsOptions) => Promise<AWS.S3.ManagedUpload.SendData[]>;
+export default uploadStaticAssets;

packages/lambda-at-edge/package.json

@@ -0,0 +1,76 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const readDirectoryFiles_1 = __importDefault(require("./lib/readDirectoryFiles"));
+const filterOutDirectories_1 = __importDefault(require("./lib/filterOutDirectories"));
+const constants_1 = require("./lib/constants");
+const s3_1 = __importDefault(require("./lib/s3"));
+const pathToPosix_1 = __importDefault(require("./lib/pathToPosix"));
+const uploadStaticAssets = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    const { bucketName, nextConfigDir } = options;
+    const s3 = yield s3_1.default({
+        bucketName,
+        credentials: options.credentials
+    });
+    const dotNextDirectory = path_1.default.join(nextConfigDir, ".next");
+    const BUILD_ID = fs_extra_1.default
+        .readFileSync(path_1.default.join(dotNextDirectory, "BUILD_ID"))
+        .toString("utf8");
+    const buildStaticFiles = yield readDirectoryFiles_1.default(path_1.default.join(dotNextDirectory, "static", BUILD_ID));
+    const nextBuildFileUploads = buildStaticFiles
+        .filter(filterOutDirectories_1.default)
+        .map((fileItem) => __awaiter(void 0, void 0, void 0, function* () {
+        const s3Key = pathToPosix_1.default(path_1.default
+            .relative(path_1.default.resolve(nextConfigDir), fileItem.path)
+            .replace(/^.next/, "_next"));
+        return s3.uploadFile({
+            s3Key,
+            filePath: fileItem.path,
+            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"))
+        .map(relativePageFilePath => {
+        const pageFilePath = pathToPosix_1.default(path_1.default.join(dotNextDirectory, `serverless/${relativePageFilePath}`));
+        return s3.uploadFile({
+            s3Key: `static-pages/${relativePageFilePath.replace(/^pages\//, "")}`,
+            filePath: pageFilePath
+        });
+    });
+    const uploadPublicOrStaticDirectory = (directory) => __awaiter(void 0, void 0, void 0, function* () {
+        const directoryPath = path_1.default.join(nextConfigDir, directory);
+        if (!(yield fs_extra_1.default.pathExists(directoryPath))) {
+            return Promise.resolve([]);
+        }
+        const files = yield readDirectoryFiles_1.default(directoryPath);
+        return files.filter(filterOutDirectories_1.default).map(fileItem => s3.uploadFile({
+            filePath: fileItem.path,
+            s3Key: pathToPosix_1.default(path_1.default.relative(path_1.default.resolve(nextConfigDir), fileItem.path))
+        }));
+    });
+    const publicDirUploads = yield uploadPublicOrStaticDirectory("public");
+    const staticDirUploads = yield uploadPublicOrStaticDirectory("static");
+    const allUploads = [
+        ...nextBuildFileUploads,
+        ...htmlPageUploads,
+        ...publicDirUploads,
+        ...staticDirUploads
+    ];
+    return Promise.all(allUploads);
+});
+exports.default = uploadStaticAssets;

packages/s3-static-assets/dist/index.d.ts

@@ -0,0 +1 @@
+export declare const IMMUTABLE_CACHE_CONTROL_HEADER = "public, max-age=31536000, immutable";

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

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IMMUTABLE_CACHE_CONTROL_HEADER = "public, max-age=31536000, immutable";

packages/s3-static-assets/dist/lib/constants.d.ts

@@ -0,0 +1,3 @@
+import { Item } from "klaw";
+declare const _default: (fileItem: Item) => boolean;
+export default _default;

packages/s3-static-assets/dist/lib/constants.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = (fileItem) => !fileItem.stats.isDirectory();

packages/s3-static-assets/dist/lib/filterOutDirectories.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (filePath: string) => string;
+export default _default;