Merge refs/heads/master into christjt/react-components-linting

cognitedata · Jun 26, 2023 · ad30e99 · ad30e99
2 parents 2302d6a + e7f57ee
commit ad30e99
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 52 deletions.
diff --git a/viewer/package.json b/viewer/package.json
@@ -96,8 +96,8 @@
     "@types/stats": "0.16.30",
     "@types/three": "0.152.1",
     "@types/tween.js": "18.5.1",
-    "@typescript-eslint/eslint-plugin": "5.59.11",
-    "@typescript-eslint/parser": "5.59.11",
+    "@typescript-eslint/eslint-plugin": "5.60.0",
+    "@typescript-eslint/parser": "5.60.0",
     "concurrently": "8.2.0",
     "cross-env": "7.0.3",
     "dat.gui": "0.7.9",

diff --git a/viewer/yarn.lock b/viewer/yarn.lock