@equinor/fusion-framework-cli 15.7.2-next.1 → 15.7.2

package/dist/esm/lib/app/merge-app-config.js

@@ -1,4 +1,4 @@
-import deepmerge from 'deepmerge';
+import { mergeConfig } from '../utils/merge-config.js';
 /**
  * Merges a base application configuration object with an overrides object,
  * returning a new configuration object. If the `scopes` property is present
@@ -11,18 +11,8 @@ import deepmerge from 'deepmerge';
  * @returns A new configuration object resulting from merging `base` and `overrides`.
  */
 export const mergeAppConfig = (base, overrides) => {
-    // if scopes are provided in overrides, use the new scopes
-    return deepmerge(base, overrides, {
-        customMerge: (key) => {
-            // Replace (rather than deep-merge) scopes so overrides fully control the array
-            if (key === 'scopes') {
-                return (_target, source) => {
-                    // If scopes are provided in overrides, replace the base scopes with the new ones
-                    return source;
-                };
-            }
-            return undefined; // Use default merging for other keys
-        },
-    });
+    return mergeConfig(base, overrides, (target, source, key) => 
+    // Replace scopes so overrides fully control which scopes are requested; append other arrays
+    key === 'scopes' ? source : target.concat(source));
 };
 //# sourceMappingURL=merge-app-config.js.map

package/dist/esm/lib/app/merge-app-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-app-config.js","sourceRoot":"","sources":["../../../../src/lib/app/merge-app-config.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAGlC;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAsB,IAAO,EAAE,SAAqB,EAAK,EAAE;IACvF,0DAA0D;IAC1D,OAAO,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE;QAChC,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE;YACnB,+EAA+E;YAC/E,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACrB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACzB,iFAAiF;oBACjF,OAAO,MAAM,CAAC;gBAChB,CAAC,CAAC;YACJ,CAAC;YACD,OAAO,SAAS,CAAC,CAAC,qCAAqC;QACzD,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"merge-app-config.js","sourceRoot":"","sources":["../../../../src/lib/app/merge-app-config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAsB,IAAO,EAAE,SAAqB,EAAK,EAAE;IACvF,OAAO,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;IAC1D,4FAA4F;IAC5F,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAClD,CAAC;AACJ,CAAC,CAAC"}

package/dist/esm/lib/app/merge-app-config.test.js

@@ -0,0 +1,34 @@
+import { describe, expect, it } from 'vitest';
+import { mergeAppConfig } from './merge-app-config.js';
+/**
+ * Treats a minimal fixture as an app config shape.
+ *
+ * @template T - Shape the fixture stands in for.
+ * @param value - Minimal fixture object.
+ * @returns The fixture typed as `T`.
+ */
+const fixture = (value) => 
+// Fixtures only carry the keys under test; the merge never reads the omitted required fields
+value;
+describe('mergeAppConfig', () => {
+    it('replaces scopes at any depth while deep-merging other properties', () => {
+        const base = fixture({
+            environment: { a: 1 },
+            endpoints: { api: { url: 'https://base', scopes: ['base/.default'] } },
+        });
+        const overrides = fixture({
+            environment: { b: 2 },
+            endpoints: { api: { scopes: ['override/.default'] } },
+        });
+        expect(mergeAppConfig(base, overrides)).toEqual({
+            environment: { a: 1, b: 2 },
+            endpoints: { api: { url: 'https://base', scopes: ['override/.default'] } },
+        });
+    });
+    it('does not mutate the base configuration', () => {
+        const base = fixture({ environment: { a: 1 } });
+        mergeAppConfig(base, fixture({ environment: { b: 2 } }));
+        expect(base).toEqual({ environment: { a: 1 } });
+    });
+});
+//# sourceMappingURL=merge-app-config.test.js.map

package/dist/esm/lib/app/merge-app-config.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-app-config.test.js","sourceRoot":"","sources":["../../../../src/lib/app/merge-app-config.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;;;;;GAMG;AACH,MAAM,OAAO,GAAG,CAAI,KAAc,EAAK,EAAE;AACvC,6FAA6F;AAC7F,KAAU,CAAC;AAEb,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,IAAI,GAAG,OAAO,CAAY;YAC9B,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE;YACrB,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,eAAe,CAAC,EAAE,EAAE;SACvE,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,OAAO,CAAqB;YAC5C,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE;YACrB,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE;SACtD,CAAC,CAAC;QAEH,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;YAC9C,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;YAC3B,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE;SAC3E,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,IAAI,GAAG,OAAO,CAAY,EAAE,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAE3D,cAAc,CAAC,IAAI,EAAE,OAAO,CAAqB,EAAE,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAE7E,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/esm/lib/app/merge-app-manifests.js

