Merge pull request #8770 from owncloud/typescript-5

chore: TypeScript 5
owncloud · Aug 1, 2023 · ff5f387 · ff5f387
2 parents 82a2eab + 3cae90b
commit ff5f387
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 83 deletions.
diff --git a/package.json b/package.json
@@ -111,7 +111,7 @@
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
     "tslib": "2.5.0",
-    "typescript": "4.9.5",
+    "typescript": "5.0.3",
     "url-search-params-polyfill": "8.1.1",
     "vite": "4.3.5",
     "vite-plugin-environment": "^1.1.3",

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
@@ -103,7 +103,7 @@
     "stylelint-config-standard": "^31.0.0",
     "tinycolor2": "^1.4.2",
     "tippy.js": "^6.3.7",
-    "typescript": "4.9.5",
+    "typescript": "5.0.3",
     "url-loader": "^4.1.1",
     "v-calendar": "github:dschmidt/v-calendar#3ce6e3b8afd5491cb53ee811281d5fa8a45b044d",
     "vue": "3.3.4",

diff --git a/packages/design-system/src/components/OcResourceSize/OcResourceSize.vue b/packages/design-system/src/components/OcResourceSize/OcResourceSize.vue
@@ -31,14 +31,14 @@ export default defineComponent({
         return '?'
       }
 
-      if (this.size < 0) {
+      if (size < 0) {
         return '--'
       }
 
       const mb = 1048576
 
       return filesize(size, {
-        round: this.size < mb ? 0 : 1,
+        round: size < mb ? 0 : 1,
         locale: (this.$language?.current || '').split('_')[0]
       })
     }

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -28,7 +28,7 @@
     "eslint-plugin-unused-imports": "^2.0.0",
     "eslint-plugin-vue": "^9.6.0",
     "eslint-plugin-vuejs-accessibility": "^2.0.0",
-    "typescript": "4.9.5"
+    "typescript": "5.0.3"
   },
   "peerDependencies": {
     "eslint": "^8.25.0"

diff --git a/packages/web-app-files/src/components/FilesList/ListInfo.vue b/packages/web-app-files/src/components/FilesList/ListInfo.vue
@@ -71,10 +71,11 @@ export default defineComponent({
         }
       )
       const itemSize = formatFileSize(this.size, this.$language.current)
+      const size = parseFloat(this.size?.toString())
       let translated
       if (this.showSpaces) {
         translated =
-          this.size > 0
+          size > 0
             ? this.$ngettext(
                 '%{ itemsCount } item with %{ itemSize } in total (%{ filesStr}, %{foldersStr}, %{spacesStr})',
                 '%{ itemsCount } items with %{ itemSize } in total (%{ filesStr}, %{foldersStr}, %{spacesStr})',
@@ -87,7 +88,7 @@ export default defineComponent({
               )
       } else {
         translated =
-          this.size > 0
+          size > 0
             ? this.$ngettext(
                 '%{ itemsCount } item with %{ itemSize } in total (%{ filesStr}, %{foldersStr})',
                 '%{ itemsCount } items with %{ itemSize } in total (%{ filesStr}, %{foldersStr})',