@dyrected/nuxt 2.5.12 → 2.5.13

package/dist/runtime/server/handler.mjs

@@ -2,15 +2,15 @@ import { defineEventHandler, getRequestURL } from "h3";
 import { createDyrectedApp } from "@dyrected/core/server";
 import { useRuntimeConfig } from "#imports";
 let app;
+let lastVersion = 0;
 export default defineEventHandler(async (event) => {
   const config = useRuntimeConfig().dyrected;
-  if (!app) {
+  const currentVersion = globalThis.__dyrected_config_version || 0;
+  if (!app || currentVersion !== lastVersion) {
+    lastVersion = currentVersion;
     let dyrectedConfig = { ...config };
     if (globalThis.__dyrected_config) {
       const gConfig = globalThis.__dyrected_config;
-      console.log("[dyrected/nuxt] raw __dyrected_config:", gConfig);
-      console.log("[dyrected/nuxt] raw __dyrected_config keys:", Object.keys(gConfig || {}));
-      console.log("[dyrected/nuxt] raw __dyrected_config default keys:", Object.keys(gConfig?.default || {}));
       const configObj = gConfig.default && (gConfig.default.collections || gConfig.default.globals || gConfig.default.db) ? gConfig.default : gConfig;
       console.log("[dyrected/nuxt] chosen configObj keys:", Object.keys(configObj || {}));
       dyrectedConfig = { ...dyrectedConfig, ...configObj };

package/dist/runtime/server/plugins/db.mjs

@@ -30,6 +30,7 @@ export default defineNitroPlugin(async (nitroApp) => {
               const newConfig = await loadDyrectedConfig(configPath);
               const newObj = newConfig.default && (newConfig.default.collections || newConfig.default.globals || newConfig.default.db) ? newConfig.default : newConfig;
               globalThis.__dyrected_config = newObj;
+              globalThis.__dyrected_config_version = (globalThis.__dyrected_config_version || 0) + 1;
               if (newObj.db) {
                 globalThis.__dyrected_db = newObj.db;
                 console.log("[dyrected/nuxt] Database hot\u2011reloaded");
@@ -38,6 +39,7 @@ export default defineNitroPlugin(async (nitroApp) => {
                 globalThis.__dyrected_storage = newObj.storage;
                 console.log("[dyrected/nuxt] Storage hot\u2011reloaded");
               }
+              console.log("[dyrected/nuxt] Configuration hot-reloaded (version " + globalThis.__dyrected_config_version + ")");
             } catch (e) {
               console.error("[dyrected/nuxt] Hot\u2011reload failed:", e);
             }

package/dist/runtime/server/plugins/loadConfig.mjs

@@ -15,16 +15,32 @@ export async function loadDyrectedConfig(configPath) {
     );
   }
   const jitiMod = await import("jiti");
-  let loader;
+  const resolvedPath = path.resolve(configPath);
   if (typeof jitiMod.createJiti === "function") {
     const jitiInstance = jitiMod.createJiti(import.meta.url, {
       esmResolve: true,
       interopDefault: true
     });
-    loader = (p) => jitiInstance.import(p);
+    if (jitiInstance.cache) {
+      delete jitiInstance.cache[resolvedPath];
+      for (const k of Object.keys(jitiInstance.cache)) {
+        if (path.resolve(k) === resolvedPath) {
+          delete jitiInstance.cache[k];
+        }
+      }
+    }
+    return await jitiInstance.import(configPath);
   } else {
     const jitiDefault = jitiMod.default || jitiMod;
-    loader = (p) => jitiDefault(p, { esmResolve: true, interopDefault: true });
+    const loader = jitiDefault(import.meta.url, { esmResolve: true, interopDefault: true });
+    if (loader.cache) {
+      delete loader.cache[resolvedPath];
+      for (const k of Object.keys(loader.cache)) {
+        if (path.resolve(k) === resolvedPath) {
+          delete loader.cache[k];
+        }
+      }
+    }
+    return loader(configPath);
   }
-  return await loader(configPath);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/nuxt",
-  "version": "2.5.12",
+  "version": "2.5.13",
   "type": "module",
   "main": "./dist/module.mjs",
   "types": "./dist/module.d.ts",
@@ -10,10 +10,10 @@
   "dependencies": {
     "@nuxt/kit": "^3.11.2",
     "h3": "^1.15.0",
-    "@dyrected/admin": "2.5.12",
-    "@dyrected/sdk": "2.5.12",
-    "@dyrected/core": "2.5.12",
-    "@dyrected/vue": "2.5.12"
+    "@dyrected/core": "2.5.13",
+    "@dyrected/sdk": "2.5.13",
+    "@dyrected/vue": "2.5.13",
+    "@dyrected/admin": "2.5.13"
   },
   "peerDependencies": {
     "nuxt": "^3.0.0",