@toolsplus/nx-forge 4.0.0 → 4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolsplus/nx-forge",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Atlassian Forge plugin for Nx",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",

package/src/executors/build/executor.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const node_fs_1 = require("node:fs");
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
-const process_custom_ui_dependencies_1 = require("./lib/process-custom-ui-dependencies");
+const process_resource_dependencies_1 = require("./lib/process-resource-dependencies");
 const patch_manifest_yml_1 = require("./lib/patch-manifest-yml");
 const generate_package_json_1 = require("./lib/generate-package-json");
 const compile_webpack_1 = require("./lib/compile-webpack");
@@ -49,9 +49,9 @@ function runExecutor(rawOptions, context) {
             }
         }
         (0, copy_forge_app_assets_1.copyForgeAppAssets)(options);
-        const customUIResources = yield (0, process_custom_ui_dependencies_1.processCustomUIDependencies)(options, context);
-        yield (0, patch_manifest_yml_1.patchManifestYml)(options);
-        (0, generate_package_json_1.generatePackageJson)(context.projectName, context.projectGraph, customUIResources, options);
+        const resources = yield (0, process_resource_dependencies_1.processResourceDependencies)(Object.assign(Object.assign({}, options), { resourcePath: options.customUIPath }), context);
+        yield (0, patch_manifest_yml_1.patchManifestYml)(Object.assign(Object.assign({}, options), { resourcePath: options.customUIPath }));
+        (0, generate_package_json_1.generatePackageJson)(context.projectName, context.projectGraph, resources, options);
         devkit_1.logger.info('Executor ran for build');
         return {
             success: true,

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

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/build/executor.ts"],"names":[],"mappings":";;;AAAA,qCAA6C;AAE7C,uCAAoC;AAEpC,+DAA2D;AAC3D,yFAAmF;AACnF,iEAA4D;AAC5D,uEAAkE;AAClE,2DAAuD;AACvD,uEAAiE;AAEjE,SAAS,UAAU,CAAC,IAAc;IAChC,IAAI,CAAC;QACH,OAAO,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAA8B,WAAW,CACvC,UAAgC,EAChC,OAAwB;;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAY,CAAC,CAAC;QAEjE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAE7E,IAAI,UAAU,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,EAAE,CAAC;YACtD,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;;gBACrD,KAA2B,eAAA,gBAAA,sBAAA,WAAW,CAAA,iBAAA,2FAAE,CAAC;oBAAd,2BAAW;oBAAX,WAAW;oBAA3B,MAAM,MAAM,KAAA,CAAA;oBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;wBACpB,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,WAAW,GAAG,CAC9D,CAAC;oBACJ,CAAC;gBACH,CAAC;;;;;;;;;QACH,CAAC;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,IAAA,2CAAmB,EACjB,OAAO,CAAC,WAAY,EACpB,OAAO,CAAC,YAAa,EACrB,iBAAiB,EACjB,OAAO,CACR,CAAC;QAEF,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AA1CD,8BA0CC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/build/executor.ts"],"names":[],"mappings":";;;AAAA,qCAA6C;AAE7C,uCAAoC;AAEpC,+DAA2D;AAC3D,uFAAkF;AAClF,iEAA4D;AAC5D,uEAAkE;AAClE,2DAAuD;AACvD,uEAAiE;AAEjE,SAAS,UAAU,CAAC,IAAc;IAChC,IAAI,CAAC;QACH,OAAO,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAA8B,WAAW,CACvC,UAAgC,EAChC,OAAwB;;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAY,CAAC,CAAC;QAEjE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAE7E,IAAI,UAAU,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,EAAE,CAAC;YACtD,MAAM,WAAW,GAAG,IAAA,gCAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;;gBACrD,KAA2B,eAAA,gBAAA,sBAAA,WAAW,CAAA,iBAAA,2FAAE,CAAC;oBAAd,2BAAW;oBAAX,WAAW;oBAA3B,MAAM,MAAM,KAAA,CAAA;oBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;wBACpB,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,WAAW,GAAG,CAC9D,CAAC;oBACJ,CAAC;gBACH,CAAC;;;;;;;;;QACH,CAAC;QAED,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;QAE5B,MAAM,SAAS,GAAG,MAAM,IAAA,2DAA2B,kCAC5C,OAAO,KAAE,YAAY,EAAE,OAAO,CAAC,YAAY,KAChD,OAAO,CACR,CAAC;QACF,MAAM,IAAA,qCAAgB,kCAAM,OAAO,KAAE,YAAY,EAAE,OAAO,CAAC,YAAY,IAAG,CAAC;QAC3E,IAAA,2CAAmB,EACjB,OAAO,CAAC,WAAY,EACpB,OAAO,CAAC,YAAa,EACrB,SAAS,EACT,OAAO,CACR,CAAC;QAEF,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AA9CD,8BA8CC"}

package/src/executors/build/lib/normalize-options.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 function normalizeOptions(options, root, sourceRoot, projectRoot) {
-    var _a, _b;
+    var _a, _b, _c;
     return Object.assign(Object.assign({}, options), { root,
         sourceRoot,
-        projectRoot, customUIPath: (_a = options.customUIPath) !== null && _a !== void 0 ? _a : 'customUI', outputFileName: 'index.js', watch: (_b = options.watch) !== null && _b !== void 0 ? _b : false });
+        projectRoot, customUIPath: (_a = options.customUIPath) !== null && _a !== void 0 ? _a : 'customUI', resourceOutputPathMap: (_b = options.resourceOutputPathMap) !== null && _b !== void 0 ? _b : {}, outputFileName: 'index.js', watch: (_c = options.watch) !== null && _c !== void 0 ? _c : false });
 }
 exports.normalizeOptions = normalizeOptions;
 //# sourceMappingURL=normalize-options.js.map

