@onivoro/onix 20.5.28 → 20.5.30

package/package.json

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

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

@@ -12,16 +12,16 @@ const s3_sync_directory_function_1 = require("../../functions/s3-sync-directory.
 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, cloudFrontId } = options;
+    const { region, bucket, omitAcl, profile, localDirectory, cloudFrontId, cloudFrontRegion, env } = 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}`);
+    (0, pmx_function_1.pmxSpawn)(context, `nx build ${app}`, env);
     const resolvedLocalDirectory = (0, path_1.resolve)(projectOutput, localDirectory);
     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({ credentials: yield (0, resolve_aws_credentials_function_1.resolveAwsCredentials)(profile) });
+        const cloudfrontClient = new client_cloudfront_1.CloudFrontClient({ region: cloudFrontRegion || 'us-east-1', 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}`);
     }

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":";;;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,WAAW,EAAE,MAAM,IAAA,wDAAqB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACrG,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"}
+{"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,gBAAgB,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAC1G,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,EAAE,GAAG,CAAC,CAAC;IAE1C,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,gBAAgB,IAAI,WAAW,EAAE,WAAW,EAAE,MAAM,IAAA,wDAAqB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC9I,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

@@ -5,4 +5,6 @@ export interface ExecutorSchema {
     profile?: string,
     localDirectory: string,
     cloudFrontId?: string,
+    cloudFrontRegion?: string,
+    env?: Record<string, any>;
 }

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

@@ -28,6 +28,15 @@
     "cloudFrontId": {
       "type": "string",
       "description": "CloudFront distribution ID for invalidation"
+    },
+    "cloudFrontRegion": {
+      "type": "string",
+      "description": "CloudFront region",
+      "default": "us-east-1"
+    },
+    "env": {
+      "type": "object",
+      "description": "object that provides keys and values to load as environment variables"
     }
   },
   "required": [

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

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const client_cloudfront_1 = require("@aws-sdk/client-cloudfront");
 const devkit_1 = require("@nx/devkit");
 function invalidateCloudFront(cloudfront_1, distributionId_1) {
-    return tslib_1.__awaiter(this, arguments, void 0, function* (cloudfront, distributionId, paths = ['*']) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* (cloudfront, distributionId, paths = ['/*']) {
         const command = new client_cloudfront_1.CreateInvalidationCommand({
             DistributionId: distributionId,
             InvalidationBatch: {

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

@@ -1 +1 @@
-{"version":3,"file":"invalidate-cloud-front.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/invalidate-cloud-front.function.ts"],"names":[],"mappings":";;AAGA,oDAeC;;AAlBD,kEAAyF;AACzF,uCAAoC;AAEpC,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,eAAM,CAAC,IAAI,CAAC,wCAAwC,cAAc,eAAe,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAErG,OAAO,MAAM,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;CAAA"}
+{"version":3,"file":"invalidate-cloud-front.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/invalidate-cloud-front.function.ts"],"names":[],"mappings":";;AAGA,oDAeC;;AAlBD,kEAAyF;AACzF,uCAAoC;AAEpC,SAAsB,oBAAoB;iEAAC,UAA4B,EAAE,cAAsB,EAAE,QAAkB,CAAC,IAAI,CAAC;QACrH,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,eAAM,CAAC,IAAI,CAAC,wCAAwC,cAAc,eAAe,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAErG,OAAO,MAAM,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;CAAA"}

package/src/functions/object-to-env-exports.function.d.ts

@@ -0,0 +1 @@
+export declare function objectToEnvExports(env: Record<string, any>): string;

package/src/functions/object-to-env-exports.function.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.objectToEnvExports = objectToEnvExports;
+function objectToEnvExports(env) {
+    return Object.entries(env).reduce((_, __) => `${_} export ${__[0]}='${__[1]}'`, '');
+}
+//# sourceMappingURL=object-to-env-exports.function.js.map

package/src/functions/object-to-env-exports.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"object-to-env-exports.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/object-to-env-exports.function.ts"],"names":[],"mappings":";;AAAA,gDAEC;AAFD,SAAgB,kBAAkB,CAAC,GAAwB;IACvD,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AACxF,CAAC"}

package/src/functions/pmx.function.d.ts

@@ -1,3 +1,3 @@
 import { ExecutorContext } from '@nx/devkit';
-export declare function pmxSpawn(context: ExecutorContext, command: string): void;
+export declare function pmxSpawn(context: ExecutorContext, command: string, env?: Record<string, any>): void;
 export declare function pmxExec(context: ExecutorContext, command: string): void;

package/src/functions/pmx.function.js

@@ -5,9 +5,11 @@ exports.pmxExec = pmxExec;
 const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
 const pm_function_1 = require("./pm.function");
-function pmxSpawn(context, command) {
+const object_to_env_exports_function_1 = require("./object-to-env-exports.function");
+function pmxSpawn(context, command, env = {}) {
     const { dlx } = (0, pm_function_1.pm)(context);
-    const completeCommand = `${dlx} ${command}`;
+    const envLiteral = (0, object_to_env_exports_function_1.objectToEnvExports)(env);
+    const completeCommand = `${envLiteral} ${dlx} ${command}`;
     devkit_1.logger.info(completeCommand);
     const [program, ...args] = completeCommand.split(' ');
     (0, child_process_1.spawnSync)(program, args, { stdio: 'inherit' });

package/src/functions/pmx.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"pmx.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/pmx.function.ts"],"names":[],"mappings":";;AAOA,4BAUC;AAED,0BAQC;AA3BD,uCAGoB;AACpB,iDAAoD;AACpD,+CAAmC;AAEnC,SAAgB,QAAQ,CAAC,OAAwB,EAAE,OAAe;IAC9D,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,gBAAE,EAAC,OAAO,CAAC,CAAC;IAE5B,MAAM,eAAe,GAAG,GAAG,GAAG,IAAI,OAAO,EAAE,CAAC;IAE5C,eAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE7B,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtD,IAAA,yBAAS,EAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AACnD,CAAC;AAED,SAAgB,OAAO,CAAC,OAAwB,EAAE,OAAe;IAC7D,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,gBAAE,EAAC,OAAO,CAAC,CAAC;IAE5B,MAAM,eAAe,GAAG,GAAG,GAAG,IAAI,OAAO,EAAE,CAAC;IAE5C,eAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE7B,IAAA,wBAAQ,EAAC,eAAe,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"pmx.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/pmx.function.ts"],"names":[],"mappings":";;AAQA,4BAYC;AAED,0BAQC;AA9BD,uCAGoB;AACpB,iDAAoD;AACpD,+CAAmC;AACnC,qFAAsE;AAEtE,SAAgB,QAAQ,CAAC,OAAwB,EAAE,OAAe,EAAE,MAA2B,EAAE;IAC7F,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,gBAAE,EAAC,OAAO,CAAC,CAAC;IAE5B,MAAM,UAAU,GAAG,IAAA,mDAAkB,EAAC,GAAG,CAAC,CAAC;IAE3C,MAAM,eAAe,GAAG,GAAG,UAAU,IAAI,GAAG,IAAI,OAAO,EAAE,CAAC;IAE1D,eAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE7B,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtD,IAAA,yBAAS,EAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AACnD,CAAC;AAED,SAAgB,OAAO,CAAC,OAAwB,EAAE,OAAe;IAC7D,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,gBAAE,EAAC,OAAO,CAAC,CAAC;IAE5B,MAAM,eAAe,GAAG,GAAG,GAAG,IAAI,OAAO,EAAE,CAAC;IAE5C,eAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE7B,IAAA,wBAAQ,EAAC,eAAe,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AACpD,CAAC"}

package/src/index.d.ts

@@ -3,6 +3,7 @@ export * from './utils/rspack-config-factory';
 export * from './utils/vite-config-factory';
 export * from './types/onix-config.type';
 export * from './plugins/plugin';
+export * from './functions/object-to-env-exports.function';
 export * from './functions/as-s3-app-key.function';
 export * from './functions/executor-factory.function';
 export * from './functions/extract-project-build-outputs.function';

package/src/index.js

@@ -6,6 +6,7 @@ tslib_1.__exportStar(require("./utils/rspack-config-factory"), exports);
 tslib_1.__exportStar(require("./utils/vite-config-factory"), exports);
 tslib_1.__exportStar(require("./types/onix-config.type"), exports);
 tslib_1.__exportStar(require("./plugins/plugin"), exports);
+tslib_1.__exportStar(require("./functions/object-to-env-exports.function"), exports);
 tslib_1.__exportStar(require("./functions/as-s3-app-key.function"), exports);
 tslib_1.__exportStar(require("./functions/executor-factory.function"), exports);
 tslib_1.__exportStar(require("./functions/extract-project-build-outputs.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,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,qFAA2D;AAC3D,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"}