[pull] main from doocs:main

.github/workflows/deploy.yml

@@ -15,72 +15,116 @@ on:
       - basic/**
 
 concurrency:
-  group: ${{github.workflow}} - ${{github.ref}}
+  group: ${{ github.workflow }} - ${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/checkout@v4
+      - name: Checkout main branch
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Checkout docs branch
+        uses: actions/checkout@v4
         with:
           ref: docs
           path: mkdocs
-      - run: |
-          mv -f mkdocs/* .
+          fetch-depth: 0
+
+      - name: Sync docs branch content
+        run: |
+          rsync -a --remove-source-files --exclude='.git' mkdocs/ ./
+          rm -rf mkdocs
           mv solution/CONTEST_README.md docs/contest.md
           mv solution/CONTEST_README_EN.md docs-en/contest.md
+
       - name: Configure Git Credentials
         run: |
-          git config user.name github-actions[bot]
-          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
+          git config --global user.name github-actions[bot]
+          git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com
 
-      - uses: actions/setup-python@v5
+      - name: Setup Python
+        uses: actions/setup-python@v5
         with:
           python-version: 3.x
 
-      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
+      - name: Restore pip cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
 
-      - uses: actions/cache@v4
+      - name: Restore mkdocs-material cache
+        uses: actions/cache@v4
         with:
-          key: mkdocs-material-${{ env.cache_id }}
           path: .cache
+          key: mkdocs-material-${{ env.cache_id }}
           restore-keys: |
             mkdocs-material-
-            
+
       - name: Install dependencies
         run: |
           python3 -m pip install --upgrade pip
           python3 -m pip install -r requirements.txt
           python3 -m pip install "mkdocs-material[imaging]"
-          sudo apt-get install pngquant
-          
-      - name: Set MKDOCS_API_KEYS environment variable
+          sudo apt-get install -y pngquant
+
+      - name: Set MKDOCS_API_KEYS
         run: echo "MKDOCS_API_KEYS=${{ secrets.MKDOCS_API_KEYS }}" >> $GITHUB_ENV
 
-      - run: |
+      - name: Build site
+        run: |
           python3 main.py
           mkdocs build -f mkdocs.yml
           mkdocs build -f mkdocs-en.yml
 
-      - name: Generate CNAME file
+      - name: Generate CNAME
         run: echo "leetcode.doocs.org" > ./site/CNAME
 
-      - name: Upload artifact
+      - name: Commit committer cache to docs branch
+        if: github.ref == 'refs/heads/main'
+        env:
+          GH_REPO: ${{ github.repository }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          CACHE_FILE=".git-committers-cache.json"
+          if [[ ! -f "$CACHE_FILE" ]]; then
+            echo "Cache file not found; skip commit."
+            exit 0
+          fi
+
+          echo "Cloning docs branch ..."
+          git clone --depth 1 --branch docs "https://x-access-token:${GH_TOKEN}@github.com/${GH_REPO}.git" docs-cache
+          cp "$CACHE_FILE" docs-cache/
+
+          cd docs-cache
+
+          git config user.name github-actions[bot]
+          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
+
+          git add .git-committers-cache.json
+          git commit -m "chore: update committer cache [skip ci]" || echo "No changes to commit"
+          git push origin docs
+
+      - name: Upload to GitHub Pages
         uses: actions/upload-pages-artifact@v3
         with:
-          path: ./site
+          path: site
 
   deploy:
     needs: build
+    runs-on: ubuntu-latest
     permissions:
       pages: write
       id-token: write
     environment:
       name: github_pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
     steps:
       - name: Deploy to GitHub Pages
         id: deployment

.github/workflows/prettier.yml

@@ -10,6 +10,12 @@ concurrency:
 
 jobs:
   format:
+    # ---------------------------------------------------------
+    # SAFETY CHECK:
+    # Only run for PRs from the SAME repository.
+    # Fork PRs are skipped entirely to prevent RCE via pnpm install.
+    # ---------------------------------------------------------
+    if: ${{ github.event.pull_request.head.repo.fork == false }}
     permissions:
       contents: write
     runs-on: ubuntu-latest
@@ -24,15 +30,19 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 18
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.25.0
       - name: Install Dependencies
-        run: npm install
+        run: pnpm install
       - name: Run prettier
         run: |
           git config --global core.quotepath off
           changed_files=$(git diff --name-only "${{ github.event.pull_request.base.sha }}" | grep -E '\.js$|\.ts$|\.php$|\.sql$|\.md$' || true)
           if [ -n "$changed_files" ]; then
             echo "Running prettier on the changed files"
-            echo "$changed_files" | xargs -d '\n' npx prettier --write
+            echo "$changed_files" | xargs -d '\n' pnpm exec prettier --write
           else
             echo "No matching files to run prettier on."
           fi

.gitignore

@@ -3,10 +3,17 @@
 .vscode
 .temp
 .vitepress
-.cache
 *.iml
 __pycache__
 /node_modules
-/solution/result.json
 /solution/__pycache__
 /solution/.env
+.cache
+!.cache/plugin/
+!.cache/plugin/git-committers/
+!.cache/plugin/git-committers/page-authors.json
+
+# pnpm
+pnpm-lock.yaml
+.pnpm-store/
+.pnpm-debug.log

.husky/commit-msg

@@ -1,3 +1,2 @@
-#!/bin/sh
-
-npx --no -- commitlint --edit $1
+#!/usr/bin/env sh
+pnpm exec commitlint --edit $1

.husky/pre-commit

@@ -1,3 +1,2 @@
-#!/bin/sh
-
-npx lint-staged --allow-empty $1
+#!/usr/bin/env sh
+pnpm exec lint-staged --allow-empty $1

CODE_OF_CONDUCT.md

@@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
 Examples of behavior that contributes to creating a positive environment
 include:
 
--   Using welcoming and inclusive language
--   Being respectful of differing viewpoints and experiences
--   Gracefully accepting constructive criticism
--   Focusing on what is best for the community
--   Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
--   The use of sexualized language or imagery and unwelcome sexual attention or
-    advances
--   Trolling, insulting/derogatory comments, and personal or political attacks
--   Public or private harassment
--   Publishing others' private information, such as a physical or electronic
-    address, without explicit permission
--   Other conduct which could reasonably be considered inappropriate in a
-    professional setting
+- The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
 ## Our Responsibilities