Merge branch 'main' into chore/dependency-fix-protobufjs-force-version

grafana · Jul 18, 2023 · 8f88e68 · 8f88e68
2 parents 50599e0 + 808adf0
commit 8f88e68
Show file tree

Hide file tree

Showing 2 changed files with 272 additions and 185 deletions.
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "build-storybook": "build-storybook"
   },
   "devDependencies": {
-    "@babel/core": "7.8.4",
+    "@babel/core": "^7.22.9",
     "@fortawesome/fontawesome-common-types": "~0.2.36",
     "@size-limit/file": "^6.0.3",
     "@size-limit/time": "^6.0.3",
@@ -266,13 +266,18 @@
     "*.{js,jsx,ts,tsx,json,yml,yaml,eslintrc,prettierrc,css,scss}": "prettier --write"
   },
   "resolutions": {
+    "@babel/core": "^7.22.9",
+    "@babel/generator": "^7.22.9",
+    "@babel/traverse": "^7.22.8",
     "react": "16.14.0",
     "react-dom": "16.14.0",
     "jquery": "3.6.0",
     "protobufjs": "^7.2.4",
+    "tough-cookie": "^4.1.3",
     "optionator": "^0.9.3",
     "d3-graphviz": "5.0.2",
-    "d3-selection": "3.0.0"
+    "d3-selection": "3.0.0",
+    "semver": "^7.5.2"
   },
   "optionalDependencies": {
     "@pyroscope/nodejs": "^0.2.5"