Upgrade vue cli

Co-authored-by: tabris <tabrisdong@gmail.com>

.github/workflows/release.yml

@@ -9,12 +9,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16'
-          cache: yarn
       - run: |
           corepack enable
           yarn install --frozen-lockfile

.github/workflows/test.yml

@@ -6,12 +6,11 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: '16'
-        cache: yarn
     - run: |
         corepack enable
         yarn install --frozen-lockfile

package.json

@@ -18,7 +18,6 @@
     "debug": "^4.1.1",
     "lodash": "^4.17.21",
     "node-polyglot": "^2.4.0",
-    "register-service-worker": "^1.7.1",
     "roboto-fontface": "*",
     "vue": "^2.6.11",
     "vue-class-component": "^7.2.3",
@@ -31,24 +30,27 @@
     "@types/debug": "^4.1.5",
     "@types/jest": "^25.1.4",
     "@types/lodash": "^4.14.149",
-    "@typescript-eslint/eslint-plugin": "^2.33.0",
-    "@typescript-eslint/parser": "^2.33.0",
-    "@vue/cli-plugin-babel": "~4.5.6",
-    "@vue/cli-plugin-eslint": "~4.5.6",
-    "@vue/cli-plugin-pwa": "~4.5.0",
-    "@vue/cli-plugin-router": "~4.5.6",
-    "@vue/cli-plugin-typescript": "~4.5.6",
-    "@vue/cli-plugin-unit-jest": "~4.5.6",
-    "@vue/cli-plugin-vuex": "~4.5.6",
-    "@vue/cli-service": "~4.5.6",
-    "@vue/eslint-config-typescript": "^5.0.2",
+    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@typescript-eslint/parser": "^5.4.0",
+    "@vue/cli-plugin-babel": "~5.0.8",
+    "@vue/cli-plugin-eslint": "~5.0.8",
+    "@vue/cli-plugin-pwa": "~5.0.8",
+    "@vue/cli-plugin-router": "~5.0.8",
+    "@vue/cli-plugin-typescript": "~5.0.8",
+    "@vue/cli-plugin-unit-jest": "~5.0.8",
+    "@vue/cli-plugin-vuex": "~5.0.8",
+    "@vue/cli-service": "~5.0.8",
+    "@vue/eslint-config-typescript": "^9.1.0",
     "@vue/test-utils": "1.0.0-beta.29",
-    "eslint": "^6.8.0",
-    "eslint-plugin-vue": "^6.2.2",
+    "@vue/vue2-jest": "^27.0.0-alpha.3",
+    "eslint": "^7.32.0",
+    "eslint-plugin-vue": "^8.0.3",
+    "jest": "^27.1.0",
     "lint-staged": "^10.1.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
-    "typescript": "~3.9.3",
+    "ts-jest": "^27.0.4",
+    "typescript": "~4.5.5",
     "vue-cli-plugin-vuetify": "^2.0.5",
     "vue-template-compiler": "^2.6.11",
     "vuetify-loader": "^1.4.3"

src/components/dialogs/InfoDialog.vue

@@ -15,16 +15,16 @@
       <v-card-text>
         <v-tabs v-model="tabSync">
           <v-tab href="#general">
-            General
+            {{ $t("prop_tab_bar.general") }}
           </v-tab>
           <v-tab href="#trackers">
-            Trackers
+            {{ $t("prop_tab_bar.trackers") }}
           </v-tab>
           <v-tab href="#peers">
-            Peers
+            {{ $t("prop_tab_bar.peers") }}
           </v-tab>
           <v-tab href="#content">
-            Content
+            {{ $t("prop_tab_bar.content") }}
           </v-tab>
         </v-tabs>
         <v-tabs-items

src/components/dialogs/Peers.vue

@@ -50,6 +50,7 @@ import { formatSize } from '../../filters';
 import BaseTorrentInfo from './baseTorrentInfo';
 import Component from 'vue-class-component';
 import { Prop } from 'vue-property-decorator';
