Skip to content

Commit aefcd5f

Browse files
Merge pull request #59121 from nextcloud/dependabot/npm_and_yarn/eslint-10.1.0
chore(deps-dev): Bump eslint from 9.39.2 to 10.1.0
2 parents fca6085 + 5287da4 commit aefcd5f

File tree

60 files changed

+476
-521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+476
-521
lines changed

.github/dependabot.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,14 @@ updates:
5353
- "feature: dependencies"
5454
# Disable automatic rebasing because without a build CI will likely fail anyway
5555
rebase-strategy: "disabled"
56+
cooldown:
57+
default-days: 4
58+
semver-major-days: 8
5659
groups:
60+
eslint:
61+
patterns:
62+
- "eslint*"
63+
- "@nextcloud/eslint-config"
5764
vite:
5865
patterns:
5966
- "vite"
@@ -101,6 +108,9 @@ updates:
101108
day: saturday
102109
time: "03:30"
103110
timezone: Europe/Paris
111+
cooldown:
112+
default-days: 4
113+
semver-major-days: 8
104114
open-pull-requests-limit: 20
105115
labels:
106116
- "3. to review"
@@ -155,6 +165,9 @@ updates:
155165
day: saturday
156166
time: "04:30"
157167
timezone: Europe/Paris
168+
cooldown:
169+
default-days: 4
170+
semver-major-days: 8
158171
open-pull-requests-limit: 20
159172
labels:
160173
- "3. to review"

apps/dav/src/components/AbsenceForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export default {
149149
ShareType.User,
150150
]
151151
152-
let request = null
152+
let request
153153
try {
154154
request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees'), {
155155
params: {

apps/files/src/components/FilesListVirtual.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,7 @@ export default defineComponent({
428428
}
429429
430430
if (event.key !== 'ArrowUp' && event.key !== 'ArrowDown'
431-
&& (!this.userConfig.grid_view || (event.key !== 'ArrowLeft' && event.key !== 'ArrowRight'))
432-
) {
431+
&& (!this.userConfig.grid_view || (event.key !== 'ArrowLeft' && event.key !== 'ArrowRight'))) {
433432
// not an arrow key we handle
434433
return
435434
}

apps/files/src/components/FilesNavigationListItem.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export default {
141141
allow-collapse
142142
:loading="isLoading"
143143
:data-cy-files-navigation-item="view.id"
144-
:exact="hasChildViews /* eslint-disable-line @nextcloud/vue/no-deprecated-props */"
144+
:exact="hasChildViews"
145145
:name="view.name"
146146
:open="isExpanded"
147147
:pinned="view.sticky"

apps/files/src/composables/usePreviewImage.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ export function usePreviewImage(
3838
const fallback = toValue(options).fallback ?? true
3939
if (source.attributes['has-preview'] !== true
4040
&& source.mime !== undefined
41-
&& source.mime !== 'application/octet-stream'
42-
) {
41+
&& source.mime !== 'application/octet-stream') {
4342
if (!fallback) {
4443
return
4544
}

apps/files/src/store/renaming.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ export const useRenamingStore = defineStore('renaming', () => {
6666
// Check for extension change for files
6767
if (node.type === FileType.File
6868
&& oldExtension !== newExtension
69-
&& !(await showFileExtensionDialog(oldExtension, newExtension))
70-
) {
69+
&& !(await showFileExtensionDialog(oldExtension, newExtension))) {
7170
// user selected to use the old extension
7271
newName = basename(newName, newExtension) + oldExtension
7372
if (oldName === newName) {
@@ -78,8 +77,7 @@ export const useRenamingStore = defineStore('renaming', () => {
7877
if (!userConfig.userConfig.show_hidden
7978
&& newName.startsWith('.')
8079
&& !oldName.startsWith('.')
81-
&& !(await showHiddenFileDialog(newName))
82-
) {
80+
&& !(await showHiddenFileDialog(newName))) {
8381
return false
8482
}
8583
}
@@ -126,7 +124,7 @@ export const useRenamingStore = defineStore('renaming', () => {
126124
if (isAxiosError(error)) {
127125
// TODO: 409 means current folder does not exist, redirect ?
128126
if (error?.response?.status === 404) {
129-
throw new Error(t('files', 'Could not rename "{oldName}", it does not exist any more', { oldName }))
127+
throw new Error(t('files', 'Could not rename "{oldName}", it does not exist any more', { oldName }), { cause: error })
130128
} else if (error?.response?.status === 412) {
131129
throw new Error(t(
132130
'files',
@@ -135,11 +133,11 @@ export const useRenamingStore = defineStore('renaming', () => {
135133
newName,
136134
dir: basename(renamingNode.value!.dirname),
137135
},
138-
))
136+
), { cause: error })
139137
}
140138
}
141139
// Unknown error
142-
throw new Error(t('files', 'Could not rename "{oldName}"', { oldName }))
140+
throw new Error(t('files', 'Could not rename "{oldName}"', { oldName }), { cause: error })
143141
} finally {
144142
Vue.set(node, 'status', undefined)
145143
isRenaming.value = false

apps/files/src/utils/permissions.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ export function isDownloadable(node: INode): boolean {
2121

2222
// check hide-download property of shares
2323
if (node.attributes['hide-download'] === true
24-
|| node.attributes['hide-download'] === 'true'
25-
) {
24+
|| node.attributes['hide-download'] === 'true') {
2625
return false
2726
}
2827

apps/files_sharing/src/components/SharingInput.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ export default {
231231
shareType.push(...remoteTypes)
232232
}
233233
234-
let request = null
234+
let request
235235
try {
236236
request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees'), {
237237
params: {
@@ -321,7 +321,7 @@ export default {
321321
async getRecommendations() {
322322
this.loading = true
323323
324-
let request = null
324+
let request
325325
try {
326326
request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees_recommended'), {
327327
params: {

apps/files_sharing/src/mixins/ShareDetails.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import logger from '../services/logger.ts'
1111
export default {
1212
methods: {
1313
async openSharingDetails(shareRequestObject) {
14-
let share = {}
14+
let share
1515
// handle externalResults from OCA.Sharing.ShareSearch
1616
// TODO : Better name/interface for handler required
1717
// For example `externalAppCreateShareHook` with proper documentation

apps/files_versions/src/utils/versions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ export async function restoreVersion(version: Version) {
9898
*/
9999
function formatVersion(version: Required<FileStat>, node: INode): Version {
100100
const mtime = Date.parse(version.lastmod)
101-
let previewUrl = ''
102101

102+
let previewUrl: string
103103
if (mtime === node.mtime?.getTime()) { // Version is the current one
104104
previewUrl = generateUrl('/core/preview?fileId={fileId}&c={fileEtag}&x=250&y=250&forceIcon=0&a=0&forceIcon=1&mimeFallback=1', {
105-
fileId: node.fileid,
105+
fileId: node.id,
106106
fileEtag: node.attributes.etag,
107107
})
108108
} else {
@@ -113,7 +113,7 @@ function formatVersion(version: Required<FileStat>, node: INode): Version {
113113
}
114114

115115
return {
116-
fileId: node.fileid!.toString(),
116+
fileId: node.id!,
117117
// If version-label is defined make sure it is a string (prevent issue if the label is a number an PHP returns a number then)
118118
label: version.props['version-label'] ? String(version.props['version-label']) : '',
119119
author: version.props['version-author'] ? String(version.props['version-author']) : null,

0 commit comments

Comments
 (0)