Xwite 3 лет назад
Родитель
Сommit
3e5d0dc409
3 измененных файлов с 32 добавлено и 8 удалено
  1. 28 7
      .github/workflows/web.yml
  2. 4 0
      modules/web/package.json
  3. 0 1
      modules/web/src/views/SourceEditor.vue

+ 28 - 7
.github/workflows/web.yml

@@ -16,25 +16,46 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout Project
+      - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        id: pnpm-install
+        with:
+          version: 8
+          run_install: false
+
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
       - uses: actions/cache@v3
+        name: Setup pnpm cache
         with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/web/package.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install dependencies
+        run: pnpm install
 
-      - name: Build
+      - name: Build and move files
         run: |
           rm -rf $GITHUB_WORKSPACE/app/src/main/assets/web/source
           rm -rf $GITHUB_WORKSPACE/app/src/main/assets/web/bookshelf
           rm -rf $GITHUB_WORKSPACE/app/src/main/assets/web/vue
           mkdir $GITHUB_WORKSPACE/app/src/main/assets/web/vue
           cd $GITHUB_WORKSPACE/modules/web
-          npm install
-          npm run-script build
+          pnpm build
           mv -f ./dist/*  $GITHUB_WORKSPACE/app/src/main/assets/web/vue/
           version="v$(date -d "8 hour" -u +3.%y.%m%d%H)"
           echo "APP_VER=$version" >> $GITHUB_ENV

+ 4 - 0
modules/web/package.json

@@ -2,6 +2,10 @@
   "name": "legado-web",
   "version": "1.0.0",
   "private": true,
+  "engines": {
+    "node": ">=16",
+    "pnpm": ">=8"
+  },
   "scripts": {
     "dev": "vite",
     "build": "vite build",

+ 0 - 1
modules/web/src/views/SourceEditor.vue

@@ -9,7 +9,6 @@
 import bookSourceConfig from "@/utils/bookSourceEditConfig.js";
 import rssSourceConfig from "@/utils/rssSourceEditConfig.js";
 import "@/assets/main.css";
-import "element-plus/theme-chalk/dark/css-vars.css";
 
 const config = ref({});