Skip to content

Commit

Permalink
Merge pull request nextcloud#10622 from nextcloud/dependabot/npm_and_…
Browse files Browse the repository at this point in the history
…yarn/nextcloud/eslint-config-8.3.0
  • Loading branch information
dependabot[bot] committed Oct 3, 2023
2 parents 0a5509b + fff983f commit d72622e
Show file tree
Hide file tree
Showing 10 changed files with 1,290 additions and 741 deletions.
4 changes: 3 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ module.exports = {
IS_DESKTOP: 'readonly',
},
rules: {
'comma-dangle': 'off',
'jsdoc/no-defaults': 'off',
'import/newline-after-import': 'warn',
'import/no-named-as-default-member': 'off',
'import/order': [
'warn',
'off', // TODO disabled with #10622 as it breaks tests and changes many components
{
groups: ['builtin', 'external', 'internal', ['parent', 'sibling', 'index'], 'unknown'],
pathGroups: [
Expand Down
1,987 changes: 1,270 additions & 717 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"@babel/preset-env": "^7.22.20",
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^3.0.0",
"@nextcloud/eslint-config": "^8.2.1",
"@nextcloud/eslint-config": "^8.3.0",
"@nextcloud/stylelint-config": "^2.3.1",
"@nextcloud/webpack-vue-config": "^6.0.0",
"@types/jest": "^29.5.5",
Expand Down
1 change: 0 additions & 1 deletion src/mixins/getParticipants.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/**
* @copyright Copyright (c) 2019 Marco Ambrosini <marcoambrosini@icloud.com>
*
Expand Down
4 changes: 1 addition & 3 deletions src/store/callViewStore.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import { createLocalVue } from '@vue/test-utils'
import { cloneDeep } from 'lodash'
import Vuex from 'vuex'

import {
CONVERSATION,
} from '../constants.js'
import { CONVERSATION } from '../constants.js'
import storeConfig from './storeConfig.js'

describe('callViewStore', () => {
Expand Down
18 changes: 12 additions & 6 deletions src/stores/sharedItems.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,21 @@ import { getItemTypeFromMessage } from '../utils/getItemTypeFromMessage.js'
* @typedef {string} Token
*/

/**
* @typedef {object} Message
* @property {string} token - conversation token
* @property {number} id - message id
*/

/**
* @typedef {object} Messages
* @property {Object<number, object>} messages - messages with shared items for this conversation
* @property {{[key: number]: Message}} messages - messages with shared items for this conversation
*/

/**
* @typedef {object} State
* @property {Object<Token, Object<Type, Messages>>} sharedItemsPool - The shared items pool.
* @property {Object<Token, boolean>} overviewLoaded - The overview loaded state.
* @property {{[key: Token]: {[key: Type]: Messages}}} sharedItemsPool - The shared items pool.
* @property {{[key: Token]: boolean}} overviewLoaded - The overview loaded state.
*/

/**
Expand Down Expand Up @@ -77,7 +83,7 @@ export const useSharedItemsStore = defineStore('sharedItems', {

/**
* @param {Token} token conversation token
* @param {Object<Type, object>} data server response
* @param {{[key: Type]: Message[]}} data server response
*/
addSharedItemsFromOverview(token, data) {
for (const type of Object.keys(data)) {
Expand All @@ -95,7 +101,7 @@ export const useSharedItemsStore = defineStore('sharedItems', {
},

/**
* @param {object} message message with shared items
* @param {Message} message message with shared items
*/
addSharedItemFromMessage(message) {
const token = message.token
Expand All @@ -110,7 +116,7 @@ export const useSharedItemsStore = defineStore('sharedItems', {
/**
* @param {Token} token conversation token
* @param {Type} type type of shared item
* @param {Array} messages message with shared items
* @param {Message[]} messages message with shared items
*/
addSharedItemsFromMessages(token, type, messages) {
this.checkForExistence(token, type)
Expand Down
1 change: 0 additions & 1 deletion src/utils/media/effects/virtual-background/TimerWorker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/**
* SET_TIMEOUT constant is used to set interval and it is set in
* the id property of the request.data property. timeMs property must
Expand Down
4 changes: 1 addition & 3 deletions src/utils/webrtc/analyzers/CallAnalyzer.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
*/

import EmitterMixin from '../../EmitterMixin.js'
import {
ParticipantAnalyzer,
} from './ParticipantAnalyzer.js'
import { ParticipantAnalyzer } from './ParticipantAnalyzer.js'

/**
* Analyzer for the quality of the connections of a call.
Expand Down
5 changes: 1 addition & 4 deletions src/utils/webrtc/analyzers/ParticipantAnalyzer.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
*/

import EmitterMixin from '../../EmitterMixin.js'
import {
PEER_DIRECTION,
PeerConnectionAnalyzer,
} from './PeerConnectionAnalyzer.js'
import { PEER_DIRECTION, PeerConnectionAnalyzer } from './PeerConnectionAnalyzer.js'

/**
* Analyzer for the quality of the connections of a Participant.
Expand Down
5 changes: 1 addition & 4 deletions src/utils/webrtc/analyzers/PeerConnectionAnalyzer.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
*/

import EmitterMixin from '../../EmitterMixin.js'
import {
STAT_VALUE_TYPE,
AverageStatValue,
} from './AverageStatValue.js'
import { STAT_VALUE_TYPE, AverageStatValue } from './AverageStatValue.js'

const CONNECTION_QUALITY = {
UNKNOWN: 0,
Expand Down

0 comments on commit d72622e

Please sign in to comment.