Skip to content

Commit

Permalink
Merge branch 'main' into pierremtb/issue443
Browse files Browse the repository at this point in the history
  • Loading branch information
pierremtb committed Nov 29, 2023
2 parents 7071825 + e57e7e0 commit 93c0727
Show file tree
Hide file tree
Showing 3 changed files with 579 additions and 146 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
RELEASE_ZIP: kittycad_diff-viewer_${{ github.event.release.name || github.sha }}.zip

steps:
- uses: actions/checkout@v3.5.3
- uses: actions/checkout@v4.1.1

- uses: actions/setup-node@v3.7.0
- uses: actions/setup-node@v4.0.0
with:
cache: 'yarn'

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@primer/octicons-react": "^19.4.0",
"@primer/react": "^35.26.1",
"@react-three/csg": "^3.0.0",
"@react-three/drei": "^9.79.2",
"@react-three/drei": "^9.89.0",
"@react-three/fiber": "^8.13.5",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.0.0",
Expand All @@ -32,7 +32,7 @@
"react-is": "^18.2.0",
"styled-components": "^5.3.11",
"three": "^0.153.0",
"three-mesh-bvh": "^0.6.1",
"three-mesh-bvh": "^0.6.8",
"three-stdlib": "^2.23.13",
"typescript": "^4.9.5"
},
Expand Down Expand Up @@ -75,7 +75,7 @@
"dotenv": "^16.2.0",
"eslint": "^8.45.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react": "^7.33.2",
"jsdom": "^22.1.0",
"prettier": "^3.0.0",
"vite": "^4.4.4",
Expand Down
Loading

0 comments on commit 93c0727

Please sign in to comment.