diff --git a/.eslintrc b/.eslintrc
index 32ea6926535..50061606929 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -99,27 +99,22 @@
         "public/app/plugins/datasource/grafana-testdata-datasource/*.{ts,tsx}",
         "public/app/plugins/datasource/grafana-testdata-datasource/**/*.{ts,tsx}"
       ],
+      "settings": {
+        "import/resolver": {
+          "node": {
+            "extensions": [".ts", ".tsx"]
+          }
+        }
+      },
       "rules": {
-        "no-restricted-imports": [
+        "import/no-restricted-paths": [
           "error",
           {
-            "paths": [
-              // generic rules
-              {
-                "name": "react-redux",
-                "importNames": ["useDispatch", "useSelector"],
-                "message": "Please import from app/types instead."
-              },
-              {
-                "name": "react-i18next",
-                "importNames": ["Trans", "t"],
-                "message": "Please import from app/core/internationalization instead"
-              }
-            ],
-            // new rules
-            "patterns": [
+            "zones": [
               {
-                "group": ["**/app/*"],
+                "target": "./public/app/plugins",
+                "from": "./public/app",
+                "except": ["./plugins"],
                 "message": "Core plugins are not allowed to depend on Grafana core packages"
               }
             ]