@toolsplus/nx-forge 3.1.0 → 3.2.1

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@toolsplus/nx-forge",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "description": "Atlassian Forge plugin for Nx",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
   "generators": "./generators.json",
   "executors": "./executors.json",
   "peerDependencies": {
-    "@nx/workspace": "^17.0.0",
     "nx": "^17.0.0"
   },
   "dependencies": {

package/src/executors/build/executor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
 const process_custom_ui_dependencies_1 = require("./lib/process-custom-ui-dependencies");
@@ -8,6 +9,14 @@ const patch_manifest_yml_1 = require("./lib/patch-manifest-yml");
 const generate_package_json_1 = require("./lib/generate-package-json");
 const compile_webpack_1 = require("./lib/compile-webpack");
 const copy_forge_app_assets_1 = require("./lib/copy-forge-app-assets");
+function fileExists(path) {
+    try {
+        return (0, node_fs_1.statSync)(path).isFile();
+    }
+    catch (_a) {
+        return false;
+    }
+}
 function runExecutor(rawOptions, context) {
     var _a, e_1, _b, _c;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -19,23 +28,25 @@ function runExecutor(rawOptions, context) {
             throw new Error(`${context.projectName} does not have a root.`);
         }
         const options = (0, normalize_options_1.normalizeOptions)(rawOptions, context.root, sourceRoot, root);
-        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}.`);
+        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);
+            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; }
             }
-            finally { if (e_1) throw e_1.error; }
         }
         (0, copy_forge_app_assets_1.copyForgeAppAssets)(options);
         const customUIResources = yield (0, process_custom_ui_dependencies_1.processCustomUIDependencies)(options, context);

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":";;;AACA,uCAAoC;AAEpC,+DAA2D;AAC3D,yFAAmF;AACnF,iEAA4D;AAC5D,uEAAkE;AAClE,2DAAuD;AACvD,uEAAiE;AAEjE,SAA8B,WAAW,CACvC,UAAgC,EAChC,OAAwB;;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAY,CAAC,CAAC;QAEjE,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,eAAA,gBAAA,sBAAA,WAAW,CAAA,iBAAA,2FAAE;gBAAb,2BAAW;gBAAX,WAAW;gBAA3B,MAAM,MAAM,KAAA,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,iBAAiB,GAAG,MAAM,IAAA,4DAA2B,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9E,MAAM,IAAA,qCAAgB,EAAC,OAAO,CAAC,CAAC;QAChC,IAAA,2CAAmB,EACjB,OAAO,CAAC,WAAY,EACpB,OAAO,CAAC,YAAa,EACrB,iBAAiB,EACjB,OAAO,CACR,CAAC;QAEF,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AAxCD,8BAwCC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/build/executor.ts"],"names":[],"mappings":";;;AAAA,qCAA6C;AAE7C,uCAAoC;AAEpC,+DAA2D;AAC3D,yFAAmF;AACnF,iEAA4D;AAC5D,uEAAkE;AAClE,2DAAuD;AACvD,uEAAiE;AAEjE,SAAS,UAAU,CAAC,IAAc;IAChC,IAAI;QACF,OAAO,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;KAChC;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAA8B,WAAW,CACvC,UAAgC,EAChC,OAAwB;;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAY,CAAC,CAAC;QAEjE,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;QAE7E,IAAI,UAAU,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,EAAE;YACrD,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;;gBACrD,KAA2B,eAAA,gBAAA,sBAAA,WAAW,CAAA,iBAAA,2FAAE;oBAAb,2BAAW;oBAAX,WAAW;oBAA3B,MAAM,MAAM,KAAA,CAAA;oBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;wBACnB,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,WAAW,GAAG,CAC9D,CAAC;qBACH;iBACF;;;;;;;;;SACF;QAED,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;QAC5B,MAAM,iBAAiB,GAAG,MAAM,IAAA,4DAA2B,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9E,MAAM,IAAA,qCAAgB,EAAC,OAAO,CAAC,CAAC;QAChC,IAAA,2CAAmB,EACjB,OAAO,CAAC,WAAY,EACpB,OAAO,CAAC,YAAa,EACrB,iBAAiB,EACjB,OAAO,CACR,CAAC;QAEF,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AA1CD,8BA0CC"}

package/src/executors/build/lib/copy-forge-app-assets.js

@@ -4,11 +4,22 @@ exports.copyForgeAppAssets = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
-const fileutils_1 = require("@nx/workspace/src/utilities/fileutils");
+/**
+ * Check if a directory exists
+ * @param path Path to directory
+ */
+function directoryExists(path) {
+    try {
+        return (0, fs_1.statSync)(path).isDirectory();
+    }
+    catch (_a) {
+        return false;
+    }
+}
 function copyForgeAppAssets(options) {
     devkit_1.logger.info('Copying Forge app assets...');
     const absoluteOutputPath = (0, path_1.resolve)(options.root, options.outputPath);
-    if (!(0, fileutils_1.directoryExists)(absoluteOutputPath)) {
+    if (!directoryExists(absoluteOutputPath)) {
         (0, fs_1.mkdirSync)(absoluteOutputPath, { recursive: true });
     }
     // Copies the Forge app manifest file from the project root directory into the

package/src/executors/build/lib/copy-forge-app-assets.js.map

@@ -1 +1 @@
-{"version":3,"file":"copy-forge-app-assets.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/copy-forge-app-assets.ts"],"names":[],"mappings":";;;AAAA,2BAA6C;AAC7C,+BAAqC;AACrC,uCAAoC;AACpC,qEAAwE;AAGxE,SAAgB,kBAAkB,CAAC,OAA0B;IAC3D,eAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAE3C,MAAM,kBAAkB,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAErE,IAAI,CAAC,IAAA,2BAAe,EAAC,kBAAkB,CAAC,EAAE;QACxC,IAAA,cAAS,EAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACpD;IAED,8EAA8E;IAC9E,0BAA0B;IAC1B,IAAA,iBAAY,EACV,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EACvD,IAAA,WAAI,EAAC,kBAAkB,EAAE,cAAc,CAAC,CACzC,CAAC;IAEF,eAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;AAChD,CAAC;AAjBD,gDAiBC"}
+{"version":3,"file":"copy-forge-app-assets.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/copy-forge-app-assets.ts"],"names":[],"mappings":";;;AAAA,2BAAiE;AACjE,+BAAqC;AACrC,uCAAoC;AAGpC;;;GAGG;AACH,SAAS,eAAe,CAAC,IAAc;IACrC,IAAI;QACF,OAAO,IAAA,aAAQ,EAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;KACrC;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAA0B;IAC3D,eAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IAE3C,MAAM,kBAAkB,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAErE,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,EAAE;QACxC,IAAA,cAAS,EAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACpD;IAED,8EAA8E;IAC9E,0BAA0B;IAC1B,IAAA,iBAAY,EACV,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EACvD,IAAA,WAAI,EAAC,kBAAkB,EAAE,cAAc,CAAC,CACzC,CAAC;IAEF,eAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;AAChD,CAAC;AAjBD,gDAiBC"}

package/src/executors/tunnel/executor.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const run_tunnel_1 = require("./lib/run-tunnel");
+const run_tunnel_1 = tslib_1.__importDefault(require("./lib/run-tunnel"));
 const extract_custom_ui_projects_1 = require("./lib/extract-custom-ui-projects");
 /**
  * Forge tunnel executor that serves all Custom UI projects in the manifest.yml

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

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/tunnel/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAkE;AAClE,wEAA4E;AAE5E,iDAAyC;AACzC,iFAAuE;AAEvE;;;;;;;;;;GAUG;AACH,SAA8B,iBAAiB,CAC7C,OAA8B,EAC9B,OAAwB;;;QAExB,MAAM,sBAAsB,GAAG,MAAM,IAAA,gDAAmB,EAAC,OAAO,CAAC,CAAC;QAClE,IAAI,mBAAmB,GAAG,SAAS,CAAC;QAEpC,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,MAAM,CAAC,kBAAkB,EAAE,GAAG,kBAAkB,CAAC,GAAG,sBAAsB,CAAC;YAE3E,iDAAiD;YACjD,mBAAmB,GAAG,MAAM,IAAA,oBAAW,EACrC,EAAE,OAAO,EAAE,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EAC5D,EAAE,IAAI,EAAE,kBAAkB,CAAC,IAAI,EAAE,EACjC,OAAO,CACR,CAAC;YAEF,KAAK,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,EAAE,EAAE;gBAC5D,mBAAmB,GAAG,IAAA,sCAAqB,EACzC,mBAAmB,EACnB,MAAM,IAAA,oBAAW,EACf,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EACzC,EAAE,IAAI,EAAE,EACR,OAAO,CACR,CACF,CAAC;aACH;SACF;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAA,oBAAW,EACxC,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EACjD,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,OAAO,CACR,CAAC;QAEF,mDAAmD;QACnD,MAAM,cAAc,GAAG,iBAAiB,CACtC,IAAA,oBAAS,kCAAM,OAAO,KAAE,sBAAsB,KAAI,OAAO,CAAC,CAC3D,CAAC;QAEF,4DAA4D;QAC5D,sDAAsD;QACtD,MAAM,QAAQ,GAAG,IAAA,sCAAqB,EACpC,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,CACf,CAAC;QAEF,IAAI;;gBACF,KAA2B,eAAA,aAAA,sBAAA,QAAQ,CAAA,cAAA,kFAAE;oBAAV,wBAAQ;oBAAR,WAAQ;oBAAxB,MAAM,MAAM,KAAA,CAAA;oBACrB,IAAI,CAAC,MAAM,CAAC,OAAO;wBAAE,OAAO,MAAM,CAAC;iBACpC;;;;;;;;;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,eAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;YACnD,MAAM,GAAG,CAAC;SACX;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;CAC1B;AA1DD,oCA0DC;AAED,SAAgB,iBAAiB,CAC/B,CAAa;;QAEb,4BAAM,sBAAM,CAAC,CAAA,CAAA,CAAC;IAChB,CAAC;CAAA"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/tunnel/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAkE;AAClE,wEAA4E;AAE5E,0EAAyC;AACzC,iFAAuE;AAEvE;;;;;;;;;;GAUG;AACH,SAA8B,iBAAiB,CAC7C,OAA8B,EAC9B,OAAwB;;;QAExB,MAAM,sBAAsB,GAAG,MAAM,IAAA,gDAAmB,EAAC,OAAO,CAAC,CAAC;QAClE,IAAI,mBAAmB,GAAG,SAAS,CAAC;QAEpC,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,MAAM,CAAC,kBAAkB,EAAE,GAAG,kBAAkB,CAAC,GAAG,sBAAsB,CAAC;YAE3E,iDAAiD;YACjD,mBAAmB,GAAG,MAAM,IAAA,oBAAW,EACrC,EAAE,OAAO,EAAE,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EAC5D,EAAE,IAAI,EAAE,kBAAkB,CAAC,IAAI,EAAE,EACjC,OAAO,CACR,CAAC;YAEF,KAAK,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,EAAE,EAAE;gBAC5D,mBAAmB,GAAG,IAAA,sCAAqB,EACzC,mBAAmB,EACnB,MAAM,IAAA,oBAAW,EACf,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EACzC,EAAE,IAAI,EAAE,EACR,OAAO,CACR,CACF,CAAC;aACH;SACF;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAA,oBAAW,EACxC,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EACjD,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,OAAO,CACR,CAAC;QAEF,mDAAmD;QACnD,MAAM,cAAc,GAAG,iBAAiB,CACtC,IAAA,oBAAS,kCAAM,OAAO,KAAE,sBAAsB,KAAI,OAAO,CAAC,CAC3D,CAAC;QAEF,4DAA4D;QAC5D,sDAAsD;QACtD,MAAM,QAAQ,GAAG,IAAA,sCAAqB,EACpC,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,CACf,CAAC;QAEF,IAAI;;gBACF,KAA2B,eAAA,aAAA,sBAAA,QAAQ,CAAA,cAAA,kFAAE;oBAAV,wBAAQ;oBAAR,WAAQ;oBAAxB,MAAM,MAAM,KAAA,CAAA;oBACrB,IAAI,CAAC,MAAM,CAAC,OAAO;wBAAE,OAAO,MAAM,CAAC;iBACpC;;;;;;;;;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,eAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;YACnD,MAAM,GAAG,CAAC;SACX;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;CAC1B;AA1DD,oCA0DC;AAED,SAAgB,iBAAiB,CAC/B,CAAa;;QAEb,4BAAM,sBAAM,CAAC,CAAA,CAAA,CAAC;IAChB,CAAC;CAAA"}

package/src/executors/tunnel/lib/wait-until-server-is-listening.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitUntilServerIsListening = void 0;
-const net = require("net");
+const tslib_1 = require("tslib");
+const net = tslib_1.__importStar(require("net"));
 const devkit_1 = require("@nx/devkit");
 /**
  *

package/src/executors/tunnel/lib/wait-until-server-is-listening.js.map

@@ -1 +1 @@
-{"version":3,"file":"wait-until-server-is-listening.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/tunnel/lib/wait-until-server-is-listening.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AAC3B,uCAAqD;AAErD;;;;;GAKG;AACH,SAAgB,0BAA0B,CACxC,IAAY,EACZ,OAAwB;IAExB,MAAM,iBAAiB,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;IAChC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACrC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,MAAM,GAAG,GAAG,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE;gBAC1B,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACzB,IACE,QAAQ,GAAG,WAAW;oBACtB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EACxC;oBACA,IAAI,OAAO,CAAC,SAAS,EAAE;wBACrB,eAAM,CAAC,KAAK,CACV,8CAA8C,IAAI,KAChD,QAAQ,GAAG,WAAW;4BACpB,CAAC,CAAC,iBAAiB,WAAW,YAAY;4BAC1C,CAAC,CAAC,yCAAyC,GAAG,CAAC,MAAM,CAAC,EAC1D,EAAE,CACH,CAAC;qBACH;oBACD,OAAO,EAAE,CAAC;oBACV,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;qBAAM;oBACL,QAAQ,EAAE,CAAC;oBACX,UAAU,CAAC,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAC,CAAC;iBACrC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC;QACF,MAAM,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC;AA/CD,gEA+CC"}
+{"version":3,"file":"wait-until-server-is-listening.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/tunnel/lib/wait-until-server-is-listening.ts"],"names":[],"mappings":";;;;AAAA,iDAA2B;AAC3B,uCAAqD;AAErD;;;;;GAKG;AACH,SAAgB,0BAA0B,CACxC,IAAY,EACZ,OAAwB;IAExB,MAAM,iBAAiB,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;IAChC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACrC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,MAAM,GAAG,GAAG,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE;gBAC1B,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACzB,IACE,QAAQ,GAAG,WAAW;oBACtB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EACxC;oBACA,IAAI,OAAO,CAAC,SAAS,EAAE;wBACrB,eAAM,CAAC,KAAK,CACV,8CAA8C,IAAI,KAChD,QAAQ,GAAG,WAAW;4BACpB,CAAC,CAAC,iBAAiB,WAAW,YAAY;4BAC1C,CAAC,CAAC,yCAAyC,GAAG,CAAC,MAAM,CAAC,EAC1D,EAAE,CACH,CAAC;qBACH;oBACD,OAAO,EAAE,CAAC;oBACV,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;qBAAM;oBACL,QAAQ,EAAE,CAAC;oBACX,UAAU,CAAC,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAC,CAAC;iBACrC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC;QACF,MAAM,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC;AA/CD,gEA+CC"}

package/src/generators/application/files/tsconfig.app.json

@@ -3,15 +3,12 @@
   "compilerOptions": {
     "outDir": "<%= offset %>dist/out-tsc",
     "module": "commonjs",
-    "target": "es2017",
     "sourceMap": true,
     "moduleResolution": "node",
-    "esModuleInterop": true,
-    "lib": ["dom", "es2017"],
     "types": ["node"],
     "jsx": "react",
     "jsxFactory": "ForgeUI.createElement"
   },
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"],
-  "include": ["**/*.ts"]
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"],
+  "include": ["src/**/*.ts"]
 }

package/src/generators/application/files/webpack.config.js

@@ -1,5 +1,7 @@
 const { composePlugins, withNx } = require('@nx/webpack');
 
-module.exports = composePlugins(withNx(), (config) => {
+module.exports = composePlugins(withNx({ target: 'node' }), (config) => {
+  // Update the webpack config as needed here.
+  // e.g. `config.plugins.push(new MyPlugin())`
   return config;
 });

package/src/generators/application/generator.d.ts

@@ -1,3 +1,3 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { ApplicationGeneratorOptions } from './schema';
-export default function (tree: Tree, rawOptions: ApplicationGeneratorOptions): Promise<GeneratorCallback>;
+export default function (tree: Tree, schema: ApplicationGeneratorOptions): Promise<GeneratorCallback>;

package/src/generators/application/generator.js

@@ -4,19 +4,43 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const jest_1 = require("@nx/jest");
-const generator_1 = require("../init/generator");
+const js_1 = require("@nx/js");
+const generator_1 = tslib_1.__importDefault(require("../init/generator"));
 const lib_1 = require("./lib");
-function default_1(tree, rawOptions) {
+function updateTsConfigOptions(tree, options) {
+    (0, devkit_1.updateJson)(tree, `${options.appProjectRoot}/tsconfig.json`, (json) => {
+        if (options.rootProject) {
+            return Object.assign(Object.assign({ compilerOptions: Object.assign(Object.assign(Object.assign({}, js_1.tsConfigBaseOptions), json.compilerOptions), { esModuleInterop: true }) }, json), { extends: undefined, exclude: ['node_modules', 'tmp'] });
+        }
+        else {
+            return Object.assign(Object.assign({}, json), { compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { esModuleInterop: true }) });
+        }
+    });
+}
+function default_1(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return yield applicationGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+    });
+}
+exports.default = default_1;
+function applicationGeneratorInternal(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
+        const options = yield (0, lib_1.normalizeOptions)(tree, rawOptions);
         const tasks = [];
+        const jsInitTask = yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, rawOptions), { tsConfigName: rawOptions.rootProject
+                ? 'tsconfig.json'
+                : 'tsconfig.base.json', skipFormat: true }));
+        tasks.push(jsInitTask);
         const initTask = yield (0, generator_1.default)(tree, {
-            unitTestRunner: options.unitTestRunner,
             skipFormat: true,
         });
         tasks.push(initTask);
-        (0, lib_1.createFiles)(tree, options);
+        (0, lib_1.addAppFiles)(tree, options);
         (0, lib_1.addProject)(tree, options);
+        updateTsConfigOptions(tree, options);
+        if (options.unitTestRunner === 'jest') {
+            tasks.push(yield (0, jest_1.jestInitGenerator)(tree, Object.assign(Object.assign({}, rawOptions), { testEnvironment: 'node' })));
+        }
         if (options.linter === eslint_1.Linter.EsLint) {
             const lintTask = yield (0, eslint_1.lintProjectGenerator)(tree, {
                 linter: options.linter,
@@ -31,15 +55,7 @@ function default_1(tree, rawOptions) {
             tasks.push(lintTask);
         }
         if (options.unitTestRunner === 'jest') {
-            const jestTask = yield (0, jest_1.jestProjectGenerator)(tree, {
-                project: options.name,
-                setupFile: 'none',
-                skipSerializers: true,
-                supportTsx: options.js,
-                compiler: 'tsc',
-                testEnvironment: 'node',
-                skipFormat: true,
-            });
+            const jestTask = yield (0, jest_1.configurationGenerator)(tree, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', skipSerializers: true, supportTsx: options.js, testEnvironment: 'node', compiler: options.swcJest ? 'swc' : 'tsc', skipFormat: true }));
             tasks.push(jestTask);
         }
         if (options.js) {
@@ -51,5 +67,4 @@ function default_1(tree, rawOptions) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
-exports.default = default_1;
 //# sourceMappingURL=generator.js.map

package/src/generators/application/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/application/generator.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,uCAA0D;AAC1D,mCAAgD;AAChD,iDAA8C;AAE9C,+BAAkE;AAElE,mBACE,IAAU,EACV,UAAuC;;QAEvC,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEnD,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,MAAM,IAAA,mBAAa,EAAC,IAAI,EAAE;YACzC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,iBAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,IAAA,gBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1B,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YACpC,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;gBAChD,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,aAAa,EAAE;oBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC;iBAC/D;gBACD,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,UAAU,EAAE,IAAI;gBAChB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;aACzD,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QAED,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;gBAChD,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,SAAS,EAAE,MAAM;gBACjB,eAAe,EAAE,IAAI;gBACrB,UAAU,EAAE,OAAO,CAAC,EAAE;gBACtB,QAAQ,EAAE,KAAK;gBACf,eAAe,EAAE,MAAM;gBACvB,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QAED,IAAI,OAAO,CAAC,EAAE,EAAE;YACd,IAAA,4BAAmB,EAAC,IAAI,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;SACpE;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AApDD,4BAoDC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/application/generator.ts"],"names":[],"mappings":"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"}

package/src/generators/application/lib/{create-files.d.ts → add-app-files.d.ts}

@@ -1,3 +1,3 @@
 import type { Tree } from '@nx/devkit';
 import type { NormalizedOptions } from '../schema';
-export declare function createFiles(tree: Tree, options: NormalizedOptions): void;
+export declare function addAppFiles(tree: Tree, options: NormalizedOptions): void;

package/src/generators/application/lib/{create-files.js → add-app-files.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFiles = void 0;
+exports.addAppFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-function createFiles(tree, options) {
+function addAppFiles(tree, options) {
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), options.appProjectRoot, {
         tmpl: '',
         name: options.name,
@@ -15,5 +15,5 @@ function createFiles(tree, options) {
         (0, devkit_1.toJS)(tree);
     }
 }
-exports.createFiles = createFiles;
-//# sourceMappingURL=create-files.js.map
+exports.addAppFiles = addAppFiles;
+//# sourceMappingURL=add-app-files.js.map

package/src/generators/application/lib/add-app-files.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-app-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-app-files.ts"],"names":[],"mappings":";;;AACA,uCAKoB;AACpB,+BAAuD;AAGvD,SAAgB,WAAW,CAAC,IAAU,EAAE,OAA0B;IAChE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAC3C,OAAO,CAAC,cAAc,EACtB;QACE,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,MAAM,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC;QAC9C,gBAAgB,EAAE,IAAA,kCAA6B,EAC7C,IAAI,EACJ,OAAO,CAAC,cAAc,CACvB;KACF,CACF,CAAC;IAEF,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;AACH,CAAC;AApBD,kCAoBC"}

package/src/generators/application/lib/index.d.ts

@@ -1,3 +1,3 @@
-export * from './create-files';
-export * from './normalize-options';
 export * from './add-project';
+export * from './add-app-files';
+export * from './normalize-options';

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

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

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

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

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nx/devkit';
 import type { ApplicationGeneratorOptions, NormalizedOptions } from '../schema';
-export declare function normalizeOptions(tree: Tree, options: ApplicationGeneratorOptions): NormalizedOptions;
+export declare function normalizeOptions(tree: Tree, options: ApplicationGeneratorOptions): Promise<NormalizedOptions>;

package/src/generators/application/lib/normalize-options.js

@@ -1,21 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
+const tslib_1 = require("tslib");
 const eslint_1 = require("@nx/eslint");
-const devkit_1 = require("@nx/devkit");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 function normalizeOptions(tree, options) {
-    var _a, _b;
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : (0, devkit_1.getWorkspaceLayout)(tree).appsDir;
-    const appDirectory = projectDirectory
-        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
-        : (0, devkit_1.names)(options.name).fileName;
-    const appProjectName = appDirectory.replace(new RegExp('/', 'g'), '-');
-    const appProjectRoot = (0, devkit_1.joinPathFragments)(appsDir, appDirectory);
-    const parsedTags = options.tags
-        ? options.tags.split(',').map((s) => s.trim())
-        : [];
-    return Object.assign(Object.assign({}, options), { name: (0, devkit_1.names)(appProjectName).fileName, appProjectRoot, linter: (_a = options.linter) !== null && _a !== void 0 ? _a : eslint_1.Linter.EsLint, unitTestRunner: (_b = options.unitTestRunner) !== null && _b !== void 0 ? _b : 'jest', parsedTags });
+    var _a, _b, _c;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+            name: options.name,
+            projectType: 'application',
+            directory: options.directory,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            rootProject: options.rootProject,
+            callingGenerator: '@toolsplus/nx-forge:application',
+        });
+        options.rootProject = appProjectRoot === '.';
+        options.projectNameAndRootFormat = projectNameAndRootFormat;
+        const parsedTags = options.tags
+            ? options.tags.split(',').map((s) => s.trim())
+            : [];
+        return Object.assign(Object.assign({}, options), { name: appProjectName, appProjectRoot,
+            parsedTags, linter: (_a = options.linter) !== null && _a !== void 0 ? _a : eslint_1.Linter.EsLint, unitTestRunner: (_b = options.unitTestRunner) !== null && _b !== void 0 ? _b : 'jest', rootProject: (_c = options.rootProject) !== null && _c !== void 0 ? _c : false });
+    });
 }
 exports.normalizeOptions = normalizeOptions;
 //# sourceMappingURL=normalize-options.js.map

package/src/generators/application/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AAEpC,uCAKoB;AAGpB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAoC;;IAEpC,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IAEpE,MAAM,YAAY,GAAG,gBAAgB;QACnC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,gBAAgB,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACvE,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAEvE,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAEhE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,uCACK,OAAO,KACV,IAAI,EAAE,IAAA,cAAK,EAAC,cAAc,CAAC,CAAC,QAAQ,EACpC,cAAc,EACd,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM,EACvC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM,EAChD,UAAU,IACV;AACJ,CAAC;AA7BD,4CA6BC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;;AAAA,uCAAoC;AAGpC,uGAA2G;AAE3G,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAAoC;;;QAEpC,MAAM,EACJ,WAAW,EAAE,cAAc,EAC3B,WAAW,EAAE,cAAc,EAC3B,wBAAwB,GACzB,GAAG,MAAM,IAAA,gEAAkC,EAAC,IAAI,EAAE;YACjD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,aAAa;YAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,wBAAwB,EAAE,OAAO,CAAC,wBAAwB;YAC1D,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,gBAAgB,EAAE,iCAAiC;SACpD,CAAC,CAAC;QACH,OAAO,CAAC,WAAW,GAAG,cAAc,KAAK,GAAG,CAAC;QAC7C,OAAO,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QAE5D,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;YAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC9C,CAAC,CAAC,EAAE,CAAC;QAEP,uCACK,OAAO,KACV,IAAI,EAAE,cAAc,EACpB,cAAc;YACd,UAAU,EACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM,EACvC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM,EAChD,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,KAAK,IACzC;;CACH;AAhCD,4CAgCC"}

package/src/generators/application/schema.d.ts

@@ -1,21 +1,26 @@
 import type { Linter } from '@nx/eslint';
+import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 
-export interface ApplicationGeneratorOptions {
+interface ApplicationGeneratorOptions {
   name: string;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   skipFormat?: boolean;
-  linter?: Exclude<Linter, Linter.TsLint>;
+  linter?: Linter;
   standaloneConfig?: boolean;
   tags?: string;
-  unitTestRunner?: UnitTestRunner;
+  unitTestRunner?: 'jest' | 'none';
+  swcJest?: boolean;
+  /** @deprecated use `swcJest` instead */
   babelJest?: boolean;
   js?: boolean;
   setParserOptionsProject?: boolean;
+  rootProject?: boolean;
 }
 
 interface NormalizedOptions extends ApplicationGeneratorOptions {
   appProjectRoot: string;
   linter: Linter;
-  unitTestRunner: UnitTestRunner;
+  unitTestRunner: 'jest' | 'none';
   parsedTags: string[];
 }

package/src/generators/application/schema.json

@@ -18,6 +18,11 @@
       "description": "Directory where the project is placed",
       "alias": "d"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
@@ -40,6 +45,11 @@
       "description": "Add tags to the project (used for linting)",
       "alias": "t"
     },
+    "swcJest": {
+      "type": "boolean",
+      "description": "Use `@swc/jest` instead `ts-jest` for faster test compilation.",
+      "default": false
+    },
     "babelJest": {
       "type": "boolean",
       "description": "Use `babel` instead of `ts-jest`.",
@@ -48,12 +58,20 @@
     "js": {
       "type": "boolean",
       "description": "Generate JavaScript files rather than TypeScript files.",
-      "default": false
+      "default": false,
+      "x-deprecated": "Use --swcJest instead for faster compilation"
     },
     "setParserOptionsProject": {
       "type": "boolean",
       "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
       "default": false
+    },
+    "rootProject": {
+      "description": "Create node application at the root of the workspace",
+      "type": "boolean",
+      "default": false,
+      "hidden": true,
+      "x-priority": "internal"
     }
   },
   "additionalProperties": false,

package/src/generators/init/generator.d.ts

@@ -1,3 +1,3 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { InitGeneratorSchema } from './schema';
-export default function (tree: Tree, rawOptions: InitGeneratorSchema): Promise<GeneratorCallback>;
+export default function (tree: Tree, options: InitGeneratorSchema): Promise<GeneratorCallback>;

package/src/generators/init/generator.js

@@ -2,8 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const lib_1 = require("./lib");
-const jest_1 = require("@nx/jest");
+const versions_1 = require("../../utils/versions");
+function addDependencies(tree) {
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {
+        '@forge/api': versions_1.forgeApiVersion,
+        '@forge/resolver': versions_1.forgeResolverVersion,
+    }, {
+        '@toolsplus/nx-forge': versions_1.pluginVersion,
+    });
+}
 function updateNxJson(host) {
     const nxJson = (0, devkit_1.readJson)(host, 'nx.json');
     nxJson.plugins = nxJson.plugins || [];
@@ -12,15 +19,12 @@ function updateNxJson(host) {
     }
     (0, devkit_1.writeJson)(host, 'nx.json', nxJson);
 }
-function default_1(tree, rawOptions) {
+function default_1(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, lib_1.normalizeOptions)(rawOptions);
         updateNxJson(tree);
         const tasks = [];
-        if (options.unitTestRunner === 'jest') {
-            tasks.push(yield (0, jest_1.jestInitGenerator)(tree, Object.assign(Object.assign({}, rawOptions), { testEnvironment: 'node' })));
-        }
-        tasks.push((0, lib_1.addDependencies)(tree));
+        tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@toolsplus/nx-forge'], []));
+        tasks.push(addDependencies(tree));
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }

package/src/generators/init/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/init/generator.ts"],"names":[],"mappings":";;;AAAA,uCAQoB;AAEpB,+BAA0D;AAC1D,mCAA6C;AAE7C,SAAS,YAAY,CAAC,IAAU;IAC9B,MAAM,MAAM,GAAwB,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,qBAAqB,CAAC,EAAE;QAC5D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;KAC5C;IACD,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAED,mBACE,IAAU,EACV,UAA+B;;QAE/B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;QAC7C,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnB,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,wBAAiB,EAAC,IAAI,kCAAO,UAAU,KAAE,eAAe,EAAE,MAAM,IAAG,CAC1E,CAAC;SACH;QAED,KAAK,CAAC,IAAI,CAAC,IAAA,qBAAe,EAAC,IAAI,CAAC,CAAC,CAAC;QAElC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAtBD,4BAsBC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/init/generator.ts"],"names":[],"mappings":";;;AAAA,uCAUoB;AAEpB,mDAI8B;AAE9B,SAAS,eAAe,CAAC,IAAU;IACjC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,YAAY,EAAE,0BAAe;QAC7B,iBAAiB,EAAE,+BAAoB;KACxC,EACD;QACE,qBAAqB,EAAE,wBAAa;KACrC,CACF,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,IAAU;IAC9B,MAAM,MAAM,GAAwB,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,qBAAqB,CAAC,EAAE;QAC5D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;KAC5C;IACD,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAED,mBACE,IAAU,EACV,OAA4B;;QAE5B,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnB,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,KAAK,CAAC,IAAI,CACR,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,qBAAqB,CAAC,EAAE,EAAE,CAAC,CACrE,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;QAElC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAlBD,4BAkBC"}

package/src/generators/init/schema.d.ts

@@ -1,4 +1,3 @@
 export interface InitGeneratorSchema {
   skipFormat?: boolean;
-  unitTestRunner?: 'jest' | 'none';
 }

package/src/generators/init/schema.json

@@ -4,12 +4,6 @@
   "title": "Init Forge Plugin",
   "type": "object",
   "properties": {
-    "unitTestRunner": {
-      "description": "Adds the specified unit test runner.",
-      "type": "string",
-      "enum": ["jest", "none"],
-      "default": "jest"
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/src/migrations/update-2-3-0/utils/manifest.js

@@ -4,7 +4,7 @@ exports.writeManifestYml = exports.readManifestYml = void 0;
 const tslib_1 = require("tslib");
 const yml_1 = require("./yml");
 const manifest_1 = require("@forge/manifest");
-const FULL_SCHEMA = require("@forge/manifest/out/schema/manifest-schema.json");
+const FULL_SCHEMA = tslib_1.__importStar(require("@forge/manifest/out/schema/manifest-schema.json"));
 const manifestSchemaValidator = new manifest_1.SchemaValidator(FULL_SCHEMA);
 const readManifestYml = (tree, path) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     const result = yield manifestSchemaValidator.validate({

package/src/migrations/update-2-3-0/utils/manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/migrations/update-2-3-0/utils/manifest.ts"],"names":[],"mappings":";;;;AACA,+BAA4C;AAC5C,8CAAkE;AAClE,+EAA+E;AAE/E,MAAM,uBAAuB,GAAG,IAAI,0BAAe,CACjD,WAAW,CACZ,CAAC;AAEK,MAAM,eAAe,GAAG,CAAO,IAAU,EAAE,IAAY,EAAE,EAAE;IAChE,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,QAAQ,CAAC;QACpD,WAAW,EAAE,IAAA,cAAQ,EAAC,IAAI,EAAE,IAAI,CAAC;KAClC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,OAAO,EAAE;QAClB,OAAO,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC;KAC3C;IAED,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACxE,CAAC,CAAA,CAAC;AAVW,QAAA,eAAe,mBAU1B;AAEK,MAAM,gBAAgB,GAAG,CAC9B,IAAU,EACV,IAAY,EACZ,KAAqB,EACrB,EAAE;IACF,IAAA,eAAS,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}
+{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/migrations/update-2-3-0/utils/manifest.ts"],"names":[],"mappings":";;;;AACA,+BAA4C;AAC5C,8CAAkE;AAClE,qGAA+E;AAE/E,MAAM,uBAAuB,GAAG,IAAI,0BAAe,CACjD,WAAW,CACZ,CAAC;AAEK,MAAM,eAAe,GAAG,CAAO,IAAU,EAAE,IAAY,EAAE,EAAE;IAChE,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,QAAQ,CAAC;QACpD,WAAW,EAAE,IAAA,cAAQ,EAAC,IAAI,EAAE,IAAI,CAAC;KAClC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,OAAO,EAAE;QAClB,OAAO,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC;KAC3C;IAED,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACxE,CAAC,CAAA,CAAC;AAVW,QAAA,eAAe,mBAU1B;AAEK,MAAM,gBAAgB,GAAG,CAC9B,IAAU,EACV,IAAY,EACZ,KAAqB,EACrB,EAAE;IACF,IAAA,eAAS,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}

package/src/utils/forge/manifest-yml.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractCustomUIProjectNames = exports.writeManifestYml = exports.readManifestYml = void 0;
 const tslib_1 = require("tslib");
 const manifest_1 = require("@forge/manifest");
-const FULL_SCHEMA = require("@forge/manifest/out/schema/manifest-schema.json");
+const FULL_SCHEMA = tslib_1.__importStar(require("@forge/manifest/out/schema/manifest-schema.json"));
 const js_yaml_1 = require("js-yaml");
 const fs_1 = require("fs");
 class ManifestYmlValidator extends manifest_1.AbstractValidationProcessor {

package/src/utils/forge/manifest-yml.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest-yml.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/utils/forge/manifest-yml.ts"],"names":[],"mappings":";;;;AAAA,8CAMyB;AACzB,+EAA+E;AAC/E,qCAA+B;AAC/B,2BAAmC;AAEnC,MAAM,oBAAqB,SAAQ,sCAA2C;IAC5E;QACE,KAAK,CAAC;YACJ,IAAI,wBAAa,EAAE;YACnB,IAAI,wBAAa,EAAE;YACnB,IAAI,0BAAe,CAAC,WAAW,CAAC;SACjC,CAAC,CAAC;IACL,CAAC;CACF;AACD,SAAsB,eAAe,CAAC,IAAY;;QAChD,MAAM,EACJ,cAAc,EACd,OAAO,EAAE,sBAAsB,EAC/B,MAAM,GACP,GAAG,MAAM,IAAI,oBAAoB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEnD,IACE,CAAC,sBAAsB;YACvB,CAAC,cAAc;YACf,CAAC,cAAc,CAAC,YAAY,EAC5B;YACA,MAAM,IAAI,KAAK,CACb,iCAAiC,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;iBACtD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;iBACrB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;SACH;QAED,MAAM,cAAc,GAAmB,cAAc,CAAC,YAAY,CAAC;QAEnE,IAAI,CAAC,cAAc,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;SACtE;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;CAAA;AA1BD,0CA0BC;AAED;;;;GAIG;AACI,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,KAAqB,EAAQ,EAAE;IAC5E,MAAM,OAAO,GAAG,IAAA,cAAI,EAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAChC,IAAA,kBAAa,EAAC,IAAI,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC;AAHW,QAAA,gBAAgB,oBAG3B;AAEF;;;;;GAKG;AACI,MAAM,2BAA2B,GAAG,CACzC,QAAwB,EACd,EAAE;IACZ,OAAO,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACvD,CAAC,CAAC;AAJW,QAAA,2BAA2B,+BAItC"}
+{"version":3,"file":"manifest-yml.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/utils/forge/manifest-yml.ts"],"names":[],"mappings":";;;;AAAA,8CAMyB;AACzB,qGAA+E;AAC/E,qCAA+B;AAC/B,2BAAmC;AAEnC,MAAM,oBAAqB,SAAQ,sCAA2C;IAC5E;QACE,KAAK,CAAC;YACJ,IAAI,wBAAa,EAAE;YACnB,IAAI,wBAAa,EAAE;YACnB,IAAI,0BAAe,CAAC,WAAW,CAAC;SACjC,CAAC,CAAC;IACL,CAAC;CACF;AACD,SAAsB,eAAe,CAAC,IAAY;;QAChD,MAAM,EACJ,cAAc,EACd,OAAO,EAAE,sBAAsB,EAC/B,MAAM,GACP,GAAG,MAAM,IAAI,oBAAoB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEnD,IACE,CAAC,sBAAsB;YACvB,CAAC,cAAc;YACf,CAAC,cAAc,CAAC,YAAY,EAC5B;YACA,MAAM,IAAI,KAAK,CACb,iCAAiC,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;iBACtD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;iBACrB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;SACH;QAED,MAAM,cAAc,GAAmB,cAAc,CAAC,YAAY,CAAC;QAEnE,IAAI,CAAC,cAAc,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;SACtE;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;CAAA;AA1BD,0CA0BC;AAED;;;;GAIG;AACI,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,KAAqB,EAAQ,EAAE;IAC5E,MAAM,OAAO,GAAG,IAAA,cAAI,EAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAChC,IAAA,kBAAa,EAAC,IAAI,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;AACrD,CAAC,CAAC;AAHW,QAAA,gBAAgB,oBAG3B;AAEF;;;;;GAKG;AACI,MAAM,2BAA2B,GAAG,CACzC,QAAwB,EACd,EAAE;IACZ,OAAO,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACvD,CAAC,CAAC;AAJW,QAAA,2BAA2B,+BAItC"}

package/src/utils/versions.d.ts

@@ -1,3 +1,3 @@
-export declare const pluginVersion = "*";
+export declare const pluginVersion: string;
 export declare const forgeApiVersion = "latest";
 export declare const forgeResolverVersion = "latest";

package/src/utils/versions.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.forgeResolverVersion = exports.forgeApiVersion = exports.pluginVersion = void 0;
-exports.pluginVersion = '*';
+const tslib_1 = require("tslib");
+const package_json_1 = tslib_1.__importDefault(require("../../package.json"));
+exports.pluginVersion = package_json_1.default.version;
 exports.forgeApiVersion = 'latest';
 exports.forgeResolverVersion = 'latest';
 //# sourceMappingURL=versions.js.map

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG,GAAG,CAAC;AAEpB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,oBAAoB,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/utils/versions.ts"],"names":[],"mappings":";;;;AAAA,8EAAmD;AAEtC,QAAA,aAAa,GAAG,sBAAiB,CAAC,OAAO,CAAC;AAE1C,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,oBAAoB,GAAG,QAAQ,CAAC"}

package/src/generators/application/lib/create-files.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/create-files.ts"],"names":[],"mappings":";;;AACA,uCAKoB;AACpB,+BAAuD;AAGvD,SAAgB,WAAW,CAAC,IAAU,EAAE,OAA0B;IAChE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAC3C,OAAO,CAAC,cAAc,EACtB;QACE,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,MAAM,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC;QAC9C,gBAAgB,EAAE,IAAA,kCAA6B,EAC7C,IAAI,EACJ,OAAO,CAAC,cAAc,CACvB;KACF,CACF,CAAC;IAEF,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;AACH,CAAC;AApBD,kCAoBC"}

package/src/generators/init/lib/add-dependencies.d.ts

@@ -1,2 +0,0 @@
-import type { GeneratorCallback, Tree } from '@nx/devkit';
-export declare function addDependencies(tree: Tree): GeneratorCallback;

package/src/generators/init/lib/add-dependencies.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addDependencies = void 0;
-const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../../utils/versions");
-function addDependencies(tree) {
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {
-        '@forge/api': versions_1.forgeApiVersion,
-        '@forge/resolver': versions_1.forgeResolverVersion,
-    }, {
-        '@toolsplus/nx-forge': versions_1.pluginVersion,
-    });
-}
-exports.addDependencies = addDependencies;
-//# sourceMappingURL=add-dependencies.js.map

package/src/generators/init/lib/add-dependencies.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"add-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/init/lib/add-dependencies.ts"],"names":[],"mappings":";;;AACA,uCAA0D;AAC1D,sDAIiC;AAEjC,SAAgB,eAAe,CAAC,IAAU;IACxC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,YAAY,EAAE,0BAAe;QAC7B,iBAAiB,EAAE,+BAAoB;KACxC,EACD;QACE,qBAAqB,EAAE,wBAAa;KACrC,CACF,CAAC;AACJ,CAAC;AAXD,0CAWC"}

package/src/generators/init/lib/index.d.ts

@@ -1,2 +0,0 @@
-export * from './add-dependencies';
-export * from './normalize-options';

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

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-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 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/init/lib/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,8DAAoC"}

package/src/generators/init/lib/normalize-options.d.ts

@@ -1,2 +0,0 @@
-import type { InitGeneratorSchema } from '../schema';
-export declare function normalizeOptions(options: InitGeneratorSchema): InitGeneratorSchema;

package/src/generators/init/lib/normalize-options.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeOptions = void 0;
-function normalizeOptions(options) {
-    var _a;
-    return Object.assign(Object.assign({}, options), { unitTestRunner: (_a = options.unitTestRunner) !== null && _a !== void 0 ? _a : 'jest' });
-}
-exports.normalizeOptions = normalizeOptions;
-//# sourceMappingURL=normalize-options.js.map

package/src/generators/init/lib/normalize-options.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/init/lib/normalize-options.ts"],"names":[],"mappings":";;;AAEA,SAAgB,gBAAgB,CAC9B,OAA4B;;IAE5B,uCAAY,OAAO,KAAE,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM,IAAG;AAC1E,CAAC;AAJD,4CAIC"}