Merge branch 'main' into tom/anatomy

grafana · Sep 30, 2024 · 04da89a · 04da89a
2 parents 17910ce + d743068
commit 04da89a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/create-plugin/templates/common/_package.json b/packages/create-plugin/templates/common/_package.json
@@ -19,8 +19,8 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@babel/core": "^7.21.4",{{#if useCypress}}
-    "@grafana/e2e": "^11.0.4",
-    "@grafana/e2e-selectors": "^11.2.0",{{/if}}
+    "@grafana/e2e": "^11.0.5",
+    "@grafana/e2e-selectors": "^11.2.1",{{/if}}
     "@grafana/eslint-config": "^7.0.0",{{#if usePlaywright}}
     "@grafana/plugin-e2e": "^1.7.2",{{/if}}
     "@grafana/tsconfig": "^2.0.0",{{#if usePlaywright}}
@@ -64,9 +64,9 @@
   },
   "dependencies": {
     "@emotion/css": "11.10.6",
-    "@grafana/data": "^11.2.0",
-    "@grafana/runtime": "^11.2.0",
-    "@grafana/ui": "^11.2.0",
+    "@grafana/data": "^11.2.1",
+    "@grafana/runtime": "^11.2.1",
+    "@grafana/ui": "^11.2.1",
     "@grafana/schema": "^10.4.0",{{#if_eq pluginType "scenesapp"}}
     "@grafana/scenes": "^5.14.7",{{/if_eq}}
     "react": "18.2.0",

diff --git a/packages/create-plugin/templates/common/docker-compose.yaml b/packages/create-plugin/templates/common/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
       context: ./.config
       args:
         grafana_image: ${GRAFANA_IMAGE:-{{~grafanaImage~}} }
-        grafana_version: ${GRAFANA_VERSION:-11.2.0}
+        grafana_version: ${GRAFANA_VERSION:-11.2.1}
         development: ${DEVELOPMENT:-false}
     ports:
       - 3000:3000/tcp