@onivoro/onix 20.5.4 → 20.5.6

package/executors.json

@@ -25,6 +25,11 @@
       "schema": "./src/executors/deploy-ecs/schema.json",
       "description": "deploy-ecs"
     },
+    "deploy-s3-react": {
+      "implementation": "./src/executors/deploy-s3-react/executor",
+      "schema": "./src/executors/deploy-s3-react/schema.json",
+      "description": "deploy-s3-react"
+    },
     "openapi-gen": {
       "implementation": "./src/executors/openapi-gen/executor",
       "schema": "./src/executors/openapi-gen/schema.json",

package/package.json

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

package/src/executors/deploy-s3-react/executor.d.ts

@@ -0,0 +1,3 @@
+import { ExecutorSchema } from './schema';
+declare const _default: import("@nx/devkit").PromiseExecutor<ExecutorSchema>;
+export default _default;

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

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+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");
+const path_1 = require("path");
+const promises_1 = require("fs/promises");
+const to_cdn_path_function_1 = require("../../functions/to-cdn-path.function");
+const fs_1 = require("fs");
+const client_s3_1 = require("@aws-sdk/client-s3");
+const resolve_aws_credentials_function_1 = require("../../functions/resolve-aws-credentials.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, version, profile } = 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 ${context.projectName}`);
+    const jsAndCssAssets = yield getAssetListFromDirectory(projectOutput);
+    const indexHtml = yield getIndexHtmlContent(projectOutput);
+    const assetRoot = (0, path_1.resolve)(projectOutput, 'assets');
+    const fileMappings = jsAndCssAssets.map(original => {
+        const [name, hash, ext] = original.split('.');
+        const key = `${app}/${version}/${name}.${ext}`;
+        const modified = (0, to_cdn_path_function_1.toCdnPath)(bucket, region, app, name, ext);
+        return {
+            original,
+            modified,
+            key,
+            ext,
+            contentType: (ext === 'js' ? 'text/javascript' : 'text/css')
+        };
+    });
+    let html = fileMappings.reduce((acc, { modified, original }) => acc.replace(original, modified), indexHtml);
+    const ACL = omitAcl ? undefined : 'public-read';
+    const s3Client = new client_s3_1.S3Client({ region, credentials: (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
+    yield Promise.all(fileMappings.map((_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ contentType, original, key }) {
+        return yield s3Client.send(new client_s3_1.PutObjectCommand({
+            Bucket: bucket,
+            ContentType: contentType,
+            Body: (0, fs_1.createReadStream)(`${assetRoot}/${original}`, 'utf-8'),
+            Key: key,
+            ACL
+        }));
+    })));
+}));
+function getAssetListFromDirectory(assetDirectory) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const allAssets = yield (0, promises_1.readdir)(assetDirectory);
+        const assets = allAssets.filter(a => ['.js', '.css'].includes((0, path_1.parse)(a).ext));
+        return assets;
+    });
+}
+function getIndexHtmlContent(projectOutput) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return yield (0, promises_1.readFile)((0, path_1.resolve)(projectOutput, 'index.html'), { encoding: 'utf-8' });
+    });
+}
+//# sourceMappingURL=executor.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy-s3-react/executor.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,7 @@
+export interface ExecutorSchema {    
+    bucket: string,
+    region: string,
+    version: string,
+    omitAcl?: boolean,
+    profile?: string,
+}

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

@@ -0,0 +1,34 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "version": 2,
+  "title": "Deploy S3 executor",
+  "description": "",
+  "type": "object",
+  "properties": {
+    "bucket": {
+      "type": "string",
+      "description": "Name of the S3 bucket to use for uploading artifacts"
+    },   
+    "profile": {
+      "type": "string",
+      "description": "AWS profile name (which must be defined in the ~/.aws/credentials file) if AWS keys aren't defined as env vars"
+    },
+    "region": {
+      "type": "string",
+      "description": "AWS region"
+    },
+    "version": {
+      "type": "string",
+      "description": "AWS region"
+    },
+    "omitAcl": {
+      "type": "boolean",
+      "description": "Whether to use acl public-read for S3 push"
+    }    
+  },
+  "required": [
+    "bucket",
+    "region",
+    "version"
+  ]
+}

package/src/functions/add-cdn-prefix-to-key.function.d.ts

@@ -0,0 +1 @@
+export declare function addCdnPrefixToKey(bucket: string, region: string, key: string): string;

package/src/functions/add-cdn-prefix-to-key.function.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addCdnPrefixToKey = addCdnPrefixToKey;
+function addCdnPrefixToKey(bucket, region, key) {
+    return bucket.includes('.')
+        ? `https://s3.${region}.amazonaws.com/${bucket}/${key}`
+        : `https://${bucket}.s3.${region}.amazonaws.com/${key}`;
+}
+//# sourceMappingURL=add-cdn-prefix-to-key.function.js.map

