Upgrade to node 18 and dependencies (#46)

* upgrade to nodejs 18.

* npm update.

* upgrade linter.

* upgrade axios.

* upgrade saas loader.

* upgrade typescript.
This commit is contained in:
Miroslav Šedivý 2024-01-26 19:25:22 +01:00 committed by GitHub
parent 4ed16f3960
commit 4e693ae4a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 1593 additions and 1280 deletions

View File

@ -20,6 +20,6 @@
}, },
"editor.formatOnSave": false, "editor.formatOnSave": false,
"editor.codeActionsOnSave": { "editor.codeActionsOnSave": {
"source.fixAll.eslint": true "source.fixAll.eslint": "explicit"
}, },
} }

View File

@ -1,4 +1,4 @@
FROM node:16-buster-slim FROM node:18-buster-slim
COPY . /app COPY . /app

View File

@ -7,4 +7,4 @@ docker run --rm -it \
--volume "${PWD}/../:/app" \ --volume "${PWD}/../:/app" \
--entrypoint="npm" \ --entrypoint="npm" \
--workdir="/app" \ --workdir="/app" \
node:16-buster-slim run build node:18-buster-slim run build

View File

@ -7,4 +7,4 @@ docker run --rm -it \
--volume "${PWD}/../:/app" \ --volume "${PWD}/../:/app" \
--entrypoint="/bin/bash" \ --entrypoint="/bin/bash" \
--workdir="/app" \ --workdir="/app" \
node:16-buster-slim node:18-buster-slim

View File

@ -7,4 +7,4 @@ docker run --rm -it \
--volume "${PWD}/../:/app" \ --volume "${PWD}/../:/app" \
--entrypoint="npm" \ --entrypoint="npm" \
--workdir="/app" \ --workdir="/app" \
node:16-buster-slim "$@" node:18-buster-slim "$@"

View File

@ -31,4 +31,4 @@ docker run --rm -it \
--volume "${PWD}/../:/app" \ --volume "${PWD}/../:/app" \
--entrypoint="npm" \ --entrypoint="npm" \
--workdir="/app" \ --workdir="/app" \
node:16-buster-slim run serve node:18-buster-slim run serve