@@ -1,6 +1,6 @@
-import mergeWith from 'deepmerge';
+import { mergeConfig } from '../utils/merge-config.js';
 /**
- * Deeply merges two application manifests using deepmerge.
+ * Deeply merges two application manifests.
  *
  * This utility is intended for combining a base manifest with an override manifest,
  * supporting recursive merging of nested properties. It is commonly used in scenarios
@@ -21,8 +21,7 @@ import mergeWith from 'deepmerge';
  */
 export const mergeAppManifests = (base, // The base manifest (may be partial)
 overrides) => {
-    // Use lodash.mergeWith for deep merging of manifest objects
-    const manifest = mergeWith(base, overrides);
+    const manifest = mergeConfig(base, overrides);
     // TODO(#5077): Add assertions or schema validation here if needed
     return manifest;
 };

package/dist/esm/lib/app/merge-app-manifests.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-app-manifests.js","sourceRoot":"","sources":["../../../../src/lib/app/merge-app-manifests.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAIlC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAAmC,EAAE,qCAAqC;AAC1E,SAAwC,EAC3B,EAAE;IACf,4DAA4D;IAC5D,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,EAAE,SAAS,CAAgB,CAAC;IAC3D,kEAAkE;IAClE,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,yDAAyD;AACzD,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"merge-app-manifests.js","sourceRoot":"","sources":["../../../../src/lib/app/merge-app-manifests.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAAmC,EAAE,qCAAqC;AAC1E,SAAwC,EAC3B,EAAE;IACf,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,CAAgB,CAAC;IAC7D,kEAAkE;IAClE,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,yDAAyD;AACzD,eAAe,iBAAiB,CAAC"}

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

@@ -1,4 +1,4 @@
-import deepmerge from 'deepmerge';
+import { mergeConfig } from './utils/merge-config.js';
 /**
  * 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.
@@ -21,8 +21,8 @@ const keyedArrayMerger = (key, target, source) => {
 /**
  * Merges a base development server configuration with an overrides object.
  *
- * Uses lodash.mergeWith to deeply merge properties, with custom logic for arrays.
- * Arrays in the overrides object will replace arrays in the base config.
+ * Objects are merged recursively. Route arrays (entries with `match` and `middleware`) are
+ * merged by `match`, with override routes winning; other arrays are concatenated and de-duplicated.
  *
  * @param base - The base development server configuration.
  * @param overrides - A partial configuration object containing properties to override in the base configuration.
@@ -31,17 +31,15 @@ const keyedArrayMerger = (key, target, source) => {
  * Inline comments are provided for maintainability and clarity.
  */
 export const mergeDevServerConfig = (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);
