Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/main' into install_docs
  • Loading branch information
tobiasdiez committed Jul 11, 2024
commit ee36f266c6d5a7ec70942c101379c1f9963e4757
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# editorconfig.org
root = true

[*]
Expand Down
23 changes: 23 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!---
☝️ PR title should follow conventional commits (https://conventionalcommits.org)
-->

### 🔗 Linked issue

<!-- If it resolves an open issue, please link the issue here. For example "Resolves #123" -->

### ❓ Type of change

<!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply. -->

- [ ] 📖 Documentation (updates to the documentation or readme)
- [ ] 🐞 Bug fix (a non-breaking change that fixes an issue)
- [ ] 👌 Enhancement (improving an existing functionality)
- [ ] ✨ New feature (a non-breaking change that adds functionality)
- [ ] 🧹 Chore (updates to the build process or auxiliary tools and libraries)
- [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to change)

### 📚 Description

<!-- Describe your changes in detail -->
<!-- Why is this change required? What problem does it solve? -->
1 change: 0 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
shamefully-hoist=true
link-workspace-packages=deep
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"eslint.experimental.useFlatConfig": true,
"cSpell.words": ["Nuxt"]
"cSpell.words": ["nuxt", "ofetch", "Pinia", "composables"]
}
131 changes: 131 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## v8.1.2

