@lupinum/ginko-content 0.3.2 → 0.3.3

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@lupinum/ginko-content",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "configKey": "content",
   "compatibility": {
     "nuxt": ">=4.4.7 <5"

package/dist/module.mjs

@@ -4,7 +4,8 @@ import { readFile, readdir, rm } from 'node:fs/promises';
 import { join as join$1, basename, resolve as resolve$1, dirname, isAbsolute as isAbsolute$1 } from 'node:path';
 import { buildResolvedContentContract } from '../dist/cms-contract/index.js';
 import fs, { existsSync } from 'fs';
-import { join, relative, resolve, isAbsolute } from 'pathe';
+import { createRequire } from 'node:module';
+import { join, relative, isAbsolute, resolve } from 'pathe';
 import jiti from 'jiti';
 import { genSafeVariableName, genImport } from 'knitwork';
 import { hash } from 'ohash';
@@ -29,7 +30,7 @@ import { createRouterMatcher } from 'vue-router';
 import { globby } from 'globby';
 
 const name = "@lupinum/ginko-content";
-const version = "0.3.2";
+const version = "0.3.3";
 const peerDependencies = {
 	nuxt: ">=4.4.7 <5"};
 
@@ -40,6 +41,17 @@ const CONFIG_FILES = [
   "content.config.mjs",
   "content.config.cjs"
 ];
+const isLocalModule = (filename, rootDir) => {
+  const localPath = relative(rootDir, filename);
+  return Boolean(localPath) && !localPath.startsWith("../") && !isAbsolute(localPath) && !localPath.split("/").includes("node_modules");
+};
+const clearLocalNativeModules = (cache, rootDir) => {
+  for (const [id, entry] of Object.entries(cache)) {
+    if (entry && isLocalModule(entry.filename, rootDir)) {
+      Reflect.deleteProperty(cache, id);
+    }
+  }
+};
 function resolveContentConfigPath(nuxt) {
   return CONFIG_FILES.map((name) => join(nuxt.options.rootDir, name)).find((path) => existsSync(path));
 }
@@ -48,8 +60,21 @@ async function loadContentConfig(nuxt) {
   if (!configPath) {
     return {};
   }
-  const importer = jiti(nuxt.options.rootDir, { interopDefault: true });
-  const loaded = await importer.import(configPath);
+  const nativeRequire = createRequire(configPath);
+  clearLocalNativeModules(nativeRequire.cache, nuxt.options.rootDir);
+  const importer = jiti(nuxt.options.rootDir, {
+    interopDefault: true,
+    // Nuxt reloads module setup in the same process for `options.watch`
+    // changes. The authored config and its imports must not come from the
+    // previous setup's module cache.
+    moduleCache: false
+  });
+  let loaded;
+  try {
+    loaded = importer(configPath);
+  } finally {
+    clearLocalNativeModules(nativeRequire.cache, nuxt.options.rootDir);
+  }
   return loaded?.default || loaded || {};
 }
 
@@ -193,11 +218,8 @@ const registerContentDevRuntime = (nuxt, options, contentContext) => {
   const isIgnored = makeIgnored(contentContext.ignores);
   let viteServer;
   if (options.watch !== false) {
-    nuxt.options.vite ||= {};
-    nuxt.options.vite.plugins ||= [];
-    nuxt.options.vite.plugins.push({
-      name: "ginko-content-hmr",
-      configureServer(server) {
+    nuxt.hook("vite:serverCreated", (server, environment) => {
+      if (environment.isClient) {
         viteServer = server;
       }
     });
@@ -1868,6 +1890,12 @@ const module$1 = defineNuxtModule({
       noExternal: runtimeInlineDependencies
     });
     const contentConfigPath = resolveContentConfigPath(nuxt);
+    if (nuxt.options.dev && options.watch !== false && contentConfigPath) {
+      nuxt.options.watch ||= [];
+      if (!nuxt.options.watch.includes(contentConfigPath)) {
+        nuxt.options.watch.push(contentConfigPath);
+      }
+    }
     const appContentConfig = await loadContentConfig(nuxt);
     if (!contentConfigPath || !appContentConfig.collections || !Object.keys(appContentConfig.collections).length) {
       throw new Error("@lupinum/ginko-content requires a content.config.ts with at least one collection. Define collections with defineContentConfig({ collections: { ... } }).");
@@ -1935,7 +1963,12 @@ const module$1 = defineNuxtModule({
       search: resolvedSearch,
       validation: options.validation || "report"
     };
-    await rm(resolve$1(nuxt.options.buildDir, "content-cache/validation.json"), { force: true });
+    const contentCacheDir = resolve$1(nuxt.options.buildDir, "content-cache");
+    if (nuxt.options.dev) {
+      await rm(contentCacheDir, { recursive: true, force: true });
+    } else {
+      await rm(resolve$1(contentCacheDir, "validation.json"), { force: true });
+    }
     const layers = nuxt.options._layers || [{ cwd: nuxt.options.rootDir, config: {} }];
     const nitroPublicAssets = nuxt.options.nitro?.publicAssets || [];
     contentContext.validationPublicAssets = await collectContentValidationPublicAssets({

package/dist/runtime/app/plugins/hot-reload.d.ts

@@ -1,2 +1,6 @@
+type ContentHot = {
+    on: (event: 'ginko-content:update', callback: (data: unknown) => void) => void;
+};
+export declare function registerContentHotReload(hot: ContentHot | undefined, isClient: boolean, refresh: () => unknown): void;
 declare const _default: any;
 export default _default;

package/dist/runtime/app/plugins/hot-reload.js

@@ -1,6 +1,14 @@
-import { defineNuxtPlugin } from "#imports";
-export default defineNuxtPlugin(() => {
-  if (import.meta.client && import.meta.hot) {
-    import("../composables/hot-reload.js").then(({ registerContentHotReload }) => registerContentHotReload());
+import { defineNuxtPlugin, refreshNuxtData } from "#imports";
+export function registerContentHotReload(hot, isClient, refresh) {
+  if (!hot || !isClient) {
+    return;
   }
+  hot.on("ginko-content:update", (data) => {
+    if (data && typeof data === "object") {
+      refresh();
+    }
+  });
+}
+export default defineNuxtPlugin(() => {
+  registerContentHotReload(import.meta.hot, import.meta.client, refreshNuxtData);
 });

package/dist/web-types.json

@@ -1,7 +1,7 @@
 {
   "framework": "vue",
   "name": "@lupinum/ginko-content",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "contributions": {
     "html": {
       "description-markup": "markdown",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lupinum/ginko-content",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Collection-first content engine for Nuxt",
   "homepage": "https://github.com/lupinum-dev/ginko-content",
   "bugs": {

package/dist/runtime/app/composables/hot-reload.d.ts

@@ -1,5 +0,0 @@
-type ContentHot = {
-    on: (event: 'ginko-content:update', callback: (data: unknown) => void) => void;
-};
-export declare function registerContentHotReload(hot?: ContentHot | undefined, isClient?: boolean | undefined): void;
-export {};

package/dist/runtime/app/composables/hot-reload.js

@@ -1,15 +0,0 @@
-import { refreshNuxtData } from "#imports";
-let registered = false;
-const onContentUpdate = (data) => {
-  if (!data || typeof data !== "object") {
-    return;
-  }
-  refreshNuxtData();
-};
-export function registerContentHotReload(hot = import.meta.hot, isClient = import.meta.client) {
-  if (!hot || !isClient || registered) {
-    return;
-  }
-  registered = true;
-  hot.on("ginko-content:update", onContentUpdate);
-}