silgi 0.24.24 → 0.25.0

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.24.24";
+const version = "0.25.0";
 const packageJson = {
 	version: version};
 

package/dist/cli/writeTypesAndFiles.mjs

@@ -1873,7 +1873,7 @@ async function prepareCoreFile(data, frameworkContext, silgi) {
     plugins.push(pluginImportName);
   }
   const importsContent = [
-    'import deepmerge from "@fastify/deepmerge"',
+    'import { mergeDeep } from "silgi/runtime"',
     ...Object.entries(importItems).map(([_name, { from, import: imports }]) => {
       if (silgi.options.typescript.removeFileExtension) {
         from = from.replace(/\.(js|ts|mjs|cjs|jsx|tsx)$/, "");
@@ -1885,8 +1885,6 @@ async function prepareCoreFile(data, frameworkContext, silgi) {
     ""
   ];
   const importData = [
-    "",
-    "const mergeDeep = deepmerge({all: true})",
     "",
     "export async function buildSilgi(framework: FrameworkContext, moduleOptions?: Partial<SilgiRuntimeOptions>,buildOptions?: Partial<SilgiOptions>) {",
     "",
@@ -1903,18 +1901,13 @@ async function prepareCoreFile(data, frameworkContext, silgi) {
     "      modulesURIs,",
     `      plugins: [${plugins.join(", ")}],`,
     _data._silgiConfigs.length > 0 ? `      ${_data._silgiConfigs.map((config) => typeof config === "string" ? config : typeof config === "object" ? Object.entries(config).map(([key, value]) => `${key}: ${value}`).join(",\n      ") : "").join(",\n      ")},` : "",
-    "      options: mergeDeep(",
-    "        {",
+    "      options: mergeDeep(cliConfigs, {",
     "        runtimeConfig: {} as SilgiRuntimeOptions,",
     "        routeRules: routeRules as any,",
-    "        },",
-    "        moduleOptions || {},",
-    "        {",
-    `          present: '${silgi.options.preset}',`,
-    "          ...cliConfigs,",
-    "        },",
-    "        buildOptions,",
-    "      ) as any,",
+    `        present: '${silgi.options.preset}',`,
+    "        ...moduleOptions,",
+    "        ...buildOptions,",
+    "      }) as any,",
     "    })",
     "",
     ...frameworkContext,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.24.24",
+  "version": "0.25.0",
   "private": false,
   "sideEffects": false,
   "exports": {