[compare changes](https://github.com/nuxt-modules/storybook/compare/v0.2.10...v8.1.2)

### 🏡 Chore

- Fix linter and update lock file ([#686](https://github.com/nuxt-modules/storybook/pull/686))

### ❤️ Contributors

- Tobias Diez <[email protected]>

## v8.1.1

[compare changes](https://github.com/nuxt-modules/storybook/compare/v8.1.0...v8.1.1)
Expand Down Expand Up @@ -152,3 +164,122 @@
## v7.0.0

[compare changes](https://github.com/nuxt-modules/storybook/compare/v7.0.0-alpha.0...v7.0.0)

## v0.2.10

[compare changes](https://github.com/nuxt-modules/storybook/compare/v0.2.9...v0.2.10)

### 🏡 Chore

- Fix release script ([#681](https://github.com/nuxt-modules/storybook/pull/681))
- **ci:** Add GitHub PR template ([#682](https://github.com/nuxt-modules/storybook/pull/682))
- Stay on main branch for releases ([#683](https://github.com/nuxt-modules/storybook/pull/683))
- Fix deployment of docs ([#685](https://github.com/nuxt-modules/storybook/pull/685))

### ❤️ Contributors

- Tobias Diez <[email protected]>
- Gangan ([@shinGangan](http://github.com/shinGangan))

## v0.2.9

[compare changes](https://github.com/nuxt-modules/storybook/compare/v0.2.8...v0.2.9)

### 🩹 Fixes

- Create nuxt instance more reliable ([#619](https://github.com/nuxt-modules/storybook/pull/619))
- Update file extensions for generated vite configs to use .json instead of .js ([#663](https://github.com/nuxt-modules/storybook/pull/663))
- Correctly provide Nuxt runtime config in storybook ([#664](https://github.com/nuxt-modules/storybook/pull/664))
- **deps:** Update storybook packages to ^8.1.11 ([#677](https://github.com/nuxt-modules/storybook/pull/677))

### 📖 Documentation

- Migrate to Nuxt UI Pro ([#668](https://github.com/nuxt-modules/storybook/pull/668))

### 🏡 Chore

- Add release script ([#655](https://github.com/nuxt-modules/storybook/pull/655))
- Move nuxt image test to showcase example ([#615](https://github.com/nuxt-modules/storybook/pull/615))
- Move router tests to showcase example ([#621](https://github.com/nuxt-modules/storybook/pull/621))
- Move nuxt link test to showcase example ([#618](https://github.com/nuxt-modules/storybook/pull/618))
- Move pinia tests to showcase example ([#616](https://github.com/nuxt-modules/storybook/pull/616))
- Remove old playground ([#622](https://github.com/nuxt-modules/storybook/pull/622))
- Update nuxt studio dependency to latest stable version ([#675](https://github.com/nuxt-modules/storybook/pull/675))
- Update renovate config to always bump storybook dependencies ([#676](https://github.com/nuxt-modules/storybook/pull/676))
- Disable shameful hoisting and improve dependency declarations ([#580](https://github.com/nuxt-modules/storybook/pull/580))

### ❤️ Contributors

- Tobias Diez <[email protected]>

## v0.2.8

[compare changes](https://github.com/nuxt-modules/storybook/compare/v8.1.1...v0.2.8)

### 🚀 Enhancements

- Start storybook in same process as dev server ([#592](https://github.com/nuxt-modules/storybook/pull/592))
- Declare module incompatibility for webpack ([#653](https://github.com/nuxt-modules/storybook/pull/653))

### 🩹 Fixes

- Update all non-major dependencies and fix "The entry point "vue" cannot be marked as external" error with nuxt 3.12 ([#634](https://github.com/nuxt-modules/storybook/pull/634))
- Extend storybook config types from vue3-vite framework ([#649](https://github.com/nuxt-modules/storybook/pull/649))

### 🏡 Chore

- Fix linter ([#644](https://github.com/nuxt-modules/storybook/pull/644))
- Move custom component test to showcase example ([#617](https://github.com/nuxt-modules/storybook/pull/617))
- Add shortcuts to start dev server for examples ([#646](https://github.com/nuxt-modules/storybook/pull/646))
- Indicate compatibility with new v4 major ([#645](https://github.com/nuxt-modules/storybook/pull/645))
- Move nuxt module to packages directory ([#654](https://github.com/nuxt-modules/storybook/pull/654))

### ❤️ Contributors

- Tobias Diez <[email protected]>
- Ryan Leckey ([@mehcode](http://github.com/mehcode))
- Daniel Roe ([@danielroe](http://github.com/danielroe))

## v0.2.6

[compare changes](https://github.com/storybook-vue/storybook-nuxt/compare/v0.2.6-alpha.0...v0.2.6)

## v0.2.1

[compare changes](https://github.com/storybook-vue/storybook-nuxt/compare/v0.2.1-alpha.1...v0.2.1)

## v0.2.0

[compare changes](https://github.com/storybook-vue/storybook-nuxt/compare/v0.2.1-alpha.0...v0.2.0)

## v0.2.0

[compare changes](https://github.com/storybook-vue/storybook-nuxt/compare/v0.2.0-alpha.4...v0.2.0)

## v0.1.9

[compare changes](https://github.com/storybook-vue/storybook-nuxt/compare/v0.1.9-alpha.0...v0.1.9)

## v0.1.8

[compare changes](https://github.com/storybook-vue/storybook-nuxt/compare/v0.1.8-alpha.0...v0.1.8)

### 📦 Build

- Storybook-static,still have nuxt inst issue ([ac15e16](https://github.com/storybook-vue/storybook-nuxt/commit/ac15e16))

### ❤️ Contributors

- ChakAs3 ([@chakAs3](http://github.com/chakAs3))

## v0.1.7

[compare changes](https://github.com/storybook-vue/storybook-nuxt/compare/v0.1.7-alpha.0...v0.1.7)

## v0.1.4

[compare changes](https://github.com/storybook-vue/storybook-nuxt/compare/v0.1.3...v0.1.4)

## v0.1.3

[compare changes](https://github.com/storybook-vue/storybook-nuxt/compare/v0.1.3-alpha.0...v0.1.3)
33 changes: 24 additions & 9 deletions docs/.gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
node_modules
*.iml
.idea
*.log*
# Nuxt dev/build outputs
.output
.data
.nuxt
.vscode
.DS_Store
coverage
.nitro
.cache
dist
sw.*

# Node dependencies
node_modules

# Logs
logs
*.log

# Misc
.DS_Store
.fleet
.idea

# Local env files
.env
.output
.env.*
!.env.example

# VSC
.history
2 changes: 0 additions & 2 deletions docs/.npmrc

This file was deleted.

2 changes: 0 additions & 2 deletions docs/.nuxtrc

This file was deleted.

4 changes: 4 additions & 0 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Documentation

[![Nuxt UI Pro](https://img.shields.io/badge/Made%20with-Nuxt%20UI%20Pro-00DC82?logo=nuxt.js&labelColor=020420)](https://ui.nuxt.com/pro)
[![Nuxt Studio](https://img.shields.io/badge/Open%20in%20Nuxt%20Studio-18181B?&logo=nuxt.js&logoColor=3BB5EC)](https://nuxt.studio/themes/docs)
38 changes: 0 additions & 38 deletions docs/app.config.ts

This file was deleted.

65 changes: 65 additions & 0 deletions docs/app/app.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
export default defineAppConfig({
ui: {
primary: 'french-rose',
gray: 'slate',
footer: {
bottom: {
left: 'text-sm text-gray-500 dark:text-gray-400',
wrapper: 'border-t border-gray-200 dark:border-gray-800',
},
},
},
seo: {
siteName: 'Nuxt Storybook',
},
header: {
logo: {
alt: '',
light: '',
dark: '',
},
search: true,
colorMode: true,
links: [
{
icon: 'i-simple-icons-github',
to: 'https://github.com/nuxt-modules/storybook',
target: '_blank',
'aria-label': 'Nuxt Storybook module on GitHub',
},
],
},
footer: {
credits: 'Made with Nuxt UI Pro',
colorMode: false,
links: [
{
icon: 'i-simple-icons-nuxtdotjs',
to: 'https://nuxt.com',
target: '_blank',
'aria-label': 'Nuxt Website',
},
{
icon: 'i-simple-icons-storybook',
to: 'https://storybook.js.org',
target: '_blank',
'aria-label': 'Storybook Website',
},
],
},
toc: {
title: 'Table of Contents',
bottom: {
title: 'Community',
edit: 'https://github.com/nuxt-modules/storybook/edit/main/docs/content',
links: [
{
icon: 'i-heroicons-star',
label: 'Star on GitHub',
to: 'https://github.com/nuxt-modules/storybook',
target: '_blank',
},
],
},
},
})
53 changes: 53 additions & 0 deletions docs/app/app.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<script setup lang="ts">
import type { ParsedContent } from '@nuxt/content'

const { seo } = useAppConfig()

const { data: navigation } = await useAsyncData('navigation', () =>
fetchContentNavigation(),
)
const { data: files } = useLazyFetch<ParsedContent[]>('/api/search.json', {
default: () => [],
server: false,
})

useHead({
meta: [{ name: 'viewport', content: 'width=device-width, initial-scale=1' }],
link: [{ rel: 'icon', href: '/favicon.ico' }],
htmlAttrs: {
lang: 'en',
},
})

useSeoMeta({
titleTemplate: `%s - ${seo?.siteName}`,
ogSiteName: seo?.siteName,
ogImage: 'https://docs-template.nuxt.dev/social-card.png',
twitterImage: 'https://docs-template.nuxt.dev/social-card.png',
twitterCard: 'summary_large_image',
})

provide('navigation', navigation)
</script>

<template>
<div>
<NuxtLoadingIndicator />

<AppHeader />

<UMain>
<NuxtLayout>
<NuxtPage />
</NuxtLayout>
</UMain>

<AppFooter />

<ClientOnly>
<LazyUContentSearch :files="files" :navigation="navigation" />
</ClientOnly>

<UNotifications />
</div>
</template>
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.