@toolsplus/nx-forge 1.3.2 → 1.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolsplus/nx-forge",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Atlassian Forge plugin for Nx",
   "main": "src/index.js",
   "generators": "./generators.json",

package/src/executors/build/executor.js

@@ -51,10 +51,10 @@ function runExecutor(rawOptions, context) {
             finally { if (e_1) throw e_1.error; }
         }
         (0, copy_forge_app_assets_1.copyForgeAppAssets)(options);
-        yield (0, process_custom_ui_dependencies_1.processCustomUIDependencies)(options, context);
+        const customUIResources = yield (0, process_custom_ui_dependencies_1.processCustomUIDependencies)(options, context);
         yield (0, patch_manifest_yml_1.patchManifestYml)(options);
         const projectGraph = yield readOrCreateProjectGraph();
-        (0, generate_package_json_1.generatePackageJson)(context.projectName, projectGraph, options);
+        (0, generate_package_json_1.generatePackageJson)(context.projectName, projectGraph, customUIResources, options);
         console.log('Executor ran for build');
         return {
             success: true,

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

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/forge/src/executors/build/executor.ts"],"names":[],"mappings":";;;AAEA,+DAA2D;AAC3D,yFAAmF;AACnF,iEAA4D;AAC5D,uEAAkE;AAClE,0EAAgF;AAChF,2DAAuD;AACvD,uEAAiE;AACjE,yCAAuD;AAEvD;;;GAGG;AACH,SAAe,wBAAwB;;QACrC,IAAI;YACF,OAAO,IAAA,sCAAsB,GAAE,CAAC;SACjC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAA,gCAAuB,GAAE,CAAC;SAClC;IACH,CAAC;CAAA;AAED,SAA8B,WAAW,CACvC,UAAgC,EAChC,OAAwB;;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE7E,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;SACvE;QAED,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;SACjE;QAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAC7E,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;;YAErD,KAA2B,IAAA,gBAAA,sBAAA,WAAW,CAAA,iBAAA;gBAA3B,MAAM,MAAM,wBAAA,CAAA;gBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;oBACnB,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,WAAW,GAAG,CAC9D,CAAC;iBACH;aACF;;;;;;;;;QAED,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;QAC5B,MAAM,IAAA,4DAA2B,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,IAAA,qCAAgB,EAAC,OAAO,CAAC,CAAC;QAChC,MAAM,YAAY,GAAG,MAAM,wBAAwB,EAAE,CAAC;QACtD,IAAA,2CAAmB,EAAC,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAEhE,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AAnCD,8BAmCC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/forge/src/executors/build/executor.ts"],"names":[],"mappings":";;;AAEA,+DAA2D;AAC3D,yFAAmF;AACnF,iEAA4D;AAC5D,uEAAkE;AAClE,0EAAgF;AAChF,2DAAuD;AACvD,uEAAiE;AACjE,yCAAuD;AAEvD;;;GAGG;AACH,SAAe,wBAAwB;;QACrC,IAAI;YACF,OAAO,IAAA,sCAAsB,GAAE,CAAC;SACjC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAA,gCAAuB,GAAE,CAAC;SAClC;IACH,CAAC;CAAA;AAED,SAA8B,WAAW,CACvC,UAAgC,EAChC,OAAwB;;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE7E,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;SACvE;QAED,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;SACjE;QAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAC7E,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;;YAErD,KAA2B,IAAA,gBAAA,sBAAA,WAAW,CAAA,iBAAA;gBAA3B,MAAM,MAAM,wBAAA,CAAA;gBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;oBACnB,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,WAAW,GAAG,CAC9D,CAAC;iBACH;aACF;;;;;;;;;QAED,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;QAC5B,MAAM,iBAAiB,GAAG,MAAM,IAAA,4DAA2B,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9E,MAAM,IAAA,qCAAgB,EAAC,OAAO,CAAC,CAAC;QAChC,MAAM,YAAY,GAAG,MAAM,wBAAwB,EAAE,CAAC;QACtD,IAAA,2CAAmB,EACjB,OAAO,CAAC,WAAW,EACnB,YAAY,EACZ,iBAAiB,EACjB,OAAO,CACR,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AAxCD,8BAwCC"}

package/src/executors/build/lib/generate-package-json.d.ts

@@ -1,11 +1,13 @@
 import type { ProjectGraph } from '@nrwl/devkit';
 import { NormalizedOptions } from '../schema';
+import { Resources } from '@forge/manifest';
 /**
  * Merges the existing package.json details with a generated package.json that includes
  * all required dependencies.
  *
  * @param projectName Name of the project
  * @param graph Graph associated with the project
+ * @param customUIResources Configured Custom UI resources
  * @param options Builder options
  */
-export declare function generatePackageJson(projectName: string, graph: ProjectGraph, options: NormalizedOptions): void;
+export declare function generatePackageJson(projectName: string, graph: ProjectGraph, customUIResources: Resources, options: NormalizedOptions): void;

package/src/executors/build/lib/generate-package-json.js

@@ -2,21 +2,122 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatePackageJson = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const create_package_json_1 = require("@nrwl/workspace/src/utilities/create-package-json");
+const object_sort_1 = require("nx/src/utils/object-sort");
 /**
  * Merges the existing package.json details with a generated package.json that includes
  * all required dependencies.
  *
  * @param projectName Name of the project
  * @param graph Graph associated with the project
+ * @param customUIResources Configured Custom UI resources
  * @param options Builder options
  */
-function generatePackageJson(projectName, graph, options) {
+function generatePackageJson(projectName, graph, customUIResources, options) {
     var _a;
-    const packageJson = (0, create_package_json_1.createPackageJson)(projectName, graph, options);
+    const packageJson = createPackageJson(projectName, graph, customUIResources, options);
     packageJson.main = (_a = packageJson.main) !== null && _a !== void 0 ? _a : options.outputFileName;
     delete packageJson.devDependencies;
     (0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, packageJson);
 }
 exports.generatePackageJson = generatePackageJson;
+/**
+ * Creates a package.json in the output directory for support to install dependencies within containers.
+ *
+ * If a package.json exists in the project, it will reuse that.
+ *
+ * Initial implementation copied from `create-package.json.ts` in Nx 15.2.4 linked below. The implementation is
+ * modified to not include dependencies from Custom UI projects marked as implicit dependencies.
+ *
+ * @see https://github.com/nrwl/nx/blob/15.2.4/packages/workspace/src/utilities/create-package-json.ts
+ */
+function createPackageJson(projectName, graph, customUIResources, options) {
+    const customUIProjectNames = customUIResources.map((r) => r.path);
+    const npmDeps = findAllNpmDeps(projectName, graph, customUIProjectNames);
+    // default package.json if one does not exist
+    let packageJson = {
+        name: projectName,
+        version: '0.0.1',
+        dependencies: {},
+        devDependencies: {},
+    };
+    try {
+        packageJson = (0, devkit_1.readJsonFile)(`${options.projectRoot}/package.json`);
+        if (!packageJson.dependencies) {
+            packageJson.dependencies = {};
+        }
+        if (!packageJson.devDependencies) {
+            packageJson.devDependencies = {};
+        }
+    }
+    catch (e) {
+        // do nothing
+    }
+    const rootPackageJson = (0, devkit_1.readJsonFile)(`${options.root}/package.json`);
+    Object.entries(npmDeps).forEach(([packageName, version]) => {
+        var _a;
+        if (((_a = rootPackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[packageName]) &&
+            !packageJson.dependencies[packageName]) {
+            packageJson.devDependencies[packageName] = version;
+        }
+        else {
+            packageJson.dependencies[packageName] = version;
+        }
+    });
+    packageJson.devDependencies && (packageJson.devDependencies = (0, object_sort_1.sortObjectByKeys)(packageJson.devDependencies));
+    packageJson.dependencies && (packageJson.dependencies = (0, object_sort_1.sortObjectByKeys)(packageJson.dependencies));
+    return packageJson;
+}
+function findAllNpmDeps(projectName, graph, customUIProjectNames, list = {}, seen = new Set()) {
+    var _a;
+    if (seen.has(projectName)) {
+        return list;
+    }
+    seen.add(projectName);
+    const node = graph.externalNodes[projectName];
+    if (node) {
+        list[node.data.packageName] = node.data.version;
+        recursivelyCollectPeerDependencies(node.name, graph, list);
+    }
+    else {
+        // we are not interested in the dependencies of external projects
+        (_a = graph.dependencies[projectName]) === null || _a === void 0 ? void 0 : _a.forEach((dep) => {
+            // Only include dependencies if they are either not implicit, or if it is not a Custom UI project
+            if (dep.type !== devkit_1.DependencyType.implicit ||
+                !customUIProjectNames.includes(dep.target)) {
+                findAllNpmDeps(dep.target, graph, customUIProjectNames, list, seen);
+            }
+        });
+    }
+    return list;
+}
+function recursivelyCollectPeerDependencies(projectName, graph, list = {}, seen = new Set()) {
+    const npmPackage = graph.externalNodes[projectName];
+    if (!npmPackage || seen.has(projectName)) {
+        return list;
+    }
+    seen.add(projectName);
+    const packageName = npmPackage.data.packageName;
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const packageJson = require(`${packageName}/package.json`);
+        if (!packageJson.peerDependencies) {
+            return list;
+        }
+        Object.keys(packageJson.peerDependencies)
+            .map((dependencyName) => `npm:${dependencyName}`)
+            .map((dependency) => graph.externalNodes[dependency])
+            .filter(Boolean)
+            .forEach((node) => {
+            var _a, _b;
+            if (!((_b = (_a = packageJson.peerDependenciesMeta) === null || _a === void 0 ? void 0 : _a[node.data.packageName]) === null || _b === void 0 ? void 0 : _b.optional)) {
+                list[node.data.packageName] = node.data.version;
+                recursivelyCollectPeerDependencies(node.name, graph, list, seen);
+            }
+        });
+        return list;
+    }
+    catch (e) {
+        return list;
+    }
+}
 //# sourceMappingURL=generate-package-json.js.map

package/src/executors/build/lib/generate-package-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/executors/build/lib/generate-package-json.ts"],"names":[],"mappings":";;;AACA,yCAA6C;AAC7C,2FAAsF;AAGtF;;;;;;;GAOG;AACH,SAAgB,mBAAmB,CACjC,WAAmB,EACnB,KAAmB,EACnB,OAA0B;;IAE1B,MAAM,WAAW,GAAG,IAAA,uCAAiB,EAAC,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACnE,WAAW,CAAC,IAAI,GAAG,MAAA,WAAW,CAAC,IAAI,mCAAI,OAAO,CAAC,cAAc,CAAC;IAC9D,OAAO,WAAW,CAAC,eAAe,CAAC;IACnC,IAAA,sBAAa,EAAC,GAAG,OAAO,CAAC,UAAU,eAAe,EAAE,WAAW,CAAC,CAAC;AACnE,CAAC;AATD,kDASC"}
+{"version":3,"file":"generate-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/forge/src/executors/build/lib/generate-package-json.ts"],"names":[],"mappings":"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"}