yarn to pnpm

shuji-koike · Jan 27, 2024 · ff06338 · ff06338
1 parent b0871f4
commit ff06338
Show file tree

Hide file tree

Showing 19 changed files with 15,311 additions and 11,258 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -3,40 +3,42 @@ on:
   push:
     branches:
       - master
+      - staging
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    permissions:
+      contents: "read"
+      id-token: "write"
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
       - uses: actions/setup-node@v4
         with:
           node-version: "20"
-      - uses: actions/cache@v4
-        id: cache_node_modules
-        with:
-          path: "**/node_modules"
-          key: node_modules-${{ hashFiles('**/package.json', 'yarn.lock') }}
-      - run: yarn install --frozen-lockfile
-        if: steps.cache_node_modules.outputs.cache-hit != 'true'
+          cache: "pnpm"
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version-file: ./go.mod
+          cache: true
       - uses: actions/cache@v4
         id: cache_go_mod
         with:
           path: ~/go/pkg/mod
           key: go_mod-${{ hashFiles('go.sum') }}
       - run: go get
         if: steps.cache_go_mod.outputs.cache-hit != 'true'
-      - run: yarn tsc --noEmit
       - run: go build -o ./static/main.wasm .
         env:
           GOOS: js
           GOARCH: wasm
       - run: touch ./static/sample.dem.json
-      - run: yarn vite build
-      - run: yarn tsc --noEmit false
+      - run: pnpm install
+      - run: npx vite build
+      - run: npx tsx build.ts
         working-directory: packages/functions
-      - run: yarn firebase deploy --force --project ${{ secrets.FIREBASE_PROJECT_ID }}
-        env:
-          FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
+      - uses: google-github-actions/auth@v2
+        with:
+          workload_identity_provider: projects/787830619763/locations/global/workloadIdentityPools/github/providers/csgo
+          service_account: github-actions-cd@csgo-tokyo.iam.gserviceaccount.com
+      - run: npx firebase deploy --force
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -5,16 +5,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2
       - uses: actions/setup-node@v4
         with:
           node-version: "20"
-      - uses: actions/cache@v4
-        id: cache_node_modules
-        with:
-          path: "**/node_modules"
-          key: node_modules-${{ hashFiles('**/package.json', 'yarn.lock') }}
-      - run: yarn install --frozen-lockfile
-        if: steps.cache_node_modules.outputs.cache-hit != 'true'
-      - run: yarn prettier -c .
-      - run: yarn eslint .
-      - run: yarn tsc --noEmit
+          cache: "pnpm"
+      - run: pnpm install
+      - run: npx prettier -c .
+      - run: npx eslint .
+      - run: npx tsc --noEmit
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 .*
 !.storybook
-/functions/lib
-/dist
+dist
 /static
 /var
 /csgo
@@ -11,3 +10,4 @@ __debug_bin
 *.log
 *.dem
 *.rar
+gha-creds-*.json
diff --git a/.prettierignore b/.prettierignore
@@ -3,3 +3,4 @@ build
 static/wasm_exec.js
 static/*.json
 **/icons.json
+pnpm-lock.yaml
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,16 +6,8 @@
       "request": "launch",
       "name": "yarn start",
       "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "yarn",
-      "runtimeArgs": ["start"]
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "yarn storybook",
-      "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "yarn",
-      "runtimeArgs": ["storybook"]
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": ["run", "start"]
     }
   ]
 }
diff --git a/README.md b/README.md
@@ -11,3 +11,13 @@ This project is open source but not a free software, and temporary licensed as
 
 - [Counter-Strike: Global Offensive](https://blog.counter-strike.net/)
 - https://www.hltv.org/
+
+# setup
+
+```
+pnpm install
+GOOS=js GOARCH=wasm go build -o ./static/main.wasm .
+touch ./static/sample.dem.json
+
+pnpm start
+```
diff --git a/package.json b/package.json
@@ -5,21 +5,32 @@
   "engines": {
     "node": "20"
   },
+  "packageManager": "pnpm@8.14.3",
   "scripts": {
     "start": "vite dev",
     "build": "vite build",
     "lint": "eslint --cache --fix .; prettier --write --loglevel warn .;tsc --noEmit",
     "storybook": "start-storybook -p 6006"
   },
-  "workspaces": [
-    "packages/*"
-  ],
   "devDependencies": {
+    "@emotion/react": "^11.11.3",
     "@firebase/app-compat": "^0.2.26",
     "@shuji-koike/boilerplate": "^1.24.0",
     "@shuji-koike/eslint-config": "^1.24.0",
     "@shuji-koike/storybook": "^1.24.0",
     "@shuji-koike/vite-react": "^1.24.0",
-    "firebase-tools": "^13.1.0"
+    "@types/lodash": "^4.14.202",
+    "@types/react": "^18.2.48",
+    "@types/react-dom": "^18.2.18",
+    "@types/react-router-dom": "^5.3.3",
+    "@vitejs/plugin-react": "^4.2.1",
+    "firebase-tools": "^13.1.0",
+    "lodash": "^4.17.21",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router": "^6.21.3",
+    "react-router-dom": "^6.21.3",
+    "typescript": "^5.3.3",
+    "vite": "^5.0.12"
   }
 }
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -15,6 +15,7 @@
     "@mui/material": "^5.15.6",
     "@sentry/react": "^7.98.0",
     "@sentry/tracing": "^7.98.0",
+    "@shuji-koike/boilerplate": "^1.24.0",
     "firebase": "^10.7.2",
     "lodash": "^4.17.21",
     "react": "^18.2.0",

diff --git a/packages/app/pages/Home.tsx b/packages/app/pages/Home.tsx
@@ -33,7 +33,8 @@ export const Home: React.FC = () => {
           const path = /\.dem$/i.test(name)
             ? await storagePutPublicMatch(match, name)
             : name
-          navigate(`/dem/${path}/`, { state: { match } })
+          console.info(path)
+          // navigate(`/dem/${path}/`, { state: { match } })
         }}
       />
       {import.meta.env.DEV && (