@toolsplus/nx-forge 1.4.0 → 2.0.0

package/src/executors/tunnel/lib/extract-custom-ui-projects.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCustomUiProjects = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const load_manifest_yml_1 = require("../../../utils/forge/load-manifest-yml");
+/**
+ * Extracts all configured Custom UI resources and their tunnel port for this Forge app.
+ *
+ * @param context Executor context for this call
+ * @returns Custom UI project names and the tunnel port on which they are required to serve their dev server.
+ */
+function getCustomUiProjects(context) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projects = yield extractVerifiedCustomUiProjects(context);
+        return projects.map((p) => ({
+            projectName: p.path,
+            port: p.tunnel.port,
+        }));
+    });
+}
+exports.getCustomUiProjects = getCustomUiProjects;
+/**
+ * Extracts all Custom UI projects from the manifest.yml
+ *
+ * This will assert that:
+ *
+ *   - the Nx workspace has a project configured for each Custom UI project
+ *   - each Custom UI project has a 'serve' target
+ *   - each Custom UI project is listed as an implicit dependency of the Forge app
+ *   - each Custom UI resource has a configured tunnel port in the Forge app's manifest.yml
+ *
+ * @param context Executor context for this call
+ * @returns All configured and verified Custom UI resources
+ */
+function extractVerifiedCustomUiProjects(context) {
+    var _a;
+    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 = (_a = manifestSchema.resources) !== null && _a !== void 0 ? _a : [];
+        return resources.map(verifyCustomUIDependency(context));
+    });
+}
+const verifyCustomUIDependency = (context) => (resource) => {
+    var _a;
+    const customUIProjectName = resource.path;
+    const customUIProjectConfiguration = context.workspace.projects[customUIProjectName];
+    if (!customUIProjectConfiguration) {
+        throw new Error(`Nx workspace is missing project for Custom UI path ${customUIProjectName}. Make sure the Custom UI resource path references a project in your Nx workspace.`);
+    }
+    if (!customUIProjectConfiguration.targets['serve']) {
+        throw new Error(`Custom UI project '${customUIProjectName}' targets is missing a 'serve' executor. Make sure the 'targets' property in the project's 'project.json' has a 'serve' executor configured.`);
+    }
+    if (!((_a = context.workspace.projects[context.projectName].implicitDependencies) === null || _a === void 0 ? void 0 : _a.includes(customUIProjectName))) {
+        throw new Error(`Project ${customUIProjectName} is configured as Forge Custom UI resource but not listed as implicit dependency of the Forge project (${context.projectName}). Add ${customUIProjectName} to the 'implicitDependencies' array in this project's 'project.json', or remove the Custom UI resource from the app's manifest.yml.`);
+    }
+    if (!resource.tunnel || !Number.isInteger(resource.tunnel.port)) {
+        throw new Error(`Custom UI resource with key ${resource.key} is missing tunnel port in manifest.yml. Follow the Forge docs on how to add a tunnel port to the Custom UI resource with key ${resource.key}: https://developer.atlassian.com/platform/forge/tunneling/#connecting-the-tunnel-to-your-own-dev-server`);
+    }
+    return resource;
+};
+//# sourceMappingURL=extract-custom-ui-projects.js.map

