@toolsplus/nx-forge 6.1.3 → 6.1.4

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

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 function addAppFiles(tree, options) {
+    var _a;
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), options.appProjectRoot, {
         tmpl: '',
         name: options.name,
@@ -13,7 +14,7 @@ function addAppFiles(tree, options) {
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
         webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)
             ? {
-                outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot, 'src'),
+                outputPath: (0, devkit_1.joinPathFragments)('dist', (_a = (options.rootProject ? options.name : options.appProjectRoot)) !== null && _a !== void 0 ? _a : '', 'src'),
                 main: './src/index' + (options.js ? '.js' : '.ts'),
                 tsConfig: './tsconfig.app.json',
                 assets: ['./src/assets'],

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

@@ -1 +1 @@
-{"version":3,"file":"add-app-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-app-files.ts"],"names":[],"mappings":";;AAWA,kCAoCC;AA9CD,uCAKoB;AACpB,+BAAuD;AAEvD,0EAAqE;AAErE,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;QACD,oBAAoB,EAAE,IAAA,qCAAgB,EAAC,IAAI,CAAC;YAC1C,CAAC,CAAC;gBACE,UAAU,EAAE,IAAA,0BAAiB,EAC3B,MAAM,EACN,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,EAC3D,KAAK,CACN;gBACD,IAAI,EAAE,aAAa,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;gBAClD,QAAQ,EAAE,qBAAqB;gBAC/B,MAAM,EAAE,CAAC,cAAc,CAAC;aACzB;YACH,CAAC,CAAC,IAAI;KACT,CACF,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;QACf,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;IACb,CAAC;AACH,CAAC"}
+{"version":3,"file":"add-app-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-app-files.ts"],"names":[],"mappings":";;AAWA,kCAqCC;AA/CD,uCAKoB;AACpB,+BAAuD;AAEvD,0EAAqE;AAErE,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;QACD,oBAAoB,EAAE,IAAA,qCAAgB,EAAC,IAAI,CAAC;YAC1C,CAAC,CAAC;gBACE,UAAU,EAAE,IAAA,0BAAiB,EAC3B,MAAM,EACN,MAAA,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,mCAC3D,EAAE,EACJ,KAAK,CACN;gBACD,IAAI,EAAE,aAAa,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;gBAClD,QAAQ,EAAE,qBAAqB;gBAC/B,MAAM,EAAE,CAAC,cAAc,CAAC;aACzB;YACH,CAAC,CAAC,IAAI;KACT,CACF,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;QACf,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;IACb,CAAC;AACH,CAAC"}

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

