@spark-ui/cli-utils 2.14.0-beta.5 → 2.14.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spark-ui/cli-utils",
-  "version": "2.14.0-beta.5",
+  "version": "2.14.0-beta.6",
   "description": "Spark CLI utils",
   "publishConfig": {
     "access": "public"

package/src/scan/index.mjs

@@ -20,7 +20,7 @@ export async function adoption(options) {
     adoption: merge(
       { ...config.adoption },
       {
-        ...optionsConfig.adoption,
+        ...optionsConfig,
         imports: optionsConfig.imports || config.imports,
         extensions: optionsConfig.extensions || config.extensions,
       }

package/src/scan/loadConfig.mjs

@@ -1,4 +1,7 @@
 import { existsSync } from 'fs'
+import merge from 'lodash.merge'
+
+import * as defaultConfig from './config.mjs'
 
 export async function loadConfig(configFileRoute, { logger }) {
   try {
@@ -6,16 +9,24 @@ export async function loadConfig(configFileRoute, { logger }) {
       logger.info('ℹ️ Loading spark-ui custom configuration file')
       const { default: customConfig } = await import(configFileRoute)
 
-      return customConfig
+      const config = {
+        adoption: merge(defaultConfig, {
+          ...customConfig.adoption,
+          imports: customConfig.imports || defaultConfig.imports,
+          extensions: customConfig.extensions || defaultConfig.extensions,
+        }),
+      }
+
+      return config
     } else {
       logger.warn('⚠️ No custom configuration file found')
       logger.info('ℹ️ Loading default configuration')
 
-      return {}
+      return { ...defaultConfig }
     }
   } catch (error) {
     logger.error('💥 Something went wrong loading the custom configuration file')
 
-    return {}
+    return { ...defaultConfig }
   }
 }