@toolsplus/nx-forge 1.2.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolsplus/nx-forge",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "Atlassian Forge plugin for Nx",
   "main": "src/index.js",
   "generators": "./generators.json",
@@ -9,10 +9,11 @@
     "@nrwl/node": "^14.0.0",
     "@nrwl/workspace": "^14.0.0"
   },
-  "typings": "./src/index.d.ts",
+  "types": "./src/index.d.ts",
   "dependencies": {
-    "@forge/manifest": "^4.4.1",
-    "js-yaml": "^4.1.0",
-    "fs-extra": "^10.0.1"
+    "@nrwl/webpack": "15.2.4",
+    "@forge/manifest": "4.5.1",
+    "js-yaml": "4.1.0",
+    "fs-extra": "10.1.0"
   }
 }

package/src/executors/build/executor.js

@@ -8,9 +8,24 @@ const generate_package_json_1 = require("./lib/generate-package-json");
 const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
 const compile_webpack_1 = require("./lib/compile-webpack");
 const copy_forge_app_assets_1 = require("./lib/copy-forge-app-assets");
+const devkit_1 = require("@nrwl/devkit");
+/**
+ *  Try to read a cached project graph. If it does not exist
+ *  trigger creation to ensure the project graph exists.
+ */
+function readOrCreateProjectGraph() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            return (0, project_graph_1.readCachedProjectGraph)();
+        }
+        catch (e) {
+            return (0, devkit_1.createProjectGraphAsync)();
+        }
+    });
+}
 function runExecutor(rawOptions, context) {
     var e_1, _a;
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { root, sourceRoot } = context.workspace.projects[context.projectName];
         if (!sourceRoot) {
             throw new Error(`${context.projectName} does not have a sourceRoot.`);
@@ -21,7 +36,7 @@ function runExecutor(rawOptions, context) {
         const options = (0, normalize_options_1.normalizeOptions)(rawOptions, context.root, sourceRoot, root);
         const compilation = (0, compile_webpack_1.compileWebpack)(options, context);
         try {
-            for (var compilation_1 = (0, tslib_1.__asyncValues)(compilation), compilation_1_1; compilation_1_1 = yield compilation_1.next(), !compilation_1_1.done;) {
+            for (var compilation_1 = tslib_1.__asyncValues(compilation), compilation_1_1; compilation_1_1 = yield compilation_1.next(), !compilation_1_1.done;) {
                 const result = compilation_1_1.value;
                 if (!result.success) {
                     throw new Error(`Failed to compile files for project ${context.projectName}.`);
@@ -38,7 +53,8 @@ function runExecutor(rawOptions, context) {
         (0, copy_forge_app_assets_1.copyForgeAppAssets)(options);
         yield (0, process_custom_ui_dependencies_1.processCustomUIDependencies)(options, context);
         yield (0, patch_manifest_yml_1.patchManifestYml)(options);
-        (0, generate_package_json_1.generatePackageJson)(context.projectName, (0, project_graph_1.readCachedProjectGraph)(), options);
+        const projectGraph = yield readOrCreateProjectGraph();
+        (0, generate_package_json_1.generatePackageJson)(context.projectName, projectGraph, options);
         console.log('Executor ran for build');
         return {
             success: true,

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

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/forge/src/executors/build/executor.ts"],"names":[],"mappings":";;;AAEA,+DAA2D;AAC3D,yFAAmF;AACnF,iEAA4D;AAC5D,uEAAkE;AAClE,0EAAgF;AAChF,2DAAuD;AACvD,uEAAiE;AAEjE,SAA8B,WAAW,CACvC,UAAgC,EAChC,OAAwB;;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE7E,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;SACvE;QAED,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;SACjE;QAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAC7E,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;;YAErD,KAA2B,IAAA,gBAAA,2BAAA,WAAW,CAAA,iBAAA;gBAA3B,MAAM,MAAM,wBAAA,CAAA;gBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;oBACnB,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,WAAW,GAAG,CAC9D,CAAC;iBACH;aACF;;;;;;;;;QAED,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;QAC5B,MAAM,IAAA,4DAA2B,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,IAAA,qCAAgB,EAAC,OAAO,CAAC,CAAC;QAChC,IAAA,2CAAmB,EAAC,OAAO,CAAC,WAAW,EAAE,IAAA,sCAAsB,GAAE,EAAE,OAAO,CAAC,CAAC;QAE5E,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AAlCD,8BAkCC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/forge/src/executors/build/executor.ts"],"names":[],"mappings":";;;AAEA,+DAA2D;AAC3D,yFAAmF;AACnF,iEAA4D;AAC5D,uEAAkE;AAClE,0EAAgF;AAChF,2DAAuD;AACvD,uEAAiE;AACjE,yCAAuD;AAEvD;;;GAGG;AACH,SAAe,wBAAwB;;QACrC,IAAI;YACF,OAAO,IAAA,sCAAsB,GAAE,CAAC;SACjC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAA,gCAAuB,GAAE,CAAC;SAClC;IACH,CAAC;CAAA;AAED,SAA8B,WAAW,CACvC,UAAgC,EAChC,OAAwB;;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE7E,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;SACvE;QAED,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;SACjE;QAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAC7E,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;;YAErD,KAA2B,IAAA,gBAAA,sBAAA,WAAW,CAAA,iBAAA;gBAA3B,MAAM,MAAM,wBAAA,CAAA;gBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;oBACnB,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,WAAW,GAAG,CAC9D,CAAC;iBACH;aACF;;;;;;;;;QAED,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;QAC5B,MAAM,IAAA,4DAA2B,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,IAAA,qCAAgB,EAAC,OAAO,CAAC,CAAC;QAChC,MAAM,YAAY,GAAG,MAAM,wBAAwB,EAAE,CAAC;QACtD,IAAA,2CAAmB,EAAC,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAEhE,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AAnCD,8BAmCC"}

package/src/executors/build/lib/compile-webpack.d.ts

@@ -1,6 +1,3 @@
 import { ExecutorContext } from '@nrwl/devkit';
 import { NormalizedOptions } from '../schema';
-export declare function compileWebpack(options: NormalizedOptions, context: ExecutorContext): AsyncGenerator<{
-    success: boolean;
-    outfile: string;
-}>;
+export declare function compileWebpack(options: NormalizedOptions, context: ExecutorContext): AsyncGenerator<import('@nrwl/webpack').WebpackExecutorEvent>;

package/src/executors/build/lib/compile-webpack.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-webpack.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/executors/build/lib/compile-webpack.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAElE,gFAAgF;AAGhF,SAAgB,cAAc,CAC5B,OAA0B,EAC1B,OAAwB;IAKxB,MAAM,cAAc,GAA4B;QAC9C,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;QACxD,cAAc,EAAE,UAAU;QAC1B,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;QACpD,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,eAAe;QAC3C,mBAAmB,EAAE,KAAK;QAC1B,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,YAAY,EAAE,EAAE;QAChB,gBAAgB,EAAE,EAAE;QACpB,eAAe,EAAE,KAAK;QACtB,oBAAoB,EAAE,KAAK;KAC5B,CAAC;IAEF,OAAO,IAAA,8BAAe,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAClD,CAAC;AAtBD,wCAsBC"}
+{"version":3,"file":"compile-webpack.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/executors/build/lib/compile-webpack.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAElE,gFAAgF;AAGhF,SAAgB,cAAc,CAC5B,OAA0B,EAC1B,OAAwB;IAExB,MAAM,cAAc,GAA2B;QAC7C,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;QACxD,cAAc,EAAE,UAAU;QAC1B,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;QACpD,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,eAAe;QAC3C,mBAAmB,EAAE,KAAK;QAC1B,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,YAAY,EAAE,EAAE;QAChB,gBAAgB,EAAE,EAAE;QACpB,eAAe,EAAE,KAAK;QACtB,oBAAoB,EAAE,KAAK;KAC5B,CAAC;IAEF,OAAO,IAAA,8BAAe,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAClD,CAAC;AAnBD,wCAmBC"}

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

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const manifest_1 = require("@forge/manifest");
 const FULL_SCHEMA = require("@forge/manifest/out/schema/manifest-schema.json");
 function loadManifestYml(manifestPath) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { manifestObject, success: isManifestParseSuccess, errors, } = yield new ManifestYmlValidator().process(manifestPath);
         if (!isManifestParseSuccess) {
             throw new Error(`Failed to parse manifest.yml (${manifestPath}): ${errors

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

@@ -15,7 +15,7 @@ const load_manifest_yml_1 = require("./load-manifest-yml");
  * @param options Executor options
  */
 function patchManifestYml(options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const manifestPath = (0, devkit_1.joinPathFragments)(options.outputPath, 'manifest.yml');
         devkit_1.logger.info(`Patching ${manifestPath}...`);
         const manifestSchema = yield (0, load_manifest_yml_1.loadManifestYml)(manifestPath);

package/src/executors/build/lib/process-custom-ui-dependencies.js

@@ -19,7 +19,7 @@ const load_manifest_yml_1 = require("./load-manifest-yml");
  * @param context Executor context
  */
 function processCustomUIDependencies(options, context) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const manifestPath = (0, devkit_1.joinPathFragments)(context.root, 'apps', context.projectName, 'manifest.yml');
         const manifestSchema = yield (0, load_manifest_yml_1.loadManifestYml)(manifestPath);
         const resources = manifestSchema.resources || [];

package/src/executors/build/schema.json

@@ -1,4 +1,6 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "title": "Forge application build target",

package/src/executors/deploy/executor.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const devkit_1 = require("@nrwl/devkit");
 function runExecutor(options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const args = [
             'deploy',
             `--environment=${options.environment}`,

package/src/executors/deploy/schema.json

@@ -1,4 +1,6 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "title": "Forge application deploy target",

package/src/generators/application/generator.js

@@ -8,7 +8,7 @@ const jest_1 = require("@nrwl/jest");
 const generator_1 = require("../init/generator");
 const lib_1 = require("./lib");
 function default_1(tree, rawOptions) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
         const tasks = [];
         const initTask = yield (0, generator_1.default)(tree, {

package/src/generators/application/lib/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-(0, tslib_1.__exportStar)(require("./create-files"), exports);
-(0, tslib_1.__exportStar)(require("./normalize-options"), exports);
-(0, tslib_1.__exportStar)(require("./add-project"), exports);
+tslib_1.__exportStar(require("./create-files"), exports);
+tslib_1.__exportStar(require("./normalize-options"), exports);
+tslib_1.__exportStar(require("./add-project"), exports);
 //# sourceMappingURL=index.js.map

package/src/generators/application/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/index.ts"],"names":[],"mappings":";;;AAAA,8DAA+B;AAC/B,mEAAoC;AACpC,6DAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,8DAAoC;AACpC,wDAA8B"}

package/src/generators/init/generator.js

@@ -7,7 +7,7 @@ const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-i
 const lib_1 = require("./lib");
 const jest_1 = require("@nrwl/jest");
 function default_1(tree, rawOptions) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const options = (0, lib_1.normalizeOptions)(rawOptions);
         (0, set_default_collection_1.setDefaultCollection)(tree, '@toolsplus/nx-forge');
         const jestTask = (0, jest_1.jestInitGenerator)(tree, {});

package/src/generators/init/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-(0, tslib_1.__exportStar)(require("./add-dependencies"), exports);
-(0, tslib_1.__exportStar)(require("./normalize-options"), exports);
+tslib_1.__exportStar(require("./add-dependencies"), exports);
+tslib_1.__exportStar(require("./normalize-options"), exports);
 //# sourceMappingURL=index.js.map

package/src/generators/init/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/init/lib/index.ts"],"names":[],"mappings":";;;AAAA,kEAAmC;AACnC,mEAAoC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/init/lib/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,8DAAoC"}