Skip to content

Commit

Permalink
Merge master into renovate/serde-1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
cognite-bulldozer[bot] authored Jul 24, 2023
2 parents ba7cae4 + 689640c commit e11436e
Show file tree
Hide file tree
Showing 8 changed files with 181 additions and 75 deletions.
4 changes: 2 additions & 2 deletions examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
"@types/react-dom": "18.2.4",
"@types/stats.js": "^0.17.0",
"@types/styled-components": "^5.1.26",
"@types/three": "0.152.0",
"@types/three": "0.154.0",
"css-loader": "^6.7.1",
"dotenv-webpack": "^7.1.0",
"html-webpack-plugin": "^5.5.0",
"prettier": "^2.8.4",
"three": "0.152.2",
"three": "0.154.0",
"ts-loader": "9.4.4",
"typescript": "^5.0.4",
"webpack": "^5.76.0",
Expand Down
140 changes: 115 additions & 25 deletions examples/yarn.lock

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

6 changes: 3 additions & 3 deletions react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@types/lodash": "^4.14.190",
"@types/react": "18.2.7",
"@types/styled-components": "5.1.26",
"@types/three": "0.152.0",
"@types/three": "0.154.0",
"@typescript-eslint/eslint-plugin": "^5.50.0",
"eslint": "^8.0.1",
"eslint-config-prettier": "^8.8.0",
Expand All @@ -58,10 +58,10 @@
"react-dom": "18.2.0",
"storybook": "7.0.27",
"styled-components": "5.3.11",
"three": "0.152.2",
"three": "0.154.0",
"ts-loader": "9.4.3",
"typescript": "5.1.6",
"webpack": "5.88.1",
"webpack": "5.88.2",
"webpack-cli": "5.1.4",
"webpack-node-externals": "3.0.0"
},
Expand Down
Loading

0 comments on commit e11436e

Please sign in to comment.