Merge branch 'main' into feat/create-folder

Author: larbish

.github/workflows/module.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        os: ubuntu-latest
+        os: [ubuntu-latest]
         node: [22]
 
     steps:
@@ -48,4 +48,7 @@ jobs:
         run: pnpm run typecheck
 
       - name: Test
-        run: pnpm run test run
+        run: pnpm run test
+
+      - name: Publish
+        run: pnpx pkg-pr-new publish --no-template --pnpm

package.json

@@ -2,7 +2,10 @@
   "name": "nuxt-studio",
   "version": "0.0.1",
   "description": "Nuxt Studio for Nuxt Content",
-  "repository": "@nuxtlabs/nuxt-studio",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nuxt-content/studio.git"
+  },
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -20,6 +23,9 @@
       "default": "./dist/app/service-worker.js"
     }
   },
+  "files": [
+    "dist"
+  ],
   "main": "./dist/module/module.mjs",
   "scripts": {
     "prepack": "nuxt-module-build build src/module; vite build src/app",
@@ -78,5 +84,16 @@
     "minimark": "^0.2.0",
     "ofetch": "^1.4.1",
     "unstorage": "^1.17.1"
-  }
+  },
+  "keywords": [
+    "nuxt",
+    "content",
+    "nuxt-module",
+    "studio",
+    "editor",
+    "preview",
+    "cms",
+    "markdown",
+    "mdc"
+  ]
 }

src/app/src/components/shared/item/ItemCard.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { TreeStatus, type TreeItem } from '../../../types'
+import { type TreeItem, TreeStatus } from '../../../types'
 import type { PropType } from 'vue'
 import { computed } from 'vue'
 import { Image } from '@unpic/vue'

src/app/src/composables/useGit.ts

@@ -1,13 +1,14 @@
 import { ofetch } from 'ofetch'
 import { createSharedComposable } from '@vueuse/core'
 import type { RawFile, GithubFile, GitOptions } from '../types'
+import { DraftStatus } from '../types/draft'
 
 import { joinURL } from 'ufo'
 
 export const useGit = createSharedComposable(({ owner, repo, token, branch, rootDir, authorName, authorEmail }: GitOptions) => {
   const gitFiles: Record<string, GithubFile> = {}
   const $api = ofetch.create({
-    baseURL: 'https://api.github.com',
+    baseURL: `https://api.github.com/repos/${owner}/${repo}`,
     headers: {
       Authorization: `Bearer ${token}`,
       Accept: 'application/vnd.github.v3+json',
@@ -24,15 +25,26 @@ export const useGit = createSharedComposable(({ owner, repo, token, branch, root
     }
 
     try {
-      const ghFile: GithubFile = await $api(`/repos/${owner}/${repo}/contents/${path}?ref=${branch}`)
+      const ghFile: GithubFile = await $api(`/contents/${path}?ref=${branch}`)
       if (cached) {
         gitFiles[path] = ghFile
       }
       return ghFile
     }
     catch (error) {
-      // TODO: Handle error
-      alert(error)
+      // Handle different types of errors gracefully
+      if ((error as { status?: number }).status === 404) {
+        console.warn(`File not found on GitHub: ${path}`)
+        return null
+      }
+
+      console.error(`Failed to fetch file from GitHub: ${path}`, error)
+
+      // For development, show alert. In production, you might want to use a toast notification
+      if (process.env.NODE_ENV === 'development') {
+        alert(`Failed to fetch file: ${path}\n${(error as { message?: string }).message || error}`)
+      }
+
       return null
     }
   }
@@ -53,33 +65,45 @@ export const useGit = createSharedComposable(({ owner, repo, token, branch, root
 
   async function commitFilesToGitHub({ owner, repo, branch, files, message, authorName, authorEmail }: { owner: string, repo: string, branch: string, files: RawFile[], message: string, authorName: string, authorEmail: string }) {
     // Get latest commit SHA
-    const refData = await $api(`/repos/${owner}/${repo}/git/ref/heads/${branch}?ref=${branch}`)
+    const refData = await $api(`/git/ref/heads/${branch}?ref=${branch}`)
     const latestCommitSha = refData.object.sha
 
     // Get base tree SHA
-    const commitData = await $api(`/repos/repos/${owner}/${repo}/git/commits/${latestCommitSha}`)
+    const commitData = await $api(`/git/commits/${latestCommitSha}`)
     const baseTreeSha = commitData.tree.sha
 
     // Create blobs and prepare tree
     const tree = []
     for (const file of files) {
-      const blobData = await $api(`/repos/repos/${owner}/${repo}/git/blobs`, {
-        method: 'POST',
-        body: JSON.stringify({
-          content: file.content,
-          encoding: file.encoding,
-        }),
-      })
-      tree.push({
-        path: file.path,
-        mode: '100644',
-        type: 'blob',
-        sha: blobData.sha,
-      })
+      if (file.status === DraftStatus.Deleted) {
+        // For deleted files, set sha to null to remove them from the tree
+        tree.push({
+          path: file.path,
+          mode: '100644',
+          type: 'blob',
+          sha: null,
+        })
+      }
+      else {
+        // For new/modified files, create blob and use its sha
+        const blobData = await $api(`/git/blobs`, {
+          method: 'POST',
+          body: JSON.stringify({
+            content: file.content,
+            encoding: file.encoding,
+          }),
+        })
+        tree.push({
+          path: file.path,
+          mode: '100644',
+          type: 'blob',
+          sha: blobData.sha,
+        })
+      }
     }
 
     // Create new tree
-    const treeData = await $api(`/repos/repos/${owner}/${repo}/git/trees`, {
+    const treeData = await $api(`/git/trees`, {
       method: 'POST',
       body: JSON.stringify({
         base_tree: baseTreeSha,
@@ -88,7 +112,7 @@ export const useGit = createSharedComposable(({ owner, repo, token, branch, root
     })
 
     // Create new commit
-    const newCommit = await $api(`/repos/repos/${owner}/${repo}/git/commits`, {
+    const newCommit = await $api(`/git/commits`, {
       method: 'POST',
       body: JSON.stringify({
         message,
@@ -103,7 +127,7 @@ export const useGit = createSharedComposable(({ owner, repo, token, branch, root
     })
 
     // Update branch ref
-    await $api(`/repos/repos/${owner}/${repo}/git/refs/heads/${branch}`, {
+    await $api(`/git/refs/heads/${branch}`, {
       method: 'PATCH',
       body: JSON.stringify({ sha: newCommit.sha }),
     })