@equinor/fusion-framework-cli 11.0.0-next.16 → 11.0.0-next.18

package/dist/esm/lib/merge-dev-server-config.js

@@ -1,4 +1,20 @@
 import deepmerge from 'deepmerge';
+/**
+ * Merges two arrays of objects by a specified key, ensuring that objects with the same key value
+ * are merged, with the `source` array taking precedence over the `target` array for duplicate keys.
+ *
+ * @template TType - The type of objects contained in the arrays, extending `Record<string, unknown>`.
+ * @param key - The property key used to identify and merge objects from both arrays.
+ * @param target - The target array of objects to merge.
+ * @param source - The source array of objects to merge, whose values take precedence on key conflicts.
+ * @returns A new array containing merged objects, with uniqueness determined by the specified key.
+ */
+const keyedArrayMerger = (key, target, source) => {
+    const sourceRecords = source.reduce((acc, item) => Object.assign(acc, { [String(item[key])]: item }), {});
+    const targetRecords = target.reduce((acc, item) => Object.assign(acc, { [String(item[key])]: item }), {});
+    const mergedRecords = { ...targetRecords, ...sourceRecords };
+    return Object.values(mergedRecords);
+};
 /**
  * Merges a base development server configuration with an overrides object.
  *
@@ -12,8 +28,17 @@ import deepmerge from 'deepmerge';
  * Inline comments are provided for maintainability and clarity.
  */
 export const mergeDevServerConfig = (base, overrides) => {
-    // Use lodash.mergeWith to merge base and overrides, applying the customizer for arrays
-    return deepmerge(base, overrides);
+    return deepmerge(base, overrides, {
+        arrayMerge: (target, source) => {
+            // extract the first entry from both arrays to determine the merge strategy
+            const entry = source[0] ?? target[0];
+            // merge routes by 'match' if the entry is a route object
+            if (typeof entry === 'object' && 'match' in entry && 'middleware' in entry) {
+                return keyedArrayMerger('match', target, source);
+            }
+            return [...new Set([...target, ...source])];
+        },
+    });
 };
 // Export as default for convenience in imports
 export default mergeDevServerConfig;

package/dist/esm/lib/merge-dev-server-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-dev-server-config.js","sourceRoot":"","sources":["../../../src/lib/merge-dev-server-config.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAKlC;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,IAAsB,EACtB,SAA6C,EAC3B,EAAE;IACpB,uFAAuF;IACvF,OAAO,SAAS,CAAC,IAAI,EAAE,SAAS,CAAqB,CAAC;AACxD,CAAC,CAAC;AAEF,+CAA+C;AAC/C,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"merge-dev-server-config.js","sourceRoot":"","sources":["../../../src/lib/merge-dev-server-config.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAKlC;;;;;;;;;GASG;AACH,MAAM,gBAAgB,GAAG,CACvB,GAAgB,EAChB,MAAoB,EACpB,MAAoB,EACN,EAAE;IAChB,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAChE,EAAW,CACZ,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAChE,EAAW,CACZ,CAAC;IACF,MAAM,aAAa,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,aAAa,EAAE,CAAC;IAC7D,OAAO,MAAM,CAAC,MAAM,CAAC,aAAa,CAAiB,CAAC;AACtD,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,IAAsB,EACtB,SAA6C,EAC3B,EAAE;IACpB,OAAO,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE;QAChC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YAC7B,2EAA2E;YAC3E,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;YAErC,yDAAyD;YACzD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,IAAI,YAAY,IAAI,KAAK,EAAE,CAAC;gBAC3E,OAAO,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YACnD,CAAC;YACD,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC9C,CAAC;KACF,CAAqB,CAAC;AACzB,CAAC,CAAC;AAEF,+CAA+C;AAC/C,eAAe,oBAAoB,CAAC"}

package/dist/esm/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '11.0.0-next.16';
+export const version = '11.0.0-next.18';
 //# sourceMappingURL=version.js.map

package/dist/types/bin/app-tag.d.ts

@@ -47,5 +47,5 @@ export type TagApplicationOptions = {
  * @throws If the tag, app key, or version is invalid, or if the tag operation fails.
  * @public
  */
-export declare const tagApplication: (options: TagApplicationOptions) => Promise<unknown>;
+export declare const tagApplication: (options: TagApplicationOptions) => Promise<any>;
 export default tagApplication;

package/dist/types/cli/commands/disco/resolve.d.ts

@@ -7,7 +7,7 @@
  *
  * @command resolve
  * @description Resolve and display information about a service registered in Fusion service discovery.
- * @argument {string} service - Name of the service to resolve in Fusion service discovery.
+ * @param {string} service - Name of the service to resolve in Fusion service discovery.
  * @option {string} --env - Environment to use (e.g., prod, test).
  * @option {string} --token - Authentication token.
  * @option {string} --tenantId - Tenant ID for authentication.

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "11.0.0-next.16";
+export declare const version = "11.0.0-next.18";

package/docs/migration-v10-to-v11.md

@@ -1,5 +1,5 @@
 ---
-title: Migration Guide: v10 to v11 CLI Command Changes
+title: Migration Guide - v10 to v11 CLI Command Changes
 description: >
   Comprehensive guide to migrating CLI commands from v10 to v11 of the Fusion Framework, including deprecated commands, new command names, authentication changes, and best practices for updating scripts and pipelines.
 category: cli

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-cli",
-  "version": "11.0.0-next.16",
+  "version": "11.0.0-next.18",
   "homepage": "https://github.com/equinor/fusion-framework",
   "keywords": [
     "Fusion",
@@ -100,10 +100,10 @@
     "ora": "^8.0.1",
     "read-package-up": "^11.0.0",
     "vite": "^6.3.5",
-    "zod": "^3.25.20",
-    "@equinor/fusion-imports": "^1.1.1-next.1",
+    "zod": "^3.25.67",
+    "@equinor/fusion-framework-dev-portal": "^1.0.0-next.3",
     "@equinor/fusion-framework-dev-server": "^1.0.0-next.10",
-    "@equinor/fusion-framework-dev-portal": "^1.0.0-next.3"
+    "@equinor/fusion-imports": "^1.1.1-next.1"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^28.0.3",
@@ -111,7 +111,6 @@
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-replace": "^6.0.2",
     "@types/adm-zip": "^0.5.0",
-    "@types/node": "^20.11.14",
     "adm-zip": "^0.5.10",
     "ajv": "^8.17.1",
     "chalk": "^5.3.0",
@@ -124,8 +123,8 @@
     "type-fest": "^4.40.0",
     "typescript": "^5.8.2",
     "@equinor/fusion-framework-module": "^4.4.3-next.2",
-    "@equinor/fusion-framework-module-http": "^6.3.4-next.0",
     "@equinor/fusion-framework-module-msal-node": "^0.1.1-next.3",
+    "@equinor/fusion-framework-module-http": "^6.3.4-next.0",
     "@equinor/fusion-framework-module-app": "^6.1.17-next.0",
     "@equinor/fusion-framework-module-service-discovery": "^8.0.18-next.0"
   },