package/src/functions/add-cdn-prefix-to-key.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-cdn-prefix-to-key.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/add-cdn-prefix-to-key.function.ts"],"names":[],"mappings":";;AAAA,8CAIC;AAJD,SAAgB,iBAAiB,CAAC,MAAc,EAAE,MAAc,EAAE,GAAW;IACzE,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;QACvB,CAAC,CAAC,cAAc,MAAM,kBAAkB,MAAM,IAAI,GAAG,EAAE;QACvD,CAAC,CAAC,WAAW,MAAM,OAAO,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAChE,CAAC"}

package/src/functions/resolve-aws-credentials.function.js

@@ -2,14 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveAwsCredentials = resolveAwsCredentials;
 const credential_providers_1 = require("@aws-sdk/credential-providers");
+const devkit_1 = require("@nx/devkit");
 const AWS_ACCESS_KEY_ID = 'AWS_ACCESS_KEY_ID';
 const AWS_SECRET_ACCESS_KEY = 'AWS_SECRET_ACCESS_KEY';
 function resolveAwsCredentials(profile) {
+    if (profile) {
+        try {
+            devkit_1.logger.warn(`using AWS profile "${profile}"`);
+            const resolved = (0, credential_providers_1.fromIni)({ profile });
+            if (resolved) {
+                return resolved;
+            }
+        }
+        catch (error) {
+            devkit_1.logger.warn(`failed to load AWS profile "${profile}"... ensure that ${[AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY].map(_ => `"${_.toLowerCase()}"`).join(' and ')} are lowercase in your ~/.aws/credentials file`);
+        }
+    }
     if ((process.env[AWS_ACCESS_KEY_ID] && process.env[AWS_SECRET_ACCESS_KEY])
         ||
             (process.env[AWS_ACCESS_KEY_ID.toLowerCase()] && process.env[AWS_SECRET_ACCESS_KEY.toLowerCase()])) {
         return undefined;
     }
-    return profile ? (0, credential_providers_1.fromIni)({ profile }) : undefined;
 }
 //# sourceMappingURL=resolve-aws-credentials.function.js.map

package/src/functions/resolve-aws-credentials.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-aws-credentials.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/resolve-aws-credentials.function.ts"],"names":[],"mappings":";;AAKA,sDAUC;AAfD,wEAAwD;AAExD,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAC9C,MAAM,qBAAqB,GAAG,uBAAuB,CAAC;AAEtD,SAAgB,qBAAqB,CAAC,OAA4B;IAC9D,IACI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;;YAEtE,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC,EACpG,CAAC;QACC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,OAAO,CAAC,CAAC,CAAC,IAAA,8BAAO,EAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtD,CAAC"}
+{"version":3,"file":"resolve-aws-credentials.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/resolve-aws-credentials.function.ts"],"names":[],"mappings":";;AAMA,sDAsBC;AA5BD,wEAAwD;AACxD,uCAAoC;AAEpC,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAC9C,MAAM,qBAAqB,GAAG,uBAAuB,CAAC;AAEtD,SAAgB,qBAAqB,CAAC,OAA4B;IAC9D,IAAI,OAAO,EAAE,CAAC;QACV,IAAI,CAAC;YACD,eAAM,CAAC,IAAI,CAAC,sBAAsB,OAAO,GAAG,CAAC,CAAC;YAE9C,MAAM,QAAQ,GAAG,IAAA,8BAAO,EAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YAEtC,IAAI,QAAQ,EAAE,CAAC;gBACX,OAAO,QAAQ,CAAC;YACpB,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,eAAM,CAAC,IAAI,CAAC,+BAA+B,OAAO,oBAAoB,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,gDAAgD,CAAC,CAAC;QACrN,CAAC;IACL,CAAC;IAED,IACI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;;YAEtE,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC,EACpG,CAAC;QACC,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC"}

package/src/functions/to-cdn-path.function.d.ts

@@ -0,0 +1 @@
+export declare function toCdnPath(bucket: string, region: string, folder: string, name: string, ext: string): string;

package/src/functions/to-cdn-path.function.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toCdnPath = toCdnPath;
+const add_cdn_prefix_to_key_function_1 = require("./add-cdn-prefix-to-key.function");
+function toCdnPath(bucket, region, folder, name, ext) {
+    return (0, add_cdn_prefix_to_key_function_1.addCdnPrefixToKey)(bucket, region, `${folder}/${name}.${ext}`);
+}
+//# sourceMappingURL=to-cdn-path.function.js.map

package/src/functions/to-cdn-path.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"to-cdn-path.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/to-cdn-path.function.ts"],"names":[],"mappings":";;AAEA,8BAEC;AAJD,qFAAqE;AAErE,SAAgB,SAAS,CAAC,MAAc,EAAE,MAAc,EAAE,MAAc,EAAE,IAAY,EAAE,GAAW;IAC/F,OAAO,IAAA,kDAAiB,EAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC,CAAA;AACxE,CAAC"}