@grafana/create-plugin 1.0.0 → 1.0.1-canary.207.0ad7d49.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "1.0.0",
+  "version": "1.0.1-canary.207.0ad7d49.0",
   "main": "index.js",
   "repository": {
     "directory": "packages/create-plugin",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "1b6746b0c95271772741cf1a8cba405919f53874"
+  "gitHead": "0ad7d495e1e58bcd9f5c2c07d6d8114218465d76"
 }

package/templates/backend/pkg/plugin/datasource.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
-	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 )
 
@@ -45,10 +44,6 @@ func (d *Datasource) Dispose() {
 // The QueryDataResponse contains a map of RefID to the response for each query, and each response
 // contains Frames ([]*Frame).
 func (d *Datasource) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-	// when logging at a non-Debug level, make sure you don't include sensitive information in the message
-	// (like the *backend.QueryDataRequest)
-	log.DefaultLogger.Debug("QueryData called", "numQueries", len(req.Queries))
-
 	// create response struct
 	response := backend.NewQueryDataResponse()
 
@@ -99,10 +94,6 @@ func (d *Datasource) query(_ context.Context, pCtx backend.PluginContext, query
 // datasource configuration page which allows users to verify that
 // a datasource is working as expected.
 func (d *Datasource) CheckHealth(_ context.Context, req *backend.CheckHealthRequest) (*backend.CheckHealthResult, error) {
-	// when logging at a non-Debug level, make sure you don't include sensitive information in the message
-	// (like the *backend.QueryDataRequest)
-	log.DefaultLogger.Debug("CheckHealth called")
-
 	var status = backend.HealthStatusOk
 	var message = "Data source is working"
 

package/templates/common/.config/webpack/utils.ts

@@ -10,10 +10,8 @@ export function getPackageJson() {
   return require(path.resolve(process.cwd(), 'package.json'));
 }
 
-export function getPluginId() {
-  const { id } = require(path.resolve(process.cwd(), `${SOURCE_DIR}/plugin.json`));
-
-  return id;
+export function getPluginJson() {
+  return require(path.resolve(process.cwd(), `${SOURCE_DIR}/plugin.json`));
 }
 
 export function hasReadme() {

package/templates/common/.config/webpack/webpack.config.ts

@@ -13,9 +13,11 @@ import path from 'path';
 import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin';
 import { Configuration } from 'webpack';
 
-import { getPackageJson, getPluginId, hasReadme, getEntries } from './utils';
+import { getPackageJson, getPluginJson, hasReadme, getEntries } from './utils';
 import { SOURCE_DIR, DIST_DIR } from './constants';
 
+const pluginJson = getPluginJson();
+
 const config = async (env): Promise<Configuration> => ({
   cache: {
     type: 'filesystem',
@@ -105,7 +107,7 @@ const config = async (env): Promise<Configuration> => ({
         type: 'asset/resource',
         generator: {
           // Keep publicPath relative for host.com/grafana/ deployments
-          publicPath: `public/plugins/${getPluginId()}/img/`,
+          publicPath: `public/plugins/${pluginJson.id}/img/`,
           outputPath: 'img/',
           filename: Boolean(env.production) ? '[hash][ext]' : '[name][ext]',
         },
@@ -115,7 +117,7 @@ const config = async (env): Promise<Configuration> => ({
         type: 'asset/resource',
         generator: {
           // Keep publicPath relative for host.com/grafana/ deployments
-          publicPath: `public/plugins/${getPluginId()}/fonts`,
+          publicPath: `public/plugins/${pluginJson.id}/fonts`,
           outputPath: 'fonts/',
           filename: Boolean(env.production) ? '[hash][ext]' : '[name][ext]',
         },
@@ -125,7 +127,7 @@ const config = async (env): Promise<Configuration> => ({
 
   output: {
     clean: {
-      keep: /gpx_.*/,
+      keep: new RegExp(`.*?_(amd64|arm(64)?)(.exe)?`),
     },
     filename: '[name].js',
     library: {
@@ -169,7 +171,7 @@ const config = async (env): Promise<Configuration> => ({
           },
           {
             search: /\%PLUGIN_ID\%/g,
-            replace: getPluginId(),
+            replace: pluginJson.id,
           },
         ],
       },