2798
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -16,33 +16,33 @@
"build:page": "vue-cli-service build" "build:page": "vue-cli-service build"
}, },
"dependencies": { "dependencies": {
"axios": "^0.27.2", "axios": "^1.6.7",
"eventemitter3": "^5.0.0", "eventemitter3": "^5.0.0",
"resize-observer-polyfill": "^1.5.1", "resize-observer-polyfill": "^1.5.1",
"vue": "^2.6.14", "vue": "^2.7.16",
"vue-class-component": "^7.2.6", "vue-class-component": "^7.2.6",
"vue-property-decorator": "^9.1.2" "vue-property-decorator": "^9.1.2"
}, },
"devDependencies": { "devDependencies": {
"@fortawesome/fontawesome-free": "^6.1.1", "@fortawesome/fontawesome-free": "^6.1.1",
"@types/node": "^16.11.35", "@types/node": "^18.0.0",
"@types/vue": "^2.0.0", "@types/vue": "^2.0.0",
"@typescript-eslint/eslint-plugin": "^5.23.0", "@typescript-eslint/eslint-plugin": "^6.19.1",
"@typescript-eslint/parser": "^5.23.0", "@typescript-eslint/parser": "^6.19.1",
"@vue/cli-plugin-babel": "^5.0.4", "@vue/cli-plugin-babel": "^5.0.4",
"@vue/cli-plugin-eslint": "^5.0.4", "@vue/cli-plugin-eslint": "^5.0.4",
"@vue/cli-plugin-typescript": "^5.0.4", "@vue/cli-plugin-typescript": "^5.0.4",
"@vue/cli-service": "^5.0.4", "@vue/cli-service": "^5.0.4",
"@vue/eslint-config-prettier": "^7.0.0", "@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^10.0.0", "@vue/eslint-config-typescript": "^12.0.0",
"eslint": "^8.15.0", "eslint": "^8.15.0",
"eslint-plugin-prettier": "^4.0.0", "eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-vue": "^8.7.1", "eslint-plugin-vue": "^9.20.1",
"prettier": "^2.6.2", "prettier": "^3.2.4",
"sass": "^1.51.0", "sass": "^1.51.0",
"sass-loader": "^12.6.0", "sass-loader": "^14.0.0",
"ts-node": "^10.7.0", "ts-node": "^10.7.0",
"typescript": "^4.6.4", "typescript": "^5.3.3",
"vue-template-compiler": "^2.6.14" "vue-template-compiler": "^2.6.14"
}, },
"files": [ "files": [

View File

@ -3,6 +3,7 @@ import * as EVENT from '../types/events'
import * as message from '../types/messages' import * as message from '../types/messages'
import EventEmitter from 'eventemitter3' import EventEmitter from 'eventemitter3'
import { AxiosProgressEvent } from 'axios'
import { Logger } from '../utils/logger' import { Logger } from '../utils/logger'
import { NekoConnection } from './connection' import { NekoConnection } from './connection'
import NekoState from '../types/state' import NekoState from '../types/state'
@ -17,7 +18,7 @@ export interface NekoEvents {
// drag and drop events // drag and drop events
['upload.drop.started']: () => void ['upload.drop.started']: () => void
['upload.drop.progress']: (progressEvent: ProgressEvent) => void ['upload.drop.progress']: (progressEvent: AxiosProgressEvent) => void
['upload.drop.finished']: (error?: Error) => void ['upload.drop.finished']: (error?: Error) => void
// upload dialog events // upload dialog events
@ -340,7 +341,7 @@ export class NekoMessages extends EventEmitter<NekoEvents> {
} }
} }
protected [EVENT.FILE_CHOOSER_DIALOG_CLOSED]({ id }: message.SessionID) { protected [EVENT.FILE_CHOOSER_DIALOG_CLOSED]({}: message.SessionID) {
this._localLog.debug(`EVENT.FILE_CHOOSER_DIALOG_CLOSED`) this._localLog.debug(`EVENT.FILE_CHOOSER_DIALOG_CLOSED`)
this.emit('upload.dialog.closed') this.emit('upload.dialog.closed')
} }

View File

@ -19,7 +19,7 @@ export function register(el: HTMLVideoElement, state: Video) {
Vue.set(state, 'playable', false) Vue.set(state, 'playable', false)
Vue.set(state, 'playing', false) Vue.set(state, 'playing', false)
}) })
el.addEventListener('volumechange', (value) => { el.addEventListener('volumechange', () => {
Vue.set(state, 'muted', el.muted) Vue.set(state, 'muted', el.muted)
Vue.set(state, 'volume', el.volume) Vue.set(state, 'volume', el.volume)
}) })

View File

