moeloli · pull · Aug 11, 2021 · Sep 7, 2021 · Sep 7, 2021 · Sep 7, 2021
diff --git a/.env b/.env
@@ -1,19 +1,21 @@
 VUE_APP_PROJECT = "https://github.com/CareyWang/sub-web"
 
-VUE_APP_BOT_LINK = "https://t.me/CareyWong_bot"
+VUE_APP_BOT_LINK = "https://t.me/subconverter_discuss"
 
-VUE_APP_BACKEND_RELEASE = "https://github.com/tindy2013/subconverter/releases"
+VUE_APP_BACKEND_RELEASE = "https://github.com/tindy2013/subconverter/actions"
 
 VUE_APP_SUBCONVERTER_REMOTE_CONFIG = "https://raw.githubusercontent.com/tindy2013/subconverter/master/base/config/example_external_config.ini"
 
+VUE_APP_SUBCONVERTER_DOC_ADVANCED = "https://github.com/tindy2013/subconverter/blob/master/README-cn.md#%E8%BF%9B%E9%98%B6%E9%93%BE%E6%8E%A5"
+
 # API 后端
 VUE_APP_SUBCONVERTER_DEFAULT_BACKEND = "https://api.wcc.best"
 
 # 短链接后端
-VUE_APP_MYURLS_DEFAULT_BACKEND = "https://suo.yt"
+VUE_APP_MYURLS_API = "https://suo.yt/short"
 
 # 文本托管后端
-VUE_APP_CONFIG_UPLOAD_BACKEND = "https://api.wcc.best"
+VUE_APP_CONFIG_UPLOAD_API = "https://oss.wcc.best/upload"
 
 # 页面配置
 VUE_APP_USE_STORAGE = true 

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -10,9 +10,10 @@ module.exports = {
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'semi': 0
+    'semi': 0,
+    'vue/multi-word-component-names': 'off'
   },
   parserOptions: {
-    parser: 'babel-eslint'
+    parser: '@babel/eslint-parser'
   }
 }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, dev ]
 
 jobs:
 
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x]
+        node-version: [20.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -26,8 +26,9 @@ jobs:
       run: |
         yarn install
         yarn build
+
     - name: Upload
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: dist
         path: dist/
diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
@@ -0,0 +1,31 @@
+name: Build and Push Multi-Arch Docker Image
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest<
6DB6
/span>
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@master
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v3
+      with:
+        context: .
+        platforms: linux/amd64,linux/arm64
+        push: true
+        tags: careywong/subweb:latest
diff --git a/Dockerfile b/Dockerfile
@@ -1,16 +1,11 @@
 # ---- Dependencies ----
-FROM node:12-alpine AS dependencies
+FROM node:20-alpine AS build
 WORKDIR /app
-COPY package.json ./
+COPY . .
 RUN yarn install
-
-# ---- Build ----
-FROM dependencies AS build
-WORKDIR /app
-COPY . /app
 RUN yarn build
 
-FROM nginx:1.16-alpine
+FROM nginx:1.24-alpine
 COPY --from=build /app/dist /usr/share/nginx/html
 EXPOSE 80
 CMD [ "nginx", "-g", "daemon off;" ]
diff --git a/README.md b/README.md
@@ -30,8 +30,10 @@ docker run -d -p 58080:80 --restart always --name subweb careywong/subweb:latest
 注：每次修改代码，你都需要重新执行 docker build 来执行打包操作。
 
 ```shell
-docker build -t subweb-local:latest .
+docker -v
+Docker version 23.0.4, build f480fb1
 
+docker build -t subweb-local:latest .
 docker run -d -p 58080:80 --restart always --name subweb subweb-local:latest
 ```
 
@@ -42,7 +44,10 @@ docker run -d -p 58080:80 --restart always --name subweb subweb-local:latest
 
 ```shell
 node -v
+v20.xx.x
+
 yarn -v
+1.22.22
 ```
 
 ## Install
@@ -98,7 +103,6 @@ server {
 
 - [tindy2013/subconverter](https://github.com/tindy2013/subconverter)
 - [CareyWang/MyUrls](https://github.com/CareyWang/MyUrls)
-- [CareyWang/bitly](https://github.com/CareyWang/bitly)
 
 ## Contributing
 

diff --git a/package.json b/package.json
@@ -2,6 +2,9 @@
   "name": "sub-web",
   "version": "0.1.0",
   "private": true,
+  "engines": {
+    "node": ">=20.0.0"
+  },
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -19,19 +22,20 @@
     "vue-router": "^3.5.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.13",
-    "@vue/cli-plugin-eslint": "^4.5.13",
-    "@vue/cli-plugin-pwa": "~4.5.0",
-    "@vue/cli-plugin-router": "^4.5.13",
-    "@vue/cli-service": "^4.5.13",
-    "babel-eslint": "^10.0.3",
+    "@babel/core": "^7.26.0",
+    "@babel/eslint-parser": "^7.25.9",
+    "@vue/cli-plugin-babel": "5",
+    "@vue/cli-plugin-eslint": "5",
+    "@vue/cli-plugin-pwa": "5",
+    "@vue/cli-plugin-router": "5",
+    "@vue/cli-service": "5",
     "babel-plugin-component": "^1.1.1",
     "babel-plugin-import": "^1.13.3",
-    "eslint": "^5.16.0",
-    "eslint-plugin-vue": "^5.0.0",
-    "node-sass": "^4.13.0",
+    "eslint": "8.56.0",
+    "eslint-plugin-vue": "9.17.0",
+    "sass": "^1.43.4",
     "sass-loader": "^8.0.0",
-    "svg-sprite-loader": "^4.2.1",
+    "svg-sprite-loader": "6.0.11",
     "vue-particles": "^1.0.9",
     "vue-template-compiler": "^2.6.10"
   }

diff --git a/public/index.html b/public/index.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="theme-color" content="#00142A">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title>sub-web</title>
   </head>
@@ -13,7 +14,5 @@
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->
-
-    <script async defer data-website-id="b1873884-fbbf-4397-9982-5c83d381d94c" src="https://analytics.ytt.yt/umami.js"></script>
   </body>
 </html>
diff --git a/public/manifest.json b/public/manifest.json
@@ -0,0 +1,20 @@
+{
+    "short_name": "sub-web",
+    "name": "sub-web",
+    "icon": [
+        {
+            "src": "./img/icons/icon-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "./img/icons/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "start_url": "index.html",
+    "display": "standalone",
+    "background_color": "#002140",
+    "theme_color": "#002140"
+}
diff --git a/src/registerServiceWorker.js b/src/registerServiceWorker.js
@@ -3,7 +3,7 @@
 import { register } from 'register-service-worker'
 
 if (process.env.NODE_ENV === 'production') {
-  register(`${process.env.BASE_URL}service-worker.js`, {
+  register(`${process.env.BASE_URL}sub-web.js`, {
     ready () {
       console.log(
         'App is being served from cache by a service worker.\n' +