Merge pull request #3 from um7a/update-deps

deps: Update deps
um7a · Nov 27, 2023 · b4d361b · b4d361b
2 parents f5f4bfa + f66958b
commit b4d361b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 30 deletions.
diff --git a/.github/workflows/daily_build.yml b/.github/workflows/daily_build.yml
@@ -17,8 +17,8 @@ jobs:
       fail-fast: false
       matrix:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-        # We should execute 16.x first. Because only 16.x job updates package.json if necessary.
-        node-version: [16.x, 14.x]
+        # We should execute 20.x first. Because only 20.x job updates package.json if necessary.
+        node-version: [20.x, 18.x]
         branch: [main]
     steps:
       - name: Checkout to ${{ matrix.branch }}
@@ -36,7 +36,7 @@ jobs:
         run: git config --global user.name "github actions"
 
       - name: Update npm packages
-        if: ${{ matrix.node-version == '16.x' }}
+        if: ${{ matrix.node-version == '20.x' }}
         run: |
           cp package.json package.json.old
           npm install -g npm-package-updater
@@ -65,7 +65,7 @@ jobs:
         run: npm run build:arm64
 
       - name: Push package.json and package-lock.json if needed
-        if: ${{ matrix.node-version == '16.x' }}
+        if: ${{ matrix.node-version == '20.x' }}
         run: |
           if [[ ! -z $(diff package.json.old package.json) ]]; then
             git push origin ${{ matrix.branch }}

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-        node-version: [16.x, 14.x]
+        node-version: [20.x, 18.x]
     steps:
       - uses: actions/checkout@v2
 
@@ -39,7 +39,7 @@ jobs:
         run: npm run build:arm64
 
       - name: Commit and push package-lock.json if needed
-        if: ${{ matrix.node-version == '16.x' && github.event_name == 'push' }}
+        if: ${{ matrix.node-version == '20.x' && github.event_name == 'push' }}
         run: |
           if [[ ! -z $(git diff --shortstat package-lock.json) ]]; then
             git add package-lock.json

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 16.x
+          node-version: 20.x
 
       - name: check tag name
         run: test `echo ${{ github.ref }} | cut -d / -f 3 | cut -d v -f 2`  = `node -e "console.log(require('./package.json').version)"`
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-        node-version: [16.x]
+        node-version: [20.x]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/package.json b/package.json
@@ -22,33 +22,27 @@
   "dependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "three": "^0.152.0"
+    "three": "^0.158.0"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^14.0.0",
-    "@testing-library/user-event": "^14.4.3",
-    "@types/jest": "^29.1.1",
-    "@types/node": "^18.8.0",
-    "@types/react": "^18.0.21",
-    "@types/react-dom": "^18.0.6",
-    "@types/three": "^0.151.0",
-    "electron": "^24.0.0",
-    "electron-builder": "^23.3.3",
+    "@testing-library/jest-dom": "^6.1.4",
+    "@testing-library/react": "^14.1.2",
+    "@testing-library/user-event": "^14.5.1",
+    "@types/jest": "^29.5.10",
+    "@types/node": "^20.10.0",
+    "@types/react": "^18.2.38",
+    "@types/react-dom": "^18.2.17",
+    "@types/three": "^0.158.3",
+    "electron": "^27.1.2",
+    "electron-builder": "^24.9.1",
     "react-scripts": "^5.0.1",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.5"
   },
   "scripts": {
-    "start": "npm run frontend:build && npm run electron:start",
-    "test": "npm run frontend:test",
-    "build:x64": "npm run frontend:build && npm run electron:build:x64",
-    "build:arm64": "npm run frontend:build && npm run electron:build:arm64",
-    "electron:start": "tsc -p electron && electron .",
-    "electron:build:x64": "tsc -p electron && electron-builder --mac --x64 --publish never",
-    "electron:build:arm64": "tsc -p electron && electron-builder --mac --arm64 --publish never",
-    "frontend:build": "CI=false && react-scripts build",
-    "frontend:test": "react-scripts test --watchAll=false",
-    "frontend:eject": "react-scripts eject"
+    "start": "tsc -p electron && electron .",
+    "build:x64": "tsc -p electron && electron-builder --mac --x64 --publish never",
+    "build:arm64": "tsc -p electron && electron-builder --mac --arm64 --publish never",
+    "test": "react-scripts test --watchAll=false"
   },
   "eslintConfig": {
     "extends": [