Skip to content

Commit

Permalink
Merge pull request #4134 from traPtitech/dependabot/npm_and_yarn/axio…
Browse files Browse the repository at this point in the history
…s-1.6.0

Bump axios from 0.27.2 to 1.6.0, @traPtitech/traq from 3.11.0-3 to 3.15.1-8
  • Loading branch information
ras0q committed Nov 13, 2023
2 parents 813093c + 7794d25 commit 52674dc
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 16 deletions.
38 changes: 27 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dependencies": {
"@mdi/js": "^7.2.96",
"@sapphi-red/web-noise-suppressor": "^0.3.3",
"@traptitech/traq": "^3.11.0-3",
"@traptitech/traq": "^3.15.1-8",
"@traptitech/traq-markdown-it": "^6.3.0",
"autosize": "^6.0.1",
"cropperjs": "^1.5.13",
Expand Down Expand Up @@ -70,7 +70,7 @@
"@vitest/coverage-c8": "^0.25.8",
"@vue/test-utils": "^2.4.1",
"autoprefixer": "^10.4.14",
"axios": "^0.27.2",
"axios": "^1.6.0",
"browserslist": "^4.21.10",
"cypress": "^13.3.0",
"esbuild": "^0.15.18",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import { countLength } from '/@/lib/basic/string'
import { useToastStore } from '/@/store/ui/toast'
import { getResizedFile } from '/@/lib/resize'
import useAttachments from '/@/components/Main/MainView/MessageInput/composables/useAttachments'
import type { AxiosProgressEvent } from 'axios'
const useEditMessage = (
props: { messageId: string },
Expand Down Expand Up @@ -99,7 +100,8 @@ const useAttachmentsEditor = (
/**
* https://github.com/axios/axios#request-config
*/
onUploadProgress(e: ProgressEvent) {
onUploadProgress(e: AxiosProgressEvent) {
if (e.total === undefined || e.total === 0) return
progress.value = e.loaded / e.total
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { useChannelTree } from '/@/store/domain/channelTree'
import { useChannelsStore } from '/@/store/entities/channels'
import { useUsersStore } from '/@/store/entities/users'
import { useGroupsStore } from '/@/store/entities/groups'
import type { AxiosProgressEvent } from 'axios'

/**
* @param progress アップロード進行状況 0~1
Expand All @@ -34,7 +35,8 @@ const uploadAttachments = async (
/**
* https://github.com/axios/axios#request-config
*/
onUploadProgress(e: ProgressEvent) {
onUploadProgress(e: AxiosProgressEvent) {
if (e.total === undefined || e.total === 0) return
onProgress((i + e.loaded / e.total) / attachments.length)
}
})
Expand Down
3 changes: 2 additions & 1 deletion src/store/domain/subscription.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ const useSubscriptionStorePinia = defineStore('domain/subscription', () => {
count: 1,
noticeable,
since: message.createdAt,
updatedAt: message.createdAt
updatedAt: message.createdAt,
oldestMessageId: message.id
})
}
updateBadge(unreadChannelsMap.value)
Expand Down

0 comments on commit 52674dc

Please sign in to comment.