Skip to content

Commit 5b71a3b

Browse files
committed
feat: その他パッケージのアップデート & Lint fix
1 parent 732954a commit 5b71a3b

26 files changed

+467
-566
lines changed

.eslintrc.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,20 @@ module.exports = {
55
'@nuxtjs/eslint-config-typescript',
66
'plugin:prettier/recommended',
77
'prettier',
8-
'prettier/vue',
98
],
109
rules: {
1110
'require-await': 'off',
1211
'nuxt/no-cjs-in-config': 'off',
1312
'vue/max-attributes-per-line': 'off',
13+
'vue/experimental-script-setup-vars': 'off',
14+
'vue/no-arrow-functions-in-watch': 'off',
15+
'vue/no-custom-modifiers-on-v-model': 'off',
16+
'vue/no-dupe-v-else-if': 'off',
17+
'vue/no-multiple-template-root': 'off',
18+
'vue/no-mutating-props': 'off',
19+
'vue/no-v-for-template-key': 'off',
20+
'vue/no-v-model-argument': 'off',
21+
'vue/one-component-per-file': 'off',
1422
'vue/html-self-closing': [
1523
'error',
1624
{

package.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "StudyAtHome",
2+
"name": "study-at-home",
33
"version": "1.0.0",
44
"description": "Ouchi De Jikanwari Web Version",
55
"author": "Nekoya3",
@@ -24,16 +24,16 @@
2424
}
2525
},
2626
"dependencies": {
27-
"@aws-amplify/api": "^3.3.3",
27+
"@aws-amplify/api": "^4.0.0",
2828
"@babel/core": "^7.14.3",
2929
"@babel/runtime-corejs3": "^7.14.0",
3030
"@nuxtjs/axios": "^5.13.4",
3131
"@nuxtjs/dotenv": "^1.4.1",
3232
"@nuxtjs/google-analytics": "^2.4.0",
3333
"@nuxtjs/pwa": "^3.3.5",
3434
"@nuxtjs/style-resources": "^1.0.0",
35-
"@types/node": "^14.14.45",
36-
"aws-amplify": "^3.4.3",
35+
"@types/node": "^15.3.0",
36+
"aws-amplify": "^4.0.2",
3737
"core-js": "^3.12.1",
3838
"cross-env": "^7.0.3",
3939
"date-fns": "^2.21.3",
@@ -54,39 +54,42 @@
5454
"@mdi/font": "^5.9.55",
5555
"@nuxt/types": "^2.15.6",
5656
"@nuxt/typescript-build": "^2.1.0",
57-
"@nuxtjs/eslint-config-typescript": "^3.0.0",
57+
"@nuxtjs/eslint-config-typescript": "^6.0.0",
5858
"@nuxtjs/stylelint-module": "^4.0.0",
5959
"@types/jest": "^26.0.23",
6060
"@vue/test-utils": "^1.2.0",
6161
"babel-core": "^6.26.3",
6262
"babel-eslint": "^10.1.0",
6363
"babel-jest": "^26.6.3",
64+
"consola": "^2.15.3",
6465
"cpx": "^1.5.0",
6566
"eslint": "^7.26.0",
66-
"eslint-config-prettier": "^6.15.0",
67+
"eslint-config-prettier": "^8.3.0",
6768
"eslint-loader": "^4.0.2",
68-
"eslint-plugin-nuxt": "^1.0.0",
69+
"eslint-plugin-nuxt": "^2.0.0",
6970
"eslint-plugin-prettier": "^3.4.0",
7071
"eslint-plugin-tsdoc": "^0.2.14",
7172
"fibers": "^5.0.0",
72-
"husky": "^4.3.8",
73+
"husky": "^6.0.0",
7374
"jest": "^26.6.3",
74-
"lint-staged": "^10.5.4",
75+
"lint-staged": "^11.0.0",
7576
"nodemon": "^2.0.7",
7677
"prettier": "^2.3.0",
7778
"rimraf": "^3.0.2",
7879
"sass": "^1.32.13",
7980
"sass-loader": "10.1.1",
8081
"stylelint": "^13.13.1",
8182
"stylelint-config-prettier": "^8.0.2",
82-
"stylelint-config-standard": "^20.0.0",
83+
"stylelint-config-standard": "^22.0.0",
8384
"stylelint-scss": "^3.19.0",
8485
"ts-jest": "^26.5.6",
8586
"ts-loader": "^8.2.0",
8687
"typescript": "4.0.5",
8788
"vue": "^2.6.12",
89+
"vue-class-component": "^7.2.6",
8890
"vue-jest": "^3.0.7",
8991
"vue-server-renderer": "^2.6.12",
90-
"vue-template-compiler": "^2.6.12"
92+
"vue-template-compiler": "^2.6.12",
93+
"webpack": "4.46.0"
9194
}
9295
}

src/components/BaseInputField.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
outlined
1515
@input="$emit('input', $event)"
1616
>
17-
<template v-slot:prepend-inner>
17+
<template #prepend-inner>
1818
<v-icon :color="prependIconColor">{{ prependIcon }}</v-icon>
1919
</template>
20-
<template v-slot:append>
20+
<template #append>
2121
<v-icon
2222
color="blue"
2323
@click="show = !show"
@@ -40,7 +40,7 @@
4040
outlined
4141
@input="$emit('input', $event)"
4242
>
43-
<template v-slot:prepend-inner>
43+
<template #prepend-inner>
4444
<v-icon :color="prependIconColor">{{ prependIcon }}</v-icon>
4545
</template>
4646
</v-text-field>
@@ -59,7 +59,7 @@
5959
outlined
6060
@input="$emit('input', $event)"
6161
>
62-
<template v-slot:prepend-inner>
62+
<template #prepend-inner>
6363
<v-icon :color="prependIconColor">{{ prependIcon }}</v-icon>
6464
</template>
6565
</v-text-field>
@@ -78,7 +78,7 @@
7878
outlined
7979
@input="$emit('input', $event)"
8080
>
81-
<template v-slot:prepend-inner>
81+
<template #prepend-inner>
8282
<v-icon :color="prependIconColor">{{ prependIcon }}</v-icon>
8383
</template>
8484
</v-text-field>