package/src/executors/tunnel/lib/extract-custom-ui-projects.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extract-custom-ui-projects.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/executors/tunnel/lib/extract-custom-ui-projects.ts"],"names":[],"mappings":";;;;AAAA,uCAAgE;AAGhE,8EAAyE;AAIzE;;;;;GAKG;AACH,SAAsB,mBAAmB,CACvC,OAAwB;;QAExB,MAAM,QAAQ,GAAG,MAAM,+BAA+B,CAAC,OAAO,CAAC,CAAC;QAChE,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1B,WAAW,EAAE,CAAC,CAAC,IAAI;YACnB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI;SACpB,CAAC,CAAC,CAAC;IACN,CAAC;CAAA;AARD,kDAQC;AAED;;;;;;;;;;;;GAYG;AACH,SAAe,+BAA+B,CAC5C,OAAwB;;;QAExB,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,MAAM,EACN,OAAO,CAAC,WAAW,EACnB,cAAc,CACf,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,IAAA,mCAAe,EAAC,YAAY,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAc,MAAA,cAAc,CAAC,SAAS,mCAAI,EAAE,CAAC;QAC5D,OAAO,SAAS,CAAC,GAAG,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;;CACzD;AAED,MAAM,wBAAwB,GAC5B,CAAC,OAAwB,EAAE,EAAE,CAC7B,CAAC,QAA+B,EAA0B,EAAE;;IAC1D,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,CAAC;IAE1C,MAAM,4BAA4B,GAChC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAElD,IAAI,CAAC,4BAA4B,EAAE;QACjC,MAAM,IAAI,KAAK,CACb,sDAAsD,mBAAmB,oFAAoF,CAC9J,CAAC;KACH;IAED,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAClD,MAAM,IAAI,KAAK,CACb,sBAAsB,mBAAmB,8IAA8I,CACxL,CAAC;KACH;IAED,IACE,CAAC,CAAA,MAAA,OAAO,CAAC,SAAS,CAAC,QAAQ,CACzB,OAAO,CAAC,WAAW,CACpB,CAAC,oBAAoB,0CAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAA,EACrD;QACA,MAAM,IAAI,KAAK,CACb,WAAW,mBAAmB,0GAA0G,OAAO,CAAC,WAAW,UAAU,mBAAmB,sIAAsI,CAC/T,CAAC;KACH;IAED,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC/D,MAAM,IAAI,KAAK,CACb,+BAA+B,QAAQ,CAAC,GAAG,iIAAiI,QAAQ,CAAC,GAAG,0GAA0G,CACnS,CAAC;KACH;IAED,OAAO,QAAkC,CAAC;AAC5C,CAAC,CAAC"}

package/src/executors/tunnel/lib/run-tunnel.d.ts

@@ -0,0 +1,21 @@
+import { ExecutorContext } from '@nx/devkit';
+import { TunnelExecutorOptions } from '../schema';
+/**
+ * Starts the `forge tunnel` process in the app's output directory. The execution of `forge tunnel` will be delayed
+ * until all configured Custom UI dev servers are listening on their configured tunnel port.
+ *
+ * This will set the `FORGE_TUNNEL_MOUNT_DIRECTORIES` env variable on the tunnel process to mount the Nx workspace
+ * root `node_modules` folder into the tunnel container. This makes sure that the Forge bundler running in the tunnel
+ * Docker container knows about installed npm dependencies.
+ *
+ * @param options Tunnel executor options
+ * @param context Executor context for this call
+ */
+export default function runTunnel(options: TunnelExecutorOptions & {
+    customUiProjectConfigs: {
+        projectName: string;
+        port: number;
+    }[];
+}, context: ExecutorContext): Promise<{
+    success: boolean;
+}>;

package/src/executors/tunnel/lib/run-tunnel.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+const child_process_1 = require("child_process");
+const wait_until_server_is_listening_1 = require("./wait-until-server-is-listening");
+/**
+ * Starts the `forge tunnel` process in the app's output directory. The execution of `forge tunnel` will be delayed
+ * until all configured Custom UI dev servers are listening on their configured tunnel port.
+ *
+ * This will set the `FORGE_TUNNEL_MOUNT_DIRECTORIES` env variable on the tunnel process to mount the Nx workspace
+ * root `node_modules` folder into the tunnel container. This makes sure that the Forge bundler running in the tunnel
+ * Docker container knows about installed npm dependencies.
+ *
+ * @param options Tunnel executor options
+ * @param context Executor context for this call
+ */
+function runTunnel(options, context) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        devkit_1.logger.info(`Wait for all Custom UI 'serve' targets to have started and servers are listening...`);
+        yield Promise.all(options.customUiProjectConfigs.map(({ port }) => (0, wait_until_server_is_listening_1.waitUntilServerIsListening)(port, context)));
+        devkit_1.logger.info(`All Custom UI 'serve' targets have started and servers are listening`);
+        const args = [
+            'tunnel',
+            ...(options.verbose === true ? ['--verbose'] : []),
+            ...(options.debug === true ? ['--debug'] : []),
+        ];
+        const command = `forge ${args.join(' ')}`;
+        devkit_1.logger.log(`Running: ${command}`);
+        // https://2ality.com/2018/05/child-process-streams.html#running-commands-in-child-processes
+        const tunnelProcess = (0, child_process_1.spawn)('forge', args, {
+            cwd: options.outputPath,
+            env: Object.assign(Object.assign({}, process.env), { 
+                // Mount the root node_modules folder into the tunnel container to avoid having to npm install in the dist directory
+                // https://github.com/toolsplus/forge-turbo/issues/1#issue-1451384347
+                FORGE_TUNNEL_MOUNT_DIRECTORIES: `${(0, path_1.join)(context.root, 'node_modules')}:/app/node_modules` }),
+            stdio: 'inherit',
+        });
+        return new Promise((resolve, reject) => {
+            tunnelProcess.once('exit', (code) => {
+                if (code === 0) {
+                    devkit_1.logger.info('Exiting the forge tunnel process...');
+                    resolve({
+                        success: true,
+                    });
+                }
+                else {
+                    reject(new Error('Forge tunnel process terminated with error code: ' + code));
+                }
+            });
+            tunnelProcess.once('error', (err) => {
+                reject(new Error('Forge tunnel process failed: ' + err));
+            });
+        });
+    });
+}
+exports.default = runTunnel;
+//# sourceMappingURL=run-tunnel.js.map

