@equinor/fusion-framework-cli 11.0.0-next.11 → 11.0.0-next.13

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## 11.0.0-next.13
+
+### Patch Changes
+
+- [#3075](https://github.com/equinor/fusion-framework/pull/3075) [`32273e1`](https://github.com/equinor/fusion-framework/commit/32273e19dd89ed7b51fac175e1e5a0b82c7ba8ec) Thanks [@odinr](https://github.com/odinr)! - Refactor dev server config loading and merging:
+
+  - Add `RecursivePartial` type for improved type safety and flexibility in dev server config overrides.
+  - Update `mergeDevServerConfig` to use a custom array merge strategy (source arrays replace and prepend base arrays).
+  - Refactor `loadDevServerConfig` to support async config functions and deep merging with the new strategy.
+  - Improve inline documentation and maintainability for config utilities.
+
+  This change improves the developer experience and reliability of dev server configuration in the CLI package.
+
+## 11.0.0-next.12
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @equinor/fusion-framework-dev-server@1.0.0-next.8
+  - @equinor/fusion-framework-dev-portal@1.0.0-next.2
+
 ## 11.0.0-next.11
 
 ### Patch Changes

package/bin/build/bin.js

@@ -1,4 +1,4 @@
-export { b as buildApplication, c as buildPortal, a as bundleApp, d as bundlePortal, g as generateApplicationConfig, e as generatePortalConfig, l as loadPortalManifest, h as pack, p as publishAppConfig, f as publishPortalConfig, s as startAppDevServer } from './portal-config-publish-ezU_DFki.js';
+export { b as buildApplication, c as buildPortal, a as bundleApp, d as bundlePortal, g as generateApplicationConfig, e as generatePortalConfig, l as loadPortalManifest, h as pack, p as publishAppConfig, f as publishPortalConfig, s as startAppDevServer } from './portal-config-publish-DfiJReWS.js';
 import 'vite';
 import 'chalk';
 import '@equinor/fusion-imports';

package/bin/build/cli.js

@@ -4,7 +4,7 @@ import { readPackageUpSync } from 'read-package-up';
 import { createCommand, createOption, InvalidOptionArgumentError, Command } from 'commander';
 import 'node:fs';
 import chalk from 'chalk';
-import { S as Spinner, b as buildApplication, a as bundleApp, F as FusionEnv, r as resolveDefaultEnv, i as resolveProjectPackage, j as resolveAppManifest, k as initializeFramework, p as publishAppConfig, g as generateApplicationConfig, m as formatPath, H as HttpJsonResponseError, n as loadAppManifest, s as startAppDevServer, o as fileExistsSync, N as NoAccountsError, q as resolvePortalManifest, t as resolvePortalConfig, u as createDevServer, l as loadPortalManifest, v as getDefaultExportFromCjs, w as loadPortalSchema, x as writeFile$1, c as buildPortal, d as bundlePortal, f as publishPortalConfig, e as generatePortalConfig } from './portal-config-publish-ezU_DFki.js';
+import { S as Spinner, b as buildApplication, a as bundleApp, F as FusionEnv, r as resolveDefaultEnv, i as resolveProjectPackage, j as resolveAppManifest, k as initializeFramework, p as publishAppConfig, g as generateApplicationConfig, m as formatPath, H as HttpJsonResponseError, n as loadAppManifest, s as startAppDevServer, o as fileExistsSync, N as NoAccountsError, q as resolvePortalManifest, t as resolvePortalConfig, u as createDevServer, l as loadPortalManifest, v as getDefaultExportFromCjs, w as loadPortalSchema, x as writeFile$1, c as buildPortal, d as bundlePortal, f as publishPortalConfig, e as generatePortalConfig } from './portal-config-publish-DfiJReWS.js';
 import { importJSON } from '@equinor/fusion-imports';
 import '@equinor/fusion-framework-dev-server';
 import 'vite';

package/bin/build/{create-auth-client-B_j4Y_Dr.js → create-auth-client-BEG7gK6o.js}

@@ -1,4 +1,4 @@
-import { P as PublicClientApplication } from './portal-config-publish-ezU_DFki.js';
+import { P as PublicClientApplication } from './portal-config-publish-DfiJReWS.js';
 import 'crypto';
 import { promises } from 'fs';
 import { pid } from 'process';

package/bin/build/{portal-config-publish-ezU_DFki.js → portal-config-publish-DfiJReWS.js}

@@ -359,42 +359,6 @@ let _spinner = new Spinner();
 const parseArgs = (args) => args.length ? args.join(' ') : undefined;
 const originalConsole = console;
 
-/**
- * Loads the dev server configuration from a file or function.
- *
- * @param env - The runtime environment configuration.
- * @param base - The base DevServerOptions to use as defaults.
- * @param options - Optional settings for file name and extensions.
- * @returns A promise resolving to the imported config result.
- *
- * This function uses importConfig to dynamically load the configuration file.
- * If the config export is a function, it is invoked with the environment and a cloned base config.
- * If the config export is an object, it is merged with the base config.
- *
- * Inline comments are provided for maintainability and clarity.
- */
-const loadDevServerConfig = async (env, base, options) => {
-    // Use importConfig to load the config file, defaulting to 'dev-server.config' if not specified
-    return importConfig('dev-server.config', {
-        baseDir: env.root, // Set the base directory for config resolution
-        extensions: options?.extensions, // Allow custom file extensions
-        script: {
-            // Custom resolver for the config module
-            resolve: async (module) => {
-                // If the default export is a function, call it with env and a cloned base config
-                if (typeof module.default === 'function') {
-                    const baseClone = { ...base }; // Clone base to avoid mutation
-                    const result = (await module.default(env, { base: baseClone })) ?? base;
-                    // TODO: Add zod validation of the config for type safety
-                    return result ?? baseClone;
-                }
-                // If the default export is an object, return it or fallback to base
-                return module.default ?? base;
-            },
-        },
-    });
-};
-
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 function getDefaultExportFromCjs (x) {
@@ -2386,6 +2350,80 @@ function requireLodash_mergewith () {
 var lodash_mergewithExports = requireLodash_mergewith();
 var mergeWith = /*@__PURE__*/getDefaultExportFromCjs(lodash_mergewithExports);
 
+/**
+ * Customizer function for merging objects, intended for use with utilities like `_.mergeWith`.
+ *
+ * - If either `objValue` or `srcValue` is an array, replaces the target array with the source array,
+ *   concatenating the source array with the target array (source first).
+ * - For non-array values, allows the default merge behavior.
+ *
+ * @param objValue - The destination value being merged.
+ * @param srcValue - The source value being merged.
+ * @returns The merged value if custom logic applies, otherwise `undefined` to use default merging.
+ */
+const customizer = (objValue, srcValue) => {
+    if (Array.isArray(objValue) || Array.isArray(srcValue)) {
+        // Replace arrays instead of merging/concatenating them
+        return (srcValue ?? []).concat(objValue ?? []);
+    }
+    // For non-arrays, use default merge behavior
+};
+/**
+ * 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.
+ *
+ * @param base - The base development server configuration.
+ * @param overrides - A partial configuration object containing properties to override in the base configuration.
+ * @returns The merged development server configuration.
+ *
+ * Inline comments are provided for maintainability and clarity.
+ */
+const mergeDevServerConfig = (base, overrides) => {
+    // Use lodash.mergeWith to merge base and overrides, applying the customizer for arrays
+    return mergeWith(base, overrides, customizer);
+};
+
+/**
+ * Loads the dev server configuration from a file or function.
+ *
+ * @param env - The runtime environment configuration.
+ * @param base - The base DevServerOptions to use as defaults.
+ * @param options - Optional settings for file name and extensions.
+ * @returns A promise resolving to the imported config result.
+ *
+ * This function uses importConfig to dynamically load the configuration file.
+ * If the config export is a function, it is invoked with the environment and a cloned base config.
+ * If the config export is an object, it is merged with the base config.
+ *
+ * Inline comments are provided for maintainability and clarity.
+ */
+const loadDevServerConfig = async (env, base, options) => {
+    // Use importConfig to load the config file, defaulting to 'dev-server.config' if not specified
+    return importConfig('dev-server.config', {
+        baseDir: env.root, // Set the base directory for config resolution
+        extensions: options?.extensions, // Allow custom file extensions
+        script: {
+            // Custom resolver for the config module
+            resolve: async (module) => {
+                // If the default export is a function, call it with env and a cloned base config
+                let overrides;
+                if (typeof module.default === 'function') {
+                    const baseClone = { ...base }; // Clone base to avoid mutation
+                    overrides = await module.default(env, { base: baseClone });
+                    // TODO: Add zod validation of the config for type safety
+                }
+                else {
+                    overrides = module.default;
+                }
+                // If the default export is an object, return it or fallback to base
+                return mergeDevServerConfig(base, overrides ?? {});
+            },
+        },
+    });
+};
+
 /**
  * Creates a Fusion dev server template environment, merging with user overrides.
  *
@@ -23386,7 +23424,7 @@ class AuthConfigurator extends BaseConfigBuilder {
             // Dynamically import the createAuthClient function since the client uses `libsecret``
             // which is not default installed in all environments.
             // This avoids installing `libsecret` in environments where it is not needed, like CI/CD pipelines.
-            const { createAuthClient } = await import('./create-auth-client-B_j4Y_Dr.js');
+            const { createAuthClient } = await import('./create-auth-client-BEG7gK6o.js');
             return createAuthClient(tenantId, clientId);
         });
     }

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

@@ -1,4 +1,5 @@
 import { importConfig } from '@equinor/fusion-imports';
+import { mergeDevServerConfig } from './merge-dev-server-config.js';
 /**
  * Helper to define a dev server config function with proper typing.
  * @param fn - The configuration function to be used as the dev server config.
@@ -28,14 +29,17 @@ export const loadDevServerConfig = async (env, base, options) => {
             // Custom resolver for the config module
             resolve: async (module) => {
                 // If the default export is a function, call it with env and a cloned base config
+                let overrides;
                 if (typeof module.default === 'function') {
                     const baseClone = { ...base }; // Clone base to avoid mutation
-                    const result = (await module.default(env, { base: baseClone })) ?? base;
+                    overrides = await module.default(env, { base: baseClone });
                     // TODO: Add zod validation of the config for type safety
-                    return result ?? baseClone;
+                }
+                else {
+                    overrides = module.default;
                 }
                 // If the default export is an object, return it or fallback to base
-                return module.default ?? base;
+                return mergeDevServerConfig(base, overrides ?? {});
             },
         },
     });

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

@@ -1 +1 @@
-{"version":3,"file":"load-dev-server-config.js","sourceRoot":"","sources":["../../../src/lib/load-dev-server-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA2B,MAAM,yBAAyB,CAAC;AAoBhF;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,EAAqB,EAAE,EAAE,CAAC,EAAE,CAAC;AAEnE;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,GAAe,EACf,IAAsB,EACtB,OAGC,EAC8C,EAAE;IACjD,+FAA+F;IAC/F,OAAO,YAAY,CAAC,OAAO,EAAE,IAAI,IAAI,mBAAmB,EAAE;QACxD,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,+CAA+C;QAClE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,+BAA+B;QAChE,MAAM,EAAE;YACN,wCAAwC;YACxC,OAAO,EAAE,KAAK,EAAE,MAA0C,EAA6B,EAAE;gBACvF,iFAAiF;gBACjF,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;oBACzC,MAAM,SAAS,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,+BAA+B;oBAC9D,MAAM,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;oBACxE,yDAAyD;oBACzD,OAAO,MAAM,IAAI,SAAS,CAAC;gBAC7B,CAAC;gBACD,oEAAoE;gBACpE,OAAO,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC;YAChC,CAAC;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"load-dev-server-config.js","sourceRoot":"","sources":["../../../src/lib/load-dev-server-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA2B,MAAM,yBAAyB,CAAC;AAGhF,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAqBpE;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,EAAqB,EAAE,EAAE,CAAC,EAAE,CAAC;AAEnE;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,GAAe,EACf,IAAsB,EACtB,OAGC,EAC8C,EAAE;IACjD,+FAA+F;IAC/F,OAAO,YAAY,CAAC,OAAO,EAAE,IAAI,IAAI,mBAAmB,EAAE;QACxD,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,+CAA+C;QAClE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,+BAA+B;QAChE,MAAM,EAAE;YACN,wCAAwC;YACxC,OAAO,EAAE,KAAK,EAAE,MAA0C,EAA6B,EAAE;gBACvF,iFAAiF;gBACjF,IAAI,SAAyD,CAAC;gBAC9D,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;oBACzC,MAAM,SAAS,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,+BAA+B;oBAC9D,SAAS,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;oBAC3D,yDAAyD;gBAC3D,CAAC;qBAAM,CAAC;oBACN,SAAS,GAAG,MAAM,CAAC,OAA6C,CAAC;gBACnE,CAAC;gBACD,oEAAoE;gBACpE,OAAO,oBAAoB,CAAC,IAAI,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;YACrD,CAAC;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}

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

@@ -1,18 +1,19 @@
 import mergeWith from 'lodash.mergewith';
 /**
- * Customizer function for lodash.mergeWith to handle merging arrays.
+ * Customizer function for merging objects, intended for use with utilities like `_.mergeWith`.
  *
- * If the property being merged is an array, the source value replaces the object value.
- * This prevents arrays from being concatenated, which is the default lodash behavior.
+ * - If either `objValue` or `srcValue` is an array, replaces the target array with the source array,
+ *   concatenating the source array with the target array (source first).
+ * - For non-array values, allows the default merge behavior.
  *
- * @param objValue - The value from the base object.
- * @param srcValue - The value from the overrides object.
- * @returns The value to use in the merged result, or undefined to use default merging.
+ * @param objValue - The destination value being merged.
+ * @param srcValue - The source value being merged.
+ * @returns The merged value if custom logic applies, otherwise `undefined` to use default merging.
  */
 const customizer = (objValue, srcValue) => {
-    if (Array.isArray(objValue)) {
+    if (Array.isArray(objValue) || Array.isArray(srcValue)) {
         // Replace arrays instead of merging/concatenating them
-        return srcValue;
+        return (srcValue ?? []).concat(objValue ?? []);
     }
     // For non-arrays, use default merge behavior
 };

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,kBAAkB,CAAC;AAKzC;;;;;;;;;GASG;AACH,MAAM,UAAU,GAAG,CAAC,QAAiB,EAAE,QAAiB,EAAE,EAAE;IAC1D,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,uDAAuD;QACvD,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,6CAA6C;AAC/C,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,IAAsB,EACtB,SAA6C,EAC3B,EAAE;IACpB,uFAAuF;IACvF,OAAO,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,CAAqB,CAAC;AACpE,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,kBAAkB,CAAC;AAKzC;;;;;;;;;;GAUG;AACH,MAAM,UAAU,GAAG,CAAC,QAAiB,EAAE,QAAiB,EAAE,EAAE;IAC1D,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvD,uDAAuD;QACvD,OAAO,CAAE,QAA2B,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IACrE,CAAC;IACD,6CAA6C;AAC/C,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,IAAsB,EACtB,SAA6C,EAC3B,EAAE;IACpB,uFAAuF;IACvF,OAAO,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,CAAqB,CAAC;AACpE,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.11';
+export const version = '11.0.0-next.13';
 //# sourceMappingURL=version.js.map