@onivoro/onix 20.5.25 → 20.5.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onivoro/onix",
-  "version": "20.5.25",
+  "version": "20.5.26",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",

package/src/executors/deploy-s3-sync/executor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
 const extract_project_build_outputs_function_1 = require("../../functions/extract-project-build-outputs.function");
 const pmx_function_1 = require("../../functions/pmx.function");
 const executor_factory_function_1 = require("../../functions/executor-factory.function");
@@ -8,9 +9,10 @@ const path_1 = require("path");
 const client_s3_1 = require("@aws-sdk/client-s3");
 const resolve_aws_credentials_function_1 = require("../../functions/resolve-aws-credentials.function");
 const s3_sync_directory_function_1 = require("../../functions/s3-sync-directory.function");
-const assetsFolder = 'assets';
+const client_cloudfront_1 = require("@aws-sdk/client-cloudfront");
+const invalidate_cloud_front_function_1 = require("../../functions/invalidate-cloud-front.function");
 exports.default = (0, executor_factory_function_1.executorFactory)((options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const { region, bucket, omitAcl, profile, localDirectory } = options;
+    const { region, bucket, omitAcl, profile, localDirectory, cloudFrontId } = options;
     const [projectOutput] = (0, extract_project_build_outputs_function_1.extractProjectBuildOutputs)(context, context.projectName);
     const app = context.projectName;
     (0, pmx_function_1.pmxSpawn)(context, `nx build ${app}`);
@@ -18,5 +20,10 @@ exports.default = (0, executor_factory_function_1.executorFactory)((options, con
     const ACL = omitAcl ? undefined : 'public-read';
     const s3Client = new client_s3_1.S3Client({ region, credentials: yield (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
     yield (0, s3_sync_directory_function_1.s3SyncDirectory)({ s3Client, bucket, localDirectory: resolvedLocalDirectory, ACL });
+    if (cloudFrontId) {
+        const cloudfrontClient = new client_cloudfront_1.CloudFrontClient({ region, credentials: yield (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
+        yield (0, invalidate_cloud_front_function_1.invalidateCloudFront)(cloudfrontClient, cloudFrontId);
+        devkit_1.logger.info(`Invalidated CloudFront distribution ${cloudFrontId}`);
+    }
 }));
 //# sourceMappingURL=executor.js.map

package/src/executors/deploy-s3-sync/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy-s3-sync/executor.ts"],"names":[],"mappings":";;;AAEA,mHAAoG;AACpG,+DAAwD;AACxD,yFAA4E;AAC5E,+BAA+B;AAC/B,kDAA8C;AAC9C,uGAAyF;AACzF,2FAA6E;AAE7E,MAAM,YAAY,GAAG,QAAQ,CAAA;AAE7B,kBAAe,IAAA,2CAAe,EAAC,CAC7B,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IACrE,MAAM,CAAC,aAAa,CAAC,GAAG,IAAA,mEAA0B,EAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAEjF,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC;IAEhC,IAAA,uBAAQ,EAAC,OAAO,EAAE,YAAY,GAAG,EAAE,CAAC,CAAC;IAErC,MAAM,sBAAsB,GAAG,IAAA,cAAO,EAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAEtE,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC;IAEhD,MAAM,QAAQ,GAAG,IAAI,oBAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,IAAA,wDAAqB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAE7F,MAAM,IAAA,4CAAe,EAAC,EAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;AAC1F,CAAC,CAAA,CAAC,CAAC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy-s3-sync/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAqD;AAErD,mHAAoG;AACpG,+DAAwD;AACxD,yFAA4E;AAC5E,+BAA+B;AAC/B,kDAA8C;AAC9C,uGAAyF;AACzF,2FAA6E;AAC7E,kEAA6D;AAC7D,qGAAuF;AAEvF,kBAAe,IAAA,2CAAe,EAAC,CAC7B,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IACnF,MAAM,CAAC,aAAa,CAAC,GAAG,IAAA,mEAA0B,EAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAEjF,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC;IAEhC,IAAA,uBAAQ,EAAC,OAAO,EAAE,YAAY,GAAG,EAAE,CAAC,CAAC;IAErC,MAAM,sBAAsB,GAAG,IAAA,cAAO,EAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAEtE,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC;IAEhD,MAAM,QAAQ,GAAG,IAAI,oBAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,IAAA,wDAAqB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAE7F,MAAM,IAAA,4CAAe,EAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;IAEzF,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,gBAAgB,GAAG,IAAI,oCAAgB,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,IAAA,wDAAqB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC7G,MAAM,IAAA,sDAAoB,EAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;QAC3D,eAAM,CAAC,IAAI,CAAC,uCAAuC,YAAY,EAAE,CAAC,CAAC;IACrE,CAAC;AACH,CAAC,CAAA,CAAC,CAAC"}

package/src/executors/deploy-s3-sync/schema.d.ts

@@ -4,4 +4,5 @@ export interface ExecutorSchema {
     omitAcl?: boolean,
     profile?: string,
     localDirectory: string,
+    cloudFrontId?: string,
 }

package/src/executors/deploy-s3-sync/schema.json

@@ -24,6 +24,10 @@
     "localDirectory": {
       "type": "string",
       "description": "Local directory to upload to S3"
+    },
+    "cloudFrontId": {
+      "type": "string",
+      "description": "CloudFront distribution ID for invalidation"
     }
   },
   "required": [

package/src/functions/invalidate-cloud-front.function.d.ts

@@ -0,0 +1,2 @@
+import { CloudFrontClient } from "@aws-sdk/client-cloudfront";
+export declare function invalidateCloudFront(cloudfront: CloudFrontClient, distributionId: string, paths?: string[]): Promise<import("@aws-sdk/client-cloudfront").CreateInvalidationCommandOutput>;

package/src/functions/invalidate-cloud-front.function.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.invalidateCloudFront = invalidateCloudFront;
+const tslib_1 = require("tslib");
+const client_cloudfront_1 = require("@aws-sdk/client-cloudfront");
+function invalidateCloudFront(cloudfront_1, distributionId_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* (cloudfront, distributionId, paths = ['*']) {
+        const command = new client_cloudfront_1.CreateInvalidationCommand({
+            DistributionId: distributionId,
+            InvalidationBatch: {
+                CallerReference: `${Date.now()}`,
+                Paths: {
+                    Quantity: paths.length,
+                    Items: paths
+                }
+            }
+        });
+        return yield cloudfront.send(command);
+    });
+}
+//# sourceMappingURL=invalidate-cloud-front.function.js.map

package/src/functions/invalidate-cloud-front.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"invalidate-cloud-front.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/invalidate-cloud-front.function.ts"],"names":[],"mappings":";;AAEA,oDAaC;;AAfD,kEAAyF;AAEzF,SAAsB,oBAAoB;iEAAC,UAA4B,EAAE,cAAsB,EAAE,QAAkB,CAAC,GAAG,CAAC;QACpH,MAAM,OAAO,GAAG,IAAI,6CAAyB,CAAC;YAC1C,cAAc,EAAE,cAAc;YAC9B,iBAAiB,EAAE;gBACf,eAAe,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE;gBAChC,KAAK,EAAE;oBACH,QAAQ,EAAE,KAAK,CAAC,MAAM;oBACtB,KAAK,EAAE,KAAK;iBACf;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,MAAM,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;CAAA"}

package/src/functions/s3-sync-directory.function.d.ts

@@ -1,8 +1,9 @@
 import { ObjectCannedACL, S3Client } from '@aws-sdk/client-s3';
-export declare function s3SyncDirectory({ s3Client, bucket, localDirectory, s3Prefix, ACL }: {
+export declare function s3SyncDirectory({ s3Client, bucket, localDirectory, s3Prefix, ACL, emptyDirectory }: {
     s3Client: S3Client;
     bucket: string;
     localDirectory: string;
     s3Prefix?: string;
     ACL?: ObjectCannedACL;
+    emptyDirectory?: boolean;
 }): Promise<void>;

package/src/functions/s3-sync-directory.function.js

@@ -8,7 +8,34 @@ const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const get_content_type_function_1 = require("./get-content-type.function");
 function s3SyncDirectory(_a) {
-    return tslib_1.__awaiter(this, arguments, void 0, function* ({ s3Client, bucket, localDirectory, s3Prefix = '', ACL }) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* ({ s3Client, bucket, localDirectory, s3Prefix = '', ACL, emptyDirectory = false }) {
+        if (emptyDirectory) {
+            devkit_1.logger.info(`Emptying directory s3://${bucket}/${s3Prefix}`);
+            const listCommand = new client_s3_1.ListObjectsV2Command({
+                Bucket: bucket,
+                Prefix: s3Prefix
+            });
+            let isTruncated = true;
+            let continuationToken;
+            while (isTruncated) {
+                const listResponse = yield s3Client.send(listCommand);
+                if (listResponse.Contents && listResponse.Contents.length > 0) {
+                    const deleteCommand = new client_s3_1.DeleteObjectsCommand({
+                        Bucket: bucket,
+                        Delete: {
+                            Objects: listResponse.Contents.map(({ Key }) => ({ Key }))
+                        }
+                    });
+                    yield s3Client.send(deleteCommand);
+                    devkit_1.logger.info(`Deleted ${listResponse.Contents.length} objects`);
+                }
+                isTruncated = !!listResponse.IsTruncated;
+                continuationToken = listResponse.NextContinuationToken;
+                if (continuationToken) {
+                    listCommand.input.ContinuationToken = continuationToken;
+                }
+            }
+        }
         function walk(dir) {
             return tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const entries = yield (0, promises_1.readdir)(dir, { withFileTypes: true });

package/src/functions/s3-sync-directory.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"s3-sync-directory.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/s3-sync-directory.function.ts"],"names":[],"mappings":";;AAMA,0CAwCC;;AA9CD,kDAAiF;AACjF,uCAAoC;AACpC,0CAAsD;AACtD,+BAA6C;AAC7C,2EAA6D;AAE7D,SAAsB,eAAe;iEAAC,EACpC,QAAQ,EACR,MAAM,EACN,cAAc,EACd,QAAQ,GAAG,EAAE,EACb,GAAG,EAOJ;QACC,SAAe,IAAI,CAAC,GAAW;;gBAC7B,MAAM,OAAO,GAAG,MAAM,IAAA,kBAAO,EAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC5D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAM,KAAK,EAAC,EAAE;oBACxD,MAAM,GAAG,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;oBAClC,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;gBACrD,CAAC,CAAA,CAAC,CAAC,CAAC;gBACJ,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC;SAAA;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,CAAC;QAEzC,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YAC7B,MAAM,WAAW,GAAG,MAAM,IAAA,mBAAQ,EAAC,QAAQ,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,YAAK,CAAC,IAAI,CACpB,QAAQ,EACR,IAAA,eAAQ,EAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACzD,CAAC;YACF,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,4BAAgB,CAAC;gBACvC,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,WAAW;gBACjB,GAAG;gBACH,WAAW,EAAE,IAAA,0CAAc,EAAC,QAAQ,CAAC;aACtC,CAAC,CAAC,CAAC;YAEJ,eAAM,CAAC,IAAI,CAAC,YAAY,QAAQ,YAAY,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CAAA"}
+{"version":3,"file":"s3-sync-directory.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/s3-sync-directory.function.ts"],"names":[],"mappings":"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"}

package/src/index.d.ts

@@ -9,6 +9,7 @@ export * from './functions/extract-project-build-outputs.function';
 export * from './functions/extract-project-configuration.function';
 export * from './functions/get-asset-list-from-directory.function';
 export * from './functions/get-index-html-content.function';
+export * from './functions/invalidate-cloud-front.function';
 export * from './functions/load-env-file.function';
 export * from './functions/normalize-output-path.function';
 export * from './functions/pm.function';

package/src/index.js

@@ -12,6 +12,7 @@ tslib_1.__exportStar(require("./functions/extract-project-build-outputs.function
 tslib_1.__exportStar(require("./functions/extract-project-configuration.function"), exports);
 tslib_1.__exportStar(require("./functions/get-asset-list-from-directory.function"), exports);
 tslib_1.__exportStar(require("./functions/get-index-html-content.function"), exports);
+tslib_1.__exportStar(require("./functions/invalidate-cloud-front.function"), exports);
 tslib_1.__exportStar(require("./functions/load-env-file.function"), exports);
 tslib_1.__exportStar(require("./functions/normalize-output-path.function"), exports);
 tslib_1.__exportStar(require("./functions/pm.function"), exports);

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../onix/src/index.ts"],"names":[],"mappings":";;;AAAA,oEAA0C;AAC1C,wEAA8C;AAC9C,sEAA4C;AAE5C,mEAAyC;AAEzC,2DAAiC;AAEjC,6EAAmD;AACnD,gFAAsD;AACtD,6FAAmE;AACnE,6FAAmE;AACnE,6FAAmE;AACnE,sFAA4D;AAC5D,6EAAmD;AACnD,qFAA2D;AAC3D,kEAAwC;AACxC,mEAAyC;AACzC,uFAA6D;AAC7D,mFAAyD;AACzD,iFAAuD;AACvD,2EAAiD;AACjD,sFAA4D;AAE5D,iFAAuD;AACvD,kFAAwD;AACxD,gFAAsD;AACtD,iFAAuD;AACvD,kFAAwD;AACxD,kFAAwD;AACxD,sFAA4D;AAE5D,uFAA6D;AAC7D,gFAAsD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../onix/src/index.ts"],"names":[],"mappings":";;;AAAA,oEAA0C;AAC1C,wEAA8C;AAC9C,sEAA4C;AAE5C,mEAAyC;AAEzC,2DAAiC;AAEjC,6EAAmD;AACnD,gFAAsD;AACtD,6FAAmE;AACnE,6FAAmE;AACnE,6FAAmE;AACnE,sFAA4D;AAC5D,sFAA4D;AAC5D,6EAAmD;AACnD,qFAA2D;AAC3D,kEAAwC;AACxC,mEAAyC;AACzC,uFAA6D;AAC7D,mFAAyD;AACzD,iFAAuD;AACvD,2EAAiD;AACjD,sFAA4D;AAE5D,iFAAuD;AACvD,kFAAwD;AACxD,gFAAsD;AACtD,iFAAuD;AACvD,kFAAwD;AACxD,kFAAwD;AACxD,sFAA4D;AAE5D,uFAA6D;AAC7D,gFAAsD"}