@toolsplus/nx-forge 6.0.0 → 6.0.1-test-fix-tunnel-executor.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolsplus/nx-forge",
-  "version": "6.0.0",
+  "version": "6.0.1-test-fix-tunnel-executor.1",
   "description": "Atlassian Forge plugin for Nx",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",

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

@@ -1,11 +1,12 @@
 import { ExecutorContext } from '@nx/devkit';
 import { TunnelExecutorOptions } from './schema';
 /**
- * Forge tunnel executor that serves all Custom UI projects in the manifest.yml
- * on the tunnel port configured in the manifest.yml.
+ * Forge tunnel executor that serves dependent Custom UI projects on the tunnel
+ * port configured in the manifest.yml.
  *
- * Additionally, this will start a build process for the Forge app in watch mode
- * and launch the `forge tunnel` command in the configured output directory.
+ * Additionally, this will start a build process for the Forge app in watch mode,
+ * call the package executor once to copy Forge app assets to the output directory
+ * and launch the `forge tunnel` process in the configured output directory.
  *
  * @see https://github.com/nrwl/nx/issues/3748#issuecomment-990980640
  * @see https://gist.github.com/chrisui/a3cdf050bf18eccd499fba29b609b90a

package/src/executors/tunnel/executor.js

@@ -4,14 +4,16 @@ exports.default = runTunnelExecutor;
 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 = tslib_1.__importDefault(require("./lib/run-tunnel"));
+const run_tunnel_1 = tslib_1.__importStar(require("./lib/run-tunnel"));
 const extract_custom_ui_projects_1 = require("./lib/extract-custom-ui-projects");
+const start_custom_uis_1 = require("./lib/start-custom-uis");
 /**
- * Forge tunnel executor that serves all Custom UI projects in the manifest.yml
- * on the tunnel port configured in the manifest.yml.
+ * Forge tunnel executor that serves dependent Custom UI projects on the tunnel
+ * port configured in the manifest.yml.
  *
- * Additionally, this will start a build process for the Forge app in watch mode
- * and launch the `forge tunnel` command in the configured output directory.
+ * Additionally, this will start a build process for the Forge app in watch mode,
+ * call the package executor once to copy Forge app assets to the output directory
+ * and launch the `forge tunnel` process in the configured output directory.
  *
  * @see https://github.com/nrwl/nx/issues/3748#issuecomment-990980640
  * @see https://gist.github.com/chrisui/a3cdf050bf18eccd499fba29b609b90a
@@ -20,45 +22,49 @@ const extract_custom_ui_projects_1 = require("./lib/extract-custom-ui-projects")
 function runTunnelExecutor(options, context) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         var _a, e_1, _b, _c;
-        const customUiProjectConfigs = yield (0, extract_custom_ui_projects_1.getCustomUiProjects)(context);
-        let runAllCustomUiServe = undefined;
-        if (customUiProjectConfigs.length > 0) {
-            const [customUiHeadConfig, ...customUiRestConfig] = customUiProjectConfigs;
-            // execute the serve target on custom UI projects
-            runAllCustomUiServe = yield (0, devkit_1.runExecutor)({ project: customUiHeadConfig.projectName, target: 'serve' }, { port: customUiHeadConfig.port }, context);
-            for (const { projectName, port } of customUiRestConfig !== null && customUiRestConfig !== void 0 ? customUiRestConfig : []) {
-                runAllCustomUiServe = (0, async_iterable_1.combineAsyncIterables)(runAllCustomUiServe, yield (0, devkit_1.runExecutor)({ project: projectName, target: 'serve' }, { port }, context));
-            }
+        var _d;
+        const customUIProjectConfigs = yield (0, extract_custom_ui_projects_1.getCustomUiProjects)(context);
+        const customUIIters = yield (0, start_custom_uis_1.startCustomUIs)(customUIProjectConfigs, context);
+        const forgeAppBuildIter = yield (0, devkit_1.runExecutor)({ project: context.projectName, target: 'build' }, { watch: true }, context);
+        yield (0, devkit_1.runExecutor)({ project: context.projectName, target: 'package' }, {}, context);
+        try {
+            const preTunnelTimeout = (_d = options.preTunnelTimeout) !== null && _d !== void 0 ? _d : 5000;
+            yield (0, run_tunnel_1.isTunnelPreparationComplete)(options.outputPath, preTunnelTimeout);
+        }
+        catch (err) {
+            devkit_1.logger.info(err.message);
+            return { success: false };
         }
-        const runForgeAppBuild = yield (0, devkit_1.runExecutor)({ project: context.projectName, target: 'build' }, { watch: true }, context);
         // execute the tunnel target on the focused project
-        const runForgeTunnel = promiseToIterator((0, run_tunnel_1.default)(Object.assign(Object.assign({}, options), { customUiProjectConfigs }), context));
-        // once all executors are loaded, watch out for any failures
-        // we combine (interleave) all executor iterators here
-        const combined = (0, async_iterable_1.combineAsyncIterables)(runAllCustomUiServe, runForgeAppBuild, runForgeTunnel);
+        const forgeTunnelIter = promiseToIterator((0, run_tunnel_1.default)(Object.assign(Object.assign({}, options), { customUIProjectConfigs }), context));
+        const combined = (0, async_iterable_1.combineAsyncIterables)(forgeAppBuildIter, ...customUIIters, forgeTunnelIter);
         try {
             try {
-                for (var _d = true, combined_1 = tslib_1.__asyncValues(combined), combined_1_1; combined_1_1 = yield combined_1.next(), _a = combined_1_1.done, !_a; _d = true) {
+                for (var _e = true, combined_1 = tslib_1.__asyncValues(combined), combined_1_1; combined_1_1 = yield combined_1.next(), _a = combined_1_1.done, !_a; _e = true) {
                     _c = combined_1_1.value;
-                    _d = false;
+                    _e = false;
                     const output = _c;
                     if (!output.success)
-                        return output;
+                        throw new Error(`A started process failed: ${JSON.stringify(output)}`);
+                    if ((output === null || output === void 0 ? void 0 : output.id) === 'tunnel') {
+                        devkit_1.logger.info('Tunnel process has been terminated.');
+                        const { value } = yield combined.return({ success: true });
+                        return value;
+                    }
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (!_d && !_a && (_b = combined_1.return)) yield _b.call(combined_1);
+                    if (!_e && !_a && (_b = combined_1.return)) yield _b.call(combined_1);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
         }
         catch (err) {
             devkit_1.logger.error(`Failed to tunnel Forge app: ${err}`);
-            throw err;
+            return yield combined.return({ success: false });
         }
-        return { success: true };
     });
 }
 function promiseToIterator(v) {

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":";;AAiBA,oCA0DC;;AA3ED,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,CAAC;YACtC,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,CAAC;gBAC7D,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;YACJ,CAAC;QACH,CAAC;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,CAAC;;gBACH,KAA2B,eAAA,aAAA,sBAAA,QAAQ,CAAA,cAAA,kFAAE,CAAC;oBAAX,wBAAQ;oBAAR,WAAQ;oBAAxB,MAAM,MAAM,KAAA,CAAA;oBACrB,IAAI,CAAC,MAAM,CAAC,OAAO;wBAAE,OAAO,MAAM,CAAC;gBACrC,CAAC;;;;;;;;;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,eAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;YACnD,MAAM,GAAG,CAAC;QACZ,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;CAAA;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":";;AAmBA,oCAmDC;;AAtED,uCAAkE;AAClE,wEAA4E;AAE5E,uEAA0E;AAC1E,iFAAuE;AACvE,6DAAwD;AAExD;;;;;;;;;;;GAWG;AACH,SAA8B,iBAAiB,CAC7C,OAA8B,EAC9B,OAAwB;;;;QAExB,MAAM,sBAAsB,GAAG,MAAM,IAAA,gDAAmB,EAAC,OAAO,CAAC,CAAC;QAElE,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAc,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAE5E,MAAM,iBAAiB,GAAG,MAAM,IAAA,oBAAW,EACzC,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EACjD,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,OAAO,CACR,CAAC;QAEF,MAAM,IAAA,oBAAW,EACf,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,EACnD,EAAE,EACF,OAAO,CACR,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,IAAI,CAAC;YAC1D,MAAM,IAAA,wCAA2B,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAC1E,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,eAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACzB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC5B,CAAC;QAED,mDAAmD;QACnD,MAAM,eAAe,GAAG,iBAAiB,CACvC,IAAA,oBAAS,kCAAM,OAAO,KAAE,sBAAsB,KAAI,OAAO,CAAC,CAC3D,CAAC;QAEF,MAAM,QAAQ,GACZ,IAAA,sCAAqB,EAAC,iBAAiB,EAAE,GAAG,aAAa,EAAE,eAAe,CAAC,CAAC;QAE9E,IAAI,CAAC;;gBACH,KAA2B,eAAA,aAAA,sBAAA,QAAQ,CAAA,cAAA,kFAAE,CAAC;oBAAX,wBAAQ;oBAAR,WAAQ;oBAAxB,MAAM,MAAM,KAAA,CAAA;oBACrB,IAAI,CAAC,MAAM,CAAC,OAAO;wBACjB,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAEzE,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,MAAK,QAAQ,EAAE,CAAC;wBAC5B,eAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;wBACnD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;wBAC3D,OAAO,KAAK,CAAC;oBACf,CAAC;gBACH,CAAC;;;;;;;;;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,eAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;YACnD,OAAO,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;CAAA;AAED,SAAgB,iBAAiB,CAG/B,CAAa;;QACb,4BAAM,sBAAM,CAAC,CAAA,CAAA,CAAC;IAChB,CAAC;CAAA"}

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

@@ -12,7 +12,7 @@ const manifest_yml_1 = require("../../../utils/forge/manifest-yml");
  */
 function getCustomUiProjects(context) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = yield extractVerifiedCustomUiProjects(context);