package/src/executors/build/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/normalize-options.ts"],"names":[],"mappings":";;;AAEA,SAAgB,gBAAgB,CAC9B,OAA6B,EAC7B,IAAY,EACZ,UAAkB,EAClB,WAAmB;;IAEnB,uCACK,OAAO,KACV,IAAI;QACJ,UAAU;QACV,WAAW,EACX,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,UAAU,EAChD,cAAc,EAAE,UAAU,EAC1B,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,KAAK,IAC7B;AACJ,CAAC;AAfD,4CAeC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/normalize-options.ts"],"names":[],"mappings":";;;AAEA,SAAgB,gBAAgB,CAC9B,OAA6B,EAC7B,IAAY,EACZ,UAAkB,EAClB,WAAmB;;IAEnB,uCACK,OAAO,KACV,IAAI;QACJ,UAAU;QACV,WAAW,EACX,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,UAAU,EAChD,qBAAqB,EAAE,MAAA,OAAO,CAAC,qBAAqB,mCAAI,EAAE,EAC1D,cAAc,EAAE,UAAU,EAC1B,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,KAAK,IAC7B;AACJ,CAAC;AAhBD,4CAgBC"}

package/src/executors/build/lib/patch-manifest-yml.d.ts

@@ -1,10 +1,12 @@
 import { NormalizedOptions } from '../schema';
-type Options = Pick<NormalizedOptions, 'root' | 'outputPath' | 'customUIPath'>;
+type Options = Pick<NormalizedOptions, 'root' | 'outputPath' | 'uiKit2Packaging'> & {
+    resourcePath: string;
+};
 /**
- * Patches the output manifest.yml file to replace resource path parameters to point to the actual Custom UI build
+ * Patches the output manifest.yml file to replace resource path parameters to point to the actual resource build
  * artifacts instead of the Nx project reference.
  *
- * This assumes that Custom UI artifacts have already been copied to the output directory in a previous step.
+ * This assumes that resource artifacts have already been copied to the output directory in a previous step.
  *
  * @param options Executor options
  */

package/src/executors/build/lib/patch-manifest-yml.js

@@ -5,27 +5,130 @@ const tslib_1 = require("tslib");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const manifest_yml_1 = require("../../../utils/forge/manifest-yml");
+const fs_1 = require("fs");
 /**
- * Patches the output manifest.yml file to replace resource path parameters to point to the actual Custom UI build
+ * Patches the output manifest.yml file to replace resource path parameters to point to the actual resource build
  * artifacts instead of the Nx project reference.
  *
- * This assumes that Custom UI artifacts have already been copied to the output directory in a previous step.
+ * This assumes that resource artifacts have already been copied to the output directory in a previous step.
  *
  * @param options Executor options
  */
 function patchManifestYml(options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const manifestPath = (0, devkit_1.joinPathFragments)((0, path_1.resolve)(options.root, options.outputPath), 'manifest.yml');
+        const absoluteOutputPath = (0, path_1.resolve)(options.root, options.outputPath);
+        const manifestPath = (0, devkit_1.joinPathFragments)(absoluteOutputPath, 'manifest.yml');
         devkit_1.logger.info(`Patching ${manifestPath}...`);
         const manifestSchema = yield (0, manifest_yml_1.readManifestYml)(manifestPath);
-        const resources = manifestSchema.resources || [];
-        const patchedManifest = Object.assign(Object.assign({}, manifestSchema), { resources: resources.map((r) => patchResource(options.customUIPath, r)) });
+        const patchedManifest = patchManifestInternal(absoluteOutputPath, manifestSchema, options);
         (0, manifest_yml_1.writeManifestYml)(manifestPath, patchedManifest);
         devkit_1.logger.info(`Done patching ${manifestPath}.`);
     });
 }
 exports.patchManifestYml = patchManifestYml;
