@vigilkids/cms-nuxt 0.0.2 → 0.2.0

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.15.0"
   },
-  "version": "0.0.2",
+  "version": "0.2.0",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "unknown"

package/dist/module.mjs

@@ -49,6 +49,10 @@ const module = defineNuxtModule({
       });
     }
     if (options.preview?.enabled !== false) {
+      addServerHandler({
+        middleware: true,
+        handler: resolve("./runtime/server/middleware/preview-context")
+      });
       addServerHandler({
         route: "/api/preview",
         method: "get",

package/dist/runtime/composables/useArticle.js

@@ -1,5 +1,5 @@
-import { toRef } from "vue";
 import { useAsyncData, useHead, useRuntimeConfig, useSeoMeta } from "#imports";
+import { toRef } from "vue";
 import { useCmsClient } from "./useCmsClient.js";
 export function useArticle(slug) {
   const resolvedSlug = toRef(slug);
@@ -29,14 +29,16 @@ export function useArticle(slug) {
   });
   useHead({
     script: () => {
-      if (!article.value?.json_ld || Object.keys(article.value.json_ld).length === 0) return [];
+      if (!article.value?.json_ld || Object.keys(article.value.json_ld).length === 0)
+        return [];
       return [{ type: "application/ld+json", innerHTML: JSON.stringify(article.value.json_ld) }];
     }
   });
   useHead({
     link: () => {
       const a = article.value;
-      if (!a?.available_locales || a.available_locales.length <= 1) return [];
+      if (!a?.available_locales || a.available_locales.length <= 1)
+        return [];
       const publicConfig = useRuntimeConfig().public;
       const siteUrl = publicConfig.siteUrl ?? "";
       const links = a.available_locales.map((locale) => ({

package/dist/runtime/composables/useArticleList.js

@@ -1,5 +1,5 @@
-import { computed, toRef } from "vue";
 import { useAsyncData } from "#imports";
+import { computed, toRef } from "vue";
 import { useCmsClient } from "./useCmsClient.js";
 export function useArticleList(params) {
   const resolvedParams = toRef(params);

package/dist/runtime/composables/useAuthor.js

@@ -1,14 +1,16 @@
-import { toRef } from "vue";
 import { useAsyncData } from "#imports";
+import { toRef } from "vue";
 import { useCmsClient } from "./useCmsClient.js";
 export function useAuthor(slug) {
   const resolvedSlug = toRef(slug);
   const client = useCmsClient();
-  const { data: author, status, error } = useAsyncData(
-    `cms-author-${resolvedSlug.value}`,
-    () => client.getAuthor(resolvedSlug.value),
-    { watch: [resolvedSlug] }
-  );
+  const {
+    data: author,
+    status,
+    error
+  } = useAsyncData(`cms-author-${resolvedSlug.value}`, () => client.getAuthor(resolvedSlug.value), {
+    watch: [resolvedSlug]
+  });
   const { data: articles } = useAsyncData(
     `cms-author-articles-${resolvedSlug.value}`,
     () => client.getAuthorArticles(resolvedSlug.value),

package/dist/runtime/composables/useBlogSeo.js

@@ -1,5 +1,5 @@
-import { toRef } from "vue";
 import { useSeoMeta } from "#imports";
+import { toRef } from "vue";
 export function useBlogSeo(options) {
   const title = toRef(options.title);
   const description = toRef(options.description ?? "");

package/dist/runtime/composables/useCategories.js

@@ -1,20 +1,19 @@
-import { computed } from "vue";
 import { useAsyncData } from "#imports";
+import { computed } from "vue";
 import { useCmsClient } from "./useCmsClient.js";
 export function useCategories() {
   const client = useCmsClient();
-  const { data, status, error } = useAsyncData(
-    "cms-categories",
-    () => client.getCategories(),
-    { dedupe: "defer" }
-  );
+  const { data, status, error } = useAsyncData("cms-categories", () => client.getCategories(), {
+    dedupe: "defer"
+  });
   const categories = computed(() => data.value ?? []);
   const flatCategories = computed(() => {
     const result = [];
     function flatten(nodes) {
       for (const node of nodes) {
         result.push(node);
-        if (node.children?.length) flatten(node.children);
+        if (node.children?.length)
+          flatten(node.children);
       }
     }
     flatten(categories.value);

package/dist/runtime/composables/useCmsClient.js

@@ -1,5 +1,5 @@
-import { CmsClient } from "@vigilkids/cms-client";
 import { useRuntimeConfig, useState } from "#imports";
+import { CmsClient } from "@vigilkids/cms-client";
 export function useCmsClient() {
   const config = useRuntimeConfig();
   const previewToken = useState("cmsPreviewToken", () => null);

package/dist/runtime/composables/useCmsPreview.js

@@ -1,10 +1,23 @@
-import { computed } from "vue";
-import { useRuntimeConfig, useState } from "#imports";
+import { useCookie, useRequestEvent, useRoute, useRuntimeConfig } from "#imports";
+import { computed, ref } from "vue";
+export function useCmsPreviewToken() {
+  const config = useRuntimeConfig();
+  const cookieName = config.public.cms.preview?.cookieName ?? "__preview_token";
+  if (import.meta.server) {
+    const event = useRequestEvent();
+    const token = event?.context?.__cms_preview_token ?? null;
+    return ref(token);
+  }
+  const cookie = useCookie(cookieName);
+  return computed(
+    () => cookie.value ? decodeURIComponent(cookie.value) : null
+  );
+}
 export function useCmsPreview() {
-  const previewToken = useState("cmsPreviewToken", () => null);
-  const isPreview = computed(() => !!previewToken.value);
+  const token = useCmsPreviewToken();
+  const route = useRoute();
+  const isPreview = computed(() => !!token.value || route.query._preview === "1");
   function exitPreview() {
-    previewToken.value = null;
     if (import.meta.client) {
       const config = useRuntimeConfig();
       const cookieName = config.public.cms.preview?.cookieName ?? "__preview_token";
@@ -12,5 +25,5 @@ export function useCmsPreview() {
       window.location.reload();
     }
   }
-  return { isPreview, previewToken, exitPreview };
+  return { isPreview, previewToken: token, exitPreview };
 }

package/dist/runtime/server/api/_revalidate.post.js

@@ -1,6 +1,6 @@
-import { createError, defineEventHandler, getHeader, readRawBody } from "h3";
 import { useRuntimeConfig, useStorage } from "#imports";
 import { verifyWebhookSignature } from "@vigilkids/cms-client/webhook";
+import { createError, defineEventHandler, getHeader, readRawBody } from "h3";
 export default defineEventHandler(async (event) => {
   const config = useRuntimeConfig();
   const secret = config.cms.webhookSecret;
@@ -29,11 +29,13 @@ export default defineEventHandler(async (event) => {
   paths.push(`${localePrefix}/blog/${payload.slug}`);
   paths.push(`${localePrefix}/blog`);
   const storage = useStorage("cache:nitro:routes");
+  const allKeys = await storage.getKeys("_:");
   let cleared = 0;
   for (const path of paths) {
-    const cacheKey = path.replace(/\//g, ":");
-    if (await storage.hasItem(cacheKey)) {
-      await storage.removeItem(cacheKey);
+    const escapedPrefix = path.replace(/\W/g, "").slice(0, 16);
+    const matchingKeys = allKeys.filter((k) => k.startsWith(`_:${escapedPrefix}.`));
+    for (const key of matchingKeys) {
+      await storage.removeItem(key);
       cleared++;
     }
   }

package/dist/runtime/server/api/preview.get.js

@@ -1,5 +1,5 @@
-import { createError, defineEventHandler, getQuery, sendRedirect, setCookie } from "h3";
 import { useRuntimeConfig } from "#imports";
+import { createError, defineEventHandler, getQuery, sendRedirect, setCookie } from "h3";
 export default defineEventHandler(async (event) => {
   const query = getQuery(event);
   const token = query.token;
@@ -23,9 +23,9 @@ export default defineEventHandler(async (event) => {
   let prefix = "";
   if (locale && locale !== defaultLocale) {
     const prefixes = cmsConfig.localePrefixes ?? {};
-    prefix = "/" + (prefixes[locale] ?? locale.toLowerCase());
+    prefix = `/${prefixes[locale] ?? locale.toLowerCase()}`;
   }
   const articlePath = cmsConfig.preview?.articlePath ?? "/blog/{slug}";
   const path = articlePath.replace("{slug}", slug);
-  return sendRedirect(event, `${prefix}${path}`, 302);
+  return sendRedirect(event, `${prefix}${path}?_preview=1`, 302);
 });

package/dist/runtime/server/middleware/preview-context.js

@@ -0,0 +1,10 @@
+import { useRuntimeConfig } from "#imports";
+import { defineEventHandler, getCookie } from "h3";
+export default defineEventHandler((event) => {
+  const config = useRuntimeConfig();
+  const cookieName = config.public.cms.preview?.cookieName ?? "__preview_token";
+  const raw = getCookie(event, cookieName);
+  if (raw) {
+    event.context.__cms_preview_token = decodeURIComponent(raw);
+  }
+});

package/dist/runtime/server/middleware/redirects.js

@@ -1,10 +1,11 @@
-import { defineEventHandler, getRequestURL, sendRedirect } from "h3";
 import { useRuntimeConfig } from "#imports";
+import { defineEventHandler, getRequestURL, sendRedirect } from "h3";
 let cachedRules = null;
 let cacheExpiry = 0;
 async function loadRules() {
   const now = Date.now();
-  if (cachedRules && now < cacheExpiry) return cachedRules;
+  if (cachedRules && now < cacheExpiry)
+    return cachedRules;
   const config = useRuntimeConfig();
   const cacheTtl = config.cms.redirects?.cacheTtl ?? 3e5;
   try {

package/dist/runtime/server/utils/cms-client.js

@@ -1,5 +1,5 @@
-import { CmsClient } from "@vigilkids/cms-client";
 import { useRuntimeConfig } from "#imports";
+import { CmsClient } from "@vigilkids/cms-client";
 let _client = null;
 export function useServerCmsClient() {
   if (!_client) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vigilkids/cms-nuxt",
-  "version": "0.0.2",
+  "version": "0.2.0",
   "description": "Nuxt 3 module for OnEx CMS — composables, server routes, middleware, sitemap",
   "type": "module",
   "main": "./dist/module.mjs",
@@ -17,7 +17,10 @@
   "sideEffects": false,
   "scripts": {
     "build": "nuxt-module-build build",
-    "prepack": "nuxt-module-build build"
+    "prepack": "nuxt-module-build build",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "format": "prettier --write src/"
   },
   "publishConfig": {
     "access": "public"
@@ -28,11 +31,15 @@
     "directory": "packages/cms-nuxt"
   },
   "devDependencies": {
+    "@antfu/eslint-config": "^4.13.2",
     "@nuxt/kit": "^3.15.0",
     "@nuxt/module-builder": "^0.8.0",
     "@nuxt/schema": "^3.15.0",
     "@types/node": "^22.0.0",
+    "eslint": "^9.22.0",
+    "eslint-config-prettier": "^10.1.1",
     "h3": "^1.12.0",
+    "prettier": "^3.5.3",
     "vue": "^3.4.0"
   },
   "peerDependencies": {