@toolsplus/nx-forge 2.2.0 → 2.3.1-test-fix-forge-cmd-inside-shell.1

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

@@ -6,13 +6,12 @@ Before you can start using this app with Forge make sure to initially build the
 
     nx build <%= name %>
 
-After that, proceed with the initial registration of the app with the Forge platform by running the following commands from the dist directory:  
+After that, proceed with the initial registration of the app with the Forge platform by running the following commands from the dist directory:
 
     forge register
     forge deploy
     forge install
 
-
 This will initially register the app with the Forge platform, deploy the code and finally install the app on any of your Atlassian applications.
 
 ## Tunnel-based dev loop
@@ -25,7 +24,7 @@ This will start the `serve` target for all Custom UI projects defined in the app
 
 ## Manual dev loop
 
-When the app code changes, the updated code has to rebuilt by calling 
+When the app code changes, the updated code has to rebuilt by calling
 
     nx build <%= name %>
 
@@ -38,8 +37,3 @@ If the app's `manifest.yml` changed, you may have to upgrade an existing install
     forge install --upgrade
 
 from within the dist directory.
-
-
-
-
-

package/src/generators/application/generator.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
 const jest_1 = require("@nx/jest");
+const lint_project_1 = require("@nx/linter/src/generators/lint-project/lint-project");
 const generator_1 = require("../init/generator");
 const lib_1 = require("./lib");
 function default_1(tree, rawOptions) {
@@ -17,7 +18,7 @@ function default_1(tree, rawOptions) {
         tasks.push(initTask);
         (0, lib_1.createFiles)(tree, options);
         (0, lib_1.addProject)(tree, options);
-        if (options.linter !== linter_1.Linter.None) {
+        if (options.linter === linter_1.Linter.EsLint) {
             const lintTask = yield (0, linter_1.lintProjectGenerator)(tree, {
                 linter: options.linter,
                 project: options.name,
@@ -25,8 +26,9 @@ function default_1(tree, rawOptions) {
                     (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
                 ],
                 eslintFilePatterns: [
-                    `${options.appProjectRoot}/**/*.${options.js ? 'js' : 'ts'}`,
+                    (0, lint_project_1.mapLintPattern)(options.appProjectRoot, options.js ? 'js' : 'ts'),
                 ],
+                unitTestRunner: options.unitTestRunner,
                 skipFormat: true,
                 setParserOptionsProject: options.setParserOptionsProject,
             });

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,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,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,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAtDD,4BAsDC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/application/generator.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,uCAA0D;AAC1D,mCAAgD;AAChD,sFAAqF;AACrF,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,kBAAkB,EAAE;oBAClB,IAAA,6BAAc,EAAC,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;iBACjE;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;AAvDD,4BAuDC"}

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,uCAKoB;AAEpB,+DAA0D;AAC1D,yDAAoD;AACpD,2DAAsD;AACtD,yDAAoD;AACpD,6DAAwD;AAExD;;;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,GAAG,EAAE,CAAC;IACrB,OAAO,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/D,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;IAC3D,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG,IAAA,qCAAgB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE7D,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,OAAO,EACP,OAAO,CAAC,gBAAgB,CACzB,CAAC;AACJ,CAAC;AAtBD,gCAsBC"}
+{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAEpB,+DAA0D;AAC1D,yDAAoD;AACpD,2DAAsD;AACtD,yDAAoD;AACpD,6DAAwD;AAExD;;;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,GAAG,EAAE,CAAC;IACrB,OAAO,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/D,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;IAC3D,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG,IAAA,qCAAgB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE7D,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,OAAO,EACP,OAAO,CAAC,gBAAgB,CACzB,CAAC;AACJ,CAAC;AAtBD,gCAsBC"}

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,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"}
+{"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/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,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"}
+{"version":3,"file":"get-build-config.js","sourceRoot":"","sources":["../../../../../../../packages/nx-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.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,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"}
+{"version":3,"file":"get-deploy-config.js","sourceRoot":"","sources":["../../../../../../../packages/nx-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-install-config.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"get-register-config.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/get-register-config.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AAGpB,SAAgB,iBAAiB,CAC/B,OAA6B,EAC7B,OAA0B;IAE1B,OAAO;QACL,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE;YACP,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;SAC9D;KACF,CAAC;AACJ,CAAC;AAVD,8CAUC"}
+{"version":3,"file":"get-register-config.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/get-register-config.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AAGpB,SAAgB,iBAAiB,CAC/B,OAA6B,EAC7B,OAA0B;IAE1B,OAAO;QACL,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE;YACP,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;SAC9D;KACF,CAAC;AACJ,CAAC;AAVD,8CAUC"}

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,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"}
+{"version":3,"file":"get-serve-config.js","sourceRoot":"","sources":["../../../../../../../packages/nx-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/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/application/lib/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,8DAAoC;AACpC,wDAA8B"}
+{"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"}

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

@@ -5,11 +5,13 @@ const linter_1 = require("@nx/linter");
 const devkit_1 = require("@nx/devkit");
 function normalizeOptions(tree, options) {
     var _a, _b;
-    const appDirectory = options.directory
-        ? `${(0, devkit_1.names)(options.directory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
+    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(/\//g, '-');
-    const appProjectRoot = (0, devkit_1.joinPathFragments)((0, devkit_1.getWorkspaceLayout)(tree).appsDir, appDirectory);
+    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())
         : [];

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,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"}
+{"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"}

package/src/generators/application/schema.json

@@ -26,19 +26,13 @@
     "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": {
@@ -63,7 +57,5 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }

package/src/generators/init/generator.js

@@ -4,15 +4,27 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 const jest_1 = require("@nx/jest");
+function updateNxJson(host) {
+    const nxJson = (0, devkit_1.readJson)(host, 'nx.json');
+    nxJson.plugins = nxJson.plugins || [];
+    if (!nxJson.plugins.some((x) => x === '@toolsplus/nx-forge')) {
+        nxJson.plugins.push('@toolsplus/nx-forge');
+    }
+    (0, devkit_1.writeJson)(host, 'nx.json', nxJson);
+}
 function default_1(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const options = (0, lib_1.normalizeOptions)(rawOptions);
-        const jestTask = yield (0, jest_1.jestInitGenerator)(tree, {});
-        const installPackagesTask = (0, lib_1.addDependencies)(tree);
+        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));
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
-        return (0, devkit_1.runTasksInSerial)(jestTask, installPackagesTask);
+        return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
 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,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"}
+{"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"add-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/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"}
+{"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.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/generators/init/lib/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,8DAAoC"}
+{"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.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/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"}
+{"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"}

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

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

package/src/generators/init/schema.json

@@ -7,10 +7,7 @@
     "unitTestRunner": {
       "description": "Adds the specified unit test runner.",
       "type": "string",
-      "enum": [
-        "jest",
-        "none"
-      ],
+      "enum": ["jest", "none"],
       "default": "jest"
     },
     "skipFormat": {

package/src/graph/forge-project-graph.d.ts

@@ -0,0 +1,2 @@
+import { ProjectGraph, ProjectGraphProcessorContext } from '@nx/devkit';
+export declare function processProjectGraph(graph: ProjectGraph, context: ProjectGraphProcessorContext): Promise<ProjectGraph>;

package/src/graph/forge-project-graph.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processProjectGraph = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const manifest_yml_1 = require("../utils/forge/manifest-yml");
+const getCustomUIStaticDependencies = ([projectName, manifestFile], context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const manifestSchema = yield (0, manifest_yml_1.readManifestYml)(manifestFile.file);
+    const customUIProjectNames = (0, manifest_yml_1.extractCustomUIProjectNames)(manifestSchema);
+    const getCustomUIStaticDependency = (customUIProjectName) => {
+        const customUIProjectConfiguration = context.projectsConfigurations.projects[customUIProjectName];
+        if (!customUIProjectConfiguration) {
+            throw new Error(`Failed to find Custom UI project in Nx workspace: The Custom UI dependency to project ${customUIProjectName} declared in the Forge manifest.yml of project ${projectName} cannot be found. Make sure the Custom UI resource path references a project in your Nx workspace.`);
+        }
+        const projectConfiguration = context.projectsConfigurations.projects[projectName];
+        if (!projectConfiguration) {
+            throw new Error(`Missing project configuration in Nx workspace for project ${projectName}`);
+        }
+        return {
+            sourceProjectFile: manifestFile.file,
+            sourceProjectName: projectName,
+            targetProjectName: customUIProjectName,
+        };
+    };
+    return customUIProjectNames.reduce((acc, customUIProjectName) => {
+        return (manifestFile.dependencies || []).find(({ type, target, source }) => type === 'static' &&
+            target === customUIProjectName &&
+            source === projectName)
+            ? acc // Dependency already exists, skip adding it again.
+            : [...acc, getCustomUIStaticDependency(customUIProjectName)];
+    }, []);
+});
+function processProjectGraph(graph, context) {
+    var _a, e_1, _b, _c;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const builder = new devkit_1.ProjectGraphBuilder(graph);
+        for (const [projectName, files] of Object.entries(context.filesToProcess)) {
+            try {
+                for (var _d = true, _e = (e_1 = void 0, tslib_1.__asyncValues(files.filter((f) => f.file.endsWith('manifest.yml')))), _f; _f = yield _e.next(), _a = _f.done, !_a;) {
+                    _c = _f.value;
+                    _d = false;
+                    try {
+                        const manifestFile = _c;
+                        devkit_1.logger.info(`[nx-forge] Processing ${projectName}:${manifestFile.file}`);
+                        const dependencies = yield getCustomUIStaticDependencies([projectName, manifestFile], context);
+                        dependencies.forEach((dependency) => {
+                            devkit_1.logger.info(`[nx-forge] Adding project graph dependency from ${dependency.sourceProjectFile}:${dependency.sourceProjectFile} -> ${dependency.targetProjectName}`);
+                            builder.addStaticDependency(dependency.sourceProjectName, dependency.targetProjectName, dependency.sourceProjectFile);
+                        });
+                    }
+                    finally {
+                        _d = true;
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        }
+        return builder.getUpdatedProjectGraph();
+    });
+}
+exports.processProjectGraph = processProjectGraph;
+//# sourceMappingURL=forge-project-graph.js.map

package/src/graph/forge-project-graph.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"forge-project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/forge-project-graph.ts"],"names":[],"mappings":"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"}

package/src/index.d.ts

@@ -0,0 +1,3 @@
+import { NxPlugin } from '@nx/devkit';
+declare const nxPlugin: NxPlugin;
+export = nxPlugin;

package/src/index.js

@@ -1 +1,8 @@
+"use strict";
+const forge_project_graph_1 = require("./graph/forge-project-graph");
+const nxPlugin = {
+    name: '@toolsplus/nx-forge',
+    processProjectGraph: forge_project_graph_1.processProjectGraph,
+};
+module.exports = nxPlugin;
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/forge/src/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/nx-forge/src/index.ts"],"names":[],"mappings":";AACA,qEAAkE;AAElE,MAAM,QAAQ,GAAa;IACzB,IAAI,EAAE,qBAAqB;IAC3B,mBAAmB,EAAnB,yCAAmB;CACpB,CAAC;AAEF,iBAAS,QAAQ,CAAC"}

package/src/migrations/update-2-3-0/add-nx-forge-plugin.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function update(host: Tree): void;

package/src/migrations/update-2-3-0/add-nx-forge-plugin.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-unused-vars */
+const devkit_1 = require("@nx/devkit");
+function update(host) {
+    const nxJson = (0, devkit_1.readJson)(host, 'nx.json');
+    nxJson.plugins = nxJson.plugins || [];
+    if (!nxJson.plugins.some((x) => x === '@toolsplus/nx-forge')) {
+        nxJson.plugins.push('@toolsplus/nx-forge');
+        (0, devkit_1.writeJson)(host, 'nx.json', nxJson);
+    }
+}
+exports.default = update;
+//# sourceMappingURL=add-nx-forge-plugin.js.map

package/src/migrations/update-2-3-0/add-nx-forge-plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-nx-forge-plugin.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/migrations/update-2-3-0/add-nx-forge-plugin.ts"],"names":[],"mappings":";;AAAA,sDAAsD;AACtD,uCAA4E;AAE5E,SAAwB,MAAM,CAAC,IAAU;IACvC,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;QAC3C,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;KACpC;AACH,CAAC;AAPD,yBAOC"}

package/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function update(host: Tree): Promise<void>;

package/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+/* eslint-disable @typescript-eslint/no-unused-vars */
+const devkit_1 = require("@nx/devkit");
+const manifest_yml_1 = require("../../utils/forge/manifest-yml");
+const manifest_1 = require("./utils/manifest");
+function update(host) {
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projects = (0, devkit_1.getProjects)(host);
+        const isForgeProjectProject = (config) => {
+            var _a, _b;
+            return (config.projectType === 'application' &&
+                ((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@toolsplus/nx-forge:build' &&
+                host.exists((0, devkit_1.joinPathFragments)(config.root, 'manifest.yml')));
+        };
+        for (const [name, config] of projects.entries()) {
+            if (config && isForgeProjectProject(config)) {
+                if (((_a = config.implicitDependencies) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+                    const manifest = yield (0, manifest_1.readManifestYml)(host, (0, devkit_1.joinPathFragments)(config.root, 'manifest.yml'));
+                    const customUIProjectNames = (0, manifest_yml_1.extractCustomUIProjectNames)(manifest);
+                    config.implicitDependencies = config.implicitDependencies.filter((d) => !customUIProjectNames.includes(d));
+                    (0, devkit_1.updateProjectConfiguration)(host, name, config);
+                }
+            }
+        }
+    });
+}
+exports.default = update;
+//# sourceMappingURL=remove-implicit-custom-ui-dependencies.js.map

package/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-implicit-custom-ui-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,uCAMoB;AACpB,iEAA6E;AAC7E,+CAAmD;AAEnD,SAA8B,MAAM,CAAC,IAAU;;;QAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,qBAAqB,GAAG,CAAC,MAA4B,EAAW,EAAE;;YACtE,OAAO,CACL,MAAM,CAAC,WAAW,KAAK,aAAa;gBACpC,CAAA,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,2BAA2B;gBAC/D,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAC5D,CAAC;QACJ,CAAC,CAAC;QAEF,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;YAC/C,IAAI,MAAM,IAAI,qBAAqB,CAAC,MAAM,CAAC,EAAE;gBAC3C,IAAI,CAAA,MAAA,MAAM,CAAC,oBAAoB,0CAAE,MAAM,IAAG,CAAC,EAAE;oBAC3C,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAe,EACpC,IAAI,EACJ,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAC/C,CAAC;oBACF,MAAM,oBAAoB,GAAG,IAAA,0CAA2B,EAAC,QAAQ,CAAC,CAAC;oBACnE,MAAM,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAC9D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CACzC,CAAC;oBACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;iBAChD;aACF;SACF;;CACF;AA1BD,yBA0BC"}

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

@@ -0,0 +1,4 @@
+import { Tree } from '@nx/devkit';
+import { ManifestSchema } from '@forge/manifest';
+export declare const readManifestYml: (tree: Tree, path: string) => Promise<ManifestSchema>;
+export declare const writeManifestYml: (tree: Tree, path: string, value: ManifestSchema) => void;

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

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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 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({
+        yamlContent: (0, yml_1.readYaml)(tree, path),
+    });
+    if (result.success) {
+        return result.manifestObject.typedContent;
+    }
+    throw new Error(`Cannot validate manifest ${path}: ${result.errors}`);
+});
+exports.readManifestYml = readManifestYml;
+const writeManifestYml = (tree, path, value) => {
+    (0, yml_1.writeYaml)(tree, path, value);
+};
+exports.writeManifestYml = writeManifestYml;
+//# sourceMappingURL=manifest.js.map

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

@@ -0,0 +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"}

package/src/migrations/update-2-3-0/utils/yml.d.ts

@@ -0,0 +1,20 @@
+import { Tree } from '@nx/devkit';
+import { ManifestSchema } from '@forge/manifest';
+import { DumpOptions, LoadOptions } from 'js-yaml';
+/**
+ * Reads a yaml file and parses YAML.
+ *
+ * @param tree - file system tree
+ * @param path - file path
+ * @param options - Optional YAML load options
+ */
+export declare const readYaml: (tree: Tree, path: string, options?: LoadOptions) => ManifestSchema;
+/**
+ * Writes a YAML value to the file system tree
+
+ * @param tree File system tree
+ * @param path Path of YAML file in the Tree
+ * @param value Serializable value to write
+ * @param options Optional YAML serialize options
+ */
+export declare const writeYaml: <T extends object = object>(tree: Tree, path: string, value: T, options?: DumpOptions) => void;

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

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeYaml = exports.readYaml = void 0;
+const js_yaml_1 = require("js-yaml");
+/**
+ * Reads a yaml file and parses YAML.
+ *
+ * @param tree - file system tree
+ * @param path - file path
+ * @param options - Optional YAML load options
+ */
+const readYaml = (tree, path, options) => {
+    if (!tree.exists(path)) {
+        throw new Error(`Cannot find ${path}`);
+    }
+    try {
+        return (0, js_yaml_1.load)(tree.read(path, 'utf-8'), options);
+    }
+    catch (e) {
+        throw new Error(`Cannot parse ${path}: ${e.message}`);
+    }
+};
+exports.readYaml = readYaml;
+/**
+ * Writes a YAML value to the file system tree
+
+ * @param tree File system tree
+ * @param path Path of YAML file in the Tree
+ * @param value Serializable value to write
+ * @param options Optional YAML serialize options
+ */
+const writeYaml = (tree, path, value, options) => {
+    tree.write(path, (0, js_yaml_1.dump)(value, options || {}));
+};
+exports.writeYaml = writeYaml;
+//# sourceMappingURL=yml.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/migrations/update-2-3-0/utils/yml.ts"],"names":[],"mappings":";;;AAEA,qCAA+D;AAE/D;;;;;;GAMG;AACI,MAAM,QAAQ,GAAG,CACtB,IAAU,EACV,IAAY,EACZ,OAAqB,EACL,EAAE;IAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;KACxC;IACD,IAAI;QACF,OAAO,IAAA,cAAI,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAmB,CAAC;KAClE;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KACvD;AACH,CAAC,CAAC;AAbW,QAAA,QAAQ,YAanB;AAEF;;;;;;;GAOG;AACI,MAAM,SAAS,GAAG,CACvB,IAAU,EACV,IAAY,EACZ,KAAQ,EACR,OAAqB,EACf,EAAE;IACR,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAA,cAAI,EAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC;AAPW,QAAA,SAAS,aAOpB"}

package/src/utils/forge/async-commands.js

@@ -15,6 +15,7 @@ const runForgeCommandAsync = (args, opts = {}) => {
         cwd: opts.cwd,
         env: Object.assign(Object.assign({}, process.env), opts.env),
         stdio: [process.stdin, process.stdout, process.stderr],
+        shell: true,
     });
     return new Promise((resolve, reject) => {
         cliProcess.once('exit', (code) => {

package/src/utils/forge/async-commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"async-commands.js","sourceRoot":"","sources":["../../../../../../packages/forge/src/utils/forge/async-commands.ts"],"names":[],"mappings":";;;AAAA,iDAAsC;AACtC,uCAAsD;AAEtD;;;;;GAKG;AACI,MAAM,oBAAoB,GAAG,CAClC,IAAc,EACd,OAAkD,EAAE,EACrC,EAAE;IACjB,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;IACvC,MAAM,UAAU,GAAG,IAAA,qBAAK,EAAC,GAAG,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EAAE;QACrD,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,GAAG,kCAAO,OAAO,CAAC,GAAG,GAAK,IAAI,CAAC,GAAG,CAAE;QACpC,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;KACvD,CAAC,CAAC;IACH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACvC,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,CAAC,SAAS,CAAC,CAAC;aACpB;iBAAM;gBACL,MAAM,CAAC,IAAI,KAAK,CAAC,wBAAwB,GAAG,IAAI,CAAC,CAAC,CAAC;aACpD;QACH,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;YACtC,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAtBW,QAAA,oBAAoB,wBAsB/B"}
+{"version":3,"file":"async-commands.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/utils/forge/async-commands.ts"],"names":[],"mappings":";;;AAAA,iDAAsC;AACtC,uCAAsD;AAEtD;;;;;GAKG;AACI,MAAM,oBAAoB,GAAG,CAClC,IAAc,EACd,OAAkD,EAAE,EACrC,EAAE;IACjB,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;IACvC,MAAM,UAAU,GAAG,IAAA,qBAAK,EAAC,GAAG,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EAAE;QACrD,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,GAAG,kCAAO,OAAO,CAAC,GAAG,GAAK,IAAI,CAAC,GAAG,CAAE;QACpC,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;QACtD,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;IACH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACvC,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,CAAC,SAAS,CAAC,CAAC;aACpB;iBAAM;gBACL,MAAM,CAAC,IAAI,KAAK,CAAC,wBAAwB,GAAG,IAAI,CAAC,CAAC,CAAC;aACpD;QACH,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;YACtC,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAvBW,QAAA,oBAAoB,wBAuB/B"}

package/src/utils/forge/manifest-yml.d.ts

@@ -0,0 +1,15 @@
+import { ManifestSchema } from '@forge/manifest';
+export declare function readManifestYml(path: string): Promise<ManifestSchema>;
+/**
+ * Writes the given manifest file to the specified file path.
+ * @param path File path where to write the file to (incl. manifest.yml).
+ * @param value Manifest contents to write.
+ */
+export declare const writeManifestYml: (path: string, value: ManifestSchema) => void;
+/**
+ * Extracts the Custom UI project names from the given manifest.
+ *
+ * @param manifest Forge manifest to scan for Custom UI projects.
+ * @returns List of project names representing Custom UI projects.
+ */
+export declare const extractCustomUIProjectNames: (manifest: ManifestSchema) => string[];