From dba846fe547a14a6faad4ad9cb901eaa3ee6fb24 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Fri, 27 Oct 2023 15:09:23 +0100
Subject: [PATCH] Chore: Some renovate config tidy up (#77275)

* update some comments, remove some things from the ignore list

* remove @mdx-js/react since storybook now directly depends on it

* add issue link to comment

* exclude @locker from grouped patch updates

* ignore grafana-e2e from renovate
---
 .github/renovate.json5           | 23 +++++++++++------------
 packages/grafana-ui/package.json |  1 -
 yarn.lock                        | 10 ----------
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 6f64cde93fd..9000449aab6 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -4,28 +4,20 @@
   ],
   "enabledManagers": ["npm"],
   "ignoreDeps": [
-    "commander", // we are planning to remove this, so no need to update it
-    "execa", // we should bump this once we move to esm modules
-    "history", // we should bump this together with react-router-dom
-    "@mdx-js/react", // storybook peer-depends on its 1.x version, we should upgrade this when we upgrade storybook
+    "history", // we should bump this together with react-router-dom (see https://github.com/grafana/grafana/issues/76744)
+    "react-router-dom", // we should bump this together with history (see https://github.com/grafana/grafana/issues/76744)
     "monaco-editor", // due to us exposing this via @grafana/ui/CodeEditor's props bumping can break plugins
     "react-hook-form", // due to us exposing these hooks via @grafana/ui form components bumping can break plugins
     "react-redux", // react-beautiful-dnd depends on react-redux 7.x, we need to update that one first
-    "react-router-dom", // we should bump this together with history
-    "ts-loader", // we should remove ts-loader and use babel-loader instead
-    "ora", // we should bump this once we move to esm modules
-    "@locker/near-membrane-dom", // critical library. we need to bump this only intentionally
-    "@locker/near-membrane-shared", // critical library. we need to bump this only intentionally
-    "@locker/near-membrane-shared-dom", // critical library. we need to bump this only intentionally
   ],
   "includePaths": ["package.json", "packages/**", "public/app/plugins/**"],
-  "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**"],
+  "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**", "packages/grafana-e2e/**"],
   "labels": ["area/frontend", "dependencies", "no-backport", "no-changelog"],
   "postUpdateOptions": ["yarnDedupeHighest"],
   "packageRules": [
     {
       "matchUpdateTypes": ["patch"],
-      "excludePackagePatterns": ["^@?storybook"],
+      "excludePackagePatterns": ["^@?storybook", "^@locker"],
       "extends": ["schedule:monthly"],
       "groupName": "Monthly patch updates"
     },
@@ -78,6 +70,13 @@
       ],
       "reviewers": ["leeoniya"],
     },
+    {
+      "groupName": "locker",
+      "matchPackagePrefixes": [
+        "@locker/"
+      ]
+      "reviewers": ["team:grafana/plugins-platform-frontend"],
+    },
   ],
   "pin": {
     "enabled": false
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index d04401940d5..5db1d39b1bb 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -117,7 +117,6 @@
   "devDependencies": {
     "@babel/core": "7.23.2",
     "@grafana/tsconfig": "^1.2.0-rc1",
-    "@mdx-js/react": "1.6.22",
     "@rollup/plugin-node-resolve": "15.2.3",
     "@storybook/addon-a11y": "7.4.5",
     "@storybook/addon-actions": "7.4.5",
diff --git a/yarn.lock b/yarn.lock
index 8c65fabf306..1e3a9293d2b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3369,7 +3369,6 @@ __metadata:
     "@grafana/schema": 10.3.0-pre
     "@grafana/tsconfig": ^1.2.0-rc1
     "@leeoniya/ufuzzy": 1.0.8
-    "@mdx-js/react": 1.6.22
     "@monaco-editor/react": 4.6.0
     "@popperjs/core": 2.11.8
     "@react-aria/button": 3.8.0
@@ -4213,15 +4212,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mdx-js/react@npm:1.6.22":
-  version: 1.6.22
-  resolution: "@mdx-js/react@npm:1.6.22"
-  peerDependencies:
-    react: ^16.13.1 || ^17.0.0
-  checksum: bc84bd514bc127f898819a0c6f1a6915d9541011bd8aefa1fcc1c9bea8939f31051409e546bdec92babfa5b56092a16d05ef6d318304ac029299df5181dc94c8
-  languageName: node
-  linkType: hard
-
 "@mdx-js/react@npm:^2.1.5":
   version: 2.3.0
   resolution: "@mdx-js/react@npm:2.3.0"