Skip to content

Commit

Permalink
Merge remote-tracking branch 'yaptide/master' into feature/254-world-…
Browse files Browse the repository at this point in the history
…zone-material
  • Loading branch information
ostatni5 committed Nov 24, 2021
2 parents 67ca739 + 172b579 commit f42bb25
Show file tree
Hide file tree
Showing 88 changed files with 1,895 additions and 1,116 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: npm install

- name: webfactory/ssh-agent 🖥️
uses: webfactory/ssh-agent@v0.5.3
uses: webfactory/ssh-agent@v0.5.4
with:
# Private SSH key to register in the SSH agent
ssh-private-key: ${{ secrets.WEBDEV }}
Expand All @@ -70,7 +70,7 @@ jobs:
uses: actions/checkout@v2

# Add keys to the SSH agent
- uses: webfactory/ssh-agent@v0.5.3
- uses: webfactory/ssh-agent@v0.5.4
with:
ssh-private-key: |
${{ secrets.DEPLOY_C3_TEST }}
Expand Down
168 changes: 84 additions & 84 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
"@emotion/css": "^11.5.0",
"@emotion/react": "^11.6.0",
"@emotion/styled": "^11.6.0",
"@mui/material": "^5.1.1",
"@testing-library/jest-dom": "^5.15.0",
"@mui/material": "^5.2.0",
"@testing-library/jest-dom": "^5.15.1",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.0.3",
"@types/node": "^16.11.9",
"@types/node": "^16.11.10",
"@types/react-dom": "^17.0.11",
"@types/signals": "^1.0.1",
"@types/throttle-debounce": "^2.1.0",
Expand Down Expand Up @@ -76,7 +76,7 @@
]
},
"devDependencies": {
"@types/react": "^17.0.35",
"@types/react": "^17.0.36",
"@types/react-async-script": "^1.2.1",
"@types/three": "^0.134.0",
"cross-env": "^7.0.3",
Expand Down
Loading

0 comments on commit f42bb25

Please sign in to comment.