@grafana/create-plugin 2.8.0 → 2.9.0-canary.573.1b536d6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "2.8.0",
+  "version": "2.9.0-canary.573.1b536d6.0",
   "main": "index.js",
   "repository": {
     "directory": "packages/create-plugin",
@@ -66,5 +66,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "93bf334f28d980ae68505eb178d37c0c89bce023"
+  "gitHead": "1b536d6e316b014cbf00ea56f0dd9918474e09e3"
 }

package/templates/common/_package.json

@@ -61,9 +61,9 @@
     "@emotion/css": "^11.1.3",
     "@grafana/data": "{{ grafanaVersion }}",
     "@grafana/runtime": "{{ grafanaVersion }}",
-    "@grafana/ui": "{{ grafanaVersion }}",{{#if_eq pluginType "scenesapp"}}
-    "@grafana/schema": "{{ grafanaVersion }}",
-    "@grafana/scenes": "0.27.0",{{/if_eq}}
+    "@grafana/ui": "{{ grafanaVersion }}",
+    "@grafana/schema": "{{ grafanaVersion }}",{{#if_eq pluginType "scenesapp"}}
+    "@grafana/scenes": "^1.28.0",{{/if_eq}}
     "react": "17.0.2",
     "react-dom": "17.0.2",{{#if isAppType}}
     "react-router-dom": "^5.2.0",

package/templates/datasource/src/types.ts

@@ -1,4 +1,5 @@
-import { DataQuery, DataSourceJsonData } from '@grafana/data';
+import { DataSourceJsonData } from '@grafana/data';
+import { DataQuery } from '@grafana/schema';
 
 export interface MyQuery extends DataQuery {
   queryText?: string;

package/templates/scenes-app/src/components/App/App.tsx

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { AppRootProps } from '@grafana/data';
 import { PluginPropsContext } from '../../utils/utils.plugin';
 import { Routes } from '../Routes';

package/templates/scenes-app/src/components/AppConfig/AppConfig.tsx

@@ -4,6 +4,7 @@ import { PluginConfigPageProps, AppPluginMeta, PluginMeta, GrafanaTheme2 } from
 import { getBackendSrv, locationService } from '@grafana/runtime';
 import { css } from '@emotion/css';
 import { testIds } from '../testIds';
+import { lastValueFrom } from 'rxjs';
 
 export type JsonData = {
   apiUrl?: string;
@@ -182,11 +183,13 @@ const updatePluginAndReload = async (pluginId: string, data: Partial<PluginMeta<
 };
 
 export const updatePlugin = async (pluginId: string, data: Partial<PluginMeta>) => {
-  const response = await getBackendSrv().datasourceRequest({
+  const response = getBackendSrv().fetch({
     url: `/api/plugins/${pluginId}/settings`,
     method: 'POST',
     data,
   });
 
-  return response?.data;
+  const dataResponse = await lastValueFrom(response);
+
+  return dataResponse.data;
 };

package/templates/scenes-app/src/components/Routes/Routes.tsx

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
 import { HomePage } from '../../pages/Home';
 import { PageWithTabs } from '../../pages/WithTabs';