package/src/executors/tunnel/lib/run-tunnel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-tunnel.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/executors/tunnel/lib/run-tunnel.ts"],"names":[],"mappings":";;;AAAA,uCAAqD;AACrD,+BAA4B;AAC5B,iDAAsC;AAEtC,qFAA8E;AAE9E;;;;;;;;;;GAUG;AACH,SAA8B,SAAS,CACrC,OAKC,EACD,OAAwB;;QAExB,eAAM,CAAC,IAAI,CACT,qFAAqF,CACtF,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAC9C,IAAA,2DAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,CAC1C,CACF,CAAC;QAEF,eAAM,CAAC,IAAI,CACT,sEAAsE,CACvE,CAAC;QAEF,MAAM,IAAI,GAAG;YACX,QAAQ;YACR,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAClD,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/C,CAAC;QAEF,MAAM,OAAO,GAAG,SAAS,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1C,eAAM,CAAC,GAAG,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC;QAElC,4FAA4F;QAC5F,MAAM,aAAa,GAAG,IAAA,qBAAK,EAAC,OAAO,EAAE,IAAI,EAAE;YACzC,GAAG,EAAE,OAAO,CAAC,UAAU;YACvB,GAAG,kCACE,OAAO,CAAC,GAAG;gBACd,oHAAoH;gBACpH,qEAAqE;gBACrE,8BAA8B,EAAE,GAAG,IAAA,WAAI,EACrC,OAAO,CAAC,IAAI,EACZ,cAAc,CACf,oBAAoB,GACtB;YACD,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QAEH,OAAO,IAAI,OAAO,CAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3D,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;gBAC1C,IAAI,IAAI,KAAK,CAAC,EAAE;oBACd,eAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;oBACnD,OAAO,CAAC;wBACN,OAAO,EAAE,IAAI;qBACd,CAAC,CAAC;iBACJ;qBAAM;oBACL,MAAM,CACJ,IAAI,KAAK,CAAC,mDAAmD,GAAG,IAAI,CAAC,CACtE,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;YACH,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;gBACzC,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,GAAG,GAAG,CAAC,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAhED,4BAgEC"}

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

