@toolsplus/nx-forge 6.0.1 → 6.0.2

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@toolsplus/nx-forge",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Atlassian Forge plugin for Nx",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@forge/manifest": "^8.3.0",
+    "@forge/manifest": "^8.6.0",
     "@nx/devkit": "20.3.1",
     "@nx/eslint": "20.3.1",
     "@nx/jest": "20.3.1",
@@ -15,6 +15,7 @@
     "@nx/webpack": "20.3.1",
     "fs-extra": "^10.0.1",
     "js-yaml": "^4.1.0",
+    "yaml": "*",
     "jsonata": "^2.0.5",
     "tslib": "^2.3.0"
   },

package/src/executors/build/executor.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = runExecutor;
-const tslib_1 = require("tslib");
 const node_fs_1 = require("node:fs");
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
@@ -26,48 +25,33 @@ function fileExists(path) {
  *
  * @deprecated
  */
-function runExecutor(rawOptions, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, e_1, _b, _c;
-        devkit_1.logger.warn(`The build executor is deprecated and will be removed in the next major nx-forge plugin release.
+async function runExecutor(rawOptions, context) {
+    devkit_1.logger.warn(`The build executor is deprecated and will be removed in the next major nx-forge plugin release.
 
     Use a default Nx 'webpack' or 'esbuild' executor to build, and the 'package' executor to assemble the Forge app.`);
-        const { root, sourceRoot } = context.projectsConfigurations.projects[context.projectName];
-        if (!sourceRoot) {
-            throw new Error(`${context.projectName} does not have a sourceRoot.`);
-        }
-        if (!root) {
-            throw new Error(`${context.projectName} does not have a root.`);
-        }
-        const options = (0, normalize_options_1.normalizeOptions)(rawOptions, context.root, sourceRoot, root);
-        if (fileExists(`${options.projectRoot}/src/index.ts`)) {
-            const compilation = (0, compile_webpack_1.compileWebpack)(options, context);
-            try {
-                for (var _d = true, compilation_1 = tslib_1.__asyncValues(compilation), compilation_1_1; compilation_1_1 = yield compilation_1.next(), _a = compilation_1_1.done, !_a; _d = true) {
-                    _c = compilation_1_1.value;
-                    _d = false;
-                    const result = _c;
-                    if (!result.success) {
-                        throw new Error(`Failed to compile files for project ${context.projectName}.`);
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (!_d && !_a && (_b = compilation_1.return)) yield _b.call(compilation_1);
-                }
-                finally { if (e_1) throw e_1.error; }
+    const { root, sourceRoot } = context.projectsConfigurations.projects[context.projectName];
+    if (!sourceRoot) {
+        throw new Error(`${context.projectName} does not have a sourceRoot.`);
+    }
+    if (!root) {
+        throw new Error(`${context.projectName} does not have a root.`);
+    }
+    const options = (0, normalize_options_1.normalizeOptions)(rawOptions, context.root, sourceRoot, root);
+    if (fileExists(`${options.projectRoot}/src/index.ts`)) {
+        const compilation = (0, compile_webpack_1.compileWebpack)(options, context);
+        for await (const result of compilation) {
+            if (!result.success) {
+                throw new Error(`Failed to compile files for project ${context.projectName}.`);
             }
         }
-        (0, copy_forge_app_assets_1.copyForgeAppAssets)(options);
-        const resources = yield (0, process_resource_dependencies_1.processResourceDependencies)(Object.assign(Object.assign({}, options), { resourcePath: options.customUIPath }), context);
-        yield (0, patch_manifest_yml_1.patchManifestYml)(Object.assign(Object.assign({}, options), { resourcePath: options.customUIPath }));
-        (0, generate_package_json_1.generatePackageJson)(context.projectName, context.projectGraph, resources, options);
-        devkit_1.logger.info('Executor ran for build');
-        return {
-            success: true,
-        };
-    });
+    }
+    (0, copy_forge_app_assets_1.copyForgeAppAssets)(options);
+    const resources = await (0, process_resource_dependencies_1.processResourceDependencies)({ ...options, resourcePath: options.customUIPath }, context);
+    await (0, patch_manifest_yml_1.patchManifestYml)({ ...options, resourcePath: options.customUIPath });
+    (0, generate_package_json_1.generatePackageJson)(context.projectName, context.projectGraph, resources, options);
+    devkit_1.logger.info('Executor ran for build');
+    return {
+        success: true,
+    };
 }
 //# sourceMappingURL=executor.js.map

package/src/executors/build/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/build/executor.ts"],"names":[],"mappings":";;AA2BA,8BAoDC;;AA/ED,qCAA6C;AAE7C,uCAAoC;AAEpC,+DAA2D;AAC3D,uFAAkF;AAClF,iEAA4D;AAC5D,uEAAkE;AAClE,2DAAuD;AACvD,uEAAiE;AAEjE,SAAS,UAAU,CAAC,IAAc;IAChC,IAAI,CAAC;QACH,OAAO,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,SAA8B,WAAW,CACvC,UAAgC,EAChC,OAAwB;;;QAExB,eAAM,CAAC,IAAI,CACT;;qHAEiH,CAClH,CAAC;QAEF,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE/D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAE7E,IAAI,UAAU,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,EAAE,CAAC;YACtD,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;;gBACrD,KAA2B,eAAA,gBAAA,sBAAA,WAAW,CAAA,iBAAA,2FAAE,CAAC;oBAAd,2BAAW;oBAAX,WAAW;oBAA3B,MAAM,MAAM,KAAA,CAAA;oBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;wBACpB,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,WAAW,GAAG,CAC9D,CAAC;oBACJ,CAAC;gBACH,CAAC;;;;;;;;;QACH,CAAC;QAED,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;QAE5B,MAAM,SAAS,GAAG,MAAM,IAAA,2DAA2B,kCAC5C,OAAO,KAAE,YAAY,EAAE,OAAO,CAAC,YAAY,KAChD,OAAO,CACR,CAAC;QACF,MAAM,IAAA,qCAAgB,kCAAM,OAAO,KAAE,YAAY,EAAE,OAAO,CAAC,YAAY,IAAG,CAAC;QAC3E,IAAA,2CAAmB,EACjB,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,YAAY,EACpB,SAAS,EACT,OAAO,CACR,CAAC;QAEF,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;CAAA"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/build/executor.ts"],"names":[],"mappings":";;AA2BA,8BAoDC;AA/ED,qCAA6C;AAE7C,uCAAoC;AAEpC,+DAA2D;AAC3D,uFAAkF;AAClF,iEAA4D;AAC5D,uEAAkE;AAClE,2DAAuD;AACvD,uEAAiE;AAEjE,SAAS,UAAU,CAAC,IAAc;IAChC,IAAI,CAAC;QACH,OAAO,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACY,KAAK,UAAU,WAAW,CACvC,UAAgC,EAChC,OAAwB;IAExB,eAAM,CAAC,IAAI,CACT;;qHAEiH,CAClH,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE/D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IAE7E,IAAI,UAAU,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,EAAE,CAAC;QACtD,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,WAAW,GAAG,CAC9D,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;IAE5B,MAAM,SAAS,GAAG,MAAM,IAAA,2DAA2B,EACjD,EAAE,GAAG,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,EAClD,OAAO,CACR,CAAC;IACF,MAAM,IAAA,qCAAgB,EAAC,EAAE,GAAG,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC3E,IAAA,2CAAmB,EACjB,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,YAAY,EACpB,SAAS,EACT,OAAO,CACR,CAAC;IAEF,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACtC,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}

package/src/executors/build/lib/normalize-options.js

@@ -3,8 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 function normalizeOptions(options, root, sourceRoot, projectRoot) {
     var _a, _b, _c;
-    return Object.assign(Object.assign({}, options), { root,
+    return {
+        ...options,
+        root,
         sourceRoot,
-        projectRoot, customUIPath: (_a = options.customUIPath) !== null && _a !== void 0 ? _a : 'customUI', resourceOutputPathMap: (_b = options.resourceOutputPathMap) !== null && _b !== void 0 ? _b : {}, outputFileName: 'index.js', watch: (_c = options.watch) !== null && _c !== void 0 ? _c : false });
+        projectRoot,
+        customUIPath: (_a = options.customUIPath) !== null && _a !== void 0 ? _a : 'customUI',
+        resourceOutputPathMap: (_b = options.resourceOutputPathMap) !== null && _b !== void 0 ? _b : {},
+        outputFileName: 'index.js',
+        watch: (_c = options.watch) !== null && _c !== void 0 ? _c : false,
+    };
 }
 //# sourceMappingURL=normalize-options.js.map

package/src/executors/build/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/normalize-options.ts"],"names":[],"mappings":";;AAEA,4CAgBC;AAhBD,SAAgB,gBAAgB,CAC9B,OAA6B,EAC7B,IAAY,EACZ,UAAkB,EAClB,WAAmB;;IAEnB,uCACK,OAAO,KACV,IAAI;QACJ,UAAU;QACV,WAAW,EACX,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,UAAU,EAChD,qBAAqB,EAAE,MAAA,OAAO,CAAC,qBAAqB,mCAAI,EAAE,EAC1D,cAAc,EAAE,UAAU,EAC1B,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,KAAK,IAC7B;AACJ,CAAC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/normalize-options.ts"],"names":[],"mappings":";;AAEA,4CAgBC;AAhBD,SAAgB,gBAAgB,CAC9B,OAA6B,EAC7B,IAAY,EACZ,UAAkB,EAClB,WAAmB;;IAEnB,OAAO;QACL,GAAG,OAAO;QACV,IAAI;QACJ,UAAU;QACV,WAAW;QACX,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,UAAU;QAChD,qBAAqB,EAAE,MAAA,OAAO,CAAC,qBAAqB,mCAAI,EAAE;QAC1D,cAAc,EAAE,UAAU;QAC1B,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,KAAK;KAC9B,CAAC;AACJ,CAAC"}

package/src/executors/build/lib/patch-manifest-yml.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchManifestYml = patchManifestYml;
-const tslib_1 = require("tslib");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const manifest_yml_1 = require("../../../utils/forge/manifest-yml");
@@ -17,44 +16,53 @@ const util_manifest_1 = require("../../../shared/manifest/util-manifest");
  *
  * @param options Executor options
  */
-function patchManifestYml(options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const absoluteOutputPath = (0, path_1.resolve)(options.root, options.outputPath);
-        const manifestPath = (0, devkit_1.joinPathFragments)(absoluteOutputPath, 'manifest.yml');
-        devkit_1.logger.info(`Patching ${manifestPath}...`);
-        const manifestSchema = yield (0, manifest_yml_1.readManifestYml)(manifestPath);
-        const patchedManifest = patchManifestInternal(absoluteOutputPath, manifestSchema, options);
-        (0, manifest_yml_1.writeManifestYml)(manifestPath, patchedManifest);
-        devkit_1.logger.info(`Done patching ${manifestPath}.`);
+async function patchManifestYml(options) {
+    const absoluteOutputPath = (0, path_1.resolve)(options.root, options.outputPath);
+    const manifestPath = (0, devkit_1.joinPathFragments)(absoluteOutputPath, 'manifest.yml');
+    devkit_1.logger.info(`Patching ${manifestPath}...`);
+    const manifestSchema = await (0, manifest_yml_1.readManifestYml)(manifestPath, {
+        interpolate: false,
     });
+    const patchedManifest = patchManifestInternal(absoluteOutputPath, manifestSchema, options);
+    (0, manifest_yml_1.writeManifestYml)(manifestPath, patchedManifest);
+    devkit_1.logger.info(`Done patching ${manifestPath}.`);
 }
 function patchManifestInternal(absoluteOutputPath, manifestSchema, options) {
     const resources = manifestSchema.resources || [];
     const uiResources = resources.filter((0, util_manifest_1.isResourceType)(manifestSchema, ['ui-kit', 'custom-ui']));
-    const genericResources = resources.filter((0, util_manifest_1.isResourceType)(manifestSchema, ['generic']));
+    const staticResources = resources.filter((0, util_manifest_1.isResourceType)(manifestSchema, ['static']));
     // Integrity check: We want to be sure that we are not losing any resource
-    // definitions when separating them into UI and generic resources.
+    // definitions when separating them into UI and static resources.
     const resourceKeySet = new Set(resources.map((r) => r.key));
     const uiResourcesKeySet = new Set(uiResources.map((r) => r.key));
-    const genericResourcesKeySet = new Set(genericResources.map((r) => r.key));
-    const missingResourceKeys = [...resourceKeySet].filter((k) => !uiResourcesKeySet.has(k) && !genericResourcesKeySet.has(k));
+    const staticResourcesKeySet = new Set(staticResources.map((r) => r.key));
+    const missingResourceKeys = [...resourceKeySet].filter((k) => !uiResourcesKeySet.has(k) && !staticResourcesKeySet.has(k));
     if (missingResourceKeys.length > 0) {
         devkit_1.logger.warn(`Failed to determine resource type for resource definitions with keys ${missingResourceKeys}.
 
       This is most likely a plugin error and should be fixed. Please include the manifest.yml in the issue report.`);
     }
     if (!options.uiKit2Packaging) {
-        return Object.assign(Object.assign({}, manifestSchema), { resources: [
-                ...uiResources.map((resource) => (Object.assign(Object.assign({}, resource), { path: `${options.resourcePath}/${resource.path}` }))),
-                ...genericResources,
-            ] });
+        return {
+            ...manifestSchema,
+            resources: [
+                ...uiResources.map((resource) => ({
+                    ...resource,
+                    path: `${options.resourcePath}/${resource.path}`,
+                })),
+                ...staticResources,
+            ],
+        };
     }
     else {
         const resourceTypeIndex = (0, util_manifest_1.getResourceTypeIndex)(manifestSchema);
-        return Object.assign(Object.assign({}, manifestSchema), { resources: [
+        return {
+            ...manifestSchema,
+            resources: [
                 ...uiResources.map((r) => patchResource(options.resourcePath, r, absoluteOutputPath, resourceTypeIndex[r.key])),
-                ...genericResources,
-            ] });
+                ...staticResources,
+            ],
+        };
     }
 }
 /**
@@ -101,6 +109,9 @@ function patchResource(resourcePath, resource, absoluteOutputPath, resourceType)
         return resource;
     }
     const verifiedResourcePath = getVerifiedResourcePath(resourcePath, resourceType, resource, absoluteOutputPath);
-    return Object.assign(Object.assign({}, resource), { path: verifiedResourcePath });
+    return {
+        ...resource,
+        path: verifiedResourcePath,
+    };
 }
 //# sourceMappingURL=patch-manifest-yml.js.map

package/src/executors/build/lib/patch-manifest-yml.js.map

@@ -1 +1 @@
-{"version":3,"file":"patch-manifest-yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/patch-manifest-yml.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"patch-manifest-yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/patch-manifest-yml.ts"],"names":[],"mappings":"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"}

package/src/executors/build/lib/process-resource-dependencies.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processResourceDependencies = processResourceDependencies;
-const tslib_1 = require("tslib");
 const fs_extra_1 = require("fs-extra");
 const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
@@ -17,16 +16,19 @@ const util_manifest_1 = require("../../../shared/manifest/util-manifest");
  * @param options Executor options
  * @param context Executor context
  */
-function processResourceDependencies(options, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const manifestPath = (0, devkit_1.joinPathFragments)(context.root, context.projectsConfigurations.projects[context.projectName].root, 'manifest.yml');
-        const manifestSchema = yield (0, manifest_yml_1.readManifestYml)(manifestPath);
-        const resources = (_a = manifestSchema.resources) !== null && _a !== void 0 ? _a : [];
-        const uiResources = resources.filter((0, util_manifest_1.isResourceType)(manifestSchema, ['ui-kit', 'custom-ui']));
-        uiResources.forEach((r) => verifyAndCopyResourceDependency(r, context, options));
-        return uiResources;
+async function processResourceDependencies(options, context) {
+    var _a;
+    const manifestPath = (0, devkit_1.joinPathFragments)(context.root, context.projectsConfigurations.projects[context.projectName].root, 'manifest.yml');
+    const manifestSchema = await (0, manifest_yml_1.readManifestYml)(manifestPath, {
+        interpolate: false,
     });
+    const resources = (_a = manifestSchema.resources) !== null && _a !== void 0 ? _a : [];
+    const uiResources = resources.filter((0, util_manifest_1.isResourceType)(manifestSchema, ['ui-kit', 'custom-ui']));
+    devkit_1.logger.info(`Detected the following UI resources in the manifest.yml:\n${uiResources
+        .map((r) => `  - ${r.key}`)
+        .join('\n')}`);
+    uiResources.forEach((r) => verifyAndCopyResourceDependency(r, context, options));
+    return uiResources;
 }
 const getResourceOutputPath = (options, resourceProjectGraphNode, configurationName) => {
     var _a, _b;
@@ -73,8 +75,8 @@ const verifyAndCopyResourceDependency = (resource, context, options) => {
         (0, fs_1.readdirSync)(absoluteResourceBuildTargetOutputPath).length === 0) {
         throw new Error(`Project ${resourceProjectName} has no build artifacts in output directory '${resourceBuildTargetOutputPath}'. Make sure the project produces compatible build artifacts.`);
     }
-    devkit_1.logger.info(`Copying ${resourceProjectName} resource build artifacts...`);
+    devkit_1.logger.info(`Copying ${resource.key} (${resourceProjectName}) resource build artifacts...`);
     (0, fs_extra_1.copySync)(absoluteResourceBuildTargetOutputPath, (0, devkit_1.joinPathFragments)(options.root, options.outputPath, options.resourcePath, resourceProjectName), { recursive: true });
-    devkit_1.logger.info(`Done copying ${resourceProjectName} resource build artifacts.`);
+    devkit_1.logger.info(`Done copying ${resource.key} (${resourceProjectName}) resource build artifacts.`);
 };
 //# sourceMappingURL=process-resource-dependencies.js.map

package/src/executors/build/lib/process-resource-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-resource-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/process-resource-dependencies.ts"],"names":[],"mappings":";;AAgCA,kEAoBC;;AApDD,uCAAoC;AACpC,2BAA6C;AAC7C,uCAMoB;AAIpB,oEAAoE;AACpE,0EAAwE;AASxE;;;;;;;;;GASG;AACH,SAAsB,2BAA2B,CAC/C,OAAgB,EAChB,OAAwB;;;QAExB,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACjE,cAAc,CACf,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,MAAA,cAAc,CAAC,SAAS,mCAAI,EAAE,CAAC;QACjD,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAClC,IAAA,8BAAc,EAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CACxD,CAAC;QAEF,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACxB,+BAA+B,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CACrD,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAED,MAAM,qBAAqB,GAAG,CAC5B,OAAgB,EAChB,wBAAiD,EACjD,iBAA0B,EAC1B,EAAE;;IACF,MAAM,mBAAmB,GAAG,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC;IAC/D,MAAM,uBAAuB,GAC3B,OAAO,CAAC,qBAAqB,CAAC,mBAAmB,CAAC,CAAC;IACrD,IACE,uBAAuB;QACvB,OAAO,uBAAuB,KAAK,QAAQ;QAC3C,uBAAuB,KAAK,EAAE,EAC9B,CAAC;QACD,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,MAAM,gCAAgC,GACpC,MAAA,MAAA,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,OAAO,0CAAE,UAAU,CAAC;IACtE,IAAI,gCAAgC,EAAE,CAAC;QACrC,OAAO,gCAAgC,CAAC;IAC1C,CAAC;IAED,IAAI,qBAA6B,CAAC;IAClC,IAAI,sBAAgC,CAAC;IAErC,IAAI,CAAC;QACH,CAAC,qBAAqB,EAAE,GAAG,sBAAsB,CAAC;YAChD,IAAA,4CAAmC,EACjC;gBACE,OAAO,EAAE,mBAAmB;gBAC5B,MAAM,EAAE,OAAO;gBACf,aAAa,EAAE,iBAAiB;aACjC,EACD,EAAE,EACF,wBAAwB,CACzB,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,uDAAuD,mBAAmB,mNAAmN,mBAAmB,2CAA2C,CAC5V,CAAC;IACJ,CAAC;IAED,IAAI,qBAAqB,IAAI,sBAAsB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjE,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAED,MAAM,IAAI,KAAK,CACb,qDAAqD,mBAAmB,gKAAgK,mBAAmB,2CAA2C,CACvS,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,+BAA+B,GAAG,CACtC,QAA+B,EAC/B,OAAwB,EACxB,OAAgB,EACV,EAAE;IACR,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC1C,MAAM,wBAAwB,GAC5B,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAClD,MAAM,4BAA4B,GAAG,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,IAAI,CAAC;IAEpE,IAAI,CAAC,wBAAwB,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CACb,qDAAqD,mBAAmB,0EAA0E,CACnJ,CAAC;IACJ,CAAC;IAED,MAAM,6BAA6B,GAAG,qBAAqB,CACzD,OAAO,EACP,wBAAwB,EACxB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;IACF,MAAM,qCAAqC,GAAG,IAAA,0BAAiB,EAC7D,OAAO,CAAC,IAAI,EACZ,6BAA6B,CAC9B,CAAC;IAEF,IACE,CAAC,6BAA6B;QAC9B,CAAC,IAAA,eAAU,EAAC,qCAAqC,CAAC;QAClD,IAAA,gBAAW,EAAC,qCAAqC,CAAC,CAAC,MAAM,KAAK,CAAC,EAC/D,CAAC;QACD,MAAM,IAAI,KAAK,CACb,WAAW,mBAAmB,gDAAgD,6BAA6B,+DAA+D,CAC3K,CAAC;IACJ,CAAC;IAED,eAAM,CAAC,IAAI,CAAC,WAAW,mBAAmB,8BAA8B,CAAC,CAAC;IAC1E,IAAA,mBAAQ,EACN,qCAAqC,EACrC,IAAA,0BAAiB,EACf,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,YAAY,EACpB,mBAAmB,CACpB,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IACF,eAAM,CAAC,IAAI,CAAC,gBAAgB,mBAAmB,4BAA4B,CAAC,CAAC;AAC/E,CAAC,CAAC"}
+{"version":3,"file":"process-resource-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/process-resource-dependencies.ts"],"names":[],"mappings":";;AAgCA,kEA4BC;AA5DD,uCAAoC;AACpC,2BAA6C;AAC7C,uCAMoB;AAIpB,oEAAoE;AACpE,0EAAwE;AASxE;;;;;;;;;GASG;AACI,KAAK,UAAU,2BAA2B,CAC/C,OAAgB,EAChB,OAAwB;;IAExB,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACjE,cAAc,CACf,CAAC;IACF,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,EAAE;QACzD,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,MAAA,cAAc,CAAC,SAAS,mCAAI,EAAE,CAAC;IACjD,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAClC,IAAA,8BAAc,EAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CACxD,CAAC;IAEF,eAAM,CAAC,IAAI,CACT,6DAA6D,WAAW;SACrE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;SAC1B,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;IAEF,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACxB,+BAA+B,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CACrD,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,qBAAqB,GAAG,CAC5B,OAAgB,EAChB,wBAAiD,EACjD,iBAA0B,EAC1B,EAAE;;IACF,MAAM,mBAAmB,GAAG,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC;IAC/D,MAAM,uBAAuB,GAC3B,OAAO,CAAC,qBAAqB,CAAC,mBAAmB,CAAC,CAAC;IACrD,IACE,uBAAuB;QACvB,OAAO,uBAAuB,KAAK,QAAQ;QAC3C,uBAAuB,KAAK,EAAE,EAC9B,CAAC;QACD,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,MAAM,gCAAgC,GACpC,MAAA,MAAA,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,OAAO,0CAAE,UAAU,CAAC;IACtE,IAAI,gCAAgC,EAAE,CAAC;QACrC,OAAO,gCAAgC,CAAC;IAC1C,CAAC;IAED,IAAI,qBAA6B,CAAC;IAClC,IAAI,sBAAgC,CAAC;IAErC,IAAI,CAAC;QACH,CAAC,qBAAqB,EAAE,GAAG,sBAAsB,CAAC;YAChD,IAAA,4CAAmC,EACjC;gBACE,OAAO,EAAE,mBAAmB;gBAC5B,MAAM,EAAE,OAAO;gBACf,aAAa,EAAE,iBAAiB;aACjC,EACD,EAAE,EACF,wBAAwB,CACzB,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,uDAAuD,mBAAmB,mNAAmN,mBAAmB,2CAA2C,CAC5V,CAAC;IACJ,CAAC;IAED,IAAI,qBAAqB,IAAI,sBAAsB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjE,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAED,MAAM,IAAI,KAAK,CACb,qDAAqD,mBAAmB,gKAAgK,mBAAmB,2CAA2C,CACvS,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,+BAA+B,GAAG,CACtC,QAA+B,EAC/B,OAAwB,EACxB,OAAgB,EACV,EAAE;IACR,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC1C,MAAM,wBAAwB,GAC5B,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAClD,MAAM,4BAA4B,GAAG,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,IAAI,CAAC;IAEpE,IAAI,CAAC,wBAAwB,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CACb,qDAAqD,mBAAmB,0EAA0E,CACnJ,CAAC;IACJ,CAAC;IAED,MAAM,6BAA6B,GAAG,qBAAqB,CACzD,OAAO,EACP,wBAAwB,EACxB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;IACF,MAAM,qCAAqC,GAAG,IAAA,0BAAiB,EAC7D,OAAO,CAAC,IAAI,EACZ,6BAA6B,CAC9B,CAAC;IAEF,IACE,CAAC,6BAA6B;QAC9B,CAAC,IAAA,eAAU,EAAC,qCAAqC,CAAC;QAClD,IAAA,gBAAW,EAAC,qCAAqC,CAAC,CAAC,MAAM,KAAK,CAAC,EAC/D,CAAC;QACD,MAAM,IAAI,KAAK,CACb,WAAW,mBAAmB,gDAAgD,6BAA6B,+DAA+D,CAC3K,CAAC;IACJ,CAAC;IAED,eAAM,CAAC,IAAI,CACT,WAAW,QAAQ,CAAC,GAAG,KAAK,mBAAmB,+BAA+B,CAC/E,CAAC;IACF,IAAA,mBAAQ,EACN,qCAAqC,EACrC,IAAA,0BAAiB,EACf,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,YAAY,EACpB,mBAAmB,CACpB,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IACF,eAAM,CAAC,IAAI,CACT,gBAAgB,QAAQ,CAAC,GAAG,KAAK,mBAAmB,6BAA6B,CAClF,CAAC;AACJ,CAAC,CAAC"}

package/src/executors/deploy/executor.js

@@ -1,41 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = runExecutor;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const async_commands_1 = require("../../utils/forge/async-commands");
 const transform_manifest_yml_1 = require("./lib/transform-manifest-yml");
 const normalizeOptions = (options, context) => {
     const isEnvironmentName = (c) => ['development', 'staging', 'production'].includes(c);
     if (isEnvironmentName(context.configurationName)) {
-        return Object.assign(Object.assign({}, options), { environment: context.configurationName });
+        return {
+            ...options,
+            environment: context.configurationName,
+        };
     }
     else {
         return options;
     }
 };
-function runExecutor(rawOptions, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(rawOptions, context);
-        if (options.manifestTransform && options.manifestTransform !== '') {
-            devkit_1.logger.info(`Applying Forge manifest transformation ${context.configurationName ? `(${context.configurationName})` : ''}: ${options.manifestTransform}`);
-            yield (0, transform_manifest_yml_1.transformManifestYml)(options, context);
-        }
-        const args = [
-            'deploy',
-            `--environment=${options.environment}`,
-            ...(options.verbose === true ? ['--verbose'] : []),
-            ...(options.verify === false ? ['--no-verify'] : []),
-            ...(options.interactive === false ? ['--non-interactive'] : []),
-        ];
-        devkit_1.logger.log(`Running: forge ${args.join(' ')}`);
-        yield (0, async_commands_1.runForgeCommandAsync)(args, {
-            cwd: options.outputPath,
-        });
-        devkit_1.logger.log('✅ Forge app deployed');
-        return {
-            success: true,
-        };
+async function runExecutor(rawOptions, context) {
+    const options = normalizeOptions(rawOptions, context);
+    if (options.manifestTransform && options.manifestTransform !== '') {
+        devkit_1.logger.info(`Applying Forge manifest transformation ${context.configurationName ? `(${context.configurationName})` : ''}: ${options.manifestTransform}`);
+        await (0, transform_manifest_yml_1.transformManifestYml)(options, context);
+    }
+    const args = [
+        'deploy',
+        `--environment=${options.environment}`,
+        ...(options.verbose === true ? ['--verbose'] : []),
+        ...(options.verify === false ? ['--no-verify'] : []),
+        ...(options.interactive === false ? ['--non-interactive'] : []),
+    ];
+    devkit_1.logger.log(`Running: forge ${args.join(' ')}`);
+    await (0, async_commands_1.runForgeCommandAsync)(args, {
+        cwd: options.outputPath,
     });
+    devkit_1.logger.log('✅ Forge app deployed');
+    return {
+        success: true,
+    };
 }
 //# sourceMappingURL=executor.js.map

package/src/executors/deploy/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/deploy/executor.ts"],"names":[],"mappings":";;AAwBA,8BAiCC;;AAzDD,uCAAqD;AAErD,qEAAwE;AACxE,yEAAoE;AAEpE,MAAM,gBAAgB,GAAG,CACvB,OAA8B,EAC9B,OAAwB,EACD,EAAE;IACzB,MAAM,iBAAiB,GAAG,CACxB,CAAS,EACkC,EAAE,CAC7C,CAAC,aAAa,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEvD,IAAI,iBAAiB,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACjD,uCACK,OAAO,KACV,WAAW,EAAE,OAAO,CAAC,iBAAiB,IACtC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC,CAAC;AAEF,SAA8B,WAAW,CACvC,UAAiC,EACjC,OAAwB;;QAExB,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAEtD,IAAI,OAAO,CAAC,iBAAiB,IAAI,OAAO,CAAC,iBAAiB,KAAK,EAAE,EAAE,CAAC;YAClE,eAAM,CAAC,IAAI,CACT,0CACE,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC,EACjE,KAAK,OAAO,CAAC,iBAAiB,EAAE,CACjC,CAAC;YACF,MAAM,IAAA,6CAAoB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,IAAI,GAAG;YACX,QAAQ;YACR,iBAAiB,OAAO,CAAC,WAAW,EAAE;YACtC,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAClD,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAChE,CAAC;QAEF,eAAM,CAAC,GAAG,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE/C,MAAM,IAAA,qCAAoB,EAAC,IAAI,EAAE;YAC/B,GAAG,EAAE,OAAO,CAAC,UAAU;SACxB,CAAC,CAAC;QAEH,eAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QACnC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;CAAA"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/deploy/executor.ts"],"names":[],"mappings":";;AAwBA,8BAiCC;AAzDD,uCAAqD;AAErD,qEAAwE;AACxE,yEAAoE;AAEpE,MAAM,gBAAgB,GAAG,CACvB,OAA8B,EAC9B,OAAwB,EACD,EAAE;IACzB,MAAM,iBAAiB,GAAG,CACxB,CAAS,EACkC,EAAE,CAC7C,CAAC,aAAa,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEvD,IAAI,iBAAiB,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACjD,OAAO;YACL,GAAG,OAAO;YACV,WAAW,EAAE,OAAO,CAAC,iBAAiB;SACvC,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC,CAAC;AAEa,KAAK,UAAU,WAAW,CACvC,UAAiC,EACjC,OAAwB;IAExB,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEtD,IAAI,OAAO,CAAC,iBAAiB,IAAI,OAAO,CAAC,iBAAiB,KAAK,EAAE,EAAE,CAAC;QAClE,eAAM,CAAC,IAAI,CACT,0CACE,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC,EACjE,KAAK,OAAO,CAAC,iBAAiB,EAAE,CACjC,CAAC;QACF,MAAM,IAAA,6CAAoB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,IAAI,GAAG;QACX,QAAQ;QACR,iBAAiB,OAAO,CAAC,WAAW,EAAE;QACtC,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAChE,CAAC;IAEF,eAAM,CAAC,GAAG,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAE/C,MAAM,IAAA,qCAAoB,EAAC,IAAI,EAAE;QAC/B,GAAG,EAAE,OAAO,CAAC,UAAU;KACxB,CAAC,CAAC;IAEH,eAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACnC,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}

package/src/executors/deploy/lib/transform-manifest-yml.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const jsonata_1 = tslib_1.__importDefault(require("jsonata"));
 const manifest_yml_1 = require("../../../utils/forge/manifest-yml");
 const devkit_1 = require("@nx/devkit");
-const transformManifestYml = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const transformManifestYml = async (options, context) => {
     var _a;
     let expression;
     try {
@@ -15,7 +15,7 @@ const transformManifestYml = (options, context) => tslib_1.__awaiter(void 0, voi
         throw new Error(`Failed to parse expression '${options.manifestTransform}': ${(_a = error.message) !== null && _a !== void 0 ? _a : JSON.stringify(error)}`);
     }
     const manifestPath = (0, devkit_1.joinPathFragments)(context.root, options.outputPath, 'manifest.yml');
-    const manifest = yield (0, manifest_yml_1.readManifestYml)(manifestPath);
+    const manifest = await (0, manifest_yml_1.readManifestYml)(manifestPath);
     expression.registerFunction('env', (s) => {
         if (process.env[s]) {
             return process.env[s];
@@ -25,11 +25,11 @@ const transformManifestYml = (options, context) => tslib_1.__awaiter(void 0, voi
         }
     }, '<s:(s)>');
     expression.registerFunction('envOrNull', (s) => process.env[s], '<s:(sl)>');
-    const transformedManifest = yield expression.evaluate(manifest);
+    const transformedManifest = await expression.evaluate(manifest);
     if (options.verify) {
-        yield (0, manifest_yml_1.validateManifestContent)(transformedManifest);
+        await (0, manifest_yml_1.validateManifestContent)(transformedManifest);
     }
     (0, manifest_yml_1.writeManifestYml)(manifestPath, transformedManifest);
-});
+};
 exports.transformManifestYml = transformManifestYml;
 //# sourceMappingURL=transform-manifest-yml.js.map

package/src/executors/deploy/lib/transform-manifest-yml.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform-manifest-yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/deploy/lib/transform-manifest-yml.ts"],"names":[],"mappings":";;;;AAAA,8DAA8C;AAE9C,oEAI2C;AAC3C,uCAAgE;AAOzD,MAAM,oBAAoB,GAAG,CAClC,OAAgB,EAChB,OAAwB,EACxB,EAAE;;IACF,IAAI,UAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,UAAU,GAAG,IAAA,iBAAO,EAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,+BAA+B,OAAO,CAAC,iBAAiB,MACtD,MAAA,KAAK,CAAC,OAAO,mCAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CACvC,EAAE,CACH,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,UAAU,EAClB,cAAc,CACf,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,CAAC;IAErD,UAAU,CAAC,gBAAgB,CACzB,KAAK,EACL,CAAC,CAAC,EAAE,EAAE;QACJ,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACnB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,CAAC;QAChE,CAAC;IACH,CAAC,EACD,SAAS,CACV,CAAC;IACF,UAAU,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;IAE5E,MAAM,mBAAmB,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAA,sCAAuB,EAAC,mBAAmB,CAAC,CAAC;IACrD,CAAC;IAED,IAAA,+BAAgB,EAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;AACtD,CAAC,CAAA,CAAC;AA3CW,QAAA,oBAAoB,wBA2C/B"}
+{"version":3,"file":"transform-manifest-yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/deploy/lib/transform-manifest-yml.ts"],"names":[],"mappings":";;;;AAAA,8DAA8C;AAE9C,oEAI2C;AAC3C,uCAAgE;AAOzD,MAAM,oBAAoB,GAAG,KAAK,EACvC,OAAgB,EAChB,OAAwB,EACxB,EAAE;;IACF,IAAI,UAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,UAAU,GAAG,IAAA,iBAAO,EAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,+BAA+B,OAAO,CAAC,iBAAiB,MACtD,MAAA,KAAK,CAAC,OAAO,mCAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CACvC,EAAE,CACH,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,UAAU,EAClB,cAAc,CACf,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,CAAC;IAErD,UAAU,CAAC,gBAAgB,CACzB,KAAK,EACL,CAAC,CAAC,EAAE,EAAE;QACJ,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACnB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,CAAC;QAChE,CAAC;IACH,CAAC,EACD,SAAS,CACV,CAAC;IACF,UAAU,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;IAE5E,MAAM,mBAAmB,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAA,sCAAuB,EAAC,mBAAmB,CAAC,CAAC;IACrD,CAAC;IAED,IAAA,+BAAgB,EAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;AACtD,CAAC,CAAC;AA3CW,QAAA,oBAAoB,wBA2C/B"}

package/src/executors/install/executor.js

@@ -1,30 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = runExecutor;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const async_commands_1 = require("../../utils/forge/async-commands");
-function runExecutor(options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // https://developer.atlassian.com/platform/forge/cli-reference/install/
-        const args = [
-            'install',
-            `--site=${options.site}`,
-            `--product=${options.product}`,
-            `--environment=${options.environment}`,
-            ...(options.upgrade === true ? ['--upgrade'] : []),
-            ...(options.confirmScopes === true ? ['--confirm-scopes'] : []),
-            ...(options.interactive === false ? ['--non-interactive'] : []),
-            ...(options.verbose === true ? ['--verbose'] : []),
-        ];
-        devkit_1.logger.log(`Running: forge ${args.join(' ')}`);
-        yield (0, async_commands_1.runForgeCommandAsync)(args, {
-            cwd: options.outputPath,
-        });
-        devkit_1.logger.info('✅ Forge app installed');
-        return {
-            success: true,
-        };
+async function runExecutor(options) {
+    // https://developer.atlassian.com/platform/forge/cli-reference/install/
+    const args = [
+        'install',
+        `--site=${options.site}`,
+        `--product=${options.product}`,
+        `--environment=${options.environment}`,
+        ...(options.upgrade === true ? ['--upgrade'] : []),
+        ...(options.confirmScopes === true ? ['--confirm-scopes'] : []),
+        ...(options.interactive === false ? ['--non-interactive'] : []),
+        ...(options.verbose === true ? ['--verbose'] : []),
+    ];
+    devkit_1.logger.log(`Running: forge ${args.join(' ')}`);
+    await (0, async_commands_1.runForgeCommandAsync)(args, {
+        cwd: options.outputPath,
     });
+    devkit_1.logger.info('✅ Forge app installed');
+    return {
+        success: true,
+    };
 }
 //# sourceMappingURL=executor.js.map

package/src/executors/install/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/install/executor.ts"],"names":[],"mappings":";;AAIA,8BAwBC;;AA3BD,uCAAoC;AACpC,qEAAwE;AAExE,SAA8B,WAAW,CAAC,OAA+B;;QACvE,wEAAwE;QACxE,MAAM,IAAI,GAAG;YACX,SAAS;YACT,UAAU,OAAO,CAAC,IAAI,EAAE;YACxB,aAAa,OAAO,CAAC,OAAO,EAAE;YAC9B,iBAAiB,OAAO,CAAC,WAAW,EAAE;YACtC,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAClD,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACnD,CAAC;QAEF,eAAM,CAAC,GAAG,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE/C,MAAM,IAAA,qCAAoB,EAAC,IAAI,EAAE;YAC/B,GAAG,EAAE,OAAO,CAAC,UAAU;SACxB,CAAC,CAAC;QAEH,eAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAErC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;CAAA"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/install/executor.ts"],"names":[],"mappings":";;AAIA,8BAwBC;AA3BD,uCAAoC;AACpC,qEAAwE;AAEzD,KAAK,UAAU,WAAW,CAAC,OAA+B;IACvE,wEAAwE;IACxE,MAAM,IAAI,GAAG;QACX,SAAS;QACT,UAAU,OAAO,CAAC,IAAI,EAAE;QACxB,aAAa,OAAO,CAAC,OAAO,EAAE;QAC9B,iBAAiB,OAAO,CAAC,WAAW,EAAE;QACtC,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACnD,CAAC;IAEF,eAAM,CAAC,GAAG,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAE/C,MAAM,IAAA,qCAAoB,EAAC,IAAI,EAAE;QAC/B,GAAG,EAAE,OAAO,CAAC,UAAU;KACxB,CAAC,CAAC;IAEH,eAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAErC,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}

package/src/executors/package/executor.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 exports.default = runExecutor;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const process_resource_dependencies_1 = require("../build/lib/process-resource-dependencies");
 const patch_manifest_yml_1 = require("../build/lib/patch-manifest-yml");
@@ -10,36 +9,39 @@ const generate_package_json_1 = require("./lib/generate-package-json");
 const copy_forge_app_assets_1 = require("../build/lib/copy-forge-app-assets");
 function normalizeOptions(options, root, sourceRoot, projectRoot) {
     var _a, _b;
-    return Object.assign(Object.assign({}, options), { root,
+    return {
+        ...options,
+        root,
         sourceRoot,
-        projectRoot, resourcePath: (_a = options.resourcePath) !== null && _a !== void 0 ? _a : 'resources', resourceOutputPathMap: (_b = options.resourceOutputPathMap) !== null && _b !== void 0 ? _b : {} });
+        projectRoot,
+        resourcePath: (_a = options.resourcePath) !== null && _a !== void 0 ? _a : 'resources',
+        resourceOutputPathMap: (_b = options.resourceOutputPathMap) !== null && _b !== void 0 ? _b : {},
+    };
 }
-function runExecutor(rawOptions, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { root, sourceRoot } = context.projectsConfigurations.projects[context.projectName];
-        if (!sourceRoot) {
-            throw new Error(`${context.projectName} does not have a sourceRoot.`);
-        }
-        if (!root) {
-            throw new Error(`${context.projectName} does not have a root.`);
-        }
-        const options = normalizeOptions(rawOptions, context.root, sourceRoot, root);
-        (0, copy_forge_app_assets_1.copyForgeAppAssets)(options);
-        const resources = yield (0, process_resource_dependencies_1.processResourceDependencies)(Object.assign(Object.assign({}, options), { resourcePath: options.resourcePath }), context);
-        yield (0, patch_manifest_yml_1.patchManifestYml)(Object.assign(Object.assign({}, options), { resourcePath: options.resourcePath }));
-        (0, generate_package_json_1.generatePackageJson)({
-            root: options.root,
-            projectRoot: options.projectRoot,
-            outputPath: options.outputPath,
-            tsConfig: options.tsConfig,
-            projectName: context.projectName,
-            projectGraph: context.projectGraph,
-            manifestResources: resources,
-        });
-        devkit_1.logger.info('Executor ran for package');
-        return {
-            success: true,
-        };
+async function runExecutor(rawOptions, context) {
+    const { root, sourceRoot } = context.projectsConfigurations.projects[context.projectName];
+    if (!sourceRoot) {
+        throw new Error(`${context.projectName} does not have a sourceRoot.`);
+    }
+    if (!root) {
+        throw new Error(`${context.projectName} does not have a root.`);
+    }
+    const options = normalizeOptions(rawOptions, context.root, sourceRoot, root);
+    (0, copy_forge_app_assets_1.copyForgeAppAssets)(options);
+    const resources = await (0, process_resource_dependencies_1.processResourceDependencies)({ ...options, resourcePath: options.resourcePath }, context);
+    await (0, patch_manifest_yml_1.patchManifestYml)({ ...options, resourcePath: options.resourcePath });
+    (0, generate_package_json_1.generatePackageJson)({
+        root: options.root,
+        projectRoot: options.projectRoot,
+        outputPath: options.outputPath,
+        tsConfig: options.tsConfig,
+        projectName: context.projectName,
+        projectGraph: context.projectGraph,
+        manifestResources: resources,
     });
+    devkit_1.logger.info('Executor ran for package');
+    return {
+        success: true,
+    };
 }
 //# sourceMappingURL=executor.js.map

package/src/executors/package/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/package/executor.ts"],"names":[],"mappings":";;AAOA,4CAcC;AAED,8BAwCC;;AA/DD,uCAAqD;AAErD,8FAAyF;AACzF,wEAAmE;AACnE,uEAAkE;AAClE,8EAAwE;AAExE,SAAgB,gBAAgB,CAC9B,OAA8B,EAC9B,IAAY,EACZ,UAAkB,EAClB,WAAmB;;IAEnB,uCACK,OAAO,KACV,IAAI;QACJ,UAAU;QACV,WAAW,EACX,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,WAAW,EACjD,qBAAqB,EAAE,MAAA,OAAO,CAAC,qBAAqB,mCAAI,EAAE,IAC1D;AACJ,CAAC;AAED,SAA8B,WAAW,CACvC,UAAiC,EACjC,OAAwB;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE/D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAE7E,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;QAE5B,MAAM,SAAS,GAAG,MAAM,IAAA,2DAA2B,kCAC5C,OAAO,KAAE,YAAY,EAAE,OAAO,CAAC,YAAY,KAChD,OAAO,CACR,CAAC;QAEF,MAAM,IAAA,qCAAgB,kCAAM,OAAO,KAAE,YAAY,EAAE,OAAO,CAAC,YAAY,IAAG,CAAC;QAE3E,IAAA,2CAAmB,EAAC;YAClB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,iBAAiB,EAAE,SAAS;SAC7B,CAAC,CAAC;QAEH,eAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACxC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;CAAA"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/package/executor.ts"],"names":[],"mappings":";;AAOA,4CAcC;AAED,8BAwCC;AA/DD,uCAAqD;AAErD,8FAAyF;AACzF,wEAAmE;AACnE,uEAAkE;AAClE,8EAAwE;AAExE,SAAgB,gBAAgB,CAC9B,OAA8B,EAC9B,IAAY,EACZ,UAAkB,EAClB,WAAmB;;IAEnB,OAAO;QACL,GAAG,OAAO;QACV,IAAI;QACJ,UAAU;QACV,WAAW;QACX,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,WAAW;QACjD,qBAAqB,EAAE,MAAA,OAAO,CAAC,qBAAqB,mCAAI,EAAE;KAC3D,CAAC;AACJ,CAAC;AAEc,KAAK,UAAU,WAAW,CACvC,UAAiC,EACjC,OAAwB;IAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE/D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IAE7E,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;IAE5B,MAAM,SAAS,GAAG,MAAM,IAAA,2DAA2B,EACjD,EAAE,GAAG,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,EAClD,OAAO,CACR,CAAC;IAEF,MAAM,IAAA,qCAAgB,EAAC,EAAE,GAAG,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAE3E,IAAA,2CAAmB,EAAC;QAClB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,iBAAiB,EAAE,SAAS;KAC7B,CAAC,CAAC;IAEH,eAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACxC,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}