+        const projects = yield extractVerifiedCustomUIProjects(context);
         return projects.map((p) => ({
             projectName: p.path,
             port: p.tunnel.port,
@@ -26,13 +26,12 @@ function getCustomUiProjects(context) {
  *
  *   - 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) {
+function extractVerifiedCustomUIProjects(context) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         var _a;
         const manifestPath = (0, devkit_1.joinPathFragments)(context.root, context.projectsConfigurations.projects[context.projectName].root, 'manifest.yml');

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

@@ -1 +1 @@
-{"version":3,"file":"extract-custom-ui-projects.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/tunnel/lib/extract-custom-ui-projects.ts"],"names":[],"mappings":";;AAaA,kDAQC;;AArBD,uCAAgE;AAGhE,oEAAoE;AAIpE;;;;;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;AAED;;;;;;;;;;;;GAYG;AACH,SAAe,+BAA+B,CAC5C,OAAwB;;;QAExB,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACjE,cAAc,CACf,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAc,MAAA,cAAc,CAAC,SAAS,mCAAI,EAAE,CAAC;QAC5D,OAAO,SAAS,CAAC,GAAG,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,CAAC;CAAA;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,sBAAsB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAE/D,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACb,sDAAsD,mBAAmB,oFAAoF,CAC9J,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CACb,sBAAsB,mBAAmB,8IAA8I,CACxL,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CACb,+BAA+B,QAAQ,CAAC,GAAG,iIAAiI,QAAQ,CAAC,GAAG,0GAA0G,CACnS,CAAC;IACJ,CAAC;IAED,OAAO,QAAkC,CAAC;AAC5C,CAAC,CAAC"}
+{"version":3,"file":"extract-custom-ui-projects.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/tunnel/lib/extract-custom-ui-projects.ts"],"names":[],"mappings":";;AAaA,kDAQC;;AArBD,uCAAgE;AAGhE,oEAAoE;AAIpE;;;;;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;AAED;;;;;;;;;;;GAWG;AACH,SAAe,+BAA+B,CAC5C,OAAwB;;;QAExB,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACjE,cAAc,CACf,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAc,MAAA,cAAc,CAAC,SAAS,mCAAI,EAAE,CAAC;QAC5D,OAAO,SAAS,CAAC,GAAG,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,CAAC;CAAA;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,sBAAsB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAE/D,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACb,sDAAsD,mBAAmB,oFAAoF,CAC9J,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CACb,sBAAsB,mBAAmB,8IAA8I,CACxL,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CACb,+BAA+B,QAAQ,CAAC,GAAG,iIAAiI,QAAQ,CAAC,GAAG,0GAA0G,CACnS,CAAC;IACJ,CAAC;IAED,OAAO,QAAkC,CAAC;AAC5C,CAAC,CAAC"}

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

@@ -1,5 +1,20 @@
 import { ExecutorContext } from '@nx/devkit';
 import { TunnelExecutorOptions } from '../schema';
+/**
+ * Checks if the tunnel executor is ready to run the Forge tunnel process.
+ *
+ * Checks if:
+ * - the manifest.yml exists in the output path
+ * - the `src` directory in the output path is non-empty
+ *
+ * This will perform these checks repeatedly with exponential backoff until,
+ * either the function times out, or all checks complete successfully.
+ *
+ * @param outputPath App output path
+ * @param timeoutMs Timeout in ms
+ * @param initialDelayMs Initial delay before re-checking the condition
+ */
+export declare function isTunnelPreparationComplete(outputPath: string, timeoutMs: number, initialDelayMs?: number): Promise<boolean>;
 /**
  * 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.
@@ -12,10 +27,11 @@ import { TunnelExecutorOptions } from '../schema';
  * @param context Executor context for this call
  */
 export default function runTunnel(options: TunnelExecutorOptions & {
-    customUiProjectConfigs: {
+    customUIProjectConfigs: {
         projectName: string;
         port: number;
     }[];
 }, context: ExecutorContext): Promise<{
+    id: 'tunnel';
     success: boolean;
 }>;

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

@@ -1,11 +1,66 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isTunnelPreparationComplete = isTunnelPreparationComplete;
 exports.default = runTunnel;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
+const process = tslib_1.__importStar(require("node:process"));
 const wait_until_server_is_listening_1 = require("./wait-until-server-is-listening");
+const node_fs_1 = require("node:fs");
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
+/**
+ * Checks if the tunnel executor is ready to run the Forge tunnel process.
+ *
+ * Checks if:
+ * - the manifest.yml exists in the output path
+ * - the `src` directory in the output path is non-empty
+ *
+ * This will perform these checks repeatedly with exponential backoff until,
+ * either the function times out, or all checks complete successfully.
+ *
+ * @param outputPath App output path
+ * @param timeoutMs Timeout in ms
+ * @param initialDelayMs Initial delay before re-checking the condition
+ */
+function isTunnelPreparationComplete(outputPath_1, timeoutMs_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* (outputPath, timeoutMs, initialDelayMs = 200) {
+        const manifestExists = () => {
+            var _a, _b;
+            return (_b = (_a = (0, node_fs_1.statSync)(node_path_1.default.join(outputPath, 'manifest.yml'), {
+                throwIfNoEntry: false,
+            })) === null || _a === void 0 ? void 0 : _a.isFile()) !== null && _b !== void 0 ? _b : false;
+        };
+        const isOutputPathSrcDirNonEmpty = () => {
+            var _a, _b;
+            return (_b = (((_a = (0, node_fs_1.statSync)(node_path_1.default.join(outputPath, 'src'), {
+                throwIfNoEntry: false,
+            })) === null || _a === void 0 ? void 0 : _a.isDirectory()) &&
+                (0, node_fs_1.readdirSync)(node_path_1.default.join(outputPath, 'src')).length > 0)) !== null && _b !== void 0 ? _b : false;
+        };
+        const timeout = new Promise((_, reject) => {
+            setTimeout(() => reject(new Error(`Timeout: Tunnel preparation not completed within ${timeoutMs} ms`)), timeoutMs);
+        });
+        const tunnelReadyCondition = function () {
+            return tslib_1.__awaiter(this, void 0, void 0, function* () {
+                let delay = initialDelayMs;
+                while (true) {
+                    try {
+                        if (manifestExists() && isOutputPathSrcDirNonEmpty()) {
+                            return true;
+                        }
+                    }
+                    catch (err) {
+                        throw new Error(`Unexpected error checking tunnel preparation complete: ${err}`);
+                    }
+                    yield new Promise((resolve) => setTimeout(resolve, delay));
+                    delay *= 2;
+                }
+            });
+        };
+        return Promise.race([tunnelReadyCondition(), timeout]);
+    });
+}
 /**
  * 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.
@@ -19,23 +74,26 @@ const wait_until_server_is_listening_1 = require("./wait-until-server-is-listeni
  */
 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`);
+        if (options.customUIProjectConfigs.length > 0) {
+            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}`);
+        devkit_1.logger.info(`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, {
+        const tunnelProcess = (0, node_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` }),
+                // Unset NODE_ENV, if this is set to 'development' it may cause issues
+                // starting the tunnel process
+                // https://stackoverflow.com/questions/69566849/installing-forge-cli-is-bringing-spawn-ts-node-enoent-error
+                NODE_ENV: undefined }),
             stdio: 'inherit',
             shell: true,
         });
