silgi 0.9.29 → 0.9.31

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.9.29";
+const version = "0.9.31";
 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

@@ -12,7 +12,6 @@ import { c as checkSilgiCompatibility } from '../cli/compatibility.mjs';
 import { existsSync, promises } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
-import process$1 from 'node:process';
 import destr from 'destr';
 import { klona } from 'klona';
 import 'semver/functions/satisfies.js';
@@ -256,11 +255,14 @@ async function resolveSilgiModule(base, paths) {
   return resolved;
 }
 
-const _inlineRuntimeConfig = process$1.env.RUNTIME_CONFIG;
+const _inlineRuntimeConfig = (
+  /** */
+  process.env.RUNTIME_CONFIG
+);
 const envOptions = {
   prefix: "NITRO_",
-  altPrefix: _inlineRuntimeConfig?.nitro.envPrefix ?? process$1.env.NITRO_ENV_PREFIX ?? "_",
-  envExpansion: _inlineRuntimeConfig?.nitro.envExpansion ?? process$1.env.NITRO_ENV_EXPANSION ?? false
+  altPrefix: _inlineRuntimeConfig?.nitro.envPrefix ?? process.env.NITRO_ENV_PREFIX ?? "_",
+  envExpansion: _inlineRuntimeConfig?.nitro.envExpansion ?? process.env.NITRO_ENV_EXPANSION ?? false
 };
 const _sharedRuntimeConfig = _deepFreeze(
   applyEnv(klona(_inlineRuntimeConfig ?? {}), envOptions)
@@ -268,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;
@@ -283,11 +285,11 @@ function useSilgiRuntimeConfig(event) {
     prefix: "NITRO_",
     altPrefix: "NUXT_",
     silgiPrefix: "SILGI_",
-    envExpansion: silgi.options.experimental?.envExpansion ?? !!process$1.env.NITRO_ENV_EXPANSION,
+    envExpansion: silgi.options.experimental?.envExpansion ?? !!process.env.NITRO_ENV_EXPANSION,
     ...silgi.envOptions
   });
 }
-function getEnv(key, opts, env = process$1.env) {
+function getEnv(key, opts, env = process.env) {
   const envKey = snakeCase(key).toUpperCase();
   return destr(
     env[opts.prefix + envKey] ?? env[opts.altPrefix + envKey] ?? env[opts.silgiPrefix + envKey]
@@ -319,7 +321,7 @@ function applyEnv(obj, opts, parentKey = "") {
   return obj;
 }
 const envExpandRx = /\{\{([^{}]*)\}\}/g;
-function _expandFromEnv(value, env = process$1.env) {
+function _expandFromEnv(value, env = process.env) {
   return value.replace(envExpandRx, (match, key) => {
     return env[key] || match;
   });

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.9.29";
+const version = "0.9.31";
 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.29";
+const version = "0.9.31";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/presets/_all.gen.d.ts

@@ -1,2 +1,2 @@
-declare const _default: readonly [any, any, any, any];
+declare const _default: readonly [any, any, any, any, any];
 export default _default;

package/dist/presets/_all.gen.mjs

@@ -1,10 +1,12 @@
 import _h3 from "./h3/preset.mjs";
 import _nitro from "./nitro/preset.mjs";
+import _npmPackage from "./npmPackage/preset.mjs";
 import _npmpackage from "./npmpackage/preset.mjs";
 import _nuxt from "./nuxt/preset.mjs";
 export default [
   ..._h3,
   ..._nitro,
+  ..._npmPackage,
   ..._npmpackage,
   ..._nuxt
 ];

package/dist/presets/npmPackage/preset.d.ts

@@ -0,0 +1,2 @@
+declare const _default: readonly [any];
+export default _default;

package/dist/presets/npmPackage/preset.mjs

@@ -0,0 +1,20 @@
+import { defineSilgiPreset } from "silgi/kit";
+const npmPackage = defineSilgiPreset(
+  {
+    output: {
+      dir: "{{ rootDir }}/.output",
+      publicDir: "{{ output.dir }}/public"
+    },
+    serverDir: "{{ rootDir }}/src",
+    silgi: {
+      serverDir: "{{ serverDir }}/silgi"
+    },
+    modules: ["./src"]
+  },
+  {
+    name: "npm-package",
+    compatibilityDate: "2025-02-04",
+    url: import.meta.url
+  }
+);
+export default [npmPackage];

package/package.json

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