@ -569,7 +569,7 @@ export class NekoWebRTC extends EventEmitter<NekoWebRTCEvents> {
stats = await this._peer.getStats() stats = await this._peer.getStats()
} else { } else {
// callback browsers support // callback browsers support
await new Promise((res, rej) => { await new Promise((res) => {
//@ts-ignore //@ts-ignore
this._peer.getStats((stats) => res(stats)) this._peer.getStats((stats) => res(stats))
}) })

View File

@ -77,7 +77,7 @@
export * as webrtcTypes from './types/webrtc' export * as webrtcTypes from './types/webrtc'
import { Configuration } from './api/configuration' import { Configuration } from './api/configuration'
import { AxiosInstance } from 'axios' import { AxiosInstance, AxiosProgressEvent } from 'axios'
import { Vue, Component, Ref, Watch, Prop } from 'vue-property-decorator' import { Vue, Component, Ref, Watch, Prop } from 'vue-property-decorator'
import ResizeObserver from 'resize-observer-polyfill' import ResizeObserver from 'resize-observer-polyfill'
@ -576,7 +576,7 @@
this.events.emit('upload.drop.started') this.events.emit('upload.drop.started')
await this.api.room.uploadDrop(x, y, files, { await this.api.room.uploadDrop(x, y, files, {
onUploadProgress: (progressEvent: ProgressEvent) => { onUploadProgress: (progressEvent: AxiosProgressEvent) => {
this.events.emit('upload.drop.progress', progressEvent) this.events.emit('upload.drop.progress', progressEvent)
}, },
}) })

View File

@ -3,7 +3,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { Vue, Component, Ref, Watch, Prop } from 'vue-property-decorator' import { Vue, Component, Watch, Prop } from 'vue-property-decorator'
import { RoomApi } from './api' import { RoomApi } from './api'
const REFRESH_RATE = 1e3 const REFRESH_RATE = 1e3

View File

@ -20,8 +20,8 @@
neko.state.connection.status == 'disconnected' neko.state.connection.status == 'disconnected'
? 'background: red;' ? 'background: red;'
: neko.state.connection.status == 'connecting' : neko.state.connection.status == 'connecting'
? 'background: #17448a;' ? 'background: #17448a;'
: '' : ''
" "
> >
{{ neko.state.connection.status }} {{ neko.state.connection.status }}

View File

@ -85,7 +85,7 @@
</style> </style>
<script lang="ts"> <script lang="ts">
import { Component, Prop, Ref, Watch, Vue } from 'vue-property-decorator' import { Component, Prop, Watch, Vue } from 'vue-property-decorator'
import Neko from '~/component/main.vue' import Neko from '~/component/main.vue'
@Component({ @Component({

View File

@ -498,7 +498,7 @@
async updateProfile(memberId: string, memberProfile: ApiModels.MemberProfile) { async updateProfile(memberId: string, memberProfile: ApiModels.MemberProfile) {
try { try {
const res = await this.neko.members.membersUpdateProfile(memberId, memberProfile) await this.neko.members.membersUpdateProfile(memberId, memberProfile)
const members = this.members.map((member) => { const members = this.members.map((member) => {
if (member.id == memberId) { if (member.id == memberId) {
return { return {

View File

@ -335,7 +335,8 @@
}) })
})(require.context('./plugins/', true, /(main-tabs|main-components)\.vue$/)) })(require.context('./plugins/', true, /(main-tabs|main-components)\.vue$/))
import { Vue, Component, Ref, Watch } from 'vue-property-decorator' import { Vue, Component, Ref } from 'vue-property-decorator'
import { AxiosProgressEvent } from 'axios'
import NekoCanvas from '~/component/main.vue' import NekoCanvas from '~/component/main.vue'
import NekoHeader from './components/header.vue' import NekoHeader from './components/header.vue'
import NekoConnect from './components/connect.vue' import NekoConnect from './components/connect.vue'
@ -398,7 +399,11 @@
this.uploadProgress = 0 this.uploadProgress = 0
try { try {
await this.neko.room.uploadDialog([...files], { await this.neko.room.uploadDialog([...files], {
onUploadProgress: (progressEvent: ProgressEvent) => { onUploadProgress: (progressEvent: AxiosProgressEvent) => {
if (!progressEvent.total) {
this.uploadProgress = 0
return
}
this.uploadProgress = (progressEvent.loaded / progressEvent.total) * 100 this.uploadProgress = (progressEvent.loaded / progressEvent.total) * 100
}, },
}) })
@ -455,7 +460,11 @@
this.uploadActive = true this.uploadActive = true
this.uploadProgress = 0 this.uploadProgress = 0
}) })
this.neko.events.on('upload.drop.progress', (progressEvent: ProgressEvent) => { this.neko.events.on('upload.drop.progress', (progressEvent: AxiosProgressEvent) => {
if (!progressEvent.total) {
this.uploadProgress = 0
return
}
this.uploadProgress = (progressEvent.loaded / progressEvent.total) * 100 this.uploadProgress = (progressEvent.loaded / progressEvent.total) * 100
}) })
this.neko.events.on('upload.drop.finished', (e?: any) => { this.neko.events.on('upload.drop.finished', (e?: any) => {
@ -473,6 +482,7 @@
}) })
this.neko.events.on('upload.dialog.overlay', (id: string) => { this.neko.events.on('upload.dialog.overlay', (id: string) => {
this.dialogOverlayActive = true this.dialogOverlayActive = true
console.log('upload.dialog.overlay', id)
}) })
this.neko.events.on('upload.dialog.closed', () => { this.neko.events.on('upload.dialog.closed', () => {
this.dialogOverlayActive = false this.dialogOverlayActive = false