@@ -44,6 +102,7 @@ function runTunnel(options, context) {
                 if (code === 0) {
                     devkit_1.logger.info('Exiting the forge tunnel process...');
                     resolve({
+                        id: 'tunnel',
                         success: true,
                     });
                 }

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

@@ -1 +1 @@
-{"version":3,"file":"run-tunnel.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/tunnel/lib/run-tunnel.ts"],"names":[],"mappings":";;AAiBA,4BAiEC;;AAlFD,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;YAChB,KAAK,EAAE,IAAI;SACZ,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,CAAC;oBACf,eAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;oBACnD,OAAO,CAAC;wBACN,OAAO,EAAE,IAAI;qBACd,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,MAAM,CACJ,IAAI,KAAK,CAAC,mDAAmD,GAAG,IAAI,CAAC,CACtE,CAAC;gBACJ,CAAC;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"}
+{"version":3,"file":"run-tunnel.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/tunnel/lib/run-tunnel.ts"],"names":[],"mappings":"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"}

package/src/executors/tunnel/lib/start-custom-uis.d.ts

@@ -0,0 +1,7 @@
+import { ExecutorContext } from '@nx/devkit';
+export declare function startCustomUIs(customUIProjectConfigs: {
+    projectName: string;
+    port: number;
+}[], context: ExecutorContext): Promise<AsyncIterable<{
+    success: boolean;
+}>[]>;

