Merge branch 'main' into markdown-options

vuepress · May 17, 2024 · 2732394 · 2732394
2 parents b1111d1 + 4fada32
commit 2732394
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 10 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
 
       - name: Use Node.js 20
         uses: actions/setup-node@v4

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
 
       - name: Setup Node.js
         uses: actions/setup-node@v4

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
 
       - name: Setup Node.js
         uses: actions/setup-node@v4

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -13,8 +13,49 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        node: ['18', '20', '22']
+        bundler: ['vite', 'webpack']
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Use Node.js 20
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Install playwright chromium
+        working-directory: ./e2e
+        run: pnpm playwright install chromium
+
+      - name: Build source files
+        run: pnpm build
+
+      - name: E2E test (base /)
+        run: pnpm test:e2e
+        env:
+          E2E_BASE: /
+          E2E_BUNDLER: ${{ matrix.bundler }}
+
+      - name: E2E test (base /e2e/)
+        run: pnpm test:e2e
+        env:
+          E2E_BASE: /e2e/
+          E2E_BUNDLER: ${{ matrix.bundler }}
+
+  e2e-os:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-latest, macos-latest]
         bundler: ['vite', 'webpack']
 
     runs-on: ${{ matrix.os }}
@@ -23,7 +64,50 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Install playwright chromium
+        working-directory: ./e2e
+        run: pnpm playwright install chromium
+
+      - name: Build source files
+        run: pnpm build
+
+      - name: E2E test (base /)
+        run: pnpm test:e2e
+        env:
+          E2E_BASE: /
+          E2E_BUNDLER: ${{ matrix.bundler }}
+
+      - name: E2E test (base /e2e/)
+        run: pnpm test:e2e
+        env:
+          E2E_BASE: /e2e/
+          E2E_BUNDLER: ${{ matrix.bundler }}
+
+  e2e-node:
+    strategy:
+      fail-fast: false
+      matrix:
+        node: ['18', '20', '22']
+        bundler: ['vite', 'webpack']
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
 
       - name: Use Node.js ${{ matrix.node }}
         uses: actions/setup-node@v4
@@ -57,7 +141,10 @@ jobs:
     if: ${{ !cancelled() }}
     name: e2e result
     runs-on: ubuntu-latest
-    needs: [e2e]
+    needs:
+      - e2e
+      - e2e-os
+      - e2e-node
     steps:
       - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
         run: exit 1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -58,7 +58,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
 
       - name: Setup Node.js
         uses: actions/setup-node@v4

diff --git a/tools/create-vuepress/src/flow/generateTemplate.ts b/tools/create-vuepress/src/flow/generateTemplate.ts
@@ -52,7 +52,7 @@ ${
   packageManager === 'pnpm'
     ? `\
       - name: ${lang === '简体中文' ? '安装 pnpm' : 'Install pnpm'}
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
         with:
           run_install: true
           version: 8