Skip to content

Commit

Permalink
Merge pull request #107 from traPtitech/feat/update_dependencies
Browse files Browse the repository at this point in the history
パッケージのアップデート
  • Loading branch information
mehm8128 authored Oct 10, 2023
2 parents d0d7d2b + 8d920bb commit 6a30b74
Show file tree
Hide file tree
Showing 10 changed files with 3,958 additions and 3,415 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"./eslint-vue-ts-recommended.js",
"plugin:@typescript-eslint/recommended",
"plugin:vue/vue3-recommended",
"plugin:prettier/recommended"
"prettier"
],
"plugins": ["import", "unused-imports"],
"rules": {
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.0.0
v20.8.0
4 changes: 3 additions & 1 deletion eslint-vue-ts-recommended.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
* @typescript-eslint/eslint-recommendedはoverridesが['*.ts','*.tsx']になっている
* そのため、`.vue`内の`<script lang='ts'>`に適用されない
* 適用されるようにするためにoverridesに'*.vue'を追加する
*
* 参考: https://zenn.dev/the_red/articles/5162f9dbbafca3
*/

// eslint-disable-next-line @typescript-eslint/no-var-requires, no-undef
const typescriptEslintEslintRecommended = require('@typescript-eslint/eslint-plugin/dist/configs/eslint-recommended')
const typescriptEslintEslintRecommended = require('./node_modules/@typescript-eslint/eslint-plugin/dist/configs/eslint-recommended')

// eslint-disable-next-line no-undef
module.exports = {
Expand Down
7,284 changes: 3,911 additions & 3,373 deletions package-lock.json

Large diffs are not rendered by default.

67 changes: 33 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,44 +15,43 @@
"format": "prettier --write src"
},
"dependencies": {
"axios": "^1.1.2",
"luxon": "^3.0.4",
"markdown-it": "^13.0.1",
"pinia": "^2.0.23",
"vue": "^3.2.40",
"vue-router": "^4.1.5",
"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",
"vue-toastification": "^2.0.0-rc.5"
},
"devDependencies": {
"@heroicons/vue": "^2.0.12",
"@openapitools/openapi-generator-cli": "^2.5.2",
"@trivago/prettier-plugin-sort-imports": "^3.3.0",
"@types/luxon": "^3.0.1",
"@types/markdown-it": "^12.2.3",
"@types/node": "18.8.0",
"@typescript-eslint/eslint-plugin": "^5.40.0",
"@typescript-eslint/parser": "^5.40.0",
"@vitejs/plugin-vue": "^3.1.2",
"@vue/compiler-sfc": "^3.2.40",
"@vue/eslint-config-prettier": "^7.0.0",
"@vue/eslint-config-typescript": "^11.0.2",
"eslint": "^8.25.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-unused-imports": "^2.0.0",
"eslint-plugin-vue": "^9.6.0",
"esno": "^0.16.3",
"execa": "^6.1.0",
"msw": "^0.47.4",
"prettier": "^2.7.1",
"prettier-plugin-tailwindcss": "^0.1.13",
"@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",
"@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",
"@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",
"execa": "^8.0.1",
"msw": "^1.3.2",
"prettier": "^3.0.3",
"prettier-plugin-tailwindcss": "^0.5.5",
"rollup-plugin-brotli": "^3.1.0",
"ts-morph": "^16.0.0",
"typescript": "^4.8.4",
"vite": "^3.1.7",
"vite-plugin-windicss": "^1.8.8",
"vue-tsc": "^1.0.6",
"ts-morph": "^20.0.0",
"typescript": "^5.2.2",
"vite": "^4.4.11",
"vite-plugin-windicss": "^1.9.1",
"vue-tsc": "^1.8.18",
"windicss": "^3.5.6"
},
"msw": {
Expand Down
6 changes: 3 additions & 3 deletions public/mockServiceWorker.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
/* tslint:disable */

/**
* Mock Service Worker (0.47.4).
* Mock Service Worker (1.3.2).
* @see https://github.com/mswjs/msw
* - Please do NOT modify this file.
* - Please do NOT serve this file on production.
*/

const INTEGRITY_CHECKSUM = 'b3066ef78c2f9090b4ce87e874965995'
const INTEGRITY_CHECKSUM = '3d6b9f06410d179a7f7404d4bf4c3c70'
const activeClientIds = new Set()

self.addEventListener('install', function () {
Expand Down Expand Up @@ -174,7 +174,7 @@ async function handleRequest(event, requestId) {
async function resolveMainClient(event) {
const client = await self.clients.get(event.clientId)

if (client.frameType === 'top-level') {
if (client?.frameType === 'top-level') {
return client
}

Expand Down
5 changes: 4 additions & 1 deletion src/components/requestDetail/RequestLogs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ const logs = computed((): Log[] => {
<div v-if="request" class="h-120 overflow-y-scroll p-2">
<RequestFiles />
<ul>
<li v-for="log in logs" :key="log.createdAt.toISO()" class="vertical-bar">
<li
v-for="(log, i) in logs"
:key="log.createdAt.toISO() ?? i"
class="vertical-bar">
<CommentLog v-if="log.type === 'comment'" :comment="log" />
<StatusChangeLog v-if="log.type === 'statusChange'" :log="log" />
</li>
Expand Down
1 change: 1 addition & 0 deletions src/components/shared/InputSelectMultiple.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { ChevronDownIcon } from '@heroicons/vue/24/solid'
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
// eslint-disable-next-line @typescript-eslint/no-explicit-any
type ValueValue = Record<string, any> | string | null
interface Value {
Expand Down
1 change: 1 addition & 0 deletions src/components/shared/InputSelectSingle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { ChevronDownIcon } from '@heroicons/vue/24/solid'
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
// eslint-disable-next-line @typescript-eslint/no-explicit-any
type ValueValue = Record<string, any> | string | null
interface Value {
Expand Down
1 change: 0 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"sourceMap": true,
"resolveJsonModule": true,
"allowSyntheticDefaultImports": true,
"importsNotUsedAsValues": "error",
"esModuleInterop": true,
"skipLibCheck": true,
"lib": ["esnext", "dom"],
Expand Down

0 comments on commit 6a30b74

Please sign in to comment.