package/src/executors/tunnel/lib/start-custom-uis.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startCustomUIs = startCustomUIs;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+function startCustomUIs(customUIProjectConfigs, context) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const customUIIters = [];
+        for (const config of customUIProjectConfigs) {
+            customUIIters.push(yield (0, devkit_1.runExecutor)({ project: config.projectName, target: 'serve' }, { port: config.port }, context));
+        }
+        return customUIIters;
+    });
+}
+//# sourceMappingURL=start-custom-uis.js.map

package/src/executors/tunnel/lib/start-custom-uis.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"start-custom-uis.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/tunnel/lib/start-custom-uis.ts"],"names":[],"mappings":";;AAEA,wCAgBC;;AAlBD,uCAA0D;AAE1D,SAAsB,cAAc,CAClC,sBAA+D,EAC/D,OAAwB;;QAExB,MAAM,aAAa,GAA0C,EAAE,CAAC;QAEhE,KAAK,MAAM,MAAM,IAAI,sBAAsB,EAAE,CAAC;YAC5C,aAAa,CAAC,IAAI,CAChB,MAAM,IAAA,oBAAW,EACf,EAAE,OAAO,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EAChD,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,EACrB,OAAO,CACR,CACF,CAAC;QACJ,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;CAAA"}

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

@@ -2,4 +2,5 @@ export interface TunnelExecutorOptions {
   outputPath: string;
   debug: boolean;
   verbose: boolean;
+  preTunnelTimeout: number;
 }