@@ -0,0 +1,8 @@
+import { ExecutorContext } from '@nx/devkit';
+/**
+ *
+ * @param port Port on which the server is listening
+ * @param context Executor context for this invocation
+ * @see https://github.com/nrwl/nx/blob/cded83b2c5bf3e4252c03d4dbcbb5b203b0faed0/packages/webpack/src/executors/ssr-dev-server/lib/wait-until-server-is-listening.ts
+ */
+export declare function waitUntilServerIsListening(port: number, context: ExecutorContext): Promise<void>;

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

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitUntilServerIsListening = void 0;
+const net = require("net");
+const devkit_1 = require("@nx/devkit");
+/**
+ *
+ * @param port Port on which the server is listening
+ * @param context Executor context for this invocation
+ * @see https://github.com/nrwl/nx/blob/cded83b2c5bf3e4252c03d4dbcbb5b203b0faed0/packages/webpack/src/executors/ssr-dev-server/lib/wait-until-server-is-listening.ts
+ */
+function waitUntilServerIsListening(port, context) {
+    const allowedErrorCodes = ['ECONNREFUSED', 'ECONNRESET'];
+    const maxAttempts = 15;
+    let attempts = 0;
+    const client = new net.Socket();
+    const cleanup = () => {
+        client.removeAllListeners('connect');
+        client.removeAllListeners('error');
+        client.end();
+        client.destroy();
+        client.unref();
+    };
+    return new Promise((resolve, reject) => {
+        const listen = () => {
+            client.once('connect', () => {
+                cleanup();
+                resolve();
+            });
+            client.on('error', (err) => {
+                if (attempts > maxAttempts ||
+                    !allowedErrorCodes.includes(err['code'])) {
+                    if (context.isVerbose) {
+                        devkit_1.logger.error(`Could not wait for server to start on port ${port}: ${attempts > maxAttempts
+                            ? `Max attempts (${maxAttempts}) exceeded`
+                            : `Server returned unexpected error code ${err['code']}`}`);
+                    }
+                    cleanup();
+                    reject(err);
+                }
+                else {
+                    attempts++;
+                    setTimeout(listen, 1000 * attempts);
+                }
+            });
+            client.connect({ port, host: 'localhost' });
+        };
+        listen();
+    });
+}
+exports.waitUntilServerIsListening = waitUntilServerIsListening;
+//# sourceMappingURL=wait-until-server-is-listening.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"wait-until-server-is-listening.js","sourceRoot":"","sources":["../../../../../../../packages/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"}

package/src/executors/tunnel/schema.d.ts

@@ -0,0 +1,5 @@
+export interface TunnelExecutorOptions {
+  outputPath: string;
+  debug: boolean;
+  verbose: boolean;
+}

package/src/executors/tunnel/schema.json

@@ -0,0 +1,30 @@
+{
+  "version": 2,
+  "outputCapture": "direct-nodejs",
+  "$schema": "http://json-schema.org/schema",
+  "title": "Forge application serve target",
+  "description": "Forge application serve target",
+  "type": "object",
+  "properties": {
+    "outputPath": {
+      "type": "string",
+      "description": "The output path of the Forge app files.",
+      "visible": false
+    },
+    "debug": {
+      "type": "boolean",
+      "description": "Run Forge tunnel in debug mode.",
+      "alias": "d",
+      "default": false
+    },
+    "verbose": {
+      "type": "boolean",
+      "description": "Run Forge tunnel in verbose mode.",
+      "alias": "v",
+      "default": false
+    }
+  },
+  "required": [
+    "outputPath"
+  ]
+}

package/src/generators/application/files/README.md

@@ -15,7 +15,15 @@ After that, proceed with the initial registration of the app with the Forge plat
 
 This will initially register the app with the Forge platform, deploy the code and finally install the app on any of your Atlassian applications.
 
-## Dev loop
+## Tunnel-based dev loop
+
+Before you tunnel a Forge app, make sure you have completed the prerequisites steps above. After that, run
+
+    nx serve <%= name %>
+
+This will start the `serve` target for all Custom UI projects defined in the app `manifest.yml` on their specified tunnel port. After that, it will start a build process in watch mode for the Forge app itself, before ultimately, starting the `forge tunnel` process for the Forge app.
+
+## Manual dev loop
 
 When the app code changes, the updated code has to rebuilt by calling 
 
@@ -23,12 +31,14 @@ When the app code changes, the updated code has to rebuilt by calling
 
 and re-deployed to the Forge platform using
 
-    forge deploy
+    nx deploy <%= name %>
 
 If the app's `manifest.yml` changed, you may have to upgrade an existing installation by running
 
     forge install --upgrade
 
+from within the dist directory.
+
 
 
 

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

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

