nuxt-studio 1.3.1 → 1.3.3

package/dist/module/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-studio",
   "configKey": "studio",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "docs": "https://content.nuxt.com/studio",
   "builder": {
     "@nuxt/module-builder": "1.0.2",

package/dist/module/module.mjs

@@ -38,7 +38,7 @@ async function getAssetsStorageTemplate(assetsStorage, _nuxt) {
   ].join("\n");
 }
 
-const version = "1.3.1";
+const version = "1.3.3";
 
 function setupDevMode(nuxt, runtime, assetsStorage) {
   nuxt.options.nitro.storage = {
@@ -111,7 +111,7 @@ function validateAuthConfig(options) {
     const missingProviderEnv = provider === "github" ? !hasGitHubAuth : !hasGitLabAuth;
     if (missingProviderEnv) {
       logger$1.warn([
-        `[Nuxt Studio] In order to use Studio in production mode, you need to setup authentication:`,
+        `In order to use Studio in production mode, you need to setup authentication:`,
         "- Read more on `https://nuxt.studio/auth-providers`",
         `- Alternatively, you can disable studio by setting \`$production: { studio: false }\` in your \`nuxt.config.ts\``
       ].join("\n"));
@@ -144,9 +144,9 @@ const module$1 = defineNuxtModule({
     },
     repository: {
       provider: "github",
-      owner: "",
-      repo: "",
-      branch: "main",
+      owner: void 0,
+      repo: void 0,
+      branch: void 0,
       rootDir: "",
       private: true
     },
@@ -197,12 +197,12 @@ const module$1 = defineNuxtModule({
       options.dev = false;
     }
     const isProdBuild = nuxt.options.dev === false && nuxt.options._prepare === false;
-    if (isProdBuild && !options.repository?.owner && !options.repository?.repo) {
-      const detected = detectRepositoryFromCI();
-      if (detected) {
-        options.repository = defu(detected, options.repository);
-        logger.info(`Auto-detected repository from CI environment: ${detected.provider}:${detected.owner}/${detected.repo}#${detected.branch}`);
+    if (isProdBuild) {
+      const detectedRepo = detectRepositoryFromCI();
+      if (detectedRepo) {
+        options.repository = defu(detectedRepo, options.repository);
       }
+      logger.info(`Using repository: ${options.repository?.provider}:${options.repository?.owner}/${options.repository?.repo}#${options.repository?.branch}`);
     }
     if (isProdBuild && !options.repository?.owner && !options.repository?.repo) {
       throw new Error("Repository owner and repository name are required");
@@ -309,12 +309,7 @@ const module$1 = defineNuxtModule({
         "nuxt-studio > debug",
         "nuxt-studio > extend"
       ];
-      config.build ||= {};
-      config.build.target = "es2020";
     });
-    nuxt.options.nitro.esbuild ||= {};
-    nuxt.options.nitro.esbuild.options ||= {};
-    nuxt.options.nitro.esbuild.options.target = "es2020";
     addPlugin(process.env.STUDIO_DEV_SERVER ? runtime("./plugins/studio.client.dev") : runtime("./plugins/studio.client"));
     const assetsStorage = createStorage({
       driver: fsDriver({
@@ -371,11 +366,13 @@ const module$1 = defineNuxtModule({
         route: "/__nuxt_studio/ai/generate",
         handler: runtime("./server/routes/ai/generate.post")
       });
-      addServerHandler({
-        method: "post",
-        route: "/__nuxt_studio/ai/analyze",
-        handler: runtime("./server/routes/ai/analyze.post")
-      });
+      if (options.ai?.experimental?.collectionContext) {
+        addServerHandler({
+          method: "post",
+          route: "/__nuxt_studio/ai/analyze",
+          handler: runtime("./server/routes/ai/analyze.post")
+        });
+      }
     }
   }
 });

package/dist/module/runtime/host.js

@@ -1,7 +1,7 @@
 import { ref } from "vue";
 import { ensure } from "./utils/ensure.js";
 import { getCollectionByFilePath, generateIdFromFsPath, generateRecordDeletion, generateRecordInsert, generateFsPathFromId, getCollectionById } from "./utils/collection.js";
-import { applyCollectionSchema, isDocumentMatchingContent, generateDocumentFromContent, generateContentFromDocument, areDocumentsEqual, pickReservedKeysFromDocument, removeReservedKeysFromDocument, sanitizeDocumentTree } from "./utils/document/index.js";
+import { applyCollectionSchema, isDocumentMatchingContent, generateDocumentFromContent, generateContentFromDocument, areDocumentsEqual, pickReservedKeysFromDocument, cleanDataKeys, sanitizeDocumentTree } from "./utils/document/index.js";
 import { getHostStyles, getSidebarWidth, adjustFixedElements } from "./utils/sidebar.js";
 import { clearError, getAppManifest, queryCollection, queryCollectionItemSurroundings, queryCollectionNavigation, queryCollectionSearchSections, useRuntimeConfig } from "#imports";
 import { collections } from "#content/preview";
@@ -210,7 +210,7 @@ export function useStudioHost(user, repository) {
         areEqual: (document1, document2) => areDocumentsEqual(document1, document2),
         isMatchingContent: async (content, document2) => isDocumentMatchingContent(content, document2),
         pickReservedKeys: (document2) => pickReservedKeysFromDocument(document2),
-        removeReservedKeys: (document2) => removeReservedKeysFromDocument(document2),
+        cleanDataKeys: (document2) => cleanDataKeys(document2),
         detectActives: () => {
           const wrappers = document.querySelectorAll("[data-content-id]");
           return Array.from(wrappers).map((wrapper) => {

package/dist/module/runtime/server/routes/ai/analyze.post.js

@@ -4,7 +4,6 @@ import { eventHandler, createError, useSession, getRequestProtocol, readBody } f
 import { consola } from "consola";
 import { useRuntimeConfig } from "#imports";
 import { queryCollection } from "@nuxt/content/server";
-import { generateContentFromDocument } from "../../../utils/document/generate.js";
 import {
   detectContentType,
   analyzeArchitecture,
@@ -87,6 +86,7 @@ export default eventHandler(async (event) => {
       }
       let excerpt = "";
       try {
+        const { generateContentFromDocument } = await import("../../../utils/document/generate.js");
         const rawContent = await generateContentFromDocument(document);
         if (rawContent) {
           excerpt = rawContent;

package/dist/module/runtime/server/routes/auth/github.get.js

@@ -1,12 +1,12 @@
-import { eventHandler, getQuery, sendRedirect, createError, getRequestURL, deleteCookie, getCookie } from "h3";
-import { withQuery } from "ufo";
-import { defu } from "defu";
 import { useRuntimeConfig } from "#imports";
+import { createError, deleteCookie, eventHandler, getCookie, getQuery, getRequestURL, sendRedirect } from "h3";
+import { withQuery } from "ufo";
 import { generateOAuthState, requestAccessToken, validateOAuthState } from "../../utils/auth.js";
 import { setInternalStudioUserSession } from "../../utils/session.js";
+import { mergeConfig } from "../../utils/object.js";
 export default eventHandler(async (event) => {
   const studioConfig = useRuntimeConfig(event).studio;
-  const config = defu(studioConfig?.auth?.github, {
+  const config = mergeConfig(studioConfig?.auth?.github, {
     clientId: process.env.STUDIO_GITHUB_CLIENT_ID,
     clientSecret: process.env.STUDIO_GITHUB_CLIENT_SECRET,
     redirectURL: process.env.STUDIO_GITHUB_REDIRECT_URL,

package/dist/module/runtime/server/routes/auth/gitlab.get.js

@@ -1,14 +1,14 @@
+import { useRuntimeConfig } from "#imports";
+import { createError, deleteCookie, eventHandler, getCookie, getQuery, getRequestURL, sendRedirect } from "h3";
 import { FetchError } from "ofetch";
-import { eventHandler, getQuery, sendRedirect, createError, getRequestURL, deleteCookie, getCookie } from "h3";
 import { withQuery } from "ufo";
-import { defu } from "defu";
-import { useRuntimeConfig } from "#imports";
 import { generateOAuthState, validateOAuthState } from "../../utils/auth.js";
 import { setInternalStudioUserSession } from "../../utils/session.js";
+import { mergeConfig } from "../../utils/object.js";
 export default eventHandler(async (event) => {
   const studioConfig = useRuntimeConfig(event).studio;
   const instanceUrl = studioConfig?.auth?.gitlab?.instanceUrl || "https://gitlab.com";
-  const config = defu(studioConfig?.auth?.gitlab, {
+  const config = mergeConfig(studioConfig?.auth?.gitlab, {
     applicationId: process.env.STUDIO_GITLAB_APPLICATION_ID,
     applicationSecret: process.env.STUDIO_GITLAB_APPLICATION_SECRET,
     redirectURL: process.env.STUDIO_GITLAB_REDIRECT_URL,

package/dist/module/runtime/server/routes/auth/google.get.js

@@ -1,14 +1,14 @@
-import { eventHandler, createError, getQuery, sendRedirect, getRequestURL, getCookie, deleteCookie } from "h3";
-import { withQuery } from "ufo";
-import { defu } from "defu";
 import { useRuntimeConfig } from "#imports";
 import { consola } from "consola";
+import { createError, deleteCookie, eventHandler, getCookie, getQuery, getRequestURL, sendRedirect } from "h3";
+import { withQuery } from "ufo";
 import { generateOAuthState, requestAccessToken, validateOAuthState } from "../../utils/auth.js";
 import { setInternalStudioUserSession } from "../../utils/session.js";
+import { mergeConfig } from "../../utils/object.js";
 const logger = consola.withTag("Nuxt Studio");
 export default eventHandler(async (event) => {
   const studioConfig = useRuntimeConfig(event).studio;
-  const config = defu(studioConfig?.auth?.google, {
+  const config = mergeConfig(studioConfig?.auth?.google, {
     clientId: process.env.STUDIO_GOOGLE_CLIENT_ID,
     clientSecret: process.env.STUDIO_GOOGLE_CLIENT_SECRET,
     redirectURL: process.env.STUDIO_GOOGLE_REDIRECT_URL,
@@ -101,7 +101,7 @@ export default eventHandler(async (event) => {
   if (!moderators.includes(user.email)) {
     if (import.meta.dev && moderators.length === 0) {
       logger.warn([
-        "[Nuxt Studio] No moderators defined. Moderators are required for Google authentication.",
+        "No moderators defined. Moderators are required for Google authentication.",
         "Please set the `STUDIO_GOOGLE_MODERATORS` environment variable to a comma-separated list of email addresses of the moderators."
       ].join("\n"));
     }

package/dist/module/runtime/server/routes/auth/sso.get.js

@@ -1,12 +1,12 @@
-import { eventHandler, createError, getQuery, sendRedirect, getRequestURL, getCookie, deleteCookie } from "h3";
-import { withQuery } from "ufo";
-import { defu } from "defu";
 import { useRuntimeConfig } from "#imports";
-import { generateOAuthState, requestAccessToken, validateOAuthState, generatePKCECodeVerifier, generateCodeChallenge, consumePKCECodeVerifier } from "../../utils/auth.js";
+import { createError, deleteCookie, eventHandler, getCookie, getQuery, getRequestURL, sendRedirect } from "h3";
+import { withQuery } from "ufo";
+import { consumePKCECodeVerifier, generateCodeChallenge, generateOAuthState, generatePKCECodeVerifier, requestAccessToken, validateOAuthState } from "../../utils/auth.js";
 import { setInternalStudioUserSession } from "../../utils/session.js";
+import { mergeConfig } from "../../utils/object.js";
 export default eventHandler(async (event) => {
   const studioConfig = useRuntimeConfig(event).studio;
-  const config = defu(studioConfig?.auth?.sso, {
+  const config = mergeConfig(studioConfig?.auth?.sso, {
     serverUrl: process.env.STUDIO_SSO_URL,
     clientId: process.env.STUDIO_SSO_CLIENT_ID,
     clientSecret: process.env.STUDIO_SSO_CLIENT_SECRET,

package/dist/module/runtime/server/utils/auth.js

@@ -1,6 +1,6 @@
-import { getRandomValues } from "uncrypto";
-import { getCookie, deleteCookie, setCookie, getRequestProtocol, createError } from "h3";
+import { createError, deleteCookie, getCookie, getRequestProtocol, setCookie } from "h3";
 import { FetchError } from "ofetch";
+import { getRandomValues } from "uncrypto";
 export async function requestAccessToken(url, options) {
   const headers = {
     "Content-Type": "application/x-www-form-urlencoded",

package/dist/module/runtime/server/utils/object.d.ts

@@ -0,0 +1 @@
+export declare function mergeConfig<T>(config: T | undefined, defaults: Partial<T>): T;

package/dist/module/runtime/server/utils/object.js

@@ -0,0 +1,14 @@
+import { createDefu } from "defu";
+const customDefu = createDefu((obj, key, value) => {
+  if (obj[key] === "" && value !== void 0 && value !== null && value !== "") {
+    obj[key] = value;
+    return true;
+  }
+  if (obj[key] !== void 0 && obj[key] !== null) {
+    return true;
+  }
+  return false;
+});
+export function mergeConfig(config, defaults) {
+  return customDefu(defaults, config || {});
+}

package/dist/module/runtime/utils/document/compare.js

@@ -5,7 +5,7 @@ import { compressTree } from "@nuxt/content/runtime";
 import { generateDocumentFromContent } from "./generate.js";
 import { removeLastStylesFromTree } from "./tree.js";
 export async function isDocumentMatchingContent(content, document) {
-  const generatedDocument = await generateDocumentFromContent(document.id, content);
+  const generatedDocument = await generateDocumentFromContent(document.id, content, { compress: true, preserveLinkAttributes: true });
   if (generatedDocument.extension === ContentFileExtension.Markdown) {
     const { body: generatedBody, ...generatedDocumentData } = generatedDocument;
     const { body: documentBody, ...documentData } = document;

package/dist/module/runtime/utils/document/generate.js

@@ -8,7 +8,7 @@ import destr from "destr";
 import { parseFrontMatter, stringifyFrontMatter } from "remark-mdc";
 import { useHostMeta } from "../../composables/useMeta.js";
 import { addPageTypeFields, generateStemFromId, getFileExtension } from "./utils.js";
-import { removeReservedKeysFromDocument } from "./schema.js";
+import { cleanDataKeys } from "./schema.js";
 import { remarkEmojiPlugin } from "nuxt-studio/app/utils";
 const logger = consola.withTag("Nuxt Studio");
 export async function generateDocumentFromContent(id, content, options = { compress: true }) {
@@ -83,9 +83,11 @@ export async function generateDocumentFromMarkdownContent(id, content, options =
       }
     }
   });
-  visit(document.body, (node) => node.type === "element" && node.tag === "a", (node) => {
-    Reflect.deleteProperty(node.props, "rel");
-  });
+  if (!options.preserveLinkAttributes) {
+    visit(document.body, (node) => node.type === "element" && node.tag === "a", (node) => {
+      Reflect.deleteProperty(node.props, "rel");
+    });
+  }
   let body = document.body;
   if (options.compress && document.body.type === "root") {
     body = compressTree(document.body);
@@ -121,21 +123,21 @@ export async function generateContentFromDocument(document) {
   return null;
 }
 export async function generateContentFromYAMLDocument(document) {
-  return await stringifyFrontMatter(removeReservedKeysFromDocument(document), "", {
+  return await stringifyFrontMatter(cleanDataKeys(document), "", {
     prefix: "",
     suffix: "",
     lineWidth: 0
   });
 }
 export async function generateContentFromJSONDocument(document) {
-  return JSON.stringify(removeReservedKeysFromDocument(document), null, 2);
+  return JSON.stringify(cleanDataKeys(document), null, 2);
 }
 export async function generateContentFromMarkdownDocument(document) {
   const body = document.body.type === "minimark" ? decompressTree(document.body) : document.body;
   visit(body, (node) => node.type === "element" && node.tag === "a", (node) => {
     Reflect.deleteProperty(node.props, "rel");
   });
-  const markdown = await stringifyMarkdown(body, removeReservedKeysFromDocument(document), {
+  const markdown = await stringifyMarkdown(body, cleanDataKeys(document), {
     frontMatter: {
       options: {
         lineWidth: 0

package/dist/module/runtime/utils/document/index.d.ts

@@ -1,4 +1,4 @@
-export { applyCollectionSchema, pickReservedKeysFromDocument, removeReservedKeysFromDocument, reservedKeys, } from './schema.js';
+export { applyCollectionSchema, pickReservedKeysFromDocument, cleanDataKeys, reservedKeys, } from './schema.js';
 export { isDocumentMatchingContent, areDocumentsEqual, } from './compare.js';
 export { generateDocumentFromContent, generateDocumentFromMarkdownContent, generateDocumentFromYAMLContent, generateDocumentFromJSONContent, generateContentFromDocument, generateContentFromMarkdownDocument, generateContentFromYAMLDocument, generateContentFromJSONDocument, } from './generate.js';
 export { addPageTypeFields, parseDocumentId, generatePathFromStem, generateStemFromId, generateTitleFromPath, getFileExtension, } from './utils.js';

package/dist/module/runtime/utils/document/index.js

@@ -1,7 +1,7 @@
 export {
   applyCollectionSchema,
   pickReservedKeysFromDocument,
-  removeReservedKeysFromDocument,
+  cleanDataKeys,
   reservedKeys
 } from "./schema.js";
 export {

package/dist/module/runtime/utils/document/schema.d.ts

@@ -3,4 +3,4 @@ import type { DatabaseItem } from 'nuxt-studio/app';
 export declare const reservedKeys: string[];
 export declare function applyCollectionSchema(id: string, collectionInfo: CollectionInfo, document: CollectionItemBase): DatabaseItem;
 export declare function pickReservedKeysFromDocument(document: DatabaseItem): DatabaseItem;
-export declare function removeReservedKeysFromDocument(document: DatabaseItem): DatabaseItem;
+export declare function cleanDataKeys(document: DatabaseItem): DatabaseItem;

package/dist/module/runtime/utils/document/schema.js

@@ -31,7 +31,7 @@ export function applyCollectionSchema(id, collectionInfo, document) {
 export function pickReservedKeysFromDocument(document) {
   return pick(document, reservedKeys);
 }
-export function removeReservedKeysFromDocument(document) {
+export function cleanDataKeys(document) {
   const result = omit(document, reservedKeys);
   if (result.navigation === true) {
     Reflect.deleteProperty(result, "navigation");
@@ -57,6 +57,9 @@ export function removeReservedKeysFromDocument(document) {
     if (result[key] === null) {
       Reflect.deleteProperty(result, key);
     }
+    if (Array.isArray(result[key]) && result[key].length === 0) {
+      Reflect.deleteProperty(result, key);
+    }
   }
   return result;
 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "nuxt-studio",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Nuxt Studio for Nuxt Content",
   "private": false,
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/nuxt-content/studio.git"
+    "url": "git+https://github.com/nuxt-content/nuxt-studio.git"
   },
   "license": "MIT",
   "type": "module",
@@ -15,6 +15,7 @@
       "types": "./dist/app/main.d.ts",
       "default": "./dist/app/main.js"
     },
+    "./app/*": "./dist/app/*",
     "./app/utils": {
       "types": "./dist/app/shared.d.ts",
       "default": "./dist/app/shared.js"
@@ -47,12 +48,12 @@
     "clean": "rm -rf dist .nuxt .output node_modules docs/node_modules docs/.output docs/.data docs/.nuxt playground/docus/node_modules playground/docus/.output playground/docus/.data playground/docus/.nuxt playground/minimal/node_modules playground/minimal/.output playground/minimal/.data playground/minimal/.nuxt pnpm-lock.yaml"
   },
   "dependencies": {
-    "@ai-sdk/gateway": "^3.0.35",
-    "@ai-sdk/vue": "^3.0.72",
-    "@iconify-json/lucide": "^1.2.88",
+    "@ai-sdk/gateway": "^3.0.42",
+    "@ai-sdk/vue": "^3.0.82",
+    "@iconify-json/lucide": "^1.2.90",
     "@nuxtjs/mdc": "^0.20.1",
-    "@vueuse/core": "^14.2.0",
-    "ai": "^6.0.72",
+    "@vueuse/core": "^14.2.1",
+    "ai": "^6.0.82",
     "defu": "^6.1.4",
     "destr": "^2.0.5",
     "js-yaml": "^4.1.1",
@@ -66,21 +67,21 @@
   },
   "devDependencies": {
     "@gitbeaker/core": "^43.8.0",
-    "@iconify-json/simple-icons": "^1.2.69",
+    "@iconify-json/simple-icons": "^1.2.70",
     "@nuxt/content": "^3.11.2",
-    "@nuxt/eslint-config": "^1.13.0",
-    "@nuxt/kit": "^4.3.0",
+    "@nuxt/eslint-config": "^1.15.1",
+    "@nuxt/kit": "^4.3.1",
     "@nuxt/module-builder": "^1.0.2",
     "@nuxt/ui": "^4.4.0",
     "@octokit/types": "^16.0.0",
-    "@release-it/conventional-changelog": "^10.0.4",
+    "@release-it/conventional-changelog": "^10.0.5",
     "@tailwindcss/typography": "^0.5.19",
     "@tiptap/extension-emoji": "^3.19.0",
     "@types/js-yaml": "^4.0.9",
-    "@unhead/vue": "^2.1.2",
+    "@unhead/vue": "^2.1.4",
     "@unpic/vue": "^1.0.0",
     "@vitejs/plugin-vue": "^6.0.4",
-    "eslint": "^9.39.2",
+    "eslint": "^10.0.0",
     "idb-keyval": "^6.2.2",
     "minimark": "^0.2.0",
     "modern-monaco": "^0.3.7",
@@ -92,11 +93,14 @@
     "vite-plugin-dts": "^4.5.4",
     "vite-plugin-libcss": "^1.1.2",
     "vitest": "^4.0.18",
-    "vue": "^3.5.27",
-    "vue-router": "^4.6.4",
+    "vue": "^3.5.28",
+    "vue-router": "^5.0.2",
     "vue-tsc": "^3.2.4"
   },
-  "packageManager": "pnpm@10.28.2",
+  "resolutions": {
+    "minimark": "^0.2.0"
+  },
+  "packageManager": "pnpm@10.29.3",
   "keywords": [
     "nuxt",
     "content",