-function patchResource(customUIPath, resource) {
-    return Object.assign(Object.assign({}, resource), { path: `${customUIPath}/${resource.path}` });
+function patchManifestInternal(absoluteOutputPath, manifestSchema, options) {
+    var _a;
+    const resources = manifestSchema.resources || [];
+    if (!options.uiKit2Packaging) {
+        return Object.assign(Object.assign({}, manifestSchema), { resources: resources.map((resource) => (Object.assign(Object.assign({}, resource), { path: `${options.resourcePath}/${resource.path}` }))) });
+    }
+    else {
+        const resourceTypeIndex = getResourceTypeIndex((_a = manifestSchema.modules) !== null && _a !== void 0 ? _a : {}, resources);
+        return Object.assign(Object.assign({}, manifestSchema), { resources: resources.map((r) => patchResource(options.resourcePath, r, absoluteOutputPath, resourceTypeIndex[r.key])) });
+    }
+}
+/**
+ * Computes an index from resource key to resource type which is either UI Kit 2 or Custom UI. The resource type
+ * is inferred from the module declaration. If a module has both the `resource` property and `render: native` declared,
+ * it means its resource has to be of type UI Kit 2. If a module, on the other hand, only declares the `resource`
+ * property, it means the resource must be a Custom UI.
+ *
+ * @param modules Modules declared in the manifest
+ * @param resources Resources declared in the manifest
+ */
+function getResourceTypeIndex(modules, resources) {
+    const modulesEntries = Object.entries(modules);
+    const resourceKeys = resources.map((r) => r.key);
+    const indexModuleDefinition = (acc, moduleType, moduleDefinition) => {
+        var _a;
+        const moduleResourceKey = moduleDefinition['resource'];
+        if (resourceKeys.includes(moduleResourceKey)) {
+            const type = moduleDefinition['render'] === 'native' ? 'ui-kit-2' : 'custom-ui';
+            const existingIndexEntry = acc[moduleResourceKey];
+            if (existingIndexEntry && existingIndexEntry.type !== type) {
+                devkit_1.logger.warn(`Inconsistent resource mapping in manifest.yml: Module ${moduleType} (${moduleDefinition['key']}) declares its resource to be of type ${type} but other modules with keys [${existingIndexEntry.modules
+                    .map(([, m]) => m['key'])
+                    .join(', ')}] pointing to the same resource appear to be of a different type`);
+            }
+            const existingModules = (_a = existingIndexEntry === null || existingIndexEntry === void 0 ? void 0 : existingIndexEntry.modules) !== null && _a !== void 0 ? _a : [];
+            return Object.assign(Object.assign({}, acc), { [moduleResourceKey]: {
+                    type,
+                    modules: [...existingModules, [moduleType, moduleDefinition]],
+                } });
+        }
+        else {
+            return acc;
+        }
+    };
+    const resourceTypeIndex = modulesEntries.reduce((acc, [moduleType, moduleDefinitions]) => {
+        return moduleDefinitions.reduce((innerAcc, moduleDefinition) => indexModuleDefinition(innerAcc, moduleType, moduleDefinition), acc);
+    }, {});
+    const resourceTypeIndexKeySet = new Set(Object.keys(resourceTypeIndex));
+    const resourceKeySet = new Set(resourceKeys);
+    if (resourceTypeIndexKeySet.size === resourceKeySet.size &&
+        [...resourceTypeIndexKeySet].every((k) => resourceKeySet.has(k))) {
+        return resourceTypeIndex;
+    }
+    else {
+        const missingResourceKeys = [...resourceKeySet].filter((k) => !resourceTypeIndexKeySet.has(k));
+        devkit_1.logger.warn(`Failed to find module definition for resources with keys ${missingResourceKeys}`);
+        return resourceTypeIndex;
+    }
+}
+/**
+ * Returns the final resource path based on the given resource type.
+ *
+ * Verifies that the path/file exists in the computed directory. UI Kit 2 builds are expected to produce an accepted
+ * bundle filename.
+ *
+ * @param resourcePath Path where all resource build artifacts are placed, relative to the app root directory
+ * @param resourceType Type of the given resource, `ui-kit-2` or `custom-ui`
+ * @param resource Resource to process
+ * @param absoluteOutputPath Absolute project output path
+ */
+function getVerifiedResourcePath(resourcePath, resourceType, resource, absoluteOutputPath) {
+    const resourceProjectName = resource.path;
+    const relativeResourcePath = (0, path_1.join)(resourcePath, resourceProjectName);
+    const absoluteResourcePath = (0, path_1.join)(absoluteOutputPath, relativeResourcePath);
+    if (!(0, fs_1.existsSync)(absoluteResourcePath)) {
+        throw new Error(`Failed to patch resource with key '${resource.key}': No resource artifacts found in ${absoluteOutputPath}. Did you forget to build the resource?`);
+    }
+    if (resourceType === 'custom-ui') {
+        devkit_1.logger.info(`Detected resource '${resource.key}' as Custom UI dependency`);
+        return relativeResourcePath;
+    }
+    devkit_1.logger.info(`Detected resource '${resource.key}' as UI Kit 2 dependency`);
+    const acceptedUiKit2EntryPoints = [
+        'index.js',
+        'index.jsx',
+        'main.js',
+        'main.jsx',
+    ];
+    const entryPointFile = acceptedUiKit2EntryPoints.find((entryPointFile) => (0, fs_1.existsSync)((0, path_1.join)(absoluteResourcePath, entryPointFile)));
+    if (entryPointFile) {
+        return `${relativeResourcePath}/${entryPointFile}`;
+    }
+    else {
+        throw new Error(`Failed to patch resource with key '${resource.key}': Could not find entry point file in ${absoluteResourcePath}. Make sure the UI Kit 2 build produces a files with one of these names: [${acceptedUiKit2EntryPoints.join(',')}]`);
+    }
+}
+function patchResource(resourcePath, resource, absoluteOutputPath, resourceContext) {
+    devkit_1.logger.info(`Patching resource with key '${resource.key}'...`);
+    if (!resourceContext) {
+        devkit_1.logger.warn(`Resource with key '${resource.key}' appears not to be used by any module. Skip patching.`);
+        return resource;
+    }
+    const verifiedResourcePath = getVerifiedResourcePath(resourcePath, resourceContext.type, resource, absoluteOutputPath);
+    return Object.assign(Object.assign({}, resource), { path: verifiedResourcePath });
 }
 //# sourceMappingURL=patch-manifest-yml.js.map

package/src/executors/build/lib/patch-manifest-yml.js.map

@@ -1 +1 @@
-{"version":3,"file":"patch-manifest-yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/patch-manifest-yml.ts"],"names":[],"mappings":";;;;AAAA,+BAA+B;AAC/B,uCAAuD;AAIvD,oEAG2C;AAI3C;;;;;;;GAOG;AACH,SAAsB,gBAAgB,CAAC,OAAgB;;QACrD,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,EACzC,cAAc,CACf,CAAC;QAEF,eAAM,CAAC,IAAI,CAAC,YAAY,YAAY,KAAK,CAAC,CAAC;QAE3C,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,CAAC;QAE3D,MAAM,SAAS,GAAc,cAAc,CAAC,SAAS,IAAI,EAAE,CAAC;QAC5D,MAAM,eAAe,mCAChB,cAAc,KACjB,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,GACxE,CAAC;QAEF,IAAA,+BAAgB,EAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAEhD,eAAM,CAAC,IAAI,CAAC,iBAAiB,YAAY,GAAG,CAAC,CAAC;IAChD,CAAC;CAAA;AAnBD,4CAmBC;AAED,SAAS,aAAa,CACpB,YAAoB,EACpB,QAA+B;IAE/B,uCACK,QAAQ,KACX,IAAI,EAAE,GAAG,YAAY,IAAI,QAAQ,CAAC,IAAI,EAAE,IACxC;AACJ,CAAC"}
+{"version":3,"file":"patch-manifest-yml.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/patch-manifest-yml.ts"],"names":[],"mappings":"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"}