@@ -16,6 +16,7 @@ async function getLatestPackageVersion(pkg) {
     }
 }
 async function addProjectDependencies(tree, options) {
+    var _a;
     const bundlers = {
         webpack: {
             '@nx/webpack': devkit_1.NX_VERSION,
@@ -27,15 +28,21 @@ async function addProjectDependencies(tree, options) {
     };
     const latestForgeApiVersion = await getLatestPackageVersion('@forge/api');
     const latestForgeResolverVersion = await getLatestPackageVersion('@forge/resolver');
+    if (!latestForgeApiVersion) {
+        devkit_1.logger.warn(`Failed to fetch latest version of @forge/api. Using 'latest' tag as version`);
+    }
+    if (!latestForgeResolverVersion) {
+        devkit_1.logger.warn(`Failed to fetch latest version of @forge/resolver. Using 'latest' tag as version`);
+    }
     const forgeDependencies = {
-        '@forge/api': latestForgeApiVersion,
-        '@forge/resolver': latestForgeResolverVersion,
+        '@forge/api': latestForgeApiVersion !== null && latestForgeApiVersion !== void 0 ? latestForgeApiVersion : 'latest',
+        '@forge/resolver': latestForgeResolverVersion !== null && latestForgeResolverVersion !== void 0 ? latestForgeResolverVersion : 'latest',
     };
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {
         ...forgeDependencies,
         tslib: versions_1.tsLibVersion,
     }, {
-        ...bundlers[options.bundler],
+        ...bundlers[(_a = options.bundler) !== null && _a !== void 0 ? _a : 'webpack'],
         '@types/node': versions_1.typesNodeVersion,
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"add-project-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-project-dependencies.ts"],"names":[],"mappings":";;AA2BA,wDAmCC;AA9DD,uCAMoB;AACpB,wDAImC;AAGnC,KAAK,UAAU,uBAAuB,CACpC,GAAW;;IAEX,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,OAAO,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,WAAW,CAAC,0CAAG,QAAQ,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,KAAK,KAAK,EAAE,CAAC,CAAC;QACnE,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,EAAE,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,IAAU,EACV,OAA0B;IAE1B,MAAM,QAAQ,GAAG;QACf,OAAO,EAAE;YACP,aAAa,EAAE,mBAAU;SAC1B;QACD,OAAO,EAAE;YACP,aAAa,EAAE,mBAAU;YACzB,OAAO,EAAE,yBAAc;SACxB;KACO,CAAC;IAEX,MAAM,qBAAqB,GAAG,MAAM,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAC1E,MAAM,0BAA0B,GAAG,MAAM,uBAAuB,CAC9D,iBAAiB,CAClB,CAAC;IAEF,MAAM,iBAAiB,GAAG;QACxB,YAAY,EAAE,qBAAqB;QACnC,iBAAiB,EAAE,0BAA0B;KAC9C,CAAC;IAEF,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,GAAG,iBAAiB;QACpB,KAAK,EAAE,uBAAY;KACpB,EACD;QACE,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;QAC5B,aAAa,EAAE,2BAAgB;KAChC,CACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"add-project-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-project-dependencies.ts"],"names":[],"mappings":";;AA2BA,wDA8CC;AAzED,uCAMoB;AACpB,wDAImC;AAGnC,KAAK,UAAU,uBAAuB,CACpC,GAAW;;IAEX,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,OAAO,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,WAAW,CAAC,0CAAG,QAAQ,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,KAAK,KAAK,EAAE,CAAC,CAAC;QACnE,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,EAAE,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,IAAU,EACV,OAA0B;;IAE1B,MAAM,QAAQ,GAAG;QACf,OAAO,EAAE;YACP,aAAa,EAAE,mBAAU;SAC1B;QACD,OAAO,EAAE;YACP,aAAa,EAAE,mBAAU;YACzB,OAAO,EAAE,yBAAc;SACxB;KACO,CAAC;IAEX,MAAM,qBAAqB,GAAG,MAAM,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAC1E,MAAM,0BAA0B,GAAG,MAAM,uBAAuB,CAC9D,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,eAAM,CAAC,IAAI,CACT,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAChC,eAAM,CAAC,IAAI,CACT,kFAAkF,CACnF,CAAC;IACJ,CAAC;IACD,MAAM,iBAAiB,GAAG;QACxB,YAAY,EAAE,qBAAqB,aAArB,qBAAqB,cAArB,qBAAqB,GAAI,QAAQ;QAC/C,iBAAiB,EAAE,0BAA0B,aAA1B,0BAA0B,cAA1B,0BAA0B,GAAI,QAAQ;KAC1D,CAAC;IAEF,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,GAAG,iBAAiB;QACpB,KAAK,EAAE,uBAAY;KACpB,EACD;QACE,GAAG,QAAQ,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,SAAS,CAAC;QACzC,aAAa,EAAE,2BAAgB;KAChC,CACF,CAAC;AACJ,CAAC"}

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

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 function getWebpackBuildConfig(project, options) {
+    var _a, _b, _c;
     return {
         executor: `@nx/webpack:webpack`,
         outputs: ['{options.outputPath}'],
@@ -12,11 +13,11 @@ function getWebpackBuildConfig(project, options) {
         options: {
             target: 'node',
             compiler: 'tsc',
-            outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot, 'src'),
-            main: (0, devkit_1.joinPathFragments)(project.sourceRoot, 'index' + (options.js ? '.js' : '.ts')),
+            outputPath: (0, devkit_1.joinPathFragments)('dist', (_a = (options.rootProject ? options.name : options.appProjectRoot)) !== null && _a !== void 0 ? _a : '', 'src'),
+            main: (0, devkit_1.joinPathFragments)((_b = project.sourceRoot) !== null && _b !== void 0 ? _b : '', 'index' + (options.js ? '.js' : '.ts')),
             outputFileName: 'index.js',
             tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-            assets: [(0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets')],
+            assets: [(0, devkit_1.joinPathFragments)((_c = project.sourceRoot) !== null && _c !== void 0 ? _c : '', 'assets')],
             webpackConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'),
         },
         configurations: {
@@ -26,20 +27,21 @@ function getWebpackBuildConfig(project, options) {
     };
 }
 function getEsBuildConfig(project, options) {
+    var _a, _b, _c;
     return {
         executor: '@nx/esbuild:esbuild',
         outputs: ['{options.outputPath}'],
         defaultConfiguration: 'production',
         options: {
             platform: 'node',
-            outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot, 'src'),
+            outputPath: (0, devkit_1.joinPathFragments)('dist', (_a = (options.rootProject ? options.name : options.appProjectRoot)) !== null && _a !== void 0 ? _a : '', 'src'),
             // Use CJS for Node apps for widest compatibility.
             format: ['cjs'],
             bundle: true,
-            main: (0, devkit_1.joinPathFragments)(project.sourceRoot, 'index' + (options.js ? '.js' : '.ts')),
+            main: (0, devkit_1.joinPathFragments)((_b = project.sourceRoot) !== null && _b !== void 0 ? _b : '', 'index' + (options.js ? '.js' : '.ts')),
             outputFileName: 'index.js',
             tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-            assets: [(0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets')],
+            assets: [(0, devkit_1.joinPathFragments)((_c = project.sourceRoot) !== null && _c !== void 0 ? _c : '', 'assets')],
             generatePackageJson: false,
             esbuildOptions: {
                 sourcemap: true,
@@ -64,6 +66,7 @@ function getEsBuildConfig(project, options) {
  * available targets.
  */
 function addProject(tree, options) {
+    var _a, _b;
     const project = {
         root: options.appProjectRoot,
         sourceRoot: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src'),
@@ -73,14 +76,16 @@ function addProject(tree, options) {
     };
     if (options.bundler === 'esbuild') {
         (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, '@nx/esbuild:esbuild');
+        (_a = project.targets) !== null && _a !== void 0 ? _a : (project.targets = {});
         project.targets.build = getEsBuildConfig(project, options);
     }
     else if (options.bundler === 'webpack') {
         if (!(0, has_webpack_plugin_1.hasWebpackPlugin)(tree)) {
             (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, `@nx/webpack:webpack`);
+            (_b = project.targets) !== null && _b !== void 0 ? _b : (project.targets = {});
             project.targets.build = getWebpackBuildConfig(project, options);
         }
     }
-    (0, devkit_1.addProjectConfiguration)(tree, options.name, project, options.standaloneConfig);
+    (0, devkit_1.addProjectConfiguration)(tree, options.name || '', project, options.standaloneConfig);
 }
 //# 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/nx-forge/src/generators/application/lib/add-project.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;AA+FA,gCA2BC;AA1HD,uCAMoB;AAEpB,2FAAyF;AACzF,0EAAqE;AAErE,SAAS,qBAAqB,CAC5B,OAA6B,EAC7B,OAA0B;;IAE1B,OAAO;QACL,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,oBAAoB,EAAE,YAAY;QAClC,OAAO,EAAE;YACP,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,IAAA,0BAAiB,EAC3B,MAAM,EACN,MAAA,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,mCAAI,EAAE,EACnE,KAAK,CACN;YACD,IAAI,EAAE,IAAA,0BAAiB,EACrB,MAAA,OAAO,CAAC,UAAU,mCAAI,EAAE,EACxB,OAAO,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CACvC;YACD,cAAc,EAAE,UAAU;YAC1B,QAAQ,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC;YACxE,MAAM,EAAE,CAAC,IAAA,0BAAiB,EAAC,MAAA,OAAO,CAAC,UAAU,mCAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC/D,aAAa,EAAE,IAAA,0BAAiB,EAC9B,OAAO,CAAC,cAAc,EACtB,mBAAmB,CACpB;SACF;QACD,cAAc,EAAE;YACd,WAAW,EAAE,EAAE;YACf,UAAU,EAAE,EAAE;SACf;KACF,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,OAA6B,EAC7B,OAA0B;;IAE1B,OAAO;QACL,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,oBAAoB,EAAE,YAAY;QAClC,OAAO,EAAE;YACP,QAAQ,EAAE,MAAM;YAChB,UAAU,EAAE,IAAA,0BAAiB,EAC3B,MAAM,EACN,MAAA,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,mCAAI,EAAE,EACnE,KAAK,CACN;YACD,kDAAkD;YAClD,MAAM,EAAE,CAAC,KAAK,CAAC;YACf,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,IAAA,0BAAiB,EACrB,MAAA,OAAO,CAAC,UAAU,mCAAI,EAAE,EACxB,OAAO,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CACvC;YACD,cAAc,EAAE,UAAU;YAC1B,QAAQ,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC;YACxE,MAAM,EAAE,CAAC,IAAA,0BAAiB,EAAC,MAAA,OAAO,CAAC,UAAU,mCAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC/D,mBAAmB,EAAE,KAAK;YAC1B,cAAc,EAAE;gBACd,SAAS,EAAE,IAAI;gBACf,+EAA+E;gBAC/E,YAAY,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;aAC/B;SACF;QACD,cAAc,EAAE;YACd,WAAW,EAAE,EAAE;YACf,UAAU,EAAE;gBACV,cAAc,EAAE;oBACd,SAAS,EAAE,KAAK;oBAChB,+EAA+E;oBAC/E,YAAY,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;iBAC/B;aACF;SACF;KACF,CAAC;AACJ,CAAC;AAED;;;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,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAClC,IAAA,8CAAsB,EAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QACpD,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;QACvB,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;SAAM,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACzC,IAAI,CAAC,IAAA,qCAAgB,EAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,IAAA,8CAAsB,EAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;YACpD,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;YACvB,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAED,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,IAAI,IAAI,EAAE,EAClB,OAAO,EACP,OAAO,CAAC,gBAAgB,CACzB,CAAC;AACJ,CAAC"}

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

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
-const eslint_1 = require("@nx/eslint");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 async function normalizeOptions(tree, options) {
     var _a, _b, _c, _d;
-    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
     const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
@@ -20,14 +18,14 @@ async function normalizeOptions(tree, options) {
         : [];
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
+        (nxJson === null || nxJson === void 0 ? void 0 : nxJson.useInferencePlugins) !== false;
     return {
         addPlugin,
         ...options,
         name: appProjectName,
         appProjectRoot,
         parsedTags,
-        linter: (_b = options.linter) !== null && _b !== void 0 ? _b : eslint_1.Linter.EsLint,
+        linter: (_b = options.linter) !== null && _b !== void 0 ? _b : 'eslint',
         unitTestRunner: (_c = options.unitTestRunner) !== null && _c !== void 0 ? _c : 'jest',
         rootProject: (_d = options.rootProject) !== null && _d !== void 0 ? _d : false,
     };

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;AAQA,4CAmCC;AA3CD,uCAAoC;AACpC,uCAA8C;AAE9C,uGAG+D;AAExD,KAAK,UAAU,gBAAgB,CACpC,IAAU,EACV,OAAoC;;IAEpC,MAAM,IAAA,+CAAiB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IACtD,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,GAChE,MAAM,IAAA,gEAAkC,EAAC,IAAI,EAAE;QAC7C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,WAAW,EAAE,aAAa;QAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC,CAAC;IACL,OAAO,CAAC,WAAW,GAAG,cAAc,KAAK,GAAG,CAAC;IAE7C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,SAAS,CAAC;IAE/C,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,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO;QACtC,MAAM,CAAC,mBAAmB,KAAK,KAAK,CAAC;IAEvC,OAAO;QACL,SAAS;QACT,GAAG,OAAO;QACV,IAAI,EAAE,cAAc;QACpB,cAAc;QACd,UAAU;QACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM;QACvC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM;QAChD,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,KAAK;KAC1C,CAAC;AACJ,CAAC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;AAIA,4CAkCC;AAtCD,uCAA8C;AAE9C,uGAA2G;AAEpG,KAAK,UAAU,gBAAgB,CACpC,IAAU,EACV,OAAoC;;IAEpC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,GAChE,MAAM,IAAA,gEAAkC,EAAC,IAAI,EAAE;QAC7C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,WAAW,EAAE,aAAa;QAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC,CAAC;IACL,OAAO,CAAC,WAAW,GAAG,cAAc,KAAK,GAAG,CAAC;IAE7C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,SAAS,CAAC;IAE/C,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,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO;QACtC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,mBAAmB,MAAK,KAAK,CAAC;IAExC,OAAO;QACL,SAAS;QACT,GAAG,OAAO;QACV,IAAI,EAAE,cAAc;QACpB,cAAc;QACd,UAAU;QACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,QAAQ;QAClC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM;QAChD,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,KAAK;KAC1C,CAAC;AACJ,CAAC"}

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

@@ -1,11 +1,11 @@
-import type { Linter } from '@nx/eslint';
+import type { LinterType } from '@nx/eslint';
 
 interface ApplicationGeneratorOptions {
   directory: string;
   name?: string;
   skipFormat?: boolean;
   skipPackageJson?: boolean;
-  linter?: Linter;
+  linter?: LinterType;
   standaloneConfig?: boolean;
   tags?: string;
   bundler?: 'esbuild' | 'webpack';
@@ -20,9 +20,10 @@ interface ApplicationGeneratorOptions {
 }
 
 interface NormalizedOptions extends ApplicationGeneratorOptions {
+  name: string;
   addPlugin: boolean;
   appProjectRoot: string;
-  linter: Linter;
+  linter: LinterType;
   unitTestRunner: 'jest' | 'none';
   parsedTags: string[];
 }

package/src/generators/init/generator.js

@@ -18,11 +18,12 @@ function updateNxJson(host) {
     (0, devkit_1.writeJson)(host, 'nx.json', nxJson);
 }
 async function default_1(tree, options) {
+    var _a;
     updateNxJson(tree);
     const tasks = [];
     if (!options.skipPackageJson) {
         tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@toolsplus/nx-forge'], []));
-        const addDependenciesTask = await addDependencies(tree, options.keepExistingVersions);
+        const addDependenciesTask = await addDependencies(tree, (_a = options.keepExistingVersions) !== null && _a !== void 0 ? _a : false);
         tasks.push(addDependenciesTask);
     }
     if (!options.skipFormat) {

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/init/generator.ts"],"names":[],"mappings":";;AAsCA,4BAwBC;;AA9DD,uCAUoB;AAEpB,iFAAsD;AAEtD,KAAK,UAAU,eAAe,CAC5B,IAAU,EACV,oBAA6B;IAE7B,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,qBAAqB,EAAE,sBAAiB,CAAC,OAAO;KACjD,EACD,SAAS,EACT,oBAAoB,CACrB,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,IAAU;IAC9B,MAAM,MAAM,GAAwB,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,qBAAqB,CAAC,EAAE,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAEc,KAAK,oBAClB,IAAU,EACV,OAA4B;IAE5B,YAAY,CAAC,IAAI,CAAC,CAAC;IAEnB,MAAM,KAAK,GAAwB,EAAE,CAAC;IAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,CACR,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,qBAAqB,CAAC,EAAE,EAAE,CAAC,CACrE,CAAC;QACF,MAAM,mBAAmB,GAAG,MAAM,eAAe,CAC/C,IAAI,EACJ,OAAO,CAAC,oBAAoB,CAC7B,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/init/generator.ts"],"names":[],"mappings":";;AAsCA,4BAwBC;;AA9DD,uCAUoB;AAEpB,iFAAsD;AAEtD,KAAK,UAAU,eAAe,CAC5B,IAAU,EACV,oBAA6B;IAE7B,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,qBAAqB,EAAE,sBAAiB,CAAC,OAAO;KACjD,EACD,SAAS,EACT,oBAAoB,CACrB,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,IAAU;IAC9B,MAAM,MAAM,GAAwB,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,qBAAqB,CAAC,EAAE,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAEc,KAAK,oBAClB,IAAU,EACV,OAA4B;;IAE5B,YAAY,CAAC,IAAI,CAAC,CAAC;IAEnB,MAAM,KAAK,GAAwB,EAAE,CAAC;IAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,CACR,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,qBAAqB,CAAC,EAAE,EAAE,CAAC,CACrE,CAAC;QACF,MAAM,mBAAmB,GAAG,MAAM,eAAe,CAC/C,IAAI,EACJ,MAAA,OAAO,CAAC,oBAAoB,mCAAI,KAAK,CACtC,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;AACpC,CAAC"}

package/src/graph/create-dependencies.js

@@ -25,7 +25,8 @@ const getUIResourceDependencies = async ([projectName, manifestFile], context) =
         };
     };
     return uiResourceProjectNames.reduce((acc, uiResourceProjectName) => {
-        return (manifestFile.deps || []).find(([source, target, type]) => type === 'static' &&
+        var _a;
+        return ((_a = manifestFile.deps) !== null && _a !== void 0 ? _a : []).some(([source, target, type]) => type === 'static' &&
             target === uiResourceProjectName &&
             source === projectName)
             ? acc // Dependency already exists, skip adding it again.
@@ -36,7 +37,7 @@ const createDependencies = async (options, context) => {
     let dependencies = [];
     for (const projectName in context.filesToProcess.projectFileMap) {
         const changed = context.filesToProcess.projectFileMap[projectName];
-        for await (const manifestFile of changed.filter((f) => f.file.endsWith('manifest.yml'))) {
+        for (const manifestFile of changed.filter((f) => f.file.endsWith('manifest.yml'))) {
             devkit_1.logger.info(`[nx-forge] Processing ${projectName}:${manifestFile.file}`);
             const uiResourceDependencies = await getUIResourceDependencies([projectName, manifestFile], context);
             dependencies = dependencies.concat(uiResourceDependencies);

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

@@ -1 +1 @@
-{"version":3,"file":"create-dependencies.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/create-dependencies.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,8DAGqC;AAErC,MAAM,yBAAyB,GAAG,KAAK,EACrC,CAAC,WAAW,EAAE,YAAY,CAAqB,EAC/C,OAAkC,EACI,EAAE;IACxC,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,IAAI,EAAE;QAC9D,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IACH,MAAM,sBAAsB,GAAG,IAAA,4CAA6B,EAAC,cAAc,CAAC,CAAC;IAE7E,MAAM,6BAA6B,GAAG,CACpC,qBAA6B,EACF,EAAE;QAC7B,MAAM,8BAA8B,GAClC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAE1C,IAAI,CAAC,8BAA8B,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACb,6FAA6F,qBAAqB,kDAAkD,WAAW,oHAAoH,CACpS,CAAC;QACJ,CAAC;QAED,MAAM,oBAAoB,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAE3D,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,6DAA6D,WAAW,EAAE,CAC3E,CAAC;QACJ,CAAC;QAED,OAAO;YACL,UAAU,EAAE,YAAY,CAAC,IAAI;YAC7B,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE,qBAAqB;YAC7B,IAAI,EAAE,uBAAc,CAAC,MAAM;SAC5B,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,sBAAsB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,qBAAqB,EAAE,EAAE;QAClE,OAAO,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CACnC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CACzB,IAAI,KAAK,QAAQ;YACjB,MAAM,KAAK,qBAAqB;YAChC,MAAM,KAAK,WAAW,CACzB;YACC,CAAC,CAAC,GAAG,CAAC,mDAAmD;YACzD,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,6BAA6B,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACrE,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAuB,KAAK,EACzD,OAAO,EACP,OAAO,EACP,EAAE;IACF,IAAI,YAAY,GAAgC,EAAE,CAAC;IAEnD,KAAK,MAAM,WAAW,IAAI,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;QAChE,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACnE,IAAI,KAAK,EAAE,MAAM,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACpD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAChC,EAAE,CAAC;YACF,eAAM,CAAC,IAAI,CAAC,yBAAyB,WAAW,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;YACzE,MAAM,sBAAsB,GAAG,MAAM,yBAAyB,CAC5D,CAAC,WAAW,EAAE,YAAY,CAAC,EAC3B,OAAO,CACR,CAAC;YACF,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AArBW,QAAA,kBAAkB,sBAqB7B"}
+{"version":3,"file":"create-dependencies.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/create-dependencies.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,8DAGqC;AAErC,MAAM,yBAAyB,GAAG,KAAK,EACrC,CAAC,WAAW,EAAE,YAAY,CAAqB,EAC/C,OAAkC,EACI,EAAE;IACxC,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,IAAI,EAAE;QAC9D,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IACH,MAAM,sBAAsB,GAAG,IAAA,4CAA6B,EAAC,cAAc,CAAC,CAAC;IAE7E,MAAM,6BAA6B,GAAG,CACpC,qBAA6B,EACF,EAAE;QAC7B,MAAM,8BAA8B,GAClC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAE1C,IAAI,CAAC,8BAA8B,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACb,6FAA6F,qBAAqB,kDAAkD,WAAW,oHAAoH,CACpS,CAAC;QACJ,CAAC;QAED,MAAM,oBAAoB,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAE3D,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,6DAA6D,WAAW,EAAE,CAC3E,CAAC;QACJ,CAAC;QAED,OAAO;YACL,UAAU,EAAE,YAAY,CAAC,IAAI;YAC7B,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE,qBAAqB;YAC7B,IAAI,EAAE,uBAAc,CAAC,MAAM;SAC5B,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,sBAAsB,CAAC,MAAM,CAClC,CAAC,GAAG,EAAE,qBAAqB,EAAE,EAAE;;QAC7B,OAAO,CAAC,MAAA,YAAY,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC,IAAI,CACnC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CACzB,IAAI,KAAK,QAAQ;YACjB,MAAM,KAAK,qBAAqB;YAChC,MAAM,KAAK,WAAW,CACzB;YACC,CAAC,CAAC,GAAG,CAAC,mDAAmD;YACzD,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,6BAA6B,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACrE,CAAC,EACD,EAAE,CACH,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAuB,KAAK,EACzD,OAAO,EACP,OAAO,EACP,EAAE;IACF,IAAI,YAAY,GAAgC,EAAE,CAAC;IAEnD,KAAK,MAAM,WAAW,IAAI,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;QAChE,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACnE,KAAK,MAAM,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9C,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAChC,EAAE,CAAC;YACF,eAAM,CAAC,IAAI,CAAC,yBAAyB,WAAW,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;YACzE,MAAM,sBAAsB,GAAG,MAAM,yBAAyB,CAC5D,CAAC,WAAW,EAAE,YAAY,CAAC,EAC3B,OAAO,CACR,CAAC;YACF,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AArBW,QAAA,kBAAkB,sBAqB7B"}

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,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"}
+{"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,OAA6B;IAE7B,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/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.js

@@ -6,7 +6,6 @@ const devkit_1 = require("@nx/devkit");
 const manifest_yml_1 = require("../../utils/forge/manifest-yml");
 const manifest_1 = require("./utils/manifest");
 async function update(host) {
-    var _a;
     const projects = (0, devkit_1.getProjects)(host);
     const isForgeProject = (config) => {
         return (config.projectType === 'application' &&
@@ -14,7 +13,8 @@ async function update(host) {
     };
     for (const [name, config] of projects.entries()) {
         if (config && isForgeProject(config)) {
-            if (((_a = config.implicitDependencies) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+            if (config.implicitDependencies &&
+                config.implicitDependencies.length > 0) {
                 const manifest = await (0, manifest_1.readManifestYml)(host, (0, devkit_1.joinPathFragments)(config.root, 'manifest.yml'));
                 const customUIProjectNames = (0, manifest_yml_1.extractUIResourceProjectNames)(manifest);
                 config.implicitDependencies = config.implicitDependencies.filter((d) => !customUIProjectNames.includes(d));

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

@@ -1 +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":";;AAWA,yBAyBC;AApCD,sDAAsD;AACtD,uCAMoB;AACpB,iEAA+E;AAC/E,+CAAmD;AAEpC,KAAK,UAAU,MAAM,CAAC,IAAU;;IAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,cAAc,GAAG,CAAC,MAA4B,EAAW,EAAE;QAC/D,OAAO,CACL,MAAM,CAAC,WAAW,KAAK,aAAa;YACpC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAC5D,CAAC;IACJ,CAAC,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,IAAI,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,IAAI,CAAA,MAAA,MAAM,CAAC,oBAAoB,0CAAE,MAAM,IAAG,CAAC,EAAE,CAAC;gBAC5C,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAe,EACpC,IAAI,EACJ,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAC/C,CAAC;gBACF,MAAM,oBAAoB,GAAG,IAAA,4CAA6B,EAAC,QAAQ,CAAC,CAAC;gBACrE,MAAM,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAC9D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CACzC,CAAC;gBACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
+{"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":";;AAWA,yBA4BC;AAvCD,sDAAsD;AACtD,uCAMoB;AACpB,iEAA+E;AAC/E,+CAAmD;AAEpC,KAAK,UAAU,MAAM,CAAC,IAAU;IAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,cAAc,GAAG,CAAC,MAA4B,EAAW,EAAE;QAC/D,OAAO,CACL,MAAM,CAAC,WAAW,KAAK,aAAa;YACpC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAC5D,CAAC;IACJ,CAAC,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,IAAI,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,IACE,MAAM,CAAC,oBAAoB;gBAC3B,MAAM,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,EACtC,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAe,EACpC,IAAI,EACJ,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAC/C,CAAC;gBACF,MAAM,oBAAoB,GAAG,IAAA,4CAA6B,EAAC,QAAQ,CAAC,CAAC;gBACrE,MAAM,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAC9D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CACzC,CAAC;gBACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

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

@@ -7,10 +7,11 @@ const manifest_1 = require("@forge/manifest");
 const FULL_SCHEMA = tslib_1.__importStar(require("@forge/manifest/out/schema/manifest-schema.json"));
 const manifestSchemaValidator = new manifest_1.SchemaValidator(FULL_SCHEMA);
 const readManifestYml = async (tree, path) => {
+    var _a;
     const result = await manifestSchemaValidator.validate({
         yamlContent: (0, yml_1.readYaml)(tree, path),
     });
-    if (result.success) {
+    if (result.success && ((_a = result.manifestObject) === null || _a === void 0 ? void 0 : _a.typedContent)) {
         return result.manifestObject.typedContent;
     }
     throw new Error(`Cannot validate manifest ${path}: ${result.errors}`);

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

@@ -1 +1 @@
-{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/migrations/update-2-3-0/utils/manifest.ts"],"names":[],"mappings":";;;;AACA,+BAA4C;AAC5C,8CAAkE;AAClE,qGAA+E;AAE/E,MAAM,uBAAuB,GAAG,IAAI,0BAAe,CACjD,WAAW,CACZ,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,EAAE,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,CAAC;QACnB,OAAO,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC;IAC5C,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACxE,CAAC,CAAC;AAVW,QAAA,eAAe,mBAU1B;AAEK,MAAM,gBAAgB,GAAG,CAC9B,IAAU,EACV,IAAY,EACZ,KAAqB,EACrB,EAAE;IACF,IAAA,eAAS,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}
+{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/migrations/update-2-3-0/utils/manifest.ts"],"names":[],"mappings":";;;;AACA,+BAA4C;AAC5C,8CAAkE;AAClE,qGAA+E;AAE/E,MAAM,uBAAuB,GAAG,IAAI,0BAAe,CACjD,WAAW,CACZ,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,EAClC,IAAU,EACV,IAAY,EACa,EAAE;;IAC3B,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,KAAI,MAAA,MAAM,CAAC,cAAc,0CAAE,YAAY,CAAA,EAAE,CAAC;QAC1D,OAAO,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC;IAC5C,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACxE,CAAC,CAAC;AAbW,QAAA,eAAe,mBAa1B;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.js

@@ -10,14 +10,15 @@ const js_yaml_1 = require("js-yaml");
  * @param options - Optional YAML load options
  */
 const readYaml = (tree, path, options) => {
+    var _a;
     if (!tree.exists(path)) {
         throw new Error(`Cannot find ${path}`);
     }
     try {
-        return (0, js_yaml_1.load)(tree.read(path, 'utf-8'), options);
+        return (0, js_yaml_1.load)((_a = tree.read(path, 'utf-8')) !== null && _a !== void 0 ? _a : '', options);
     }
     catch (e) {
-        throw new Error(`Cannot parse ${path}: ${e.message}`);
+        throw new Error(`Cannot parse ${path}: ${e instanceof Error ? e.message : String(e)}`);
     }
 };
 exports.readYaml = readYaml;

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

@@ -1 +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,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAA,cAAI,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAmB,CAAC;IACnE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IACxD,CAAC;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"}
+{"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,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAA,cAAI,EAAC,MAAA,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,mCAAI,EAAE,EAAE,OAAO,CAAmB,CAAC;IACzE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,gBAAgB,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CACtE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAfW,QAAA,QAAQ,YAenB;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/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 async function default_1(tree) {
     const update = (options, projectName, targetName, configurationName) => {
+        var _a;
         // There should not be any configurations, if there are skip the update - only handle the default config
         if (configurationName)
             return;
@@ -21,7 +22,8 @@ async function default_1(tree) {
           return config;
         });
         `);
-            projectConfiguration.targets[targetName].options = options;
+            const targets = ((_a = projectConfiguration.targets) !== null && _a !== void 0 ? _a : (projectConfiguration.targets = {}));
+            targets[targetName] = { ...targets[targetName], options };
             (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
         }
     };

package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-3-0-0-webpack-config-setup.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.ts"],"names":[],"mappings":";;AASA,4BAwCC;AAjDD,uCAKoB;AACpB,6FAA0F;AAG3E,KAAK,oBAAW,IAAU;IACvC,MAAM,MAAM,GAAG,CACb,OAA6B,EAC7B,WAAmB,EACnB,UAAkB,EAClB,iBAAyB,EACzB,EAAE;QACF,wGAAwG;QACxG,IAAI,iBAAiB;YAAE,OAAO;QAE9B,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEzE,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3B,OAAO,CAAC,aAAa,GAAG,GAAG,oBAAoB,CAAC,IAAI,oBAAoB,CAAC;YACzE,IAAI,CAAC,KAAK,CACR,OAAO,CAAC,aAAa,EACrB;;;;;;;;;SASC,CACF,CAAC;YAEF,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;YAC3D,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;QACtE,CAAC;IACH,CAAC,CAAC;IAEF,IAAA,+CAAsB,EACpB,IAAI,EACJ,2BAA2B,EAC3B,MAAM,CACP,CAAC;IAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"update-3-0-0-webpack-config-setup.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.ts"],"names":[],"mappings":";;AASA,4BAyCC;AAlDD,uCAKoB;AACpB,6FAA0F;AAG3E,KAAK,oBAAW,IAAU;IACvC,MAAM,MAAM,GAAG,CACb,OAA6B,EAC7B,WAAmB,EACnB,UAAkB,EAClB,iBAA0B,EAC1B,EAAE;;QACF,wGAAwG;QACxG,IAAI,iBAAiB;YAAE,OAAO;QAE9B,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEzE,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3B,OAAO,CAAC,aAAa,GAAG,GAAG,oBAAoB,CAAC,IAAI,oBAAoB,CAAC;YACzE,IAAI,CAAC,KAAK,CACR,OAAO,CAAC,aAAa,EACrB;;;;;;;;;SASC,CACF,CAAC;YAEF,MAAM,OAAO,GAAG,OAAC,oBAAoB,CAAC,OAAO,oCAA5B,oBAAoB,CAAC,OAAO,GAAK,EAAE,EAAC,CAAC;YACtD,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC;YAC1D,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;QACtE,CAAC;IACH,CAAC,CAAC;IAEF,IAAA,+CAAsB,EACpB,IAAI,EACJ,2BAA2B,EAC3B,MAAM,CACP,CAAC;IAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}

package/src/shared/manifest/util-manifest.d.ts

@@ -15,7 +15,7 @@ export type ResourceTypeIndex = {
  */
 export declare const getResourceTypeIndex: (manifestSchema: ManifestSchema) => ResourceTypeIndex;
 /**
- * Determines if type of the given resource.
+ * Determines the type of the given resource.
  *
  * The resource type is determined by the following reduction:
  *
@@ -23,14 +23,14 @@ export declare const getResourceTypeIndex: (manifestSchema: ManifestSchema) => R
  *   UI or UI Kit resource.
  * - If the resource key is referenced via resource string interpolation
  *   (resource:<resource-key>;) anywhere in the manifest, infer a static resource.
- * - Else infer Custom UI. These kind of resources are typically used as Modal
+ * - Else infer Custom UI. These kinds of resources are typically used as Modal
  *   dialogs in Custom UIs. They are not referenced in the manifest and instead,
  *   opened via @forge/bridge in Custom UI code.
  *
  * @see https://developer.atlassian.com/platform/forge/apis-reference/ui-api-bridge/modal/
  *
  * @param manifestSchema Complete manifest definition
- * @param resource Resource to resolve against the manifest definition
+ * @returns Function that takes the resource to resolve against the manifest definition
  */
 export declare const resourceTypeByResourceDefinition: (manifestSchema: ManifestSchema) => (resource: HostedResourcesSchema) => ResourceType;
 /**
@@ -43,6 +43,6 @@ export declare const resourceTypeByResourceDefinition: (manifestSchema: Manifest
  *
  * @param manifestSchema Complete manifest definition
  * @param acceptedResourceTypes Allows to filer for specific resource types
- * @param resource Resource to resolve against the manifest definition
+ * @returns Function that takes a resource to resolve against the manifest definition
  */
 export declare const isResourceType: (manifestSchema: ManifestSchema, acceptedResourceTypes: ResourceType[]) => (resource: HostedResourcesSchema) => boolean;

package/src/shared/manifest/util-manifest.js

@@ -1,28 +1,93 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isResourceType = exports.resourceTypeByResourceDefinition = exports.getResourceTypeIndex = void 0;
-const manifest_1 = require("@forge/manifest");
 const devkit_1 = require("@nx/devkit");
 // https://stackoverflow.com/a/8511350/5115898
-const isObject = (v) => typeof v === 'object' && v !== null;
+const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
+const isModuleDefinitionWithKey = (m) => isObject(m) && 'key' in m && typeof m.key === 'string';
 /**
- * Determines the resource type based on the module definition.
+ * Adapted version of getAllModules from @forge/manifest that preserves the module type for each module and validates
+ * that each module definition is a record with a key property.
+ */
+const allModulesWithType = (modules) => Object.keys(modules).reduce((acc, moduleType) => [
+    ...acc,
+    ...modules[moduleType].reduce((innerAcc, m) => {
+        if (!isModuleDefinitionWithKey(m)) {
+            devkit_1.logger.warn(`Unexpected module definition for type ${moduleType}: Module is missing a 'key' property: ${JSON.stringify(m)}`);
+            return innerAcc;
+        }
+        return [
+            ...innerAcc,
+            {
+                type: moduleType,
+                definition: m,
+            },
+        ];
+    }, []),
+], []);
+/**
+ * Extracts the resource reference from the given module like definition if the
+ * definition is an object with a `resource` property.
  *
- * The criteria are as follows:
- * - UI Kit:    module has the `resource` property and the `render` property is
- *              `native`
- * - Custom UI: module has the `resource` property and the `render` property is
- *              not `native` or missing
- * - Static:    none of the above, consider it a static resource
+ * The resource type is determined as follows:
+ * - UI Kit: module has the `resource` property and the `render` property is `native`
+ * - Custom UI: module has the `resource` property, and the `render` property is not `native` or missing
  *
- * @param moduleDefinition Module definition to analyze
+ * @param moduleLikeDefinition
+ * @returns Resource reference if the definition is an object with a `resource` property, undefined otherwise.
  */
-const resourceTypeByModuleDefinition = (moduleDefinition) => {
-    if (!!moduleDefinition['resource'] && moduleDefinition['render'] === 'native')
-        return 'ui-kit';
-    if (!!moduleDefinition['resource'] && moduleDefinition['render'] !== 'native')
-        return 'custom-ui';
-    return 'static';
+const extractResourceFromModuleLike = (moduleLikeDefinition) => {
+    if (!isObject(moduleLikeDefinition) ||
+        typeof moduleLikeDefinition.resource !== 'string') {
+        return undefined;
+    }
+    const { resource, render } = moduleLikeDefinition;
+    return {
+        key: resource,
+        type: render === 'native' ? 'ui-kit' : 'custom-ui',
+    };
+};
+/**
+ * Searches at the root of the module definition for resource references.
+ * @param def Module definition to analyze
+ */
+const defaultExtractionStrategy = (def) => [def];
+/**
+ * Specialized resource reference extraction strategies for certain module types.
+ */
+const extractionStrategies = {
+    'jira:customField': (def) => {
+        return [
+            def === null || def === void 0 ? void 0 : def.view,
+            def === null || def === void 0 ? void 0 : def.edit,
+        ];
+    },
+};
+/**
+ * Extracts resource references from the given module definition indexed by the
+ * resource key.
+ *
+ * Note that some modules may not define resources at the root, so for certain
+ * module types, we need to look deeper into the definition to find potential
+ * resource references.
+ *
+ * The resource type is determined as follows:
+ * - UI Kit: module has the `resource` property and the `render` property is `native`
+ * - Custom UI: module has the `resource` property, and the `render` property is not `native` or missing
+ * - otherwise: assume there is no resource reference in the module definition
+ *
+ * @param type Module type, e.g. `jira:customField`
+ * @param definition Module definition to analyze
+ */
+const extractResourceReferencesFromModule = ({ type, definition, }) => {
+    var _a;
+    const getSearchInputs = (_a = extractionStrategies[type]) !== null && _a !== void 0 ? _a : defaultExtractionStrategy;
+    return getSearchInputs(definition).reduce((acc, m) => {
+        const resource = extractResourceFromModuleLike(m);
+        return resource === undefined
+            ? acc
+            : { ...acc, [resource.key]: resource };
+    }, {});
 };
 /**
  * Computes an index from resource key to resource type which is either `ui-kit`,
@@ -47,7 +112,7 @@ const getResourceTypeIndex = (manifestSchema) => (manifestSchema.resources || []
 }, {});
 exports.getResourceTypeIndex = getResourceTypeIndex;
 /**
- * Determines if type of the given resource.
+ * Determines the type of the given resource.
  *
  * The resource type is determined by the following reduction:
  *
@@ -55,33 +120,42 @@ exports.getResourceTypeIndex = getResourceTypeIndex;
  *   UI or UI Kit resource.
  * - If the resource key is referenced via resource string interpolation
  *   (resource:<resource-key>;) anywhere in the manifest, infer a static resource.
- * - Else infer Custom UI. These kind of resources are typically used as Modal
+ * - Else infer Custom UI. These kinds of resources are typically used as Modal
  *   dialogs in Custom UIs. They are not referenced in the manifest and instead,
  *   opened via @forge/bridge in Custom UI code.
  *
  * @see https://developer.atlassian.com/platform/forge/apis-reference/ui-api-bridge/modal/
  *
  * @param manifestSchema Complete manifest definition
- * @param resource Resource to resolve against the manifest definition
+ * @returns Function that takes the resource to resolve against the manifest definition
  */
 const resourceTypeByResourceDefinition = (manifestSchema) => {
+    var _a;
     const manifestSchemaString = JSON.stringify(manifestSchema);
-    return (resource) => {
-        var _a;
-        for (const moduleDefinition of (0, manifest_1.getAllModules)((_a = manifestSchema.modules) !== null && _a !== void 0 ? _a : {})) {
-            if (isObject(moduleDefinition) &&
-                Object.hasOwn(moduleDefinition, 'resource') &&
-                typeof moduleDefinition['resource'] === 'string' &&
-                moduleDefinition['resource'] === resource.key) {
-                return resourceTypeByModuleDefinition(moduleDefinition);
+    const modules = allModulesWithType((_a = manifestSchema.modules) !== null && _a !== void 0 ? _a : {});
+    const moduleResourceReferencesByResourceKey = modules.reduce((acc, module) => {
+        const resourceReferences = extractResourceReferencesFromModule(module);
+        for (const r of Object.values(resourceReferences)) {
+            if (r.key in acc && acc[r.key].type !== r.type) {
+                devkit_1.logger.warn(`nx-forge has already been inferred resource with key ${r.key} to a different type. The current module ${module.type}:${module.definition.key} inferred the type as ${r.type} but it was previously inferred as ${acc[r.key].type}. This may be a bug, please report it at https://github.com/toolsplus/nx-forge/issues including your Forge manifest.yml`);
             }
         }
+        return {
+            ...acc,
+            ...resourceReferences,
+        };
+    }, {});
+    return (resource) => {
+        const maybeResourceRef = moduleResourceReferencesByResourceKey[resource.key];
+        if (maybeResourceRef) {
+            return maybeResourceRef.type;
+        }
         // If the resource key is referenced in the manifest via a resource
         // string interpolation, assume it is a static resource
         if (manifestSchemaString.includes(`resource:${resource.key};`)) {
             return 'static';
         }
-        // Assume that the resource is a Custom UI. There may be resources which are
+        // Assume that the resource is a Custom UI. There may be resources that are
         // not directly referenced in the manifest. For example, UI Kit modal dialogs
         // can be referenced in other Custom UI projects and loaded via @forge/bridge.
         // https://developer.atlassian.com/platform/forge/apis-reference/ui-api-bridge/modal/
@@ -99,7 +173,7 @@ exports.resourceTypeByResourceDefinition = resourceTypeByResourceDefinition;
  *
  * @param manifestSchema Complete manifest definition
  * @param acceptedResourceTypes Allows to filer for specific resource types
- * @param resource Resource to resolve against the manifest definition
+ * @returns Function that takes a resource to resolve against the manifest definition
  */
 const isResourceType = (manifestSchema, acceptedResourceTypes) => (resource) => acceptedResourceTypes.includes((0, exports.resourceTypeByResourceDefinition)(manifestSchema)(resource));
 exports.isResourceType = isResourceType;