package/src/generators/application/generator.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
-const linter_1 = require("@nrwl/linter");
-const jest_1 = require("@nrwl/jest");
+const devkit_1 = require("@nx/devkit");
+const run_tasks_in_serial_1 = require("@nx/workspace/src/utilities/run-tasks-in-serial");
+const linter_1 = require("@nx/linter");
+const jest_1 = require("@nx/jest");
 const generator_1 = require("../init/generator");
 const lib_1 = require("./lib");
 function default_1(tree, rawOptions) {
@@ -39,7 +39,7 @@ function default_1(tree, rawOptions) {
                 setupFile: 'none',
                 skipSerializers: true,
                 supportTsx: options.js,
-                babelJest: options.babelJest,
+                compiler: 'tsc',
                 testEnvironment: 'node',
                 skipFormat: true,
             });

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/forge/src/generators/application/generator.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,2FAAqF;AACrF,yCAA4D;AAC5D,qCAAkD;AAClD,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,IAAI,EAAE;YAClC,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,kBAAkB,EAAE;oBAClB,GAAG,OAAO,CAAC,cAAc,SAAS,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;iBAC7D;gBACD,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,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,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,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAtDD,4BAsDC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/forge/src/generators/application/generator.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AACpB,yFAAmF;AACnF,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,IAAI,EAAE;YAClC,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,kBAAkB,EAAE;oBAClB,GAAG,OAAO,CAAC,cAAc,SAAS,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;iBAC7D;gBACD,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,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAtDD,4BAsDC"}

package/src/generators/application/lib/add-project.d.ts

