Merge pull request #11519 from owncloud/chore/bump-eslint-to-v9

JammingBen · web-flow · commit f43b289f0de5 · 2024-09-05T07:42:55.000+02:00
chore: bump eslint to v9
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,3 @@
+import owncloudersConfig from '@ownclouders/eslint-config'
+
+export default [...owncloudersConfig]
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
     "core-js": "3.30.2",
     "cucumber-html-reporter": "7.1.1",
     "ejs": "3.1.10",
-    "eslint": "8.56.0",
+    "eslint": "9.9.1",
     "git-repo-info": "2.1.1",
     "glob": "11.0.0",
     "happy-dom": "13.3.1",
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
@@ -89,7 +89,7 @@
     "style-loader": "^4.0.0",
     "style-value-types": "^5.0.0",
     "stylelint": "16.2.1",
-    "stylelint-config-sass-guidelines": "^11.0.0",
+    "stylelint-config-sass-guidelines": "^12.0.0",
     "stylelint-config-standard": "^36.0.0",
     "tinycolor2": "^1.6.0",
     "ts-loader": "^9.5.1",
diff --git a/packages/design-system/src/components/OcApplicationIcon/OcApplicationIcon.vue b/packages/design-system/src/components/OcApplicationIcon/OcApplicationIcon.vue
@@ -58,7 +58,7 @@ export default defineComponent({
       return !!props.colorSecondary
     })
     const generatedHashedPrimaryColor = computed((): string => {
-      let hashedColor = generateHashedColorForString(props.icon)
+      const hashedColor = generateHashedColorForString(props.icon)
       return rgbToHex(setDesiredContrastRatio(hexToRgb(hashedColor), hexToRgb('#ffffff'), 4))
     })
     const iconStyle = computed(() => {
diff --git a/packages/design-system/src/components/OcCheckbox/OcCheckbox.vue b/packages/design-system/src/components/OcCheckbox/OcCheckbox.vue
@@ -50,7 +50,7 @@ export default defineComponent({
      *
      * Can be any type, but most common is boolean for singular checkbox use, or array when used in a group of checkboxes.
      **/
-    // eslint-disable-next-line vue/require-prop-types
+
     modelValue: {
       type: [Boolean, Array] as PropType<boolean | unknown[]>,
       required: false,
diff --git a/packages/design-system/src/components/OcGrid/OcGrid.vue b/packages/design-system/src/components/OcGrid/OcGrid.vue
@@ -35,7 +35,7 @@ export default defineComponent({
   },
   computed: {
     classes() {
-      let c = []
+      const c = []
 
       c.push('oc-grid-' + this.gutter)
 
diff --git a/packages/design-system/src/components/OcRadio/OcRadio.vue b/packages/design-system/src/components/OcRadio/OcRadio.vue
@@ -50,7 +50,7 @@ export default defineComponent({
      *
      * Can be any type.
      **/
-    // eslint-disable-next-line vue/require-prop-types
+
     modelValue: {
       type: [String, Number, Boolean, Object],
       required: false,
diff --git a/packages/design-system/src/components/OcTextInput/OcTextInput.vue b/packages/design-system/src/components/OcTextInput/OcTextInput.vue
@@ -288,7 +288,7 @@ export default defineComponent({
         additionalAttrs['has-error'] = !!this.errorMessage
       }
       // Exclude listeners for events which are handled via methods in this component
-      // eslint-disable-next-line no-unused-vars
+
       const { change, input, focus, class: classes, ...attrs } = this.$attrs
 
       return { ...attrs, ...additionalAttrs }
diff --git a/packages/design-system/src/index.spec.ts b/packages/design-system/src/index.spec.ts
@@ -50,7 +50,7 @@ describe('Depending on what gets passed into the theming options', () => {
     )
     expect(document.documentElement.style.getPropertyValue('--oc-space-small')).toMatch('20px')
   })
-  // eslint-disable-next-line
+
   // it('Defaults to ODS colors where none are passed in theming options', () => {
   //   expect(document.documentElement.style.getPropertyValue('--oc-color')).toMatch("green")
   //   expect(document.documentElement.style.getPropertyValue('--oc-brand-primary-hover')).toMatch('#223959')
diff --git a/packages/design-system/src/utils/webFontLoader.ts b/packages/design-system/src/utils/webFontLoader.ts
@@ -2,7 +2,7 @@
  * Web Font Loader takes care of ownCloud Design System’s font loading.
  * For full documentation, see: https://github.com/typekit/webfontloader
  */
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
 // @ts-ignore
 import WebFont from 'webfontloader'
 
diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js
@@ -1,60 +1,59 @@
-module.exports = {
-  env: {
-    browser: true,
-    es6: true,
-    amd: true
-  },
-  extends: ['plugin:vue/vue3-recommended', 'plugin:prettier-vue/recommended'],
-  parser: 'vue-eslint-parser',
-  parserOptions: {
-    parser: {
-      js: '@babel/eslint-parser',
-      ts: '@typescript-eslint/parser'
-    },
-    requireConfigFile: false,
-    sourceType: 'module'
-  },
-  rules: {
-    /**
-     * TODO: fix project import issues and then enable it
-     * 'sort-imports': 'warn',
-     */
-    'require-await': 'warn',
-    'no-new': 'off',
-    'node/no-callback-literal': 'off',
-    'unused-imports/no-unused-imports': 'error',
-    'nonblock-statement-body-position': ['error', 'below'],
-    curly: 'error',
+import unusedImports from 'eslint-plugin-unused-imports'
+import eslintConfigPrettier from 'eslint-plugin-prettier/recommended'
+import tseslint from 'typescript-eslint'
+import globals from 'globals'
+import pluginVue from 'eslint-plugin-vue'
+
+export default [
+  ...tseslint.configs.recommended,
+  ...pluginVue.configs['flat/recommended'],
+  eslintConfigPrettier,
 
-    // Vue 3 rules: (need to be fixed, but can be done incrementally)
-    'vue/no-deprecated-events-api': 'warn'
-  },
-  globals: {
-    require: false,
-    requirejs: false
-  },
-  plugins: ['unused-imports'],
-  overrides: [
-    {
-      files: ['**/*.vue'],
-      extends: ['plugin:vue/recommended', 'plugin:prettier-vue/recommended'],
-      rules: {
-        'vue/multi-word-component-names': 'warn',
-        'vue/no-multiple-template-root': 'off',
-        'vue/no-v-model-argument': 'off',
-        'vue/no-v-text-v-html-on-component': 'warn'
+  {
+    languageOptions: {
+      ecmaVersion: 5,
+      globals: {
+        ...globals.browser,
+        ...globals.amd,
+        require: false,
+        requirejs: false
+      },
+      parserOptions: {
+        parser: {
+          js: '@babel/eslint-parser',
+          ts: '@typescript-eslint/parser',
+          vue: 'vue-eslint-parser'
+        },
+        requireConfigFile: false,
+        sourceType: 'module'
       }
     },
-    {
-      files: ['**/*.ts'],
-      parser: '@typescript-eslint/parser',
-      extends: ['plugin:@typescript-eslint/recommended'],
-      rules: {
-        '@typescript-eslint/no-extra-semi': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/no-unused-vars': 'warn',
-        'prefer-const': 'warn'
-      }
+
+    plugins: {
+      'unused-imports': unusedImports
+    },
+
+    rules: {
+      '@typescript-eslint/ban-ts-comment': 'off',
+      '@typescript-eslint/no-empty-object-type': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-extra-semi': 'off',
+      '@typescript-eslint/no-require-imports': 'off',
+      '@typescript-eslint/no-this-alias': 'warn',
+      '@typescript-eslint/no-unused-expressions': 'off',
+      '@typescript-eslint/no-unused-vars': 'warn',
+
+      'no-new': 'off',
+      'node/no-callback-literal': 'off',
+      'prefer-const': 'warn',
+      'require-await': 'warn',
+      // 'sort-imports': 'warn', TODO: fix project import issues and then enable it
+      'unused-imports/no-unused-imports': 'error',
+
+      'vue/multi-word-component-names': 'warn',
+      'vue/no-multiple-template-root': 'off',
+      'vue/no-v-model-argument': 'off',
+      'vue/no-v-text-v-html-on-component': 'warn'
     }
-  ]
-}
+  }
+]
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -4,6 +4,7 @@
   "private": false,
   "version": "0.0.1",
   "license": "AGPL-3.0",
+  "type": "module",
   "author": "ownCloud GmbH <devops@owncloud.com>",
   "homepage": "https://github.com/owncloud/web/tree/master/packages/eslint-config",
   "repository": {
@@ -16,18 +17,19 @@
   },
   "dependencies": {
     "@babel/eslint-parser": "^7.23.3",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.16.0",
+    "@typescript-eslint/parser": "^8.0.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-n": "^14.0.0",
-    "eslint-plugin-prettier-vue": "^5.0.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-unused-imports": "^3.2.0",
-    "eslint-plugin-vue": "^9.19.2",
+    "eslint-plugin-n": "^17.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-promise": "^7.0.0",
+    "eslint-plugin-unused-imports": "^4.0.0",
+    "eslint-plugin-vue": "^9.28.0",
     "eslint-plugin-vuejs-accessibility": "^2.2.0",
+    "globals": "^15.0.0",
+    "typescript-eslint": "^8.4.0",
     "typescript": "5.5.4"
   },
   "peerDependencies": {
-    "eslint": "^8.56.0"
+    "eslint": "^9.0.0"
   }
 }
diff --git a/packages/web-app-epub-reader/src/App.vue b/packages/web-app-epub-reader/src/App.vue
@@ -140,8 +140,8 @@ export default defineComponent({
     const localStorageData = useLocalStorage<{ fontSizePercentage?: number }>(`oc_epubReader`, {})
     const currentFontSizePercentage = ref(unref(localStorageData).fontSizePercentage || 100)
     const themeStore = useThemeStore()
-    let book = ref<Book>()
-    let rendition = ref<Rendition>()
+    const book = ref<Book>()
+    const rendition = ref<Rendition>()
 
     const navigateLeft = () => {
       unref(rendition).prev()
diff --git a/packages/web-app-files/src/helpers/textUtils.ts b/packages/web-app-files/src/helpers/textUtils.ts
@@ -39,7 +39,7 @@ function naturalSortCompare(a: string, b: string) {
       aNum = Number(aa[x])
       bNum = Number(bb[x])
       // note: == is correct here
-      // eslint-disable-next-line eqeqeq
+
       if (aNum == aa[x] && bNum == bb[x]) {
         return aNum - bNum
       } else {
diff --git a/packages/web-app-files/src/views/spaces/DriveResolver.vue b/packages/web-app-files/src/views/spaces/DriveResolver.vue
@@ -155,7 +155,7 @@ export default defineComponent({
          * find an easy way to do that.
          **/
         if (space.fileId === space.id) {
-          let publicSpace = (await getSpaceResource()) as PublicSpaceResource
+          const publicSpace = (await getSpaceResource()) as PublicSpaceResource
 
           // FIXME: check for type once https://github.com/owncloud/ocis/issues/8740 is resolved
           if (publicSpace.publicLinkPermission === SharePermissionBit.Create) {
diff --git a/packages/web-app-importer/src/extensions.ts b/packages/web-app-importer/src/extensions.ts
@@ -13,7 +13,7 @@ import type { UppyService } from '@ownclouders/web-pkg'
 import '@uppy/dashboard/dist/style.min.css'
 import { Extension } from '@ownclouders/web-pkg'
 import { ApplicationSetupOptions } from '@ownclouders/web-pkg'
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
 // @ts-ignore
 import { WebdavPublicLink } from '@uppy/webdav'
 
diff --git a/packages/web-app-ocm/src/views/App.vue b/packages/web-app-ocm/src/views/App.vue
@@ -65,7 +65,7 @@ export default defineComponent({
     }
 
     const highlightNewConnections = async () => {
-      let oldConnections = [...unref(connections)]
+      const oldConnections = [...unref(connections)]
       await findAcceptedUsers()
       if (oldConnections.length < unref(connections).length) {
         highlightedConnections.value = unref(connections).filter(
diff --git a/packages/web-app-ocm/src/views/IncomingInvitations.vue b/packages/web-app-ocm/src/views/IncomingInvitations.vue
@@ -167,7 +167,7 @@ export default defineComponent({
       }
       const providerDomainQuery = to.query.providerDomain
       if (providerDomainQuery) {
-        let matchedProvider = unref(providers)?.find(
+        const matchedProvider = unref(providers)?.find(
           (p) => p.domain === queryItemAsString(providerDomainQuery)
         )
         if (matchedProvider) {
diff --git a/packages/web-app-preview/src/App.vue b/packages/web-app-preview/src/App.vue
@@ -367,7 +367,7 @@ export default defineComponent({
     },
     preloadImages() {
       const preloadFile = (preloadFileIndex: number) => {
-        let cycleIndex =
+        const cycleIndex =
           (((this.activeIndex + preloadFileIndex) % this.filteredFiles.length) +
             this.filteredFiles.length) %
           this.filteredFiles.length
diff --git a/packages/web-app-search/src/index.ts b/packages/web-app-search/src/index.ts
@@ -1,6 +1,6 @@
 import App from './App.vue'
 import List from './views/List.vue'
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
 // @ts-ignore
 import translations from '../l10n/translations.json'
 import { ApplicationInformation, defineWebApplication } from '@ownclouders/web-pkg'
diff --git a/packages/web-client/src/ocs/capabilities.ts b/packages/web-client/src/ocs/capabilities.ts
@@ -1,7 +1,6 @@
 import { AxiosInstance } from 'axios'
 import get from 'lodash-es/get'
 
-/* eslint-disable camelcase */
 export interface AppProviderCapability {
   apps_url?: string
   enabled?: boolean
@@ -45,7 +44,7 @@ export interface ArchiverCapability {
   enabled?: boolean
   version?: string // version is just a major version, e.g. `v2`
   formats?: string[]
-  // eslint-disable-next-line camelcase
+
   archiver_url?: string
   max_num_files?: string
   max_size?: string
@@ -185,7 +184,6 @@ export interface Capabilities {
     string?: string
   }
 }
-/* eslint-enable camelcase */
 
 export const GetCapabilitiesFactory = (baseURI: string, axios: AxiosInstance) => {
   const url = new URL(baseURI)
diff --git a/packages/web-pkg/src/components/CreateLinkModal.vue b/packages/web-pkg/src/components/CreateLinkModal.vue
@@ -246,7 +246,7 @@ export default defineComponent({
         )
       }
 
-      let userFacingErrors: Error[] = []
+      const userFacingErrors: Error[] = []
       const failed = result.filter(({ status }) => status === 'rejected')
       if (failed.length) {
         ;(failed as PromiseRejectedResult[])
diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -179,7 +179,7 @@ export default defineComponent({
     let markInstance: Mark = null
 
     const getInputUrlWithProtocol = (input: string) => {
-      let url = input.trim()
+      const url = input.trim()
       if (isMaybeUrl(url)) {
         return url
       }
diff --git a/packages/web-pkg/src/composables/sort/useSort.ts b/packages/web-pkg/src/composables/sort/useSort.ts
@@ -15,7 +15,7 @@ export enum SortDir {
 export interface SortField {
   name: string
   prop?: string
-  // eslint-disable-next-line @typescript-eslint/ban-types
+  // eslint-disable-next-line
   sortable?: MaybeRef<boolean | Function | string>
   sortDir?: MaybeRef<SortDir>
   label?: string
diff --git a/packages/web-pkg/src/helpers/resource/conflictHandling/conflictDialog.ts b/packages/web-pkg/src/helpers/resource/conflictHandling/conflictDialog.ts
@@ -12,7 +12,6 @@ export interface FileConflict {
 }
 
 export class ConflictDialog {
-  /* eslint-disable no-useless-constructor */
   constructor(
     protected $gettext: Language['$gettext'],
     protected $ngettext: Language['$ngettext']
diff --git a/packages/web-pkg/src/services/archiver.ts b/packages/web-pkg/src/services/archiver.ts
@@ -1,8 +1,8 @@
 // Workaround https://github.com/npm/node-semver/issues/381
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
 // @ts-ignore
 import major from 'semver/functions/major'
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
 // @ts-ignore
 import rcompare from 'semver/functions/rcompare'
 
diff --git a/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts b/packages/web-pkg/src/services/passwordPolicy/passwordPolicy.ts
@@ -10,7 +10,7 @@ import {
 import { PasswordPolicyCapability } from '@ownclouders/web-client/ocs'
 import { GeneratePassword } from 'js-generate-password'
 import { CapabilityStore } from '../../composables'
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+
 // @ts-ignore
 import { PasswordPolicy } from 'password-sheriff'
 
diff --git a/packages/web-pkg/src/services/preview/previewService.ts b/packages/web-pkg/src/services/preview/previewService.ts
diff --git a/packages/web-pkg/src/services/uppy/uppyService.ts b/packages/web-pkg/src/services/uppy/uppyService.ts
diff --git a/packages/web-pkg/tests/unit/utils/urlJoin.spec.ts b/packages/web-pkg/tests/unit/utils/urlJoin.spec.ts
diff --git a/packages/web-runtime/src/components/Account/AccountTable.vue b/packages/web-runtime/src/components/Account/AccountTable.vue
diff --git a/packages/web-runtime/src/components/UploadInfo.vue b/packages/web-runtime/src/components/UploadInfo.vue
diff --git a/packages/web-runtime/src/container/application/index.ts b/packages/web-runtime/src/container/application/index.ts
diff --git a/packages/web-runtime/src/router/index.ts b/packages/web-runtime/src/router/index.ts
diff --git a/packages/web-runtime/src/services/clientRegistration.ts b/packages/web-runtime/src/services/clientRegistration.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/e2e/.eslintrc.json b/tests/e2e/.eslintrc.json
diff --git a/tests/e2e/support/objects/app-files/resource/index.ts b/tests/e2e/support/objects/app-files/resource/index.ts
diff --git a/vite.config.ts b/vite.config.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import owncloudersConfig from '@ownclouders/eslint-config'`
	`2`	`+`
	`3`	`+export default [...owncloudersConfig]`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ export default defineComponent({`
`50`	`50`	`*`
`51`	`51`	`* Can be any type, but most common is boolean for singular checkbox use, or array when used in a group of checkboxes.`
`52`	`52`	`**/`
`53`		`- // eslint-disable-next-line vue/require-prop-types`
	`53`	`+`
`54`	`54`	`modelValue: {`
`55`	`55`	`type: [Boolean, Array] as PropType<boolean \| unknown[]>,`
`56`	`56`	`required: false,`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ export default defineComponent({`
`288`	`288`	`additionalAttrs['has-error'] = !!this.errorMessage`
`289`	`289`	`}`
`290`	`290`	`// Exclude listeners for events which are handled via methods in this component`
`291`		`- // eslint-disable-next-line no-unused-vars`
	`291`	`+`
`292`	`292`	`const { change, input, focus, class: classes, ...attrs } = this.$attrs`
`293`	`293`
`294`	`294`	`return { ...attrs, ...additionalAttrs }`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ describe('Depending on what gets passed into the theming options', () => {`
`50`	`50`	`)`
`51`	`51`	`expect(document.documentElement.style.getPropertyValue('--oc-space-small')).toMatch('20px')`
`52`	`52`	`})`
`53`		`- // eslint-disable-next-line`
	`53`	`+`
`54`	`54`	`// it('Defaults to ODS colors where none are passed in theming options', () => {`
`55`	`55`	`// expect(document.documentElement.style.getPropertyValue('--oc-color')).toMatch("green")`
`56`	`56`	`// expect(document.documentElement.style.getPropertyValue('--oc-brand-primary-hover')).toMatch('#223959')`