Skip to content

Commit f9146ad

Browse files
committed
Merge remote-tracking branch 'upstream/main' into install_docs
2 parents ee36f26 + 627527e commit f9146ad

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

eslint.config.mjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ export default createConfigForNuxt({
99
dirs: {
1010
src: ['./playground'],
1111
},
12+
}).override('nuxt/vue/rules', {
13+
rules: {
14+
'vue/html-self-closing': 'off',
15+
},
1216
})

examples/showcase/components/CustomComponent.vue

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@ const props = withDefaults(
2222
* background color of the button
2323
*/
2424
backgroundColor?: string
25-
26-
union?: string | number | boolean
2725
}>(),
28-
{ primary: false },
26+
{
27+
primary: false,
28+
label: '',
29+
size: 'medium',
30+
backgroundColor: 'transparent',
31+
},
2932
)
3033
3134
const emit = defineEmits<{
@@ -51,7 +54,7 @@ function onClick() {
5154
<template>
5255
<div class="storybook sb-column">
5356
<button :class="classes" :style="style" @click="onClick">
54-
{{ label ?? '' }} <slot />
57+
{{ label }} <slot />
5558
</button>
5659
</div>
5760
</template>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"example:showcase:storybook:publish": "chromatic --exit-zero-on-changes --build-script-name example:showcase:storybook:build --project-token=chpt_a53adf402cb628c",
3030
"build": "pnpm run --recursive --filter=./packages/* --parallel build",
3131
"lint": "pnpm lint:eslint && pnpm lint:prettier",
32-
"lint:eslint": "eslint --report-unused-disable-directives .",
32+
"lint:eslint": "eslint --max-warnings=0 --report-unused-disable-directives .",
3333
"lint:prettier": "prettier --check .",
3434
"prepack": "pnpm build",
3535
"release": "pnpm jiti prepare-release.ts && pnpm publish --recursive",

packages/storybook-addon/playground/components/vuetify/index.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<!-- eslint-disable vue/multi-word-component-names -->
2-
<script setup>
3-
defineProps({
4-
message: String,
5-
})
6-
</script>
2+
<script setup></script>
73

84
<template>
95
<v-container>

0 commit comments

Comments
 (0)