@@ -1,4 +1,4 @@
-import { Tree } from '@nrwl/devkit';
+import { Tree } from '@nx/devkit';
 import { NormalizedOptions } from '../schema';
 /**
  * Generate the new Forge app project in the workspace and configure

package/src/generators/application/lib/add-project.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = void 0;
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 const get_build_config_1 = require("./get-build-config");
 const get_deploy_config_1 = require("./get-deploy-config");
 const get_serve_config_1 = require("./get-serve-config");
@@ -21,11 +21,6 @@ function addProject(tree, options) {
     project.targets.serve = (0, get_serve_config_1.getServeConfig)(project, options);
     project.targets.deploy = (0, get_deploy_config_1.getDeployConfig)(project, options);
     (0, devkit_1.addProjectConfiguration)(tree, options.name, project, options.standaloneConfig);
-    const workspace = (0, devkit_1.readWorkspaceConfiguration)(tree);
-    if (!workspace.defaultProject) {
-        workspace.defaultProject = options.name;
-        (0, devkit_1.updateWorkspaceConfiguration)(tree, workspace);
-    }
 }
 exports.addProject = addProject;
 //# sourceMappingURL=add-project.js.map

package/src/generators/application/lib/add-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAEtB,yDAAoD;AACpD,2DAAsD;AACtD,yDAAoD;AAEpD;;;GAGG;AACH,SAAgB,UAAU,CAAC,IAAU,EAAE,OAA0B;IAC/D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC;QAC5D,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,IAAA,iCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzD,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,IAAA,iCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzD,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,IAAA,mCAAe,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE3D,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,OAAO,EACP,OAAO,CAAC,gBAAgB,CACzB,CAAC;IAEF,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;QAC7B,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;QACxC,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;KAC/C;AACH,CAAC;AA1BD,gCA0BC"}
+{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAEpB,yDAAoD;AACpD,2DAAsD;AACtD,yDAAoD;AAEpD;;;GAGG;AACH,SAAgB,UAAU,CAAC,IAAU,EAAE,OAA0B;IAC/D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC;QAC5D,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,IAAA,iCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzD,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,IAAA,iCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzD,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,IAAA,mCAAe,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE3D,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,OAAO,EACP,OAAO,CAAC,gBAAgB,CACzB,CAAC;AACJ,CAAC;AAnBD,gCAmBC"}

package/src/generators/application/lib/create-files.d.ts

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

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

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
-const devkit_1 = require("@nrwl/devkit");
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
+const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
 function createFiles(tree, options) {
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), options.appProjectRoot, {
         tmpl: '',
         name: options.name,
         root: options.appProjectRoot,
         offset: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
-        rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
+        rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
     });
     if (options.js) {
         (0, devkit_1.toJS)(tree);

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

@@ -1 +1 @@
-{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/create-files.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAEtB,yEAAyF;AAEzF,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,0CAA6B,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"}
+{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/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/application/lib/get-build-config.d.ts

@@ -1,3 +1,3 @@
 import { NormalizedOptions } from '../schema';
-import { ProjectConfiguration, TargetConfiguration } from '@nrwl/devkit';
+import { ProjectConfiguration, TargetConfiguration } from '@nx/devkit';
 export declare function getBuildConfig(project: ProjectConfiguration, options: NormalizedOptions): TargetConfiguration;

package/src/generators/application/lib/get-build-config.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBuildConfig = void 0;
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 function getBuildConfig(project, options) {
     return {
         executor: '@toolsplus/nx-forge:build',

package/src/generators/application/lib/get-build-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-build-config.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/get-build-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,cAAc,CAC5B,OAA6B,EAC7B,OAA0B;IAE1B,OAAO;QACL,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,OAAO,EAAE;YACP,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;SAC9D;KACF,CAAC;AACJ,CAAC;AAXD,wCAWC"}
+{"version":3,"file":"get-build-config.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/get-build-config.ts"],"names":[],"mappings":";;;AACA,uCAIoB;AAEpB,SAAgB,cAAc,CAC5B,OAA6B,EAC7B,OAA0B;IAE1B,OAAO;QACL,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,OAAO,EAAE;YACP,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;SAC9D;KACF,CAAC;AACJ,CAAC;AAXD,wCAWC"}

package/src/generators/application/lib/get-deploy-config.d.ts

@@ -1,3 +1,3 @@
 import { NormalizedOptions } from '../schema';
-import { ProjectConfiguration, TargetConfiguration } from '@nrwl/devkit';
+import { ProjectConfiguration, TargetConfiguration } from '@nx/devkit';
 export declare function getDeployConfig(project: ProjectConfiguration, options: NormalizedOptions): TargetConfiguration;

package/src/generators/application/lib/get-deploy-config.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDeployConfig = void 0;
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 function getDeployConfig(project, options) {
     return {
         executor: '@toolsplus/nx-forge:deploy',

package/src/generators/application/lib/get-deploy-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-deploy-config.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/get-deploy-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,eAAe,CAC7B,OAA6B,EAC7B,OAA0B;IAE1B,OAAO;QACL,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE;YACP,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;SAC9D;KACF,CAAC;AACJ,CAAC;AAVD,0CAUC"}
+{"version":3,"file":"get-deploy-config.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/get-deploy-config.ts"],"names":[],"mappings":";;;AACA,uCAIoB;AAEpB,SAAgB,eAAe,CAC7B,OAA6B,EAC7B,OAA0B;IAE1B,OAAO;QACL,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE;YACP,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;SAC9D;KACF,CAAC;AACJ,CAAC;AAVD,0CAUC"}

package/src/generators/application/lib/get-serve-config.d.ts

@@ -1,3 +1,3 @@
 import { NormalizedOptions } from '../schema';
-import { ProjectConfiguration, TargetConfiguration } from '@nrwl/devkit';
+import { ProjectConfiguration, TargetConfiguration } from '@nx/devkit';
 export declare function getServeConfig(project: ProjectConfiguration, options: NormalizedOptions): TargetConfiguration;

package/src/generators/application/lib/get-serve-config.js

@@ -1,21 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServeConfig = void 0;
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 function getServeConfig(project, options) {
     return {
-        executor: '@nrwl/workspace:run-commands',
+        executor: '@toolsplus/nx-forge:tunnel',
         options: {
-            commands: [
-                {
-                    command: `nx run ${options.name}:build --watch`,
-                },
-                {
-                    command: `forge tunnel`,
-                },
-            ],
-            cwd: (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot),
-            parallel: true,
+            outputPath: (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot),
         },
     };
 }

package/src/generators/application/lib/get-serve-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-serve-config.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/get-serve-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,cAAc,CAC5B,OAA6B,EAC7B,OAA0B;IAE1B,OAAO;QACL,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE;YACP,QAAQ,EAAE;gBACR;oBACE,OAAO,EAAE,UAAU,OAAO,CAAC,IAAI,gBAAgB;iBAChD;gBACD;oBACE,OAAO,EAAE,cAAc;iBACxB;aACF;YACD,GAAG,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;YACtD,QAAQ,EAAE,IAAI;SACf;KACF,CAAC;AACJ,CAAC;AAnBD,wCAmBC"}
+{"version":3,"file":"get-serve-config.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/get-serve-config.ts"],"names":[],"mappings":";;;AACA,uCAIoB;AAEpB,SAAgB,cAAc,CAC5B,OAA6B,EAC7B,OAA0B;IAE1B,OAAO;QACL,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE;YACP,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;SAC9D;KACF,CAAC;AACJ,CAAC;AAVD,wCAUC"}

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

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

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const linter_1 = require("@nrwl/linter");
-const devkit_1 = require("@nrwl/devkit");
+const linter_1 = require("@nx/linter");
+const devkit_1 = require("@nx/devkit");
 function normalizeOptions(tree, options) {
     var _a, _b;
     const appDirectory = options.directory

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAEtC,yCAA4E;AAG5E,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAoC;;IAEpC,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAExD,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,YAAY,CACb,CAAC;IAEF,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;AA3BD,4CA2BC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AAEpC,uCAA0E;AAG1E,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAoC;;IAEpC,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAExD,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,YAAY,CACb,CAAC;IAEF,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;AA3BD,4CA2BC"}

package/src/generators/application/schema.json

@@ -1,6 +1,5 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
   "$id": "NxForgeApplicationGenerator",
   "title": "Nx Application Options Schema",
   "type": "object",
@@ -27,13 +26,19 @@
     "linter": {
       "description": "Tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint", "none"],
+      "enum": [
+        "eslint",
+        "none"
+      ],
       "default": "eslint"
     },
     "unitTestRunner": {
       "description": "Test runner to use for unit tests.",
       "type": "string",
-      "enum": ["jest", "none"],
+      "enum": [
+        "jest",
+        "none"
+      ],
       "default": "jest"
     },
     "tags": {
@@ -55,12 +60,10 @@
       "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
-    },
-    "standaloneConfig": {
-      "description": "Split the project configuration into <projectRoot>/project.json rather than including it inside workspace.json",
-      "type": "boolean"
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": [
+    "name"
+  ]
 }

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

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

package/src/generators/init/generator.js

@@ -1,21 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const set_default_collection_1 = require("@nrwl/workspace/src/utilities/set-default-collection");
-const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
+const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
-const jest_1 = require("@nrwl/jest");
+const jest_1 = require("@nx/jest");
 function default_1(tree, rawOptions) {
     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, {});
+        const jestTask = yield (0, jest_1.jestInitGenerator)(tree, {});
         const installPackagesTask = (0, lib_1.addDependencies)(tree);
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
-        return (0, run_tasks_in_serial_1.runTasksInSerial)(jestTask, installPackagesTask);
+        return (0, devkit_1.runTasksInSerial)(jestTask, installPackagesTask);
     });
 }
 exports.default = default_1;

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/forge/src/generators/init/generator.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AACpE,iGAA4F;AAC5F,2FAAqF;AAErF,+BAA0D;AAC1D,qCAA+C;AAE/C,mBACE,IAAU,EACV,UAA+B;;QAE/B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;QAC7C,IAAA,6CAAoB,EAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QAElD,MAAM,QAAQ,GAAG,IAAA,wBAAiB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7C,MAAM,mBAAmB,GAAG,IAAA,qBAAe,EAAC,IAAI,CAAC,CAAC;QAElD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;IACzD,CAAC;CAAA;AAfD,4BAeC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/forge/src/generators/init/generator.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAEpB,+BAA0D;AAC1D,mCAA6C;AAE7C,mBACE,IAAU,EACV,UAA+B;;QAE/B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAiB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnD,MAAM,mBAAmB,GAAG,IAAA,qBAAe,EAAC,IAAI,CAAC,CAAC;QAElD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;IACzD,CAAC;CAAA;AAbD,4BAaC"}

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

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

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDependencies = void 0;
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 function addDependencies(tree) {
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {