silgi 0.9.30 → 0.9.32

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.9.30";
+const version = "0.9.32";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/cli/prepare.mjs

@@ -147,7 +147,8 @@ async function readCoreFile(silgi) {
   });
   try {
     if (silgi.options.commandType === "prepare") {
-      injectedResult.code = `global.$silgiSharedRuntimeConfig = ${JSON.stringify(silgi.options.runtimeConfig)};
+      globalThis.$silgiSharedRuntimeConfig = silgi.options.runtimeConfig;
+      injectedResult.code = `globalThis.$silgiSharedRuntimeConfig = ${JSON.stringify(silgi.options.runtimeConfig)};
 ${injectedResult.code}`;
       injectedResult.code = injectedResult.code.replace(/runtimeConfig: \{\}/, `runtimeConfig: ${JSON.stringify(silgi.options.runtimeConfig)}`);
     }

package/dist/core/index.mjs

@@ -661,14 +661,18 @@ async function cacheExecute(input, operation, handler, event) {
   };
 }
 
-function merge(items, maxLevel = 4, currentLevel = 3) {
+function merge(items, maxLevel = 4, currentLevel = 1) {
   const arrayItems = Array.isArray(items) ? items : [items];
   return arrayItems.reduce((acc, item) => {
+    if (!item)
+      return acc;
     Object.keys(item).forEach((key) => {
       if (typeof item[key] === "object" && item[key] !== null && currentLevel < maxLevel) {
-        acc[key] = acc[key] || {};
+        if (!acc[key] || typeof acc[key] !== "object") {
+          acc[key] = {};
+        }
         acc[key] = merge([acc[key], item[key]], maxLevel, currentLevel + 1);
-      } else {
+      } else if (acc[key] === void 0) {
         acc[key] = item[key];
       }
     });

package/dist/kit/index.mjs

@@ -270,9 +270,9 @@ const _sharedRuntimeConfig = _deepFreeze(
 function useSilgiRuntimeConfig(event) {
   const silgi = tryUseSilgi();
   if (!silgi) {
-    const data = globalThis.$silgiSharedRuntimeConfig;
-    if (data) {
-      return data;
+    const globalRuntimeConfig = globalThis.$silgiSharedRuntimeConfig;
+    if (globalRuntimeConfig && !event) {
+      return globalRuntimeConfig;
     }
     if (!event) {
       return _sharedRuntimeConfig;

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.9.30";
+const version = "0.9.32";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.9.30";
+const version = "0.9.32";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/package.json

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