chore:upgrade node version and pnpm (#474)

Signed-off-by: shaoanianche <github@duanfei.org>
yihong0618 · Sep 10, 2023 · e484aa1 · e484aa1
1 parent a0ada4b
commit e484aa1
Show file tree

Hide file tree

Showing 10 changed files with 3,481 additions and 3,183 deletions.
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -21,34 +21,41 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v2.1.4
+        uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
-      - uses: actions/cache@v2
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-
+            ${{ runner.os }}-pnpm-store-
 
       - run: |
-          yarn install
+          pnpm install
       - run: |
-          yarn build
+          pnpm build
         env:
           PATH_PREFIX: /
 
       - name: GitHub Pages
-        uses: crazy-max/ghaction-github-pages@v2.2.0
+        uses: crazy-max/ghaction-github-pages@v3.1.0
         with:
           # Git branch where site will be deployed
           target_branch: gh-pages

diff --git a/.yarnrc b/.yarnrc
diff --git a/Dockerfile b/Dockerfile
@@ -3,19 +3,22 @@ FROM python:3.10.5-slim AS develop-py
 WORKDIR /root/running_page
 COPY ./requirements.txt /root/running_page/requirements.txt
 RUN apt-get update \
-        && apt-get install -y --no-install-recommends git \
-        && apt-get purge -y --auto-remove \
-        && rm -rf /var/lib/apt/lists/* \
-        && pip3 install -i https://mirrors.aliyun.com/pypi/simple/ pip -U \
-        && pip3 config set global.index-url https://mirrors.aliyun.com/pypi/simple/ \
-        && pip3 install -r requirements.txt
-
-FROM node:16  AS develop-node
+  && apt-get install -y --no-install-recommends git \
+  && apt-get purge -y --auto-remove \
+  && rm -rf /var/lib/apt/lists/* \
+  && pip3 install -i https://mirrors.aliyun.com/pypi/simple/ pip -U \
+  && pip3 config set global.index-url https://mirrors.aliyun.com/pypi/simple/ \
+  && pip3 install -r requirements.txt
+
+FROM node:18  AS develop-node
 WORKDIR /root/running_page
 COPY ./package.json /root/running_page/package.json
-COPY ./yarn.lock /root/running_page/yarn.lock
+COPY ./pnpm-lock.yaml /root/running_page/pnpm-lock.yaml
 RUN npm config set registry https://registry.npm.taobao.org \
-        && yarn install
+  &&npm install -g corepack \
+  &&corepack enable \
+  &&pnpm install
+
 
 
 FROM develop-py AS data
@@ -32,29 +35,29 @@ WORKDIR /root/running_page
 COPY . /root/running_page/
 ARG DUMMY=unknown
 RUN DUMMY=${DUMMY}; \
-    echo $app ; \
-    if [ "$app" = "NRC" ] ; then \
-       python3 scripts/nike_sync.py ${nike_refresh_token}; \
-    elif [ "$app" = "Garmin" ] ; then \
-         python3 scripts/garmin_sync.py ${email} ${password}; \
-    elif [ "$app" = "Garmin-CN" ] ; then \
-         python3 scripts/garmin_sync.py ${email} ${password}  --is-cn ; \
-    elif [ "$app" = "Strava" ] ; then \
-        python3 scripts/strava_sync.py ${client_id} ${client_secret} ${refresh_token};\
-    elif [ "$app" = "Nike_to_Strava" ] ; then \
-        python3  scripts/nike_to_strava_sync.py ${nike_refresh_token} ${client_id} ${client_secret} ${refresh_token};\
-    else \
-        echo "Unknown app" ; \
-    fi
-RUN python3 scripts/gen_svg.py --from-db --title "my running page" --type grid --athlete "$YOUR_NAME" --output assets/grid.svg --min-distance 10.0 --special-color yellow --special-color2 red --special-distance 20 --special-distance2 40 --use-localtime \
-        && python3 scripts/gen_svg.py --from-db --title "my running page" --type github --athlete "$YOUR_NAME" --special-distance 10 --special-distance2 20 --special-color yellow --special-color2 red --output assets/github.svg --use-localtime --min-distance 0.5 \
-        && python3 scripts/gen_svg.py --from-db --type circular --use-localtime
+  echo $app ; \
+  if [ "$app" = "NRC" ] ; then \
+  python3 run_page/nike_sync.py ${nike_refresh_token}; \
+  elif [ "$app" = "Garmin" ] ; then \
+  python3 run_page/garmin_sync.py ${email} ${password}; \
+  elif [ "$app" = "Garmin-CN" ] ; then \
+  python3 run_page/garmin_sync.py ${email} ${password}  --is-cn ; \
+  elif [ "$app" = "Strava" ] ; then \
+  python3 run_page/strava_sync.py ${client_id} ${client_secret} ${refresh_token};\
+  elif [ "$app" = "Nike_to_Strava" ] ; then \
+  python3  run_page/nike_to_strava_sync.py ${nike_refresh_token} ${client_id} ${client_secret} ${refresh_token};\
+  else \
+  echo "Unknown app" ; \
+  fi
+RUN python3 run_page/gen_svg.py --from-db --title "my running page" --type grid --athlete "$YOUR_NAME" --output assets/grid.svg --min-distance 10.0 --special-color yellow --special-color2 red --special-distance 20 --special-distance2 40 --use-localtime \
+  && python3 run_page/gen_svg.py --from-db --title "my running page" --type github --athlete "$YOUR_NAME" --special-distance 10 --special-distance2 20 --special-color yellow --special-color2 red --output assets/github.svg --use-localtime --min-distance 0.5 \
+  && python3 run_page/gen_svg.py --from-db --type circular --use-localtime
 
 
 FROM develop-node AS frontend-build
 WORKDIR /root/running_page
 COPY --from=data /root/running_page /root/running_page
-RUN yarn build-prefix
+RUN pnpm run build
 
 FROM nginx:alpine AS web
 COPY --from=frontend-build /root/running_page/public /usr/share/nginx/html/

diff --git a/README-CN.md b/README-CN.md
@@ -136,8 +136,8 @@ git clone https://github.com/yihong0618/running_page.git --depth=1
 
 ```
 pip3 install -r requirements.txt
-yarn install
-yarn develop
+npm install -g corepack && corepack enable && pnpm install
+pnpm develop
 ```
 
 访问 <http://localhost:8000/> 查看

diff --git a/README.md b/README.md
@@ -120,8 +120,8 @@ git clone https://github.com/yihong0618/running_page.git --depth=1
 
 ```
 pip3 install -r requirements.txt
-yarn install
-yarn develop
+npm install -g corepack && corepack enable && pnpm install
+pnpm develop
 ```
 
 Open your browser and visit <http://localhost:8000/>

diff --git a/package.json b/package.json
@@ -36,12 +36,12 @@
     "serve": "vite serve",
     "lint": "eslint --ext .ts,.tsx src --fix",
     "check": "prettier --write src/main.tsx src/**/*.{scss,json,ts,tsx} *.{md,yaml,json,ts,js}",
-    "ci": "yarn run check && yarn run lint && yarn run build && yarn run test"
+    "ci": "pnpm run check && pnpm run lint && pnpm run build"
   },
   "engineStrict": true,
   "browserslist": "defaults, not ie 11",
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=18"
   },
   "repository": {
     "type": "git",
@@ -60,8 +60,5 @@
     "prettier": "2.8.8",
     "typescript": "^5.1.6"
   },
-  "volta": {
-    "node": "18.16.0",
-    "yarn": "1.22.19"
-  }
+  "packageManager": "pnpm@8.7.0"
 }