-            }
-            // Deduplicate the combined target and source entries
-            return [...new Set([...target, ...source])];
-        },
+    return mergeConfig(base, overrides, (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' && entry !== null && 'match' in entry && 'middleware' in entry) {
+            return keyedArrayMerger('match', target, source);
+        }
+        // Deduplicate the combined target and source entries
+        return [...new Set([...target, ...source])];
     });
 };
 // Export as default for convenience in imports

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;;;;;;;;;GASG;AACH,MAAM,gBAAgB,GAAG,CACvB,GAAgB,EAChB,MAAoB,EACpB,MAAoB,EACN,EAAE;IAChB,qEAAqE;IACrE,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,2EAA2E;IAC3E,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,oFAAoF;IACpF,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,qDAAqD;YACrD,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"}
+{"version":3,"file":"merge-dev-server-config.js","sourceRoot":"","sources":["../../../src/lib/merge-dev-server-config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD;;;;;;;;;GASG;AACH,MAAM,gBAAgB,GAAG,CACvB,GAAgB,EAChB,MAAoB,EACpB,MAAoB,EACN,EAAE;IAChB,qEAAqE;IACrE,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,2EAA2E;IAC3E,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,oFAAoF;IACpF,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,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;QACrD,2EAA2E;QAC3E,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;QAErC,yDAAyD;QACzD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,IAAI,YAAY,IAAI,KAAK,EAAE,CAAC;YAC7F,OAAO,gBAAgB,CACrB,OAAO,EACP,MAAwC,EACxC,MAAwC,CACzC,CAAC;QACJ,CAAC;QACD,qDAAqD;QACrD,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,+CAA+C;AAC/C,eAAe,oBAAoB,CAAC"}

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

@@ -0,0 +1,44 @@
+import { describe, expect, it } from 'vitest';
+import { mergeDevServerConfig } from './merge-dev-server-config.js';
+/**
+ * Treats a minimal fixture as a full dev-server shape.
+ *
+ * @template T - Shape the fixture stands in for.
+ * @param value - Minimal fixture object.
+ * @returns The fixture typed as `T`.
+ */
+const fixture = (value) => 
+// Fixtures only carry the keys under test; the merge never reads the omitted required fields
+value;
+describe('mergeDevServerConfig', () => {
+    it('merges routes by match with override routes winning, and de-duplicates other arrays', () => {
+        const baseMiddleware = () => { };
+        const overrideMiddleware = () => { };
+        const base = fixture({
+            api: {
+                routes: [
+                    { match: '/a', middleware: baseMiddleware },
+                    { match: '/b', middleware: baseMiddleware },
+                ],
+                processServices: ['x', 'y'],
+            },
+        });
+        const overrides = fixture({
+            api: {
+                routes: [{ match: '/b', middleware: overrideMiddleware }],
+                processServices: ['y', 'z'],
+            },
+        });
+        const result = fixture(mergeDevServerConfig(base, overrides));
+        expect(result.api.routes).toEqual([
+            { match: '/a', middleware: baseMiddleware },
+            { match: '/b', middleware: overrideMiddleware },
+        ]);
+        expect(result.api.processServices).toEqual(['x', 'y', 'z']);
+    });
+    it('keeps base values when overrides are empty', () => {
+        const base = fixture({ api: { processServices: ['x'] } });
+        expect(mergeDevServerConfig(base, {})).toEqual(base);
+    });
+});
+//# sourceMappingURL=merge-dev-server-config.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-dev-server-config.test.js","sourceRoot":"","sources":["../../../src/lib/merge-dev-server-config.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAOpE;;;;;;GAMG;AACH,MAAM,OAAO,GAAG,CAAI,KAAc,EAAK,EAAE;AACvC,6FAA6F;AAC7F,KAAU,CAAC;AAEb,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,qFAAqF,EAAE,GAAG,EAAE;QAC7F,MAAM,cAAc,GAAG,GAAS,EAAE,GAAE,CAAC,CAAC;QACtC,MAAM,kBAAkB,GAAG,GAAS,EAAE,GAAE,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,OAAO,CAAmB;YACrC,GAAG,EAAE;gBACH,MAAM,EAAE;oBACN,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE;oBAC3C,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE;iBAC5C;gBACD,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;aAC5B;SACF,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,OAAO,CAAY;YACnC,GAAG,EAAE;gBACH,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAC;gBACzD,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;aAC5B;SACF,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,OAAO,CAAY,oBAAoB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QAEzE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YAChC,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE;YAC3C,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,kBAAkB,EAAE;SAChD,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,IAAI,GAAG,OAAO,CAAmB,EAAE,GAAG,EAAE,EAAE,eAAe,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QAE5E,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/esm/lib/portal/load-portal-manifest.js

@@ -1,5 +1,5 @@
 import { importConfig } from '@equinor/fusion-imports';
-import deepmerge from 'deepmerge';
+import { mergeConfig } from '../utils/merge-config.js';
 import { PortalManifestSchema } from './portal-manifest-schema.js';
 /**
  * Loads a portal manifest configuration file, merging it with optional base values and supporting multiple file extensions.
@@ -38,7 +38,7 @@ export const loadPortalManifest = async (env, options) => {
                     // If the manifest export is not a function, treat it as an object
                     overrides = module.default;
                 }
-                return overrides ? deepmerge(base, overrides) : base;
+                return overrides ? mergeConfig(base, overrides) : base;
             },
         },
     });

package/dist/esm/lib/portal/load-portal-manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-portal-manifest.js","sourceRoot":"","sources":["../../../../src/lib/portal/load-portal-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAwDnE;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,GAAe,EACf,OAAsC,EACA,EAAE;IACxC,iGAAiG;IACjG,MAAM,WAAW,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,mBAAmB,GAAG,CAAC,WAAW,EAAE,EAAE,iBAAiB,CAAC,CAAC;IAE/F,+EAA+E;IAC/E,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE;QACnD,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,iDAAiD;QACpE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,2CAA2C;QAC5E,MAAM,EAAE;YACN,uCAAuC;YACvC,OAAO,EAAE,KAAK,EAAE,MAA4C,EAAc,EAAE;gBAC1E,0EAA0E;gBAC1E,MAAM,IAAI,GAAM,OAAO,EAAE,IAAI,IAAK,EAAQ,CAAC;gBAC3C,IAAI,SAA0C,CAAC;gBAC/C,uFAAuF;gBACvF,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;oBACzC,+EAA+E;oBAC/E,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,SAAS,CAAC;gBACjE,CAAC;qBAAM,CAAC;oBACN,kEAAkE;oBAClE,SAAS,GAAG,MAAM,CAAC,OAA8B,CAAC;gBACpD,CAAC;gBACD,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,SAAuB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACrE,CAAC;SACF;KACF,CAAC,CAAC;IAEH,0EAA0E;IAC1E,8EAA8E;IAC9E,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAW,CAAC;IAC1C,MAAM,UAAU,GAAG,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5D,2EAA2E;IAC3E,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACxB,oEAAoE;QACpE,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM;aAC1C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;aAC/C,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,4BAA4B,aAAa,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO;QACL,QAAQ;QACR,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,SAAS,EAAE,YAAY,CAAC,SAAS;KAClC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"load-portal-manifest.js","sourceRoot":"","sources":["../../../../src/lib/portal/load-portal-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAwDnE;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,GAAe,EACf,OAAsC,EACA,EAAE;IACxC,iGAAiG;IACjG,MAAM,WAAW,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,mBAAmB,GAAG,CAAC,WAAW,EAAE,EAAE,iBAAiB,CAAC,CAAC;IAE/F,+EAA+E;IAC/E,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE;QACnD,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,iDAAiD;QACpE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,2CAA2C;QAC5E,MAAM,EAAE;YACN,uCAAuC;YACvC,OAAO,EAAE,KAAK,EAAE,MAA4C,EAAc,EAAE;gBAC1E,0EAA0E;gBAC1E,MAAM,IAAI,GAAM,OAAO,EAAE,IAAI,IAAK,EAAQ,CAAC;gBAC3C,IAAI,SAA0C,CAAC;gBAC/C,uFAAuF;gBACvF,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;oBACzC,+EAA+E;oBAC/E,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,SAAS,CAAC;gBACjE,CAAC;qBAAM,CAAC;oBACN,kEAAkE;oBAClE,SAAS,GAAG,MAAM,CAAC,OAA8B,CAAC;gBACpD,CAAC;gBACD,OAAO,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACzD,CAAC;SACF;KACF,CAAC,CAAC;IAEH,0EAA0E;IAC1E,8EAA8E;IAC9E,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAW,CAAC;IAC1C,MAAM,UAAU,GAAG,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5D,2EAA2E;IAC3E,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACxB,oEAAoE;QACpE,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM;aAC1C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;aAC/C,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,4BAA4B,aAAa,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO;QACL,QAAQ;QACR,IAAI,EAAE,YAAY,CAAC,IAAI;QACvB,SAAS,EAAE,YAAY,CAAC,SAAS;KAClC,CAAC;AACJ,CAAC,CAAC"}

package/dist/esm/lib/utils/merge-config.js

@@ -0,0 +1,109 @@
+/**
+ * Checks whether a value is an object literal, as opposed to an array or a class instance
+ * such as `Date` or `URL`, which replace rather than merge.
+ *
+ * @param value - Value to inspect.
+ * @returns `true` when the value is a plain object.
+ */
+const isConfigObject = (value) => {
+    // Primitives and null replace rather than merge
+    if (typeof value !== 'object' || value === null) {
+        return false;
+    }
+    const prototype = Object.getPrototypeOf(value);
+    return prototype === Object.prototype || prototype === null;
+};
+/**
+ * Default array strategy: append override entries after base entries.
+ *
+ * @param base - Array from the base config.
+ * @param overrides - Array from the overrides.
+ * @returns A new array with base entries followed by override entries.
+ */
+const appendArrays = (base, overrides) => base.concat(overrides);
+/**
+ * Lists an object's entries without `__proto__`, which would replace the prototype of an object
+ * it is assigned to (GHSA-gcqx-w48m-w2h4).
+ *
+ * @param value - Object whose entries are listed.
+ * @returns The entries that are safe to assign.
+ */
+const safeEntries = (value) => 
+// `JSON.parse` keeps `__proto__` as an own key, so untrusted config can carry one
+Object.entries(value).filter(([entryKey]) => entryKey !== '__proto__');
+/**
+ * Copies plain objects and arrays from the overrides, dropping `__proto__` keys at any depth so
+ * an override value that has no base counterpart is cleaned the same way as a merged one.
+ *
+ * @param value - Value from the overrides.
+ * @returns A cleaned copy of plain objects and arrays; any other value as-is.
+ */
+const sanitize = (value) => {
+    // Arrays may contain plain objects that carry `__proto__` keys
+    if (Array.isArray(value)) {
+        // Clean every item, since items never merge with a base value
+        return value.map(sanitize);
+    }
+    // Class instances and primitives are kept as-is
+    if (!isConfigObject(value)) {
+        return value;
+    }
+    // Clean each nested value too, since none of them has a base value to merge with
+    const entries = safeEntries(value).map(([entryKey, entryValue]) => [
+        entryKey,
+        sanitize(entryValue),
+    ]);
+    return Object.fromEntries(entries);
+};
+/**
+ * Merges one value from the overrides into the matching base value.
+ *
+ * @param base - Value from the base config.
+ * @param overrides - Value from the overrides.
+ * @param mergeArrays - Strategy used when both values are arrays.
+ * @param key - Property key of the values, passed to `mergeArrays`.
+ * @returns The merged value.
+ */
+const mergeValue = (base, overrides, mergeArrays, key) => {
+    // Both sides are lists, so the caller's strategy decides how to combine them
+    if (Array.isArray(base) && Array.isArray(overrides)) {
+        // Clean override items before the strategy sees them, since it may keep them as-is
+        return mergeArrays(base, overrides.map(sanitize), key);
+    }
+    // Anything other than two plain objects is replaced by the override
+    if (!isConfigObject(base) || !isConfigObject(overrides)) {
+        return sanitize(overrides);
+    }
+    // Start from the base keys so keys absent from the overrides survive
+    const result = Object.fromEntries(safeEntries(base));
+    // Overlay each override key, recursing where both sides define it
+    for (const [entryKey, value] of safeEntries(overrides)) {
+        result[entryKey] = Object.hasOwn(base, entryKey)
+            ? mergeValue(base[entryKey], value, mergeArrays, entryKey)
+            : sanitize(value);
+    }
+    return result;
+};
+/**
+ * Deeply merges CLI config overrides (app config, app or portal manifest, dev-server config)
+ * into a base config without mutating either input.
+ *
+ * Plain objects merge key by key with override values winning, including an explicit `undefined`.
+ * Arrays are appended unless `mergeArrays` says otherwise. Any other value, including class
+ * instances, replaces the base value. Values taken from the overrides are copied with `__proto__`
+ * keys removed at any depth; base values that are not overridden are shared with the inputs.
+ *
+ * @template T - Shape of the config.
+ * @param base - Base config.
+ * @param overrides - Partial config whose values take precedence.
+ * @param mergeArrays - Strategy for combining two arrays at the same key. Defaults to appending.
+ * @returns A new config containing the merged values.
+ *
+ * @example
+ * ```ts
+ * mergeConfig({ server: { port: 3000 }, scopes: ['a'] }, { server: { host: 'x' }, scopes: ['b'] });
+ * // { server: { port: 3000, host: 'x' }, scopes: ['a', 'b'] }
+ * ```
+ */
+export const mergeConfig = (base, overrides, mergeArrays = appendArrays) => mergeValue(base, overrides, mergeArrays, '');
+//# sourceMappingURL=merge-config.js.map

package/dist/esm/lib/utils/merge-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-config.js","sourceRoot":"","sources":["../../../../src/lib/utils/merge-config.ts"],"names":[],"mappings":"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"}

package/dist/esm/lib/utils/tests/merge-config.test.js

@@ -0,0 +1,48 @@
+import { describe, expect, it } from 'vitest';
+import { mergeConfig } from '../merge-config.js';
+describe('mergeConfig', () => {
+    it('merges nested objects with overrides winning and appends arrays by default', () => {
+        expect(mergeConfig({ server: { port: 3000, host: 'a' }, scopes: ['x'] }, { server: { host: 'b' }, scopes: ['y'], extra: true })).toEqual({ server: { port: 3000, host: 'b' }, scopes: ['x', 'y'], extra: true });
+    });
+    it('does not mutate the base config', () => {
+        const base = { server: { port: 3000 }, scopes: ['x'] };
+        mergeConfig(base, { server: { host: 'b' }, scopes: ['y'] });
+        expect(base).toEqual({ server: { port: 3000 }, scopes: ['x'] });
+    });
+    it('lets explicit undefined, arrays, and class instances replace the base value', () => {
+        const url = new URL('https://example.com');
+        expect(mergeConfig({ a: 1, b: { c: 1 }, url: { href: 'x' } }, { a: undefined, b: [1], url })).toEqual({
+            a: undefined,
+            b: [1],
+            url,
+        });
+    });
+    it('passes the property key to a custom array strategy', () => {
+        const result = mergeConfig({ scopes: ['a'], nested: { scopes: ['b'], list: [1] } }, { scopes: ['x'], nested: { scopes: ['y'], list: [2] } }, (base, overrides, key) => (key === 'scopes' ? overrides : base.concat(overrides)));
+        expect(result).toEqual({ scopes: ['x'], nested: { scopes: ['y'], list: [1, 2] } });
+    });
+    it('ignores __proto__ keys from untrusted overrides', () => {
+        const overrides = JSON.parse('{"__proto__": {"polluted": true}, "nested": {"__proto__": {"polluted": true}}}');
+        const result = mergeConfig({ nested: {} }, overrides);
+        expect(Object.getPrototypeOf(result)).toBe(Object.prototype);
+        expect(Object.getPrototypeOf(result.nested)).toBe(Object.prototype);
+        expect(result.polluted).toBeUndefined();
+    });
+    it('strips __proto__ keys from override values that have no base counterpart, at any depth', () => {
+        const overrides = JSON.parse('{"added": {"deep": {"__proto__": {"polluted": true}}}, "list": [{"__proto__": {"polluted": true}}], "replaced": {"__proto__": {"polluted": true}}}');
+        const base = { list: [], replaced: 'primitive' };
+        const result = mergeConfig(base, overrides);
+        // Object.assign uses [[Set]], so a surviving own `__proto__` key would swap the prototype
+        const reassigned = [
+            Object.assign({}, result.added.deep),
+            Object.assign({}, result.list[0]),
+            Object.assign({}, result.replaced),
+        ];
+        // Each value came from the overrides without a base counterpart to merge with
+        for (const value of reassigned) {
+            expect(Object.getPrototypeOf(value)).toBe(Object.prototype);
+            expect(Object.hasOwn(value, '__proto__')).toBe(false);
+        }
+    });
+});
+//# sourceMappingURL=merge-config.test.js.map

package/dist/esm/lib/utils/tests/merge-config.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-config.test.js","sourceRoot":"","sources":["../../../../../src/lib/utils/tests/merge-config.test.ts"],"names":[],"mappings":"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"}

package/dist/esm/version.js

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

package/dist/types/lib/app/merge-app-config.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/lib/app/merge-app-manifests.d.ts

@@ -1,7 +1,7 @@
 import type { AppManifest } from '@equinor/fusion-framework-module-app';
 import type { RecursivePartial } from '../utils/types.js';
 /**
- * Deeply merges two application manifests using deepmerge.
+ * Deeply merges two application manifests.
  *
  * This utility is intended for combining a base manifest with an override manifest,
  * supporting recursive merging of nested properties. It is commonly used in scenarios

package/dist/types/lib/merge-dev-server-config.d.ts

@@ -3,8 +3,8 @@ import type { RecursivePartial } from './utils/types.js';
 /**
  * Merges a base development server configuration with an overrides object.
  *
- * Uses lodash.mergeWith to deeply merge properties, with custom logic for arrays.
- * Arrays in the overrides object will replace arrays in the base config.
+ * Objects are merged recursively. Route arrays (entries with `match` and `middleware`) are
+ * merged by `match`, with override routes winning; other arrays are concatenated and de-duplicated.
  *
  * @param base - The base development server configuration.
  * @param overrides - A partial configuration object containing properties to override in the base configuration.

package/dist/types/lib/merge-dev-server-config.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/lib/utils/merge-config.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Combines two arrays found at the same key in a base config and its overrides.
+ *
+ * @param base - Array from the base config.
+ * @param overrides - Array from the overrides.
+ * @param key - Property key holding both arrays.
+ * @returns The array to keep in the merged config.
+ */
+export type MergeConfigArrays = (base: unknown[], overrides: unknown[], key: string) => unknown[];
+/**
+ * Deeply merges CLI config overrides (app config, app or portal manifest, dev-server config)
+ * into a base config without mutating either input.
+ *
+ * Plain objects merge key by key with override values winning, including an explicit `undefined`.
+ * Arrays are appended unless `mergeArrays` says otherwise. Any other value, including class
+ * instances, replaces the base value. Values taken from the overrides are copied with `__proto__`
+ * keys removed at any depth; base values that are not overridden are shared with the inputs.
+ *
+ * @template T - Shape of the config.
+ * @param base - Base config.
+ * @param overrides - Partial config whose values take precedence.
+ * @param mergeArrays - Strategy for combining two arrays at the same key. Defaults to appending.
+ * @returns A new config containing the merged values.
+ *
+ * @example
+ * ```ts
+ * mergeConfig({ server: { port: 3000 }, scopes: ['a'] }, { server: { host: 'x' }, scopes: ['b'] });
+ * // { server: { port: 3000, host: 'x' }, scopes: ['a', 'b'] }
+ * ```
+ */
+export declare const mergeConfig: <T>(base: T, overrides: unknown, mergeArrays?: MergeConfigArrays) => T;

package/dist/types/lib/utils/tests/merge-config.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "15.7.2-next.1";
+export declare const version = "15.7.2";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-cli",
-  "version": "15.7.2-next.1",
+  "version": "15.7.2",
   "keywords": [
     "Fusion",
     "Fusion Framework",
@@ -94,23 +94,20 @@
     "directory": "packages/cli"
   },
   "dependencies": {
-    "@equinor/fusion-framework-dev-portal": "11.1.10-next.1",
-    "@equinor/fusion-framework-dev-server": "2.3.3-next.1",
-    "@equinor/fusion-framework-module-azure-identity": "0.4.0-next.0",
+    "@equinor/fusion-framework-dev-portal": "11.1.10",
+    "@equinor/fusion-framework-dev-server": "2.3.3",
+    "@equinor/fusion-framework-module-azure-identity": "0.3.4",
     "@equinor/fusion-framework-vite-plugin-raw-imports": "2.0.5",
     "@equinor/fusion-framework-vite-plugin-react-router": "0.1.5",
     "@equinor/fusion-imports": "2.0.7",
-    "@types/inquirer": "^9.0.9",
     "chalk": "^6.0.0",
     "commander": "^15.0.0",
-    "deepmerge": "^4.3.1",
     "dotenv": "^18.0.4",
     "execa": "^10.0.0",
     "find-up": "^8.0.0",
     "inquirer": "^14.0.0",
-    "is-mergeable-object": "^1.1.1",
     "is-path-inside": "^4.0.0",
-    "ora": "^9.0.0",
+    "ora": "^10.0.0",
     "read-package-up": "^12.0.0",
     "semver": "^7.7.4",
     "simple-git": "^4.0.1",
@@ -119,11 +116,11 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@equinor/fusion-framework-cli-plugin-mock-server": "^0.3.3-next.0",
-    "@equinor/fusion-framework-module": "6.2.0-next.0",
-    "@equinor/fusion-framework-module-app": "8.3.0-next.0",
-    "@equinor/fusion-framework-module-http": "8.1.5-next.0",
-    "@equinor/fusion-framework-module-service-discovery": "10.3.0-next.0",
+    "@equinor/fusion-framework-cli-plugin-mock-server": "^0.3.3",
+    "@equinor/fusion-framework-module": "6.1.6",
+    "@equinor/fusion-framework-module-app": "8.2.2",
+    "@equinor/fusion-framework-module-http": "8.1.4",
+    "@equinor/fusion-framework-module-service-discovery": "10.2.0",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.1",