fix: conflicts

cognitedata · Jun 23, 2023 · 1e69fe0 · 1e69fe0
2 parents a4b3e5d + 1f2e5f0
commit 1e69fe0
Show file tree

Hide file tree

Showing 14 changed files with 498 additions and 684 deletions.
diff --git a/examples/package.json b/examples/package.json
@@ -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",

diff --git a/examples/yarn.lock b/examples/yarn.lock
diff --git a/react-components/package.json b/react-components/package.json
@@ -28,12 +28,12 @@
     "@cognite/cogs.js": "^9.17.0",
     "@cognite/reveal": "^4.3.3",
     "@cognite/sdk": "^8.2.0",
-    "@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.7",
@@ -43,7 +43,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",
     "three": "0.152.2",
     "ts-loader": "9.4.3",
@@ -60,4 +60,4 @@
     "lodash": "^4.17.21",
     "style-loader": "^3.3.3"
   }
-}
+}