Skip to content

Commit 71a9152

Browse files
authored
Merge pull request #341 from vuejs-jp/enhance/eslint-lint-fix
Enhance/eslint lint fix
2 parents cbccf3c + c473f46 commit 71a9152

20 files changed

+57
-30
lines changed

apps/web/.eslintrc.cjs

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ module.exports = {
2323
'privacy',
2424
'register',
2525
'share',
26+
'sharemap',
27+
'tokusho',
2628
'users',
2729
'[id]',
2830
],

apps/web/app/components/admin/AttendeeList.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const handleConfirm = (attendee?: Attendee) => {
9595
</td>
9696
</tr>
9797
</table>
98-
<VFDialog v-if="showDialog">
98+
<VFDialog v-if="showDialog" open>
9999
<AdminAttendeeItem :attendee="attendees.filter((s) => s.id === attendeeId)[0]" @close="handleDialog" />
100100
</VFDialog>
101101
</template>

apps/web/app/components/admin/JobList.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const handleDialog = (id?: string) => {
6262
</td>
6363
</tr>
6464
</table>
65-
<VFDialog v-if="showDialog">
65+
<VFDialog v-if="showDialog" open>
6666
<AdminJobItem
6767
:job="jobs.filter((s) => s.id === jobId)[0]"
6868
:sponsors

apps/web/app/components/admin/Page.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ const pageText = props.page.replace(/^[a-z]/g, function (val) {
115115
<AdminStaffList :staffs="staffs?.data" />
116116
<AdminAdminUserList :admin-users="adminUsers?.data" />
117117
</div>
118-
<VFDialog v-if="showDialog">
118+
<VFDialog v-if="showDialog" open>
119119
<AdminSpeakerItem v-if="page === 'speaker'" @close="handleDialog" />
120120
<AdminSponsorItem v-if="page === 'sponsor'" :speakers="speakers?.data" @close="handleDialog" />
121121
<AdminJobItem v-if="page === 'job'" :sponsors="sponsors?.data" @close="handleDialog" />

apps/web/app/components/admin/SpeakerList.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const handleDialog = (id?: string) => {
9595
</td>
9696
</tr>
9797
</table>
98-
<VFDialog v-if="showDialog">
98+
<VFDialog v-if="showDialog" open>
9999
<AdminSpeakerItem :speaker="speakers.filter((s) => s.id === speakerId)[0]" @close="handleDialog" />
100100
</VFDialog>
101101
</template>

apps/web/app/components/admin/SponsorList.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const handleDialog = (id?: string) => {
101101
</td>
102102
</tr>
103103
</table>
104-
<VFDialog v-if="showDialog">
104+
<VFDialog v-if="showDialog" open>
105105
<AdminSponsorItem
106106
:sponsor="sponsors.filter((s) => s.id === sponsorId)[0]"
107107
:speakers="speakers"

apps/web/app/components/admin/StaffList.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ const handleDialog = (id?: string) => {
7474
</td>
7575
</tr>
7676
</table>
77-
<VFDialog v-if="showDialog">
77+
<VFDialog v-if="showDialog" open>
7878
<AdminStaffItem
7979
:staff="staffs.filter((s) => s.id === staffId)[0]"
8080
@close="handleDialog"

apps/web/app/composables/useInvitation.ts

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export function useInvitation() {
1717
})
1818

1919
async function publish(type: 'invite' | 'delete', target: string) {
20+
// eslint-disable-next-line no-undef
2021
await $fetch(`/api/${type}-user`, {
2122
method: 'post',
2223
headers: {

apps/web/app/server/api/speakers.get.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import db from '../db'
2+
import { useRuntimeConfig } from '#imports'
23
import { defineEventHandler } from 'h3'
34
import type { PanelerInfo, Speaker, SpeakerInfo } from '@vuejs-jp/model'
45
import { serverSupabaseClient } from '#supabase/server'

apps/web/app/server/api/sponsors.get.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import db from '../db'
2+
import { useRuntimeConfig } from '#imports'
23
import { defineEventHandler } from 'h3'
34
import type { Sponsor, SponsorInfo } from '@vuejs-jp/model'
45
import { serverSupabaseClient } from '#supabase/server'

apps/web/nuxt.config.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { createClient } from '@supabase/supabase-js'
2+
import { defineNuxtConfig } from 'nuxt/config'
23
import svgLoader from 'vite-svg-loader'
34
import { conferenceTitle } from './app/utils/constants'
45
import { generalOg, twitterOg } from './app/utils/og.constants'

packages/eslint-config/base.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module.exports = {
2+
env: { browser: true, jest: true, node: true },
23
extends: [
34
'eslint:recommended',
45
'eslint-config-turbo',
@@ -9,6 +10,7 @@ module.exports = {
910
parser: '@typescript-eslint/parser',
1011
},
1112
rules: {
13+
'no-unused-vars': 'off',
1214
quotes: ['error', 'single', { avoidEscape: true }],
1315
semi: ['error', 'never'],
1416
'object-curly-spacing': ['error', 'always'],

packages/ui/.eslintrc.cjs

+12-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module.exports = {
1010
'Avatar',
1111
'Button',
1212
'Comment',
13+
'Credit',
1314
'Date',
1415
'Dialog',
1516
'Header',
@@ -23,9 +24,19 @@ module.exports = {
2324
'Tag',
2425
'Time',
2526
'Title',
27+
'Track',
2628
'Typography',
2729
],
2830
},
2931
],
30-
}
32+
'vuejs-accessibility/label-has-for': [
33+
'error',
34+
{
35+
'required': {
36+
'some': ['nesting', 'id'],
37+
},
38+
'allowChildren': false,
39+
},
40+
],
41+
},
3142
}

packages/ui/components/common/Comment.vue

+2-7
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,8 @@ onMounted(() => {
3333

3434
<template>
3535
<p class="comment">
36-
<span
37-
class="comment-main"
38-
:style="{
39-
'--main-color': textColor(color),
40-
}"
41-
v-html="titleText"
42-
/>
36+
<!-- eslint-disable-next-line vue/no-v-html -->
37+
<span class="comment-main" :style="{ '--main-color': textColor(color) }" v-html="titleText" />
4338
</p>
4439
</template>
4540

packages/ui/components/common/CssResetButton.vue

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<script setup lang="ts" generic="ButtonHTMLAttributes">
2+
// eslint-disable-next-line vue/valid-define-props
23
const props = defineProps()
34
</script>
45

packages/ui/components/common/Dialog.stories.ts

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default {
66
component: Dialog,
77
args: {
88
default: '<strong>Go!</strong>',
9+
open: true,
910
},
1011
argTypes: {
1112
default: {

packages/ui/components/common/Dialog.vue

+22-15
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,32 @@
11
<script setup lang="ts">
2+
import { ref } from 'vue'
3+
24
type Props = {
3-
arialabel?: string
4-
ariaModal?: boolean
5+
open: boolean
6+
}
7+
const props = defineProps<Props>()
8+
9+
const dialog = ref<HTMLDialogElement>()
10+
const visible = ref(props.open)
11+
12+
const showModal = () => {
13+
dialog.value?.showModal()
14+
visible.value = true
515
}
6-
withDefaults(defineProps<Props>(), {
7-
arialabel: '',
8-
ariaModal: false,
16+
17+
defineExpose({
18+
show: showModal,
19+
close: (returnVal?: string): void => dialog.value?.close(returnVal),
20+
visible,
921
})
1022
</script>
23+
1124
<template>
12-
<div class="mask" @click="$emit('on-close')">
13-
<div
14-
role="dialog"
15-
class="root"
16-
:aria-label="arialabel"
17-
:aria-modal="ariaModal"
18-
@click="(e) => e.stopPropagation()"
19-
>
25+
<dialog ref="dialog" :open class="mask">
26+
<form v-if="visible" method="dialog" class="root">
2027
<slot />
21-
</div>
22-
</div>
28+
</form>
29+
</dialog>
2330
</template>
2431

2532
<style scoped>

packages/ui/components/date/Date.vue

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ export type DateProps = {
1111
}
1212
1313
withDefaults(defineProps<DateProps>(), {
14+
prefixYear: '',
15+
suffixYear: '',
16+
dayOfWeek: '',
1417
color: 'vue-blue',
1518
})
1619

packages/ui/components/event/EventFrame.vue

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ onMounted(function () {
2626
<template>
2727
<div class="event-frame-root">
2828
<div class="event-frame-content" :class="paddingClass">
29+
<!-- eslint-disable-next-line vue/no-v-html -->
2930
<h3 :id="id" :class="fontClass" v-html="titleText" />
3031
<slot name="content" />
3132
</div>

packages/ui/components/namecard/IntegrationDialog.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function handleLinkButton(provider: Extract<AuthProvider, 'github' | 'google'>)
1717
</script>
1818

1919
<template>
20-
<Dialog :aria-label="title" :aria-modal="true" @on-close="$emit('on-close')">
20+
<Dialog open>
2121
<div class="dialog-container">
2222
<h3 class="dialog-title">{{ title }}</h3>
2323
<slot />

0 commit comments

Comments
 (0)