package/src/executors/tunnel/schema.json

@@ -22,6 +22,12 @@
       "description": "Run Forge tunnel in verbose mode.",
       "alias": "v",
       "default": false
+    },
+    "preTunnelTimeout": {
+      "type": "number",
+      "description": "Max milliseconds to wait for tunnel preparation tasks.",
+      "default": 5000,
+      "visible": false
     }
   },
   "required": ["outputPath"]

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

@@ -19,6 +19,11 @@ module.exports = {
       assets: <%- JSON.stringify(webpackPluginOptions.assets) %>,
       optimization: false,
       outputHashing: 'none',
+      // Do not delete all the files in the output path. This is required to maintain the
+      // manifest.yml in the output path when running the tunnel executor. By default,
+      // Webpack still cleans the src folder in the output directory (dist/apps/<my-app>/src)
+      // but not the project root (refer to Webpack option `output.clean`).
+      deleteOutputPath: false,
     })
   ],
 };

package/src/graph/create-nodes.js

@@ -5,7 +5,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const get_register_config_1 = require("../shared/targets/get-register-config");
-const get_serve_config_1 = require("../shared/targets/get-serve-config");
+const get_tunnel_config_1 = require("../shared/targets/get-tunnel-config");
 const get_deploy_config_1 = require("../shared/targets/get-deploy-config");
 const get_install_config_1 = require("../shared/targets/get-install-config");
 const get_forge_cli_config_1 = require("../shared/targets/get-forge-cli-config");
