Skip to content

Commit

Permalink
Merge pull request #140 from traPtitech/feat/update_deps
Browse files Browse the repository at this point in the history
依存関係のバージョン上げた
  • Loading branch information
reiroop authored Apr 25, 2024
2 parents affea3c + f5dd023 commit c41f80b
Show file tree
Hide file tree
Showing 9 changed files with 2,370 additions and 1,445 deletions.
11 changes: 2 additions & 9 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,5 @@
"proseWrap": "preserve",
"htmlWhitespaceSensitivity": "css",
"vueIndentScriptAndStyle": false,
"endOfLine": "auto",
"importOrder": [
"^/@/stores/(.*)$",
"^/@/lib/(.*)$",
"^/@/(.*)",
"^[./]"
],
"importOrderSeparation": true
}
"endOfLine": "auto"
}
3,733 changes: 2,330 additions & 1,403 deletions package-lock.json

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,43 +15,43 @@
"format": "prettier --write src"
},
"dependencies": {
"axios": "^1.5.1",
"luxon": "^3.4.3",
"markdown-it": "^13.0.2",
"pinia": "^2.1.6",
"vue": "^3.3.4",
"vue-router": "^4.2.5",
"axios": "^1.6.8",
"luxon": "^3.4.4",
"markdown-it": "^14.1.0",
"pinia": "^2.1.7",
"vue": "^3.4.24",
"vue-router": "^4.3.2",
"vue-toastification": "^2.0.0-rc.5"
},
"devDependencies": {
"@heroicons/vue": "^2.0.18",
"@openapitools/openapi-generator-cli": "^2.7.0",
"@trivago/prettier-plugin-sort-imports": "^4.2.0",
"@types/luxon": "^3.3.2",
"@types/markdown-it": "^13.0.2",
"@types/node": "20.8.3",
"@heroicons/vue": "^2.1.3",
"@openapitools/openapi-generator-cli": "^2.13.4",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/luxon": "^3.4.2",
"@types/markdown-it": "^14.0.1",
"@types/node": "20.12.7",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
"@vitejs/plugin-vue": "^4.4.0",
"@vue/compiler-sfc": "^3.3.4",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "^3.4.24",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-unused-imports": "^3.0.0",
"eslint-plugin-vue": "^9.17.0",
"esno": "^0.17.0",
"esno": "^4.7.0",
"execa": "^8.0.1",
"msw": "^2.0.5",
"msw": "2.0.5",
"prettier": "^3.0.3",
"prettier-plugin-tailwindcss": "^0.5.5",
"rollup-plugin-brotli": "^3.1.0",
"ts-morph": "^20.0.0",
"typescript": "^5.2.2",
"vite": "^4.4.11",
"vite-plugin-windicss": "^1.9.1",
"vue-tsc": "^1.8.18",
"ts-morph": "^22.0.0",
"typescript": "^5.2.0",
"vite": "^5.2.10",
"vite-plugin-windicss": "^1.9.3",
"vue-tsc": "^2.0.14",
"windicss": "^3.5.6"
},
"msw": {
Expand Down
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts" setup>
import { onMounted , watch } from 'vue'
import { onMounted, watch } from 'vue'
import { useFetchMeUsecase } from '/@/features/user/usecase'
Expand Down
4 changes: 3 additions & 1 deletion src/components/shared/InputSelectTagWithCreation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ const value = computed({
<template>
<InputSelectMultiple
v-model="value"
:create-option="(tag: string) => ({ name: tag, id: '', created_at: '', updated_at: '' })"
:create-option="
(tag: string) => ({ name: tag, id: '', created_at: '', updated_at: '' })
"
:options="tagOptions"
placeholder="タグを選択"
taggable
Expand Down
2 changes: 1 addition & 1 deletion src/features/requestStatus/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ export const requestStatusOptions = () =>
value: requestStatus.state
}))

export type RequestStatus = typeof StatusEnum[keyof typeof StatusEnum]
export type RequestStatus = (typeof StatusEnum)[keyof typeof StatusEnum]
2 changes: 1 addition & 1 deletion src/features/requestTemplate/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ export const requestTemplates = [
] as const

const requestTemplateNames = requestTemplates.map(v => v.name)
export type RequestTemplate = typeof requestTemplateNames[number]
export type RequestTemplate = (typeof requestTemplateNames)[number]
11 changes: 7 additions & 4 deletions src/stores/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@ export const useUserStore = defineStore('user', () => {

const userMap = computed(
() =>
users.value?.reduce((acc, user) => {
acc[user.id] = user.name
return acc
}, {} as Record<string, string>) ?? {}
users.value?.reduce(
(acc, user) => {
acc[user.id] = user.name
return acc
},
{} as Record<string, string>
) ?? {}
)

return {
Expand Down
8 changes: 4 additions & 4 deletions src/styles/toast.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.Vue-Toastification__toast--info {
background-color: #38bdf8; //sky-400
background-color: #38bdf8; /** sky-400*/
}
.Vue-Toastification__toast--success {
background-color: #34d399; //emerald-400
background-color: #34d399; /** emerald-400*/
}
.Vue-Toastification__toast--error {
background-color: #f87171; //red-400
background-color: #f87171; /** red-400*/
}
.Vue-Toastification__toast--warning {
background-color: #fbbf24; //yellow-400
background-color: #fbbf24; /** yellow-400*/
}

0 comments on commit c41f80b

Please sign in to comment.