wip

shuji-koike · Jan 26, 2024 · 41d0fc9 · 41d0fc9
1 parent 96a04a9
commit 41d0fc9
Show file tree

Hide file tree

Showing 9 changed files with 9,729 additions and 15,001 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -12,7 +12,7 @@ jobs:
         id: cache_node_modules
         with:
           path: "**/node_modules"
-          key: node_modules-${{ hashFiles('**/package.json', 'yarn.lock') }}
+          key: node_modules-${{ hashFiles('**/package.json', 'pnpm-lock.yaml') }}
       - run: yarn install --frozen-lockfile
         if: steps.cache_node_modules.outputs.cache-hit != 'true'
       - run: yarn prettier -c .

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/package.json b/package.json
@@ -11,9 +11,6 @@
     "lint": "eslint --cache --fix .; prettier --write --loglevel warn .;tsc --noEmit",
     "storybook": "start-storybook -p 6006"
   },
-  "workspaces": [
-    "packages/*"
-  ],
   "devDependencies": {
     "@firebase/app-compat": "^0.2.26",
     "@shuji-koike/boilerplate": "^1.24.0",

diff --git a/packages/functions/package.json b/packages/functions/package.json
@@ -8,7 +8,7 @@
   "type": "module",
   "main": "dist/index.js",
   "scripts": {
-    "build": "tsx build.ts"
+    "build": "npx tsx build.ts"
   },
   "dependencies": {
     "axios": "^1.6.7",
@@ -18,6 +18,7 @@
   "devDependencies": {
     "esbuild": "^0.19.12",
     "firebase-functions-test": "^3.1.1",
-    "jest": "^29.7.0"
+    "jest": "^29.7.0",
+    "tsx": "^4.7.0"
   }
 }