@@ -17,7 +17,7 @@ const buildForgeProjectTargets = (projectRoot) => {
     const targets = {};
     targets.register = (0, get_register_config_1.getRegisterConfig)({ outputPath });
     targets.package = (0, get_package_config_1.getPackageConfig)({ outputPath });
-    targets.serve = (0, get_serve_config_1.getServeConfig)({ outputPath });
+    targets.tunnel = (0, get_tunnel_config_1.getTunnelConfig)({ outputPath });
     targets.deploy = (0, get_deploy_config_1.getDeployConfig)({ outputPath });
     targets.install = (0, get_install_config_1.getInstallConfig)({ outputPath });
     targets.forge = (0, get_forge_cli_config_1.getForgeCliConfig)({ outputPath });

package/src/graph/create-nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-nodes.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/create-nodes.ts"],"names":[],"mappings":";;;AAAA,2BAAiC;AACjC,+BAAqC;AACrC,uCAKoB;AACpB,+EAA0E;AAC1E,yEAAoE;AACpE,2EAAsE;AACtE,6EAAwE;AACxE,iFAA2E;AAC3E,6EAAwE;AAIxE,MAAM,wBAAwB,GAAG,CAAC,WAAmB,EAAuB,EAAE;IAC5E,MAAM,UAAU,GACd,WAAW,KAAK,GAAG;QACjB,CAAC,CAAC,qBAAqB;QACvB,CAAC,CAAC,oCAAoC,CAAC;IAE3C,MAAM,OAAO,GAAoC,EAAE,CAAC;IAEpD,OAAO,CAAC,QAAQ,GAAG,IAAA,uCAAiB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACrD,OAAO,CAAC,OAAO,GAAG,IAAA,qCAAgB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,KAAK,GAAG,IAAA,iCAAc,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,MAAM,GAAG,IAAA,mCAAe,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACjD,OAAO,CAAC,OAAO,GAAG,IAAA,qCAAgB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,KAAK,GAAG,IAAA,wCAAiB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAElD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAE/B,QAAA,aAAa,GAAkB;IAC1C,iBAAiB;IACjB,CAAC,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QACtC,OAAO,IAAA,6BAAoB,EACzB,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CACjC,mBAAmB,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,EACrD,iBAAiB,EACjB,OAAO,EACP,OAAO,CACR,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,SAAS,mBAAmB,CAC1B,gBAAwB,EACxB,OAAgB,EAChB,OAA2B;IAE3B,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,gBAAgB,CAAC,CAAC;IAE9C,uDAAuD;IACvD,MAAM,YAAY,GAAG,IAAA,gBAAW,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC;IAC3E,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO;QACL,QAAQ,EAAE;YACR,CAAC,WAAW,CAAC,EAAE;gBACb,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,wBAAwB,CAAC,WAAW,CAAC;aAC/C;SACF;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"create-nodes.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/create-nodes.ts"],"names":[],"mappings":";;;AAAA,2BAAiC;AACjC,+BAAqC;AACrC,uCAKoB;AACpB,+EAA0E;AAC1E,2EAAsE;AACtE,2EAAsE;AACtE,6EAAwE;AACxE,iFAA2E;AAC3E,6EAAwE;AAIxE,MAAM,wBAAwB,GAAG,CAAC,WAAmB,EAAuB,EAAE;IAC5E,MAAM,UAAU,GACd,WAAW,KAAK,GAAG;QACjB,CAAC,CAAC,qBAAqB;QACvB,CAAC,CAAC,oCAAoC,CAAC;IAE3C,MAAM,OAAO,GAAoC,EAAE,CAAC;IAEpD,OAAO,CAAC,QAAQ,GAAG,IAAA,uCAAiB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACrD,OAAO,CAAC,OAAO,GAAG,IAAA,qCAAgB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,MAAM,GAAG,IAAA,mCAAe,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACjD,OAAO,CAAC,MAAM,GAAG,IAAA,mCAAe,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACjD,OAAO,CAAC,OAAO,GAAG,IAAA,qCAAgB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACnD,OAAO,CAAC,KAAK,GAAG,IAAA,wCAAiB,EAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAElD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAE/B,QAAA,aAAa,GAAkB;IAC1C,iBAAiB;IACjB,CAAC,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QACtC,OAAO,IAAA,6BAAoB,EACzB,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CACjC,mBAAmB,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,EACrD,iBAAiB,EACjB,OAAO,EACP,OAAO,CACR,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,SAAS,mBAAmB,CAC1B,gBAAwB,EACxB,OAAgB,EAChB,OAA2B;IAE3B,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,gBAAgB,CAAC,CAAC;IAE9C,uDAAuD;IACvD,MAAM,YAAY,GAAG,IAAA,gBAAW,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC;IAC3E,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO;QACL,QAAQ,EAAE;YACR,CAAC,WAAW,CAAC,EAAE;gBACb,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,wBAAwB,CAAC,WAAW,CAAC;aAC/C;SACF;KACF,CAAC;AACJ,CAAC"}

