Skip to content

Commit ce37473

Browse files
AndyScherzingerAndyScherzinger
authored
Merge pull request #56619 from nextcloud/chore/eslint
chore(eslint): fix linting on CI and resolve issues
2 parents 9d41f4b + 1dff595 commit ce37473

File tree

11 files changed

+85
-68
lines changed

11 files changed

+85
-68
lines changed

‎REUSE.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ SPDX-FileCopyrightText = "2019 Fabian Wiktor <https://www.pexels.com/photo/green
400400
SPDX-License-Identifier = "CC0-1.0"
401401

402402
[[annotations]]
403-
path = ["openapi.json", ".envrc", "flake.nix", "flake.lock", "build/eslint-baseline.json"]
403+
path = ["openapi.json", ".envrc", "flake.nix", "flake.lock", "build/eslint-baseline.json", "build/eslint-baseline-legacy.json"]
404404
precedence = "aggregate"
405405
SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
406406
SPDX-License-Identifier = "AGPL-3.0-or-later"

‎apps/files_versions/src/components/VirtualScrolling.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ export default defineComponent({
9696
},
9797
},
9898
99+
emits: ['need-content'],
100+
99101
data() {
100102
return {
101103
scrollPosition: 0,
@@ -312,7 +314,7 @@ export default defineComponent({
312314
this.container.addEventListener('scroll', this.updateScrollPosition, { passive: true })
313315
},
314316
315-
beforeDestroy() {
317+
beforeUnmount() {
316318
if (this.useWindow) {
317319
window.removeEventListener('resize', this.updateContainerSize)
318320
}

‎apps/files_versions/src/utils/davClient.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ const rootPath = 'dav'
1212
const remote = generateRemoteUrl(rootPath)
1313
const client = createClient(remote)
1414

15-
// set CSRF token header
1615
/**
16+
* set CSRF token header
1717
*
18-
* @param token
18+
* @param token - CSRF token
1919
*/
2020
function setHeaders(token) {
2121
client.setHeaders({

‎build/demi.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,25 @@ run_sequentially() {
3030
echo -e "\e[1;34m>> Running 'npm $COMMAND' for Vue 3 based frontend\e[0m"
3131
echo
3232
pushd "$FRONTEND"
33+
set +e
3334
npm $COMMAND
35+
STATUS=$?
36+
set -e
3437
popd
3538

3639
echo -e "\e[1;34m>> Running 'npm $COMMAND' for Vue 2 based frontend\e[0m"
3740
echo
3841
pushd "$FRONTEND_LEGACY"
3942
npm $COMMAND
4043
popd
41-
}
4244

45+
if [ $STATUS -ne 0 ]; then
46+
echo -e "\e[1;31m>> Vue 3 based frontend build failed\e[0m"
47+
exit $STATUS
48+
fi
49+
}
4350

51+
set -e
4452
if [ "--parallel" = "$1" ]; then
4553
build_command ${@:2}
4654
run_parallel

‎build/eslint-baseline-legacy.json‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"apps/files/src/components/TransferOwnershipDialogue.vue": {
3+
"@nextcloud/vue/no-deprecated-props": {
4+
"count": 1
5+
}
6+
},
7+
"apps/files_sharing/src/components/SharingEntryQuickShareSelect.vue": {
8+
"vue/no-mutating-props": {
9+
"count": 2
10+
}
11+
},
12+
"apps/files_sharing/src/components/SharingInput.vue": {
13+
"@nextcloud/vue/no-deprecated-props": {
14+
"count": 1
15+
}
16+
},
17+
"apps/files_sharing/src/views/SharingDetailsTab.vue": {
18+
"vue/no-mutating-props": {
19+
"count": 23
20+
}
21+
},
22+
"apps/files_sharing/src/views/SharingLinkList.vue": {
23+
"vue/no-mutating-props": {
24+
"count": 1
25+
}
26+
},
27+
"apps/settings/src/components/Users/NewUserDialog.vue": {
28+
"@nextcloud/vue/no-deprecated-props": {
29+
"count": 1
30+
},
31+
"vue/no-mutating-props": {
32+
"count": 17
33+
}
34+
},
35+
"apps/workflowengine/src/components/Check.vue": {
36+
"vue/no-mutating-props": {
37+
"count": 3
38+
}
39+
},
40+
"apps/workflowengine/src/components/Rule.vue": {
41+
"vue/no-mutating-props": {
42+
"count": 1
43+
}
44+
},
45+
"core/src/OC/dialogs.js": {
46+
"camelcase": {
47+
"count": 33
48+
},
49+
"no-undef": {
50+
"count": 1
51+
}
52+
},
53+
"core/src/views/Login.vue": {
54+
"vue/multi-word-component-names": {
55+
"count": 1
56+
}
57+
},
58+
"core/src/views/Setup.vue": {
59+
"vue/multi-word-component-names": {
60+
"count": 1
61+
}
62+
}
63+
}

‎build/eslint-baseline.json‎

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,7 @@
11
{
2-
"apps/files/src/components/TransferOwnershipDialogue.vue": {
2+
"apps/dav/src/components/AbsenceForm.vue": {
33
"@nextcloud/vue/no-deprecated-props": {
44
"count": 1
55
}
6-
},
7-
"apps/files_sharing/src/components/SharingEntryQuickShareSelect.vue": {
8-
"vue/no-mutating-props": {
9-
"count": 2
10-
}
11-
},
12-
"apps/files_sharing/src/components/SharingInput.vue": {
13-
"@nextcloud/vue/no-deprecated-props": {
14-
"count": 1
15-
}
16-
},
17-
"apps/files_sharing/src/views/SharingDetailsTab.vue": {
18-
"vue/no-mutating-props": {
19-
"count": 23
20-
}
21-
},
22-
"apps/files_sharing/src/views/SharingLinkList.vue": {
23-
"vue/no-mutating-props": {
24-
"count": 1
25-
}
26-
},
27-
"apps/settings/src/components/Users/NewUserDialog.vue": {
28-
"@nextcloud/vue/no-deprecated-props": {
29-
"count": 1
30-
},
31-
"vue/no-mutating-props": {
32-
"count": 16
33-
}
34-
},
35-
"apps/workflowengine/src/components/Check.vue": {
36-
"vue/no-mutating-props": {
37-
"count": 3
38-
}
39-
},
40-
"apps/workflowengine/src/components/Rule.vue": {
41-
"vue/no-mutating-props": {
42-
"count": 1
43-
}
44-
},
45-
"core/src/OC/dialogs.js": {
46-
"camelcase": {
47-
"count": 33
48-
},
49-
"no-undef": {
50-
"count": 1
51-
}
52-
},
53-
"core/src/views/Login.vue": {
54-
"vue/multi-word-component-names": {
55-
"count": 1
56-
}
57-
},
58-
"core/src/views/Setup.vue": {
59-
"vue/multi-word-component-names": {
60-
"count": 1
61-
}
626
}
637
}

‎build/frontend-legacy/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"scripts": {
99
"build": "webpack --node-env production --progress",
1010
"dev": "webpack --node-env development --progress",
11-
"lint": "eslint --suppressions-location ../eslint-baseline.json --no-error-on-unmatched-pattern ./apps/*/ ./core/",
12-
"lint:fix": "eslint --suppressions-location ../eslint-baseline.json --fix --no-error-on-unmatched-pattern ./apps/*/ ./core/",
11+
"lint": "eslint --suppressions-location ../eslint-baseline-legacy.json --no-error-on-unmatched-pattern ./apps/*/ ./core/",
12+
"lint:fix": "eslint --suppressions-location ../eslint-baseline-legacy.json --fix --no-error-on-unmatched-pattern ./apps/*/ ./core/",
1313
"test": "vitest run",
1414
"test:coverage": "vitest run --coverage --reporter=default",
1515
"test:update-snapshots": "vitest run --update",

dist/files_versions-files_versions-sidebar-tab-4BohXFH5.chunk.css renamed to dist/files_versions-files_versions-sidebar-tab-DbvfeGRa.chunk.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/files_versions-sidebar-tab.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/* extracted by css-entry-points-plugin */
2-
@import './files_versions-files_versions-sidebar-tab-4BohXFH5.chunk.css';
2+
@import './files_versions-files_versions-sidebar-tab-DbvfeGRa.chunk.css';
33
@import './NcSettingsSection-BfK7eHNT-BFoYkIs3.chunk.css';
44
@import './check-BhZ0LWiU.chunk.css';

‎dist/files_versions-sidebar-tab.mjs‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)