package/src/executors/build/lib/{process-custom-ui-dependencies.d.ts → process-resource-dependencies.d.ts}

@@ -1,14 +1,16 @@
-import type { ExecutorContext } from '@nx/devkit';
+import { ExecutorContext } from '@nx/devkit';
 import { Resources } from '@forge/manifest';
 import { NormalizedOptions } from '../schema';
-type Options = Pick<NormalizedOptions, 'root' | 'outputPath' | 'customUIPath'>;
+type Options = Pick<NormalizedOptions, 'root' | 'outputPath' | 'resourceOutputPathMap'> & {
+    resourcePath: string;
+};
 /**
- * Verifies that Custom UI projects are correctly linked to the Nx Forge app and copies build artifacts into the app's
+ * Verifies that resource projects are correctly linked to the Nx Forge app and copies build artifacts into the app's
  * output directory. In particular, this will make sure that each resource listed in the manifest.yml has its path
  * configured to point to a Nx project in this workspace.
  *
  * @param options Executor options
  * @param context Executor context
  */
-export declare function processCustomUIDependencies(options: Options, context: ExecutorContext): Promise<Resources>;
+export declare function processResourceDependencies(options: Options, context: ExecutorContext): Promise<Resources>;
 export {};

package/src/executors/build/lib/process-resource-dependencies.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processResourceDependencies = void 0;
+const tslib_1 = require("tslib");
+const fs_extra_1 = require("fs-extra");
+const fs_1 = require("fs");
+const devkit_1 = require("@nx/devkit");
+const manifest_yml_1 = require("../../../utils/forge/manifest-yml");
+/**
+ * Verifies that resource projects are correctly linked to the Nx Forge app and copies build artifacts into the app's
+ * output directory. In particular, this will make sure that each resource listed in the manifest.yml has its path
+ * configured to point to a Nx project in this workspace.
+ *
+ * @param options Executor options
+ * @param context Executor context
+ */
+function processResourceDependencies(options, context) {
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const manifestPath = (0, devkit_1.joinPathFragments)(context.root, context.projectsConfigurations.projects[context.projectName].root, 'manifest.yml');
+        const manifestSchema = yield (0, manifest_yml_1.readManifestYml)(manifestPath);
+        const resources = (_a = manifestSchema.resources) !== null && _a !== void 0 ? _a : [];
+        resources.forEach((r) => verifyAndCopyResourceDependency(r, context, options));
+        return resources;
+    });
+}
+exports.processResourceDependencies = processResourceDependencies;
+const getResourceOutputPath = (options, resourceProjectGraphNode, configurationName) => {
+    var _a, _b;
+    const resourceProjectName = resourceProjectGraphNode.data.name;
+    const maybeResourceOutputPath = options.resourceOutputPathMap[resourceProjectName];
+    if (maybeResourceOutputPath &&
+        typeof maybeResourceOutputPath === 'string' &&
+        maybeResourceOutputPath !== '') {
+        return maybeResourceOutputPath;
+    }
+    const maybeBuildTargetOutputPathOption = (_b = (_a = resourceProjectGraphNode.data.targets['build']) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.outputPath;
+    if (maybeBuildTargetOutputPathOption) {
+        return maybeBuildTargetOutputPathOption;
+    }
+    const [firstOutputDefinition, ...otherOutputDefinitions] = (0, devkit_1.getOutputsForTargetAndConfiguration)({
+        project: resourceProjectName,
+        target: 'build',
+        configuration: configurationName,
+    }, {}, resourceProjectGraphNode);
+    if (firstOutputDefinition && otherOutputDefinitions.length === 0) {
+        return firstOutputDefinition;
+    }
+    throw new Error(`Failed to infer output path for resource project '${resourceProjectName}': Try to define an explicit output path mapping using the 'resourceOutputPathMap' option of this executor. Add an entry to the mapping object as follows: {'${resourceProjectName}': '<replace-with-project-output-path>'}.`);
+};
+const verifyAndCopyResourceDependency = (resource, context, options) => {
+    const resourceProjectName = resource.path;
+    const resourceProjectGraphNode = context.projectGraph.nodes[resourceProjectName];
+    const resourceProjectConfiguration = resourceProjectGraphNode === null || resourceProjectGraphNode === void 0 ? void 0 : resourceProjectGraphNode.data;
+    if (!resourceProjectGraphNode || !resourceProjectConfiguration) {
+        throw new Error(`Nx workspace is missing project for resource path ${resourceProjectName}. Make sure the resource path references a project in your Nx workspace.`);
+    }
+    const resourceBuildTargetOutputPath = getResourceOutputPath(options, resourceProjectGraphNode, context.configurationName);
+    const absoluteResourceBuildTargetOutputPath = (0, devkit_1.joinPathFragments)(context.root, resourceBuildTargetOutputPath);
+    if (!resourceBuildTargetOutputPath ||
+        !(0, fs_1.existsSync)(absoluteResourceBuildTargetOutputPath) ||
+        (0, fs_1.readdirSync)(absoluteResourceBuildTargetOutputPath).length === 0) {
+        throw new Error(`Project ${resourceProjectName} has no build artifacts in output directory '${resourceBuildTargetOutputPath}'. Make sure the project produces compatible build artifacts.`);
+    }
+    devkit_1.logger.info(`Copying ${resourceProjectName} resource build artifacts...`);
+    (0, fs_extra_1.copySync)(absoluteResourceBuildTargetOutputPath, (0, devkit_1.joinPathFragments)(options.root, options.outputPath, options.resourcePath, resourceProjectName), { recursive: true });
+    devkit_1.logger.info(`Done copying ${resourceProjectName} resource build artifacts.`);
+};
+//# sourceMappingURL=process-resource-dependencies.js.map

package/src/executors/build/lib/process-resource-dependencies.js.map

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

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

@@ -4,6 +4,8 @@ export interface BuildExecutorOptions {
   watch: boolean;
   sourceMap?: boolean | 'hidden';
   webpackConfig?: string;
+  resourceOutputPathMap?: Record<string, string>;
+  uiKit2Packaging: boolean;
 }
 
 export interface NormalizedOptions extends BuildExecutorOptions {
@@ -13,4 +15,5 @@ export interface NormalizedOptions extends BuildExecutorOptions {
   customUIPath: string;
   outputPath: string;
   outputFileName: string;
+  resourceOutputPathMap: Record<string, string>;
 }

package/src/executors/build/schema.json

@@ -14,6 +14,11 @@
       "type": "string",
       "description": "Custom UI output path relative to the outputPath."
     },
+    "resourceOutputPathMap": {
+      "type": "object",
+      "description": "Map of resource project names to their respective output path.",
+      "default": {}
+    },
     "watch": {
       "type": "boolean",
       "description": "Enable re-building when files change.",
@@ -36,6 +41,11 @@
       "x-completion-type": "file",
       "x-completion-glob": "webpack?(*)@(.js|.ts)",
       "x-priority": "important"
+    },
+    "uiKit2Packaging": {
+      "type": "boolean",
+      "description": "Enables UI Kit 2 compatible packaging.",
+      "default": false
     }
   },
   "required": ["outputPath"]

