Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nuxt/content
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.13.1
Choose a base ref
...
head repository: nuxt/content
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.13.2
Choose a head ref

Commits on Jul 7, 2024

  1. Copy the full SHA
    112e79d View commit details

Commits on Jul 9, 2024

  1. Copy the full SHA
    1adba91 View commit details
  2. chore(deps): update devdependency vitest to v2 (#2695)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 9, 2024
    Copy the full SHA
    d870d51 View commit details
  3. chore(deps): update all non-major dependencies (#2689)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 9, 2024
    Copy the full SHA
    cf2254f View commit details

Commits on Jul 10, 2024

  1. chore(deps): lock file maintenance (#2693)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 10, 2024
    Copy the full SHA
    28434c3 View commit details
  2. chore(deps): update dependency @iconify-json/simple-icons to ^1.1.109 (

    …#2697)
    
    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 10, 2024
    Copy the full SHA
    c686c22 View commit details
  3. docs: prerender home

    farnabaz committed Jul 10, 2024
    Copy the full SHA
    4253f0b View commit details
  4. chore(deps): update dependency minisearch to v7 (#2694)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 10, 2024
    Copy the full SHA
    669cc57 View commit details

Commits on Jul 11, 2024

  1. docs: update nuxt-og-image and add postinstall script (#2705)

    * docs: improve deps
    
    * up
    
    * up
    
    * try without the resolution
    
    * up
    benjamincanac authored Jul 11, 2024
    Copy the full SHA
    ee3c7e6 View commit details

Commits on Jul 12, 2024

  1. Copy the full SHA
    67df705 View commit details
  2. ci: add stale action

    farnabaz committed Jul 12, 2024
    Copy the full SHA
    99f6060 View commit details
  3. Copy the full SHA
    233533d View commit details
  4. chore(deps): update all non-major dependencies (#2701)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 12, 2024
    Copy the full SHA
    abd6766 View commit details
  5. Copy the full SHA
    75208f1 View commit details
  6. Copy the full SHA
    d420dd8 View commit details

Commits on Jul 15, 2024

  1. chore(deps): update all non-major dependencies (#2708)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 15, 2024
    Copy the full SHA
    0ad31f4 View commit details

Commits on Jul 16, 2024

  1. chore(deps): lock file maintenance (#2710)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 16, 2024
    Copy the full SHA
    00f3fbf View commit details

Commits on Jul 17, 2024

  1. Copy the full SHA
    5f2a0b1 View commit details
  2. chore(deps): update all non-major dependencies (#2712)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 17, 2024
    Copy the full SHA
    874b78d View commit details

Commits on Jul 18, 2024

  1. ci: Update stale.yml

    farnabaz authored Jul 18, 2024
    Copy the full SHA
    225ff46 View commit details
  2. ci: update stale.yml

    farnabaz authored Jul 18, 2024
    Copy the full SHA
    964857d View commit details
  3. chore(deps): update dependency minisearch to ^7.0.2 (#2714)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 18, 2024
    Copy the full SHA
    9c86298 View commit details
  4. Copy the full SHA
    ec7105a View commit details

Commits on Jul 19, 2024

  1. chore(deps): update nuxt framework to ^3.12.4 (#2717)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 19, 2024
    Copy the full SHA
    a96fb2c View commit details
  2. chore(deps): update devdependency husky to ^9.1.1 (#2716)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 19, 2024
    Copy the full SHA
    69199d8 View commit details
  3. Copy the full SHA
    f1cc115 View commit details
24 changes: 24 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: 'Close stale issues'

on:
schedule:
- cron: '30 1 * * *'
workflow_dispatch:

permissions:
contents: write # only for delete-branch option
issues: write
pull-requests: write

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v9
with:
exempt-issue-labels: pending
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
close-issue-message: 'This issue was closed because it has been stalled for 30 days with no activity.'
days-before-stale: 60
days-before-close: 30
days-before-pr-stale: -1
38 changes: 38 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,44 @@
# Changelog


## v2.13.2

[compare changes](https://github.com/nuxt/content/compare/v2.13.1...v2.13.2)

### 🚀 Enhancements

- **home:** Update studio section ([#2696](https://github.com/nuxt/content/pull/2696))
- **landing:** Design review ([#2703](https://github.com/nuxt/content/pull/2703))

### 🩹 Fixes

- Add string type to gt/lt/gte/lte type definitions ([#2704](https://github.com/nuxt/content/pull/2704))
- **search:** Non-md file might not have dscription file ([#2706](https://github.com/nuxt/content/pull/2706))
- **module:** Disable MDC plugin if user disabled it ([#2707](https://github.com/nuxt/content/pull/2707))
- Unwatch storage on nitro `close` ([ec7105ad](https://github.com/nuxt/content/commit/ec7105ad))

### 📖 Documentation

- Add missing `await` for searchContent docs ([#2692](https://github.com/nuxt/content/pull/2692))
- Prerender home ([4253f0bf](https://github.com/nuxt/content/commit/4253f0bf))
- Update `nuxt-og-image` and add `postinstall` script ([#2705](https://github.com/nuxt/content/pull/2705))
- Update ContentSlot Documentation ([#2713](https://github.com/nuxt/content/pull/2713))

### 🤖 CI

- Add stale action ([99f6060b](https://github.com/nuxt/content/commit/99f6060b))
- Update stale.yml ([225ff460](https://github.com/nuxt/content/commit/225ff460))
- Update stale.yml ([964857d4](https://github.com/nuxt/content/commit/964857d4))

### ❤️ Contributors

- Farnabaz <farnabaz@gmail.com>
- Jacob Strong ([@jacstrong](http://github.com/jacstrong))
- Damien Guard <damien@envytech.co.uk>
- Florent Delerue <florentdelerue@hotmail.com>
- Benjamin Canac ([@benjamincanac](http://github.com/benjamincanac))
- Brock Wilcox ([@awwaiid](http://github.com/awwaiid))

## v2.13.1

[compare changes](https://github.com/nuxt/content/compare/v2.13.0...v2.13.1)
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/content/3.composables/7.search-content.md
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ Used to search in your `content` directory.

```ts
const input = ref('')
const results = searchContent(input)
const results = await searchContent(input)
```

## Parameters
2 changes: 1 addition & 1 deletion docs/content/4.components/6.content-slot.md
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ It is useful when creating components that you want to use in your Markdown cont

## Example

```html [components/FancyHeader.vue]
```html [components/content/FancyHeader.vue]
<template>
<h2 class="fancy-header"><ContentSlot :use="$slots.default" unwrap="p" /></h2>
</template>
2 changes: 2 additions & 0 deletions docs/content/7.v1/1.getting-started/4.fetching.md
Original file line number Diff line number Diff line change
@@ -76,6 +76,8 @@ const articles = await this.$content('articles').where({ title: { $eq: 'Home' }

// $gt
const articles = await this.$content('articles').where({ age: { $gt: 18 } }).fetch()
// $lte
const articles = await this.$content('articles').where({ createdDateTime: { $lte: new Date().toISOString() } }).fetch()
// $in
const articles = await this.$content('articles').where({ name: { $in: ['odin', 'thor'] } }).fetch()
```
32 changes: 30 additions & 2 deletions docs/content/_partials/get-started.md
Original file line number Diff line number Diff line change
@@ -4,12 +4,40 @@ navigation: false

Start a fresh Nuxt Content project with:

```bash [Terminal]
::code-group
```bash [npm]
npx nuxi@latest init content-app -t content
```

```bash [yarn]
yarn dlx nuxi@latest init content-app -t content
```

```bash [pnpm]
pnpm dlx nuxi@latest init content-app -t content
```

```bash [bun]
bunx nuxi@latest init content-app -t content
```
::

To start your Nuxt content app in development mode:

```bash [Terminal]
::code-group
```bash [npm]
npm run dev
```

```bash [yarn]
yarn run dev
```

```bash [pnpm]
pnpm run dev
```

```bash [bun]
bun run dev
```
::
20 changes: 10 additions & 10 deletions docs/content/index.yml
Original file line number Diff line number Diff line change
@@ -41,18 +41,18 @@ sections:
subTitle: Trusted and supported by our<br />amazing community
avatarText: Created and maintained by 180+ contributors
- slot: meet-studio
title: Meet Studio <br /><span class="text-primary-400">The Editor for Nuxt Content</span>
description: 'Nuxt Studio lets you edit your websites made with Nuxt Content on any devices and by anyone. Opening a new door between git-based CMS and collaboration with your marketing teams.'
button: Try it now!
title: Meet Studio <br /><span class="text-primary-400">The Git-based CMS for Nuxt</span>
description: 'Nuxt Studio is a new editing experience for your Nuxt Content website, offering infinite customization and user-friendly edition. Edit your website with our Notion-like editor and unleash the collaboration between developers and copywriters.'
button: Try Nuxt Studio for free!
list:
- Markdown Editor
- Sync with GitHub
- Live Preview
- Editors permissions
- Notion like editor
- Live collaboration
- Edit on mobile
- Media Library
- Deployment
- Sync with GitHub
- Google authentication
- Custom components
- Preview links
- Continuous deployment
- Draft & review
- slot: start-building
subTitle: Start building <span class="text-primary-400">Today</span>
subDescription: Are you ready to start building your next project with Nuxt Content? Our documentation will help you get up and running in no time.
16 changes: 12 additions & 4 deletions docs/nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
export default defineNuxtConfig({
extends: '@nuxt/ui-pro',
extends: ['@nuxt/ui-pro'],
devtools: { enabled: true },

routeRules: {
'/': { prerender: true },
// content.nuxtjs.org redirects
'/get-started': { redirect: '/get-started/installation' },
'/guide/writing/content-directory': { redirect: '/usage/content-directory' },
@@ -48,26 +49,31 @@ export default defineNuxtConfig({
// Prevent prerendering of partials, due to nuxt-og-image issue with prerendering
'/_partials/**': { prerender: false }
},

nitro: {
prerender: {
routes: [
'/',
'/api/search.json'
]
}
},

modules: [
'@nuxt/content',
'@nuxt/fonts',
'@nuxt/image',
'@nuxt/ui',
'@nuxthq/studio',
'@nuxtjs/plausible',
'@vueuse/nuxt',
'nuxt-og-image',
'@nuxtjs/plausible'
'nuxt-og-image'
],

colorMode: {
preference: 'dark'
},

ui: {
icons: ['heroicons', 'simple-icons', 'ph']
},
@@ -81,5 +87,7 @@ export default defineNuxtConfig({
if (comp.global) { comp.global = 'sync' }
}
}
}
},

compatibilityDate: '2024-07-11'
})
23 changes: 10 additions & 13 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -3,27 +3,24 @@
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "nuxi dev",
"build": "nuxi build",
"preview": "nuxi preview",
"generate": "nuxi generate"
"build": "nuxt build",
"dev": "nuxt dev",
"generate": "nuxt generate",
"preview": "nuxt preview",
"postinstall": "nuxt prepare"
},
"dependencies": {
"@iconify-json/ph": "^1.1.13",
"@iconify-json/simple-icons": "^1.1.108",
"@nuxt/content": "^2.13.0",
"@iconify-json/simple-icons": "^1.1.109",
"@nuxt/content": "^2.13.1",
"@nuxt/fonts": "^0.7.1",
"@nuxt/image": "^1.7.0",
"@nuxt/ui-pro": "^1.3.1",
"@nuxthq/studio": "^2.0.3",
"@nuxtjs/fontaine": "^0.4.3",
"@nuxtjs/google-fonts": "^3.2.0",
"@nuxtjs/plausible": "^1.0.0",
"@vueuse/core": "^10.11.0",
"@vueuse/nuxt": "^10.11.0",
"nuxt": "^3.12.3",
"nuxt-og-image": "^2.2.6"
},
"devDependencies": {
"@nuxt/devtools": "^1.3.9"
"nuxt": "^3.12.4",
"nuxt-og-image": "^3.0.0-rc.64"
}
}
25 changes: 18 additions & 7 deletions docs/pages/index.vue
Original file line number Diff line number Diff line change
@@ -40,12 +40,13 @@ const { format: formatNumber } = Intl.NumberFormat('en-GB', { notation: 'compact
</script>

<template>
<div class="gradient" />

<ULandingHero
align="center"
direction="vertical"
:ui="{ base: 'relative z-[1]', container: 'flex flex-col gap-6 lg:gap-8', description: 'mt-6 text-lg/8 lg:px-28 text-gray-400' }"
>
<div class="gradient" />
<div class="flex w-full justify-center order-first">
<UBadge
class="w-fit"
@@ -150,14 +151,14 @@ const { format: formatNumber } = Intl.NumberFormat('en-GB', { notation: 'compact
<div class="w-full flex flex-col items-center justify-center">
<div class="flex flex-col space-y-6">
<div class="flex space-x-4">
<div class="relative hidden flex-col justify-between pt-[20px] pb-[70px] md:flex">
<div class="relative hidden flex-col justify-between pt-[20px] pb-[135px] md:flex">
<svg
width="2"
height="295"
viewBox="0 0 2 295"
fill="none"
xmlns="http://www.w3.org/2000/svg"
class="absolute left-4 -top-10 h-full z-[-1]"
class="absolute left-4 top-2 h-full z-[-1]"
>
<path d="M1 0L1 153" stroke="#334155" stroke-dasharray="4 4" />
<path d="M1 142L1 295" stroke="#334155" stroke-dasharray="4 4" />
@@ -225,7 +226,7 @@ const { format: formatNumber } = Intl.NumberFormat('en-GB', { notation: 'compact
</UAvatar>
</UTooltip>
</UAvatarGroup>
<p class="text-center text-sm">
<p class="text-center lg:text-left text-sm w-full">
{{ section.avatarText }}
</p>
</template>
@@ -277,8 +278,8 @@ const { format: formatNumber } = Intl.NumberFormat('en-GB', { notation: 'compact
<div class="p-4">
<video
class="rounded-lg bg-slate-800"
src="https://res.cloudinary.com/nuxt/video/upload/v1695121040/studio/nuxt-studio-intro_p9kph1.mp4"
poster="https://res.cloudinary.com/nuxt/video/upload/v1695121040/studio/nuxt-studio-intro_p9kph1.jpg"
src="https://res.cloudinary.com/nuxt/video/upload/v1717684070/studio/like-in-notion-final_yclhv7.mp4"
poster="/HomeNotionLikePoster.webp"
muted
loop
controls
@@ -333,7 +334,7 @@ const { format: formatNumber } = Intl.NumberFormat('en-GB', { notation: 'compact

<style scoped lang="postcss">
.gradient {
position: fixed;
position: absolute;
top: 25vh;
width: 100%;
height: 30vh;
@@ -349,6 +350,16 @@ const { format: formatNumber } = Intl.NumberFormat('en-GB', { notation: 'compact
:where(code) {
@apply text-gray-200;
}
:where(pre):not(:where([class~="not-prose"],[class~="not-prose"] *)) {
@apply !bg-gray-800;
}
@media (min-width: 640px) {
:where(.prose > :last-child):not(:where([class~="not-prose"],[class~="not-prose"] *)) {
min-width: 450px;
}
}
}
video[poster] {
Loading