src/components/EditLessonScreen.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@ import EditLessonScreenInner3 from '@/components/EditLessonScreenInner3.vue'
6161
import EditLessonScreenInner4 from '@/components/EditLessonScreenInner4.vue'
6262
import classData from '@/types/store/classData'
6363
64-
type stateType = {
65-
error: boolean
66-
lessonData: LessonDataType
67-
}
68-
6964
type LessonDataType = {
7065
lessonId: string
7166
isHidden: boolean
@@ -85,6 +80,11 @@ type LessonDataType = {
8580
materialsUrl: string
8681
}
8782
83+
type stateType = {
84+
error: boolean
85+
lessonData: LessonDataType
86+
}
87+
8888
export default Vue.extend({
8989
components: {
9090
BaseActionButton,

src/components/EditingVisibilityDialog.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
]"
2727
@click-outside="closeModal"
2828
>
29-
<template v-slot:title>
29+
<template #title>
3030
{{ modalTitle }}
3131
</template>
32-
<template v-slot:default>
32+
<template #default>
3333
<div class="EditingVisibilityModal-Contents">
3434
<p class="EditingVisibilityModal-Text">
3535
{{ date }} <br />
@@ -79,9 +79,6 @@ export default Vue.extend({
7979
value: {
8080
type: Object as () => classData.LessonWithId,
8181
required: true,
82-
default: {
83-
id: '',
84-
},
8582
},
8683
},
8784
data(): LocalData {

src/components/PeriodSection.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default Vue.extend({
4545
},
4646
classData: {
4747
type: Array as () => classData.LessonWithId[],
48-
default: [],
48+
default: () => [],
4949
},
5050
editable: {
5151
type: Boolean,

src/layouts/classes.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
},
4343
]"
4444
>
45-
<template v-slot:title>
45+
<template #title>
4646
{{ $t('common.class_id_dialog.title') }}
4747
</template>
48-
<template v-slot:default>
48+
<template #default>
4949
<div class="ClassIdModal-Contents">
5050
<p class="ClassIdModal-ClassText">{{ className }}</p>
5151
<p class="ClassIdModal-Text">
@@ -74,7 +74,7 @@
7474
<v-icon>mdi-clipboard-account</v-icon>
7575
</v-btn>
7676
</div>
77-
<template v-slot:extension>
77+
<template #extension>
7878
<div class="header-calender">
7979
<CalendarBar
8080
v-model="app.currentDate"
@@ -111,14 +111,14 @@ type LocalData = {
111111
}
112112
113113
export default Vue.extend({
114-
middleware: 'checkClassData',
115114
components: {
116115
AppLanguageSelector,
117116
CalendarBar,
118117
BaseDialog,
119118
HeaderLogo,
120119
BaseActionButton,
121120
},
121+
middleware: 'checkClassData',
122122
data(): LocalData {
123123
return {
124124
loading: true,

src/layouts/protected.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929
),
3030
action: () => {
3131
unloadClassData()
32-
this.$router.push('/user/classlist')
32+
$router.push('/user/classlist')
3333
return false
3434
},
3535
},
3636
]"
3737
>
38-
<template v-slot:title>
38+
<template #title>
3939
{{ $t('common.class_id_dialog.title') }}
4040
</template>
41-
<template v-slot:default>
41+
<template #default>
4242
<div class="ClassIdModal-Contents">
4343
<p class="ClassIdModal-ClassText">{{ classData.className }}</p>
4444
<p class="ClassIdModal-Text">
@@ -77,7 +77,7 @@
7777
<v-icon>mdi-cog</v-icon>
7878
</v-btn>
7979
</div>
80-
<template v-slot:extension>
80+
<template #extension>
8181
<div class="header-calender">
8282
<CalendarBar
8383
v-model="app.currentDate"
@@ -112,14 +112,14 @@ type LocalData = {
112112
}
113113
114114
export default Vue.extend({
115-
middleware: ['authenticated', 'checkClassData'],
116115
components: {
117116
AppLanguageSelector,
118117
CalendarBar,
119118
BaseDialog,
120119
HeaderLogo,
121120
BaseActionButton,
122121
},
122+
middleware: ['authenticated', 'checkClassData'],
123123
data(): LocalData {
124124
return {
125125
loading: true,

src/pages/classes/index.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,17 @@ import PeriodSection from '@/components/PeriodSection.vue'
3232
type Data = {
3333
classData: typeof vxm.classData
3434
}
35-
35+
/*
3636
type Computed = {
3737
today: boolean
3838
dateTitle: string
3939
}
40+
*/
4041
4142
export default Vue.extend({
4243
components: { PeriodSection },
4344
layout: 'classes',
44-
data() {
45+
data(): Data {
4546
return {
4647
classData: vxm.classData,
4748
}

src/pages/classes/terms.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ export default Vue.extend({
5353
},
5454
computed: {
5555
isCheck(): boolean {
56-
return this.toggle.some((value) => {
57-
return value === 'check'
58-
})
56+
return Boolean(this.toggle.length)
5957
},
6058
},
6159
methods: {

0 commit comments

Comments
 (0)