+import { tr } from '@/locale'
 
 @Component({
   filters: {
@@ -74,17 +75,17 @@ export default class Peers extends BaseTorrentInfo {
   readonly hash!: string
 
   headers = [
-    { text: 'IP', value: 'ip' },
-    { text: 'Connection', value: 'connection' },
-    { text: 'Flags', value: 'flags' },
-    { text: 'Client', value: 'client' },
-    { text: 'Progress', value: 'progress' },
-    { text: 'DL Speed', value: 'dl_speed' },
-    { text: 'Downloaded', value: 'downloaded' },
-    { text: 'UP Speed', value: 'up_speed' },
-    { text: 'Uploaded', value: 'uploaded' },
-    { text: 'Relevance', value: 'relevance' },
-    { text: 'Files', value: 'files' },
+    { text: tr('properties_widget.ip'), value: 'ip' },
+    { text: tr('properties_widget.connection'), value: 'connection' },
+    { text: tr('properties_widget.flags'), value: 'flags' },
+    { text: tr('properties_widget.client'), value: 'client' },
+    { text: tr('properties_widget.progress'), value: 'progress' },
+    { text: tr('properties_widget.downloadSpeed'), value: 'dl_speed' },
+    { text: tr('properties_widget.downloaded'), value: 'downloaded' },
+    { text: tr('properties_widget.uploadSpeed'), value: 'up_speed' },
+    { text: tr('properties_widget.uploaded'), value: 'uploaded' },
+    { text: tr('properties_widget.relevance'), value: 'relevance' },
+    { text: tr('properties_widget.files'), value: 'files' },
   ]
 
   peersObj: any = null

src/components/dialogs/TorrentInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="torrent-info">
     <div class="progress">
-      <span>Progress:</span>
+      <span>{{ $t('properties_widget.progress') }}:</span>
       <canvas
         ref="canvas"
         class="progress-inner"
@@ -9,7 +9,7 @@
       <span>{{ torrent.progress | progress }}</span>
     </div>
     <fieldset>
-      <legend>Transfer</legend>
+      <legend>{{ $t('properties_widget.transfer') }}</legend>
       <v-container
         v-if="properties"
         class="pa-1"
@@ -41,7 +41,7 @@
       </v-container>
     </fieldset>
     <fieldset>
-      <legend>Information</legend>
+      <legend>{{ $t('properties_widget.information') }}</legend>
       <v-container
         v-if="properties"
         class="pa-1"
@@ -85,6 +85,7 @@ import {Torrent, TorrentProperties} from '@/types'
 import Component from 'vue-class-component'
 import {Prop, Watch} from 'vue-property-decorator'
 import BaseTorrentInfo from './baseTorrentInfo'
+import { tr } from '@/locale'
 
 interface Item {
   label: string;
@@ -108,33 +109,33 @@ export default class TorrentInfo extends BaseTorrentInfo {
 
   transfer: Item[] = [
     {
-      label: 'Time active',
-      value: prop => formatDuration(prop.time_elapsed) + (prop.seeding_time ? ` (seeded ${formatDuration(prop.seeding_time)})` : ''),
+      label: tr('properties_widget.timeActive'),
+      value: prop => formatDuration(prop.time_elapsed) + (prop.seeding_time ? ` ($tr('properties_widget.seeded') ${formatDuration(prop.seeding_time)})` : ''),
     },
-    { label: 'ETA', value: prop => formatDuration(prop.eta, { dayLimit: 100 }) },
-    { label: 'Connections', value: prop => `${prop.nb_connections} (${prop.nb_connections_limit} max)` },
-    { label: 'Downloaded', value: prop => `${formatSize(prop.total_downloaded_session)}/${formatSize(prop.total_downloaded)}` },
-    { label: 'Uploaded', value: prop => `${formatSize(prop.total_uploaded_session)}/${formatSize(prop.total_uploaded)}` },
-    { label: 'Seeds', value: prop => `${prop.seeds} (${prop.seeds_total} total)` },
-    { label: 'DL speed', value: prop => `${formatSize(prop.dl_speed)}/s` },
-    { label: 'UP speed', value: prop => `${formatSize(prop.up_speed)}/s` },
-    { label: 'Peers', value: prop => `${prop.peers} (${prop.peers_total} total)` },
-    { label: 'Wasted', value: prop => formatSize(prop.total_wasted) },
-    { label: 'Share ratio', value: prop => toPrecision(prop.share_ratio, 3) },
-    { label: 'Reannounce', value: prop => formatDuration(prop.reannounce) },
-    { label: 'Last seen', value: prop => formatTimestamp(prop.last_seen) },
+    { label: tr('properties_widget.eta'), value: prop => formatDuration(prop.eta, { dayLimit: 100 }) },
+    { label: tr('properties_widget.connections'), value: prop => `${prop.nb_connections} (${prop.nb_connections_limit} ${tr('properties_widget.max')})` },
+    { label: tr('properties_widget.downloaded'), value: prop => `${formatSize(prop.total_downloaded_session)}/${formatSize(prop.total_downloaded)}` },
+    { label: tr('properties_widget.uploaded'), value: prop => `${formatSize(prop.total_uploaded_session)}/${formatSize(prop.total_uploaded)}` },
+    { label: tr('properties_widget.seeds'), value: prop => `${prop.seeds} (${prop.seeds_total} ${tr('properties_widget.total')})` },
+    { label: tr('properties_widget.downloadSpeed'), value: prop => `${formatSize(prop.dl_speed)}/${tr('properties_widget.second')}` },
+    { label: tr('properties_widget.uploadSpeed'), value: prop => `${formatSize(prop.up_speed)}/${tr('properties_widget.second')}` },
+    { label: tr('properties_widget.peers'), value: prop => `${prop.peers} (${prop.peers_total} ${tr('properties_widget.total')})` },
+    { label: tr('properties_widget.wasted'), value: prop => formatSize(prop.total_wasted) },
+    { label: tr('properties_widget.shareRatio'), value: prop => toPrecision(prop.share_ratio, 3) },
+    { label: tr('properties_widget.reannounce'), value: prop => formatDuration(prop.reannounce) },
+    { label: tr('properties_widget.lastSeen'), value: prop => formatTimestamp(prop.last_seen) },
   ]
 
   information: Item[] = [
-    { label: 'Total size', value: prop => formatSize(prop.total_size) },
-    { label: 'Pieces', value: prop => `${prop.pieces_num} x ${formatSize(prop.piece_size)} (have ${prop.pieces_have})` },
-    { label: 'Created by', value: prop => prop.created_by },
-    { label: 'Created on', value: prop => formatTimestamp(prop.creation_date) },
-    { label: 'Added on', value: prop => formatTimestamp(prop.addition_date) },
-    { label: 'Completed on', value: prop => formatTimestamp(prop.completion_date) },
-    { label: 'Torrent hash', value: () => this.torrent.hash },
-    { label: 'Save path', value: prop => prop.save_path },
-    { label: 'Comment', value: prop => prop.comment },
+    { label: tr('properties_widget.totalSize'), value: prop => formatSize(prop.total_size) },
+    { label: tr('properties_widget.pieces'), value: prop => `${prop.pieces_num} x ${formatSize(prop.piece_size)} (${tr('properties_widget.have')} ${prop.pieces_have})` },
+    { label: tr('properties_widget.createdBy'), value: prop => prop.created_by },
+    { label: tr('properties_widget.createdOn'), value: prop => formatTimestamp(prop.creation_date) },
+    { label: tr('properties_widget.addedOn'), value: prop => formatTimestamp(prop.addition_date) },
+    { label: tr('properties_widget.completedOn'), value: prop => formatTimestamp(prop.completion_date) },
+    { label: tr('properties_widget.torrentHash'), value: () => this.torrent.hash },
+    { label: tr('properties_widget.savePath'), value: prop => prop.save_path },
+    { label: tr('properties_widget.comment'), value: prop => prop.comment },
   ]
   pieces: PieceState[] = []
   canvas: CanvasRenderingContext2D | null = null

src/components/dialogs/Trackers.vue

@@ -25,16 +25,17 @@ import api from '../../Api';
 import Component from 'vue-class-component';
 import { Prop } from 'vue-property-decorator';
 import BaseTorrentInfo from './baseTorrentInfo';
+import { tr } from '@/locale'
 
 @Component({
   filters: {
     formatTrackerStatus(status: number) {
       const map = [
-        'Disabled',
-        'Not contacted',
-        'Working',
-        'Updating',
-        'Not working',
+        tr('properties_widget.disabled'),
+        tr('properties_widget.notContracted'),
+        tr('properties_widget.working'),
+        tr('properties_widget.updating'),
+        tr('properties_widget.notWorking'),
       ];
 
       return map[status];
@@ -53,14 +54,14 @@ export default class Trackers extends BaseTorrentInfo {
   readonly hash!: string
 
   readonly headers = [
-    { text: '#', value: 'tier' },
-    { text: 'URL', value: 'url' },
-    { text: 'Status', value: 'status' },
-    { text: 'Peers', value: 'num_peers' },
-    { text: 'Seeds', value: 'num_seeds' },
-    { text: 'Leeches', value: 'num_leeches' },
-    { text: 'Downloaded', value: 'num_downloaded' },
-    { text: 'Message', value: 'msg' },
+    { text: tr('properties_widget.tier'), value: 'tier' },
+    { text: tr('properties_widget.url'), value: 'url' },
+    { text: tr('properties_widget.status'), value: 'status' },
+    { text: tr('properties_widget.numPeers'), value: 'num_peers' },
+    { text: tr('properties_widget.numSeeds'), value: 'num_seeds' },
+    { text: tr('properties_widget.numLeeches'), value: 'num_leeches' },
+    { text: tr('properties_widget.numDownloaded'), value: 'num_downloaded' },
+    { text: tr('properties_widget.msg'), value: 'msg' },
   ]
 
   trackers = []

src/locale/en.ts

@@ -260,4 +260,69 @@ export default {
     moving: 'moving',
     unknown: 'unknown',
   },
+
+
+  prop_tab_bar: {
+    general: 'General',
+    trackers: 'Trackers',
+    peers: 'Peers',
+    // httpSource: 'HTTP Sources',
+    content: 'Content',
+  },
+  properties_widget: {
+    disabled: 'Disabled',
+    notContracted: 'Not contacted',
+    working: 'Working',
+    updating: 'Updating',
+    notWorking: 'Not working',
+
+    tier: '#',
+    url: 'URL',
+    status: 'Status',
+    numPeers: 'Peers',
+    numSeeds: 'Seeds',
+    numLeeches: 'Leeches',
+    numDownloaded: 'Downloaded',
+    msg: 'Message',
+
+    progress: 'Progress',
+    transfer: 'Transfer',
+    information: 'Information',
+
+    timeActive: 'Time active',
+    eta: 'ETA',
+    connections: 'Connections',
+    downloaded: 'Downloaded',
+    uploaded: 'Uploaded',
+    seeds: 'Seeds',
+    downloadSpeed: 'DL speed',
+    uploadSpeed: 'UP speed',
+    peers: 'Peers',
+    wasted: 'Wasted',
+    shareRatio: 'Share ratio',
+    reannounce: 'Reannounce',
+    lastSeen: 'Last seen',
+    totalSize: 'Total size',
+    pieces: 'Pieces',
+    CreatedBy: 'Created by',
+    CreatedOn: 'Created on',
+    addedOn: 'Added on',
+    completedOn: 'Completed on',
+    torrentHash: 'Torrent hash',
+    savePath: 'Save path',
+    comment: 'Comment',
+
+    ip: 'IP',
+    connection: 'Connection',
+    flags: 'Flags',
+    client: 'Client',
+    relevance: 'Relevance',
+    files: 'Files',
+
+    seeded: 'seeded',
+    second: 's',
+    total: 'Total',
+    max: 'max',
+    have: 'have',
+  },
 }

src/locale/zh-CN.ts

@@ -18,6 +18,7 @@ export default {
   resume: '恢复',
   pause: '暂停',
   force_start: '强制继续',
+  toggle_sequential: '切换顺序下载',
   info: '信息',
   reset: '重置',
   login: '登录',
@@ -45,7 +46,6 @@ export default {
   added_on: '添加时间',
 
   settings: '设置',
-
   logs: '日志',
   light: '亮色',
   dark: '暗色',
@@ -66,6 +66,9 @@ export default {
   plugin: '插件',
   action: '操作',
   search_engine: '搜索引擎',
+  usage: '用法',
+  plugin_manager: '插件管理',
+  update_plugins: '更新插件',
 
   preferences: {
     change_applied: '配置已保存',
@@ -108,6 +111,7 @@ export default {
     connection: '连接',
     bittorrent: 'BitTorrent',
 
+    rss: 'RSS',
     rss_processing_enabled: '启用自动刷新',
     rss_auto_downloading_enabled: '启用自动下载种子',
     rss_refresh_interval: '订阅刷新间隔',
@@ -165,6 +169,7 @@ export default {
     reannounced: '已重新通告',
     rechecking: '重新检查中…',
     dht_nodes: '%{smart_count} 节点',
+    base_url: 'Base URL',
   },
 
   msg: {
@@ -255,4 +260,68 @@ export default {
     moving: '移动中',
     unknown: '未知',
   },
+
+  prop_tab_bar: {
+    general: '普通',
+    trackers: 'Tracker',
+    peers: '用户',
+    // httpSource: 'HTTP 源',
+    content: '内容',
+  },
+  properties_widget: {
+    disabled: '禁用',
+    notContracted: '未联系',
+    working: '工作',
+    updating: '更新...',
+    notWorking: '未工作',
+
+    tier: '层级',
+    url: 'URL',
+    status: '状态',
+    numPeers: '用户',
+    numSeeds: '种子',
+    numLeeches: '下载',
+    numDownloaded: '下载次数',
+    msg: '消息',
+
+    progress: '进度',
+    transfer: '传输',
+    information: '信息',
+
+    timeActive: '活动时间',
+    eta: '剩余时间',
+    connections: '连接',
+    downloaded: '已下载',
+    uploaded: '已上传',
+    seeds: '种子',
+    downloadSpeed: '下载速度',
+    uploadSpeed: '上传速度',
+    peers: '用户',
+    wasted: '已丢弃',
+    shareRatio: '分享率',
+    reannounce: '下次汇报',
+    lastSeen: '最后完整可见',
+    totalSize: '总大小',
+    pieces: '区块',
+    createdBy: '创建',
+    createdOn: '创建于',
+    addedOn: '添加于',
+    completedOn: '完成于',
+    torrentHash: '种子哈希',
+    savePath: '保存路径',
+    comment: '注释',
+
+    ip: 'IP',
+    connection: '连接',
+    flags: '标志',
+    client: '客户端',
+    relevance: '文件关联',
+    files: '文件',
+
+    seeded: '已做种',
+    second: '秒',
+    total: '总计',
+    max: '最大',
+    have: '已完成',
+  },
 }

src/main.ts

@@ -15,7 +15,6 @@ import App from './App.vue';
 
 import 'roboto-fontface/css/roboto/roboto-fontface.css';
 import '@mdi/font/css/materialdesignicons.css';
-import './registerServiceWorker';
 
 Vue.config.productionTip = false;
 

src/registerServiceWorker.ts

@@ -1,32 +0,0 @@
-/* eslint-disable no-console */
-
-import { register } from 'register-service-worker'
-
-if (process.env.NODE_ENV === 'production') {
-  register(`${process.env.BASE_URL}service-worker.js`, {
-    ready () {
-      console.log(
-        'App is being served from cache by a service worker.\n' +
-        'For more details, visit https://goo.gl/AFskqB',
-      )
-    },
-    registered () {
-      console.log('Service worker has been registered.')
-    },
-    cached () {
-      console.log('Content has been cached for offline use.')
-    },
-    updatefound () {
-      console.log('New content is downloading.')
-    },
-    updated () {
-      console.log('New content is available; please refresh.')
-    },
-    offline () {
-      console.log('No internet connection found. App is running in offline mode.')
-    },
-    error (error) {
-      console.error('Error during service worker registration:', error)
-    },
-  })
-}

vue.config.js

@@ -15,9 +15,6 @@ module.exports = {
       maskIcon: null,
       msTileImage: null,
     },
-    workboxOptions: {
-      importWorkboxFrom: 'local',
-    },
   },
 
   devServer: {