package/src/executors/package/executor.js

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const process_custom_ui_dependencies_1 = require("../build/lib/process-custom-ui-dependencies");
+const process_resource_dependencies_1 = require("../build/lib/process-resource-dependencies");
 const patch_manifest_yml_1 = require("../build/lib/patch-manifest-yml");
 const generate_package_json_1 = require("../build/lib/generate-package-json");
 const copy_forge_app_assets_1 = require("../build/lib/copy-forge-app-assets");
 function normalizeOptions(options, root, sourceRoot, projectRoot) {
-    var _a;
+    var _a, _b;
     return Object.assign(Object.assign({}, options), { root,
         sourceRoot,
-        projectRoot, resourcePath: (_a = options.resourcePath) !== null && _a !== void 0 ? _a : 'resources' });
+        projectRoot, resourcePath: (_a = options.resourcePath) !== null && _a !== void 0 ? _a : 'resources', resourceOutputPathMap: (_b = options.resourceOutputPathMap) !== null && _b !== void 0 ? _b : {} });
 }
 exports.normalizeOptions = normalizeOptions;
 function runExecutor(rawOptions, context) {
@@ -25,9 +25,9 @@ function runExecutor(rawOptions, context) {
         }
         const options = normalizeOptions(rawOptions, context.root, sourceRoot, root);
         (0, copy_forge_app_assets_1.copyForgeAppAssets)(options);
-        const customUIResources = yield (0, process_custom_ui_dependencies_1.processCustomUIDependencies)(Object.assign(Object.assign({}, options), { customUIPath: options.resourcePath }), context);
-        yield (0, patch_manifest_yml_1.patchManifestYml)(Object.assign(Object.assign({}, options), { customUIPath: options.resourcePath }));
-        (0, generate_package_json_1.generatePackageJson)(context.projectName, context.projectGraph, customUIResources, options);
+        const resources = yield (0, process_resource_dependencies_1.processResourceDependencies)(Object.assign(Object.assign({}, options), { resourcePath: options.resourcePath }), context);
+        yield (0, patch_manifest_yml_1.patchManifestYml)(Object.assign(Object.assign({}, options), { resourcePath: options.resourcePath }));
+        (0, generate_package_json_1.generatePackageJson)(context.projectName, context.projectGraph, resources, options);
         devkit_1.logger.info('Executor ran for package');
         return {
             success: true,

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

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/package/executor.ts"],"names":[],"mappings":";;;;AAAA,uCAAqD;AAErD,gGAA0F;AAC1F,wEAAmE;AACnE,8EAAyE;AACzE,8EAAwE;AAExE,SAAgB,gBAAgB,CAC9B,OAA8B,EAC9B,IAAY,EACZ,UAAkB,EAClB,WAAmB;;IAEnB,uCACK,OAAO,KACV,IAAI;QACJ,UAAU;QACV,WAAW,EACX,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,WAAW,IACjD;AACJ,CAAC;AAbD,4CAaC;AAED,SAA8B,WAAW,CACvC,UAAiC,EACjC,OAAwB;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAY,CAAC,CAAC;QAEjE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAE7E,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;QAE5B,MAAM,iBAAiB,GAAG,MAAM,IAAA,4DAA2B,kCACpD,OAAO,KAAE,YAAY,EAAE,OAAO,CAAC,YAAY,KAChD,OAAO,CACR,CAAC;QAEF,MAAM,IAAA,qCAAgB,kCAAM,OAAO,KAAE,YAAY,EAAE,OAAO,CAAC,YAAY,IAAG,CAAC;QAE3E,IAAA,2CAAmB,EACjB,OAAO,CAAC,WAAY,EACpB,OAAO,CAAC,YAAa,EACrB,iBAAiB,EACjB,OAAO,CACR,CAAC;QAEF,eAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACxC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;CAAA;AArCD,8BAqCC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/executors/package/executor.ts"],"names":[],"mappings":";;;;AAAA,uCAAqD;AAErD,8FAAyF;AACzF,wEAAmE;AACnE,8EAAyE;AACzE,8EAAwE;AAExE,SAAgB,gBAAgB,CAC9B,OAA8B,EAC9B,IAAY,EACZ,UAAkB,EAClB,WAAmB;;IAEnB,uCACK,OAAO,KACV,IAAI;QACJ,UAAU;QACV,WAAW,EACX,YAAY,EAAE,MAAA,OAAO,CAAC,YAAY,mCAAI,WAAW,EACjD,qBAAqB,EAAE,MAAA,OAAO,CAAC,qBAAqB,mCAAI,EAAE,IAC1D;AACJ,CAAC;AAdD,4CAcC;AAED,SAA8B,WAAW,CACvC,UAAiC,EACjC,OAAwB;;QAExB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACxB,OAAO,CAAC,sBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAY,CAAC,CAAC;QAEjE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,8BAA8B,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,wBAAwB,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAE7E,IAAA,0CAAkB,EAAC,OAAO,CAAC,CAAC;QAE5B,MAAM,SAAS,GAAG,MAAM,IAAA,2DAA2B,kCAC5C,OAAO,KAAE,YAAY,EAAE,OAAO,CAAC,YAAY,KAChD,OAAO,CACR,CAAC;QAEF,MAAM,IAAA,qCAAgB,kCAAM,OAAO,KAAE,YAAY,EAAE,OAAO,CAAC,YAAY,IAAG,CAAC;QAE3E,IAAA,2CAAmB,EACjB,OAAO,CAAC,WAAY,EACpB,OAAO,CAAC,YAAa,EACrB,SAAS,EACT,OAAO,CACR,CAAC;QAEF,eAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACxC,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;CAAA;AArCD,8BAqCC"}

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

@@ -1,6 +1,8 @@
 export interface PackageExecutorSchema {
   outputPath: string;
   resourcePath?: string;
+  resourceOutputPathMap?: Record<string, string>;
+  uiKit2Packaging: boolean;
 }
 
 export interface NormalizedOptions extends PackageExecutorSchema {
@@ -9,4 +11,5 @@ export interface NormalizedOptions extends PackageExecutorSchema {
   projectRoot: string;
   resourcePath: string;
   outputPath: string;
+  resourceOutputPathMap: Record<string, string>;
 }

package/src/executors/package/schema.json

@@ -12,6 +12,16 @@
     "resourcePath": {
       "type": "string",
       "description": "Path where resource files such as Custom UI output is placed relative to the outputPath."
+    },
+    "resourceOutputPathMap": {
+      "type": "object",
+      "description": "Map of resource project names to their respective output path.",
+      "default": {}
+    },
+    "uiKit2Packaging": {
+      "type": "boolean",
+      "description": "Enables UI Kit 2 compatible packaging.",
+      "default": false
     }
   },
   "required": ["outputPath"]

package/src/executors/build/lib/process-custom-ui-dependencies.js

@@ -1,46 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.processCustomUIDependencies = void 0;
-const tslib_1 = require("tslib");
-const fs_extra_1 = require("fs-extra");
-const fs_1 = require("fs");
-const devkit_1 = require("@nx/devkit");
-const manifest_yml_1 = require("../../../utils/forge/manifest-yml");
-/**
- * Verifies that Custom UI projects are correctly linked to the Nx Forge app and copies build artifacts into the app's
- * output directory. In particular, this will make sure that each resource listed in the manifest.yml has its path
- * configured to point to a Nx project in this workspace.
- *
- * @param options Executor options
- * @param context Executor context
- */
-function processCustomUIDependencies(options, context) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const manifestPath = (0, devkit_1.joinPathFragments)(context.root, context.projectsConfigurations.projects[context.projectName].root, 'manifest.yml');
-        const manifestSchema = yield (0, manifest_yml_1.readManifestYml)(manifestPath);
-        const resources = (_a = manifestSchema.resources) !== null && _a !== void 0 ? _a : [];
-        resources.forEach((r) => verifyAndCopyCustomUIDependency(r, context, options));
-        return resources;
-    });
-}
-exports.processCustomUIDependencies = processCustomUIDependencies;
-const verifyAndCopyCustomUIDependency = (resource, context, options) => {
-    var _a, _b;
-    const customUIProjectName = resource.path;
-    const customUIProjectConfiguration = context.projectsConfigurations.projects[customUIProjectName];
-    if (!customUIProjectConfiguration) {
-        throw new Error(`Nx workspace is missing project for Custom UI path ${customUIProjectName}. Make sure the Custom UI resource path references a project in your Nx workspace.`);
-    }
-    const customUIBuildTargetOutputPath = (_b = (_a = customUIProjectConfiguration.targets['build']) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.outputPath;
-    const absoluteCustomUIBuildTargetOutputPath = (0, devkit_1.joinPathFragments)(context.root, customUIBuildTargetOutputPath);
-    if (!customUIBuildTargetOutputPath ||
-        !(0, fs_1.existsSync)(absoluteCustomUIBuildTargetOutputPath) ||
-        (0, fs_1.readdirSync)(absoluteCustomUIBuildTargetOutputPath).length === 0) {
-        throw new Error(`Project ${customUIProjectName} is missing build artifacts. Make sure the project produces Custom UI compatible build artifacts.`);
-    }
-    devkit_1.logger.info(`Copying ${customUIProjectName} Custom UI build artifacts...`);
-    (0, fs_extra_1.copySync)(absoluteCustomUIBuildTargetOutputPath, (0, devkit_1.joinPathFragments)(options.root, options.outputPath, options.customUIPath, customUIProjectName), { recursive: true });
-    devkit_1.logger.info(`Done copying ${customUIProjectName} Custom UI build artifacts.`);
-};
-//# sourceMappingURL=process-custom-ui-dependencies.js.map

package/src/executors/build/lib/process-custom-ui-dependencies.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"process-custom-ui-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/executors/build/lib/process-custom-ui-dependencies.ts"],"names":[],"mappings":";;;;AAAA,uCAAoC;AACpC,2BAA6C;AAE7C,uCAAuD;AAIvD,oEAAoE;AAIpE;;;;;;;GAOG;AACH,SAAsB,2BAA2B,CAC/C,OAAgB,EAChB,OAAwB;;;QAExB,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACjE,cAAc,CACf,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,MAAA,cAAc,CAAC,SAAS,mCAAI,EAAE,CAAC;QAEjD,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACtB,+BAA+B,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CACrD,CAAC;QAEF,OAAO,SAAS,CAAC;;CAClB;AAjBD,kEAiBC;AAED,MAAM,+BAA+B,GAAG,CACtC,QAA+B,EAC/B,OAAwB,EACxB,OAAgB,EACV,EAAE;;IACR,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,CAAC;IAE1C,MAAM,4BAA4B,GAChC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAE/D,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACb,sDAAsD,mBAAmB,oFAAoF,CAC9J,CAAC;IACJ,CAAC;IAED,MAAM,6BAA6B,GACjC,MAAA,MAAA,4BAA4B,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,OAAO,0CAAE,UAAU,CAAC;IACrE,MAAM,qCAAqC,GAAG,IAAA,0BAAiB,EAC7D,OAAO,CAAC,IAAI,EACZ,6BAA6B,CAC9B,CAAC;IAEF,IACE,CAAC,6BAA6B;QAC9B,CAAC,IAAA,eAAU,EAAC,qCAAqC,CAAC;QAClD,IAAA,gBAAW,EAAC,qCAAqC,CAAC,CAAC,MAAM,KAAK,CAAC,EAC/D,CAAC;QACD,MAAM,IAAI,KAAK,CACb,WAAW,mBAAmB,mGAAmG,CAClI,CAAC;IACJ,CAAC;IAED,eAAM,CAAC,IAAI,CAAC,WAAW,mBAAmB,+BAA+B,CAAC,CAAC;IAC3E,IAAA,mBAAQ,EACN,qCAAqC,EACrC,IAAA,0BAAiB,EACf,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,YAAY,EACpB,mBAAmB,CACpB,EACD,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;IACF,eAAM,CAAC,IAAI,CAAC,gBAAgB,mBAAmB,6BAA6B,CAAC,CAAC;AAChF,CAAC,CAAC"}