package/src/shared/targets/get-tunnel-config.d.ts

@@ -0,0 +1,6 @@
+import { TargetConfiguration } from '@nx/devkit';
+interface GetTunnelConfigOptions {
+    outputPath: string;
+}
+export declare function getTunnelConfig(options: GetTunnelConfigOptions): TargetConfiguration;
+export {};

package/src/shared/targets/{get-serve-config.js → get-tunnel-config.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getServeConfig = getServeConfig;
-function getServeConfig(options) {
+exports.getTunnelConfig = getTunnelConfig;
+function getTunnelConfig(options) {
     return {
         executor: '@toolsplus/nx-forge:tunnel',
         options: {
@@ -13,4 +13,4 @@ function getServeConfig(options) {
         },
     };
 }
-//# sourceMappingURL=get-serve-config.js.map
+//# sourceMappingURL=get-tunnel-config.js.map

package/src/shared/targets/get-tunnel-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-tunnel-config.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/shared/targets/get-tunnel-config.ts"],"names":[],"mappings":";;AAKA,0CAaC;AAbD,SAAgB,eAAe,CAC7B,OAA+B;IAE/B,OAAO;QACL,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE;YACP,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,CAAC,OAAO,CAAC;YACvB,WAAW,EAAE,uBAAuB;SACrC;KACF,CAAC;AACJ,CAAC"}

package/src/shared/targets/get-serve-config.d.ts

@@ -1,6 +0,0 @@
-import { TargetConfiguration } from '@nx/devkit';
-interface GetServeConfigOptions {
-    outputPath: string;
-}
-export declare function getServeConfig(options: GetServeConfigOptions): TargetConfiguration;
-export {};

package/src/shared/targets/get-serve-config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-serve-config.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/shared/targets/get-serve-config.ts"],"names":[],"mappings":";;AAKA,wCAaC;AAbD,SAAgB,cAAc,CAC5B,OAA8B;IAE9B,OAAO;QACL,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE;YACP,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,CAAC,OAAO,CAAC;YACvB,WAAW,EAAE,uBAAuB;SACrC;KACF,CAAC;AACJ,CAAC"}