carlin 1.27.0 → 1.27.1

package/dist/deploy/s3.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteS3Directory = exports.emptyS3Directory = exports.uploadDirectoryToS3 = exports.getAllFilesInsideADirectory = exports.uploadFileToS3 = exports.getBucketKeyUrl = exports.s3 = void 0;
+exports.deleteS3Directory = exports.emptyS3Directory = exports.uploadDirectoryToS3 = exports.copyRoot404To404Index = exports.getAllFilesInsideADirectory = exports.uploadFileToS3 = exports.getBucketKeyUrl = exports.s3 = void 0;
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable no-await-in-loop */
 const aws_sdk_1 = require("aws-sdk");
@@ -62,6 +62,41 @@ const getAllFilesInsideADirectory = async ({ directory, }) => {
     return allFiles;
 };
 exports.getAllFilesInsideADirectory = getAllFilesInsideADirectory;
+/**
+ * Docusaurus 2 has a 404.html file in the root of the build folder. This
+ * function copies it to 404/index.html so that it can be served by S3 and
+ * CloudFront.
+ */
+const copyRoot404To404Index = async ({ bucket }) => {
+    try {
+        const root404Exists = await exports.s3
+            .headObject({
+            Bucket: bucket,
+            Key: '404.html',
+        })
+            .promise()
+            .catch(() => {
+            /**
+             * If the file does not exist, return false.
+             */
+            return false;
+        });
+        if (root404Exists) {
+            await exports.s3
+                .copyObject({
+                Bucket: bucket,
+                CopySource: `${bucket}/404.html`,
+                Key: '404/index.html',
+            })
+                .promise();
+        }
+    }
+    catch (err) {
+        npmlog_1.default.error(logPrefix, `Cannot copy 404.html to 404/index.html`);
+        throw err;
+    }
+};
+exports.copyRoot404To404Index = copyRoot404To404Index;
 const uploadDirectoryToS3 = async ({ bucket, bucketKey = '', directory, }) => {
     npmlog_1.default.info(logPrefix, `Uploading directory ${directory}/ to ${bucket}/${bucketKey}...`);
     const allFiles = await (0, exports.getAllFilesInsideADirectory)({ directory });

package/dist/deploy/staticApp/removeOldVersions.js

@@ -29,14 +29,23 @@ const removeOldVersions = async ({ bucket }) => {
         const { CommonPrefixes = [] } = await s3_1.s3
             .listObjectsV2({ Bucket: bucket, Delimiter: '/' })
             .promise();
-        const versions = CommonPrefixes === null || CommonPrefixes === void 0 ? void 0 : CommonPrefixes.map(({ Prefix }) => Prefix === null || Prefix === void 0 ? void 0 : Prefix.replace('/', '')).filter((version) => semver_1.default.valid(version)).sort((a, b) => (semver_1.default.gt(a, b) ? -1 : 1));
+        const versions = CommonPrefixes === null || CommonPrefixes === void 0 ? void 0 : CommonPrefixes.map(({ Prefix }) => {
+            return Prefix === null || Prefix === void 0 ? void 0 : Prefix.replace('/', '');
+        }).filter((version) => {
+            return semver_1.default.valid(version);
+        }).sort((a, b) => {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            return semver_1.default.gt(a, b) ? -1 : 1;
+        });
         /**
          * Keep the 3 most recent versions.
          */
         versions.shift();
         versions.shift();
         versions.shift();
-        await Promise.all(versions.map((version) => (0, s3_1.deleteS3Directory)({ bucket, directory: `${version}` })));
+        await Promise.all(versions.map((version) => {
+            return (0, s3_1.deleteS3Directory)({ bucket, directory: `${version}` });
+        }));
     }
     catch (error) {
         npmlog_1.default.info(logPrefix, `Cannot remove older versions from "${bucket}" bucket.`);

package/dist/deploy/staticApp/staticApp.template.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStaticAppTemplate = exports.ROUTE_53_RECORD_SET_GROUP_LOGICAL_ID = exports.CLOUDFRONT_ORIGIN_ACCESS_CONTROL_LOGICAL_ID = exports.CLOUDFRONT_DISTRIBUTION_LOGICAL_ID = exports.STATIC_APP_BUCKET_LOGICAL_ID = void 0;
+exports.getStaticAppTemplate = exports.ERROR_DOCUMENT = exports.ROUTE_53_RECORD_SET_GROUP_LOGICAL_ID = exports.CLOUDFRONT_ORIGIN_ACCESS_CONTROL_LOGICAL_ID = exports.CLOUDFRONT_DISTRIBUTION_LOGICAL_ID = exports.STATIC_APP_BUCKET_LOGICAL_ID = void 0;
 const utils_1 = require("../../utils");
 const PACKAGE_VERSION = (0, utils_1.getPackageVersion)();
 exports.STATIC_APP_BUCKET_LOGICAL_ID = 'StaticBucket';
 exports.CLOUDFRONT_DISTRIBUTION_LOGICAL_ID = 'CloudFrontDistribution';
 exports.CLOUDFRONT_ORIGIN_ACCESS_CONTROL_LOGICAL_ID = 'OriginAccessControl';
 exports.ROUTE_53_RECORD_SET_GROUP_LOGICAL_ID = 'Route53RecordSetGroup';
+exports.ERROR_DOCUMENT = '404/index.html';
 /**
  * Name: Managed-CachingDisabled
  * ID: 4135ea2d-6df8-44a3-9df3-4b5a84be39ad
@@ -48,7 +49,7 @@ const getBucketStaticWebsiteTemplate = ({ spa, }) => {
                     },
                     WebsiteConfiguration: {
                         IndexDocument: `index.html`,
-                        ErrorDocument: spa ? 'index.html' : '404/index.html',
+                        ErrorDocument: spa ? 'index.html' : exports.ERROR_DOCUMENT,
                     },
                 },
             },
@@ -174,7 +175,7 @@ const getCloudFrontTemplate = ({ acm, aliases = [], spa, hostedZoneName, }) => {
                             ErrorCachingMinTTL: 0,
                             ErrorCode: errorCode,
                             ResponseCode: 404,
-                            ResponsePagePath: '/404',
+                            ResponsePagePath: '/' + exports.ERROR_DOCUMENT,
                         };
                     }),
                     DefaultCacheBehavior: {
@@ -195,7 +196,7 @@ const getCloudFrontTemplate = ({ acm, aliases = [], spa, hostedZoneName, }) => {
                         TargetOriginId: { Ref: exports.STATIC_APP_BUCKET_LOGICAL_ID },
                         ViewerProtocolPolicy: 'redirect-to-https',
                     },
-                    DefaultRootObject: spa ? 'index.html' : undefined,
+                    DefaultRootObject: 'index.html',
                     Enabled: true,
                     HttpVersion: 'http2',
                     Origins: [

package/dist/deploy/staticApp/uploadBuiltAppToS3.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadBuiltAppToS3 = void 0;
-const findDefaultBuildFolder_1 = require("./findDefaultBuildFolder");
 const s3_1 = require("../s3");
+const findDefaultBuildFolder_1 = require("./findDefaultBuildFolder");
 const uploadBuiltAppToS3 = async ({ buildFolder: directory, bucket, }) => {
     /**
      * Only empty directory if the number of the files inside $directory.
@@ -20,6 +20,7 @@ const uploadBuiltAppToS3 = async ({ buildFolder: directory, bucket, }) => {
     if (defaultDirectory) {
         await (0, s3_1.emptyS3Directory)({ bucket });
         await (0, s3_1.uploadDirectoryToS3)({ bucket, directory: defaultDirectory });
+        await (0, s3_1.copyRoot404To404Index)({ bucket });
         return;
     }
     throw new Error(`build-folder option wasn't provided and files weren't found in ${findDefaultBuildFolder_1.defaultBuildFolders.join(', ')} directories.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carlin",
-  "version": "1.27.0",
+  "version": "1.27.1",
   "description": "",
   "license": "GPL-3.0",
   "author": "Pedro Arantes <arantespp@gmail.com> (https://twitter.com/arantespp)",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "20c0a3590f47b7c4b6b866080a6d00bc9fb9a0b1"
+  "gitHead": "3d6ffa89bf6f83619ac12a3688e8250e47c1a8c6"
 }