Skip to content

Commit

Permalink
Merge branch 'master' into hflatval/update-docs-360-4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
haakonflatval-cognite authored Jun 26, 2023
2 parents 76c1ba4 + 33c1db5 commit a9ebf10
Show file tree
Hide file tree
Showing 17 changed files with 526 additions and 710 deletions.
3 changes: 2 additions & 1 deletion examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"react-dom": "18.2.0",
"react-router-dom": "6.11.1",
"stats.js": "0.17.0",
"styled-components": "5.3.10"
"styled-components": "5.3.10",
"three-stdlib": "2.23.10"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.11.5",
Expand Down
47 changes: 20 additions & 27 deletions examples/yarn.lock

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

14 changes: 7 additions & 7 deletions react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"@babel/preset-typescript": "7.22.5",
"@cognite/cogs.js": "^9.13.2",
"@cognite/reveal": "^4.3.1",
"@storybook/addon-essentials": "7.0.21",
"@storybook/addon-interactions": "7.0.21",
"@storybook/addon-links": "7.0.21",
"@storybook/blocks": "7.0.21",
"@storybook/react": "7.0.21",
"@storybook/react-webpack5": "7.0.21",
"@storybook/addon-essentials": "7.0.22",
"@storybook/addon-interactions": "7.0.22",
"@storybook/addon-links": "7.0.22",
"@storybook/blocks": "7.0.22",
"@storybook/react": "7.0.22",
"@storybook/react-webpack5": "7.0.22",
"@storybook/testing-library": "0.1.0",
"@types/lodash": "^4.14.190",
"@types/react": "18.2.12",
Expand All @@ -42,7 +42,7 @@
"prop-types": "15.8.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"storybook": "7.0.21",
"storybook": "7.0.22",
"styled-components": "5.3.11",
"ts-loader": "9.4.3",
"typescript": "5.1.3",
Expand Down
Loading

0 comments on commit a9ebf10

Please sign in to comment.