@grafana/create-plugin 2.0.1-canary.441.b3db721.0 → 2.0.2

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+# v2.0.2 (Wed Oct 04 2023)
+
+:tada: This release contains work from a new contributor! :tada:
+
+Thank you, null[@mikkancso](https://github.com/mikkancso), for all your work!
+
+#### 🐛 Bug Fix
+
+- Create-plugin: Make baseURL absolute and bump swc/core [#424](https://github.com/grafana/plugin-tools/pull/424) ([@mikkancso](https://github.com/mikkancso))
+
+#### Authors: 1
+
+- [@mikkancso](https://github.com/mikkancso)
+
+---
+
+# v2.0.1 (Tue Oct 03 2023)
+
+#### 🐛 Bug Fix
+
+- Add fixes for backend sdk v0.177.0 [#437](https://github.com/grafana/plugin-tools/pull/437) ([@wbrowne](https://github.com/wbrowne))
+
+#### Authors: 1
+
+- Will Browne ([@wbrowne](https://github.com/wbrowne))
+
+---
+
 # v2.0.0 (Mon Oct 02 2023)
 
 #### 🐛 Bug Fix

package/dist/commands/generate.plopfile.js

@@ -29,7 +29,6 @@ var path_1 = __importDefault(require("path"));
 var constants_1 = require("../constants");
 var utils_handlebars_1 = require("../utils/utils.handlebars");
 var utils_path_1 = require("../utils/utils.path");
-var utils_version_1 = require("../utils/utils.version");
 var utils_packageManager_1 = require("../utils/utils.packageManager");
 var print_success_message_1 = require("./generate-actions/print-success-message");
 var update_go_sdk_and_packages_1 = require("./generate-actions/update-go-sdk-and-packages");
@@ -108,8 +107,7 @@ function default_1(plop) {
                 packageManagerInstallCmd: packageManagerInstallCmd,
                 packageManagerVersion: packageManagerVersion,
                 isAppType: isAppType,
-                isNPM: packageManagerName === 'npm',
-                packageVersion: (0, utils_version_1.getVersion)()
+                isNPM: packageManagerName === 'npm'
             };
             var commonActions = getActionsForTemplateFolder({
                 folderPath: constants_1.TEMPLATE_PATHS.common,

package/dist/commands/version.command.js

@@ -37,11 +37,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 exports.version = void 0;
-var utils_version_1 = require("../utils/utils.version");
+var path_1 = require("path");
+var fs_1 = require("fs");
 var version = function () { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         try {
-            console.log((0, utils_version_1.getVersion)());
+            console.log(getVersion());
         }
         catch (error) {
             console.error(error);
@@ -51,3 +52,12 @@ var version = function () { return __awaiter(void 0, void 0, void 0, function ()
     });
 }); };
 exports.version = version;
+var getVersion = function () {
+    var packageJsonPath = (0, path_1.resolve)(__dirname, '..', '..', 'package.json');
+    var pkg = (0, fs_1.readFileSync)(packageJsonPath, 'utf8');
+    var version = JSON.parse(pkg).version;
+    if (!version) {
+        throw "Could not find the version of sign-plugin";
+    }
+    return version;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "2.0.1-canary.441.b3db721.0",
+  "version": "2.0.2",
   "main": "index.js",
   "repository": {
     "directory": "packages/create-plugin",
@@ -66,5 +66,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "b3db72193f5a344f1088441233e85f67ace6548c"
+  "gitHead": "a935c3d30a844512ff5209cd4dee677b80f9c304"
 }

package/src/commands/generate.plopfile.ts

@@ -5,7 +5,6 @@ import type { ModifyActionConfig, NodePlopAPI } from 'plop';
 import { EXTRA_TEMPLATE_VARIABLES, IS_DEV, PARTIALS_DIR, PLUGIN_TYPES, TEMPLATE_PATHS } from '../constants';
 import { ifEq, normalizeId } from '../utils/utils.handlebars';
 import { getExportPath } from '../utils/utils.path';
-import { getVersion } from '../utils/utils.version';
 import { getPackageManagerInstallCmd, getPackageManagerFromUserAgent } from '../utils/utils.packageManager';
 import { printGenerateSuccessMessage } from './generate-actions/print-success-message';
 import { updateGoSdkAndModules } from './generate-actions/update-go-sdk-and-packages';
@@ -96,8 +95,7 @@ export default function (plop: NodePlopAPI) {
         packageManagerInstallCmd,
         packageManagerVersion,
         isAppType,
-        isNPM: packageManagerName === 'npm',
-        packageVersion: getVersion(),
+        isNPM: packageManagerName === 'npm'
       };
       // Copy over files that are shared between plugins types
       const commonActions = getActionsForTemplateFolder({

package/src/commands/types.ts

@@ -17,5 +17,4 @@ export type TemplateData = {
   packageManagerVersion: string;
   isAppType: boolean;
   isNPM: boolean;
-  packageVersion: string;
 };

package/src/commands/version.command.ts

@@ -1,4 +1,5 @@
-import { getVersion } from '../utils/utils.version';
+import { resolve } from 'path';
+import { readFileSync } from 'fs';
 
 export const version = async () => {
   try {
@@ -8,3 +9,13 @@ export const version = async () => {
     process.exit(1);
   }
 };
+
+const getVersion = () => {
+  const packageJsonPath = resolve(__dirname, '..', '..', 'package.json');
+  const pkg = readFileSync(packageJsonPath, 'utf8');
+  const { version } = JSON.parse(pkg);
+  if (!version) {
+    throw `Could not find the version of sign-plugin`;
+  }
+  return version;
+};

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

@@ -16,7 +16,7 @@ import (
 // since otherwise we will only get a not implemented error response from plugin in
 // runtime. In this example datasource instance implements backend.QueryDataHandler,
 // backend.CheckHealthHandler interfaces. Plugin should not implement all these
-// interfaces- only those which are required for a particular task.
+// interfaces - only those which are required for a particular task.
 var (
 	_ backend.QueryDataHandler      = (*Datasource)(nil)
 	_ backend.CheckHealthHandler    = (*Datasource)(nil)
@@ -24,7 +24,7 @@ var (
 )
 
 // NewDatasource creates a new datasource instance.
-func NewDatasource(_ backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
+func NewDatasource(_ context.Context, _ backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 	return &Datasource{}, nil
 }
 

package/templates/backend-app/pkg/plugin/app.go

@@ -2,10 +2,11 @@ package plugin
 
 import (
 	"context"
+	"net/http"
+
 	"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/resource/httpadapter"
-	"net/http"
 )
 
 // Make sure App implements required interfaces. This is important to do
@@ -24,7 +25,7 @@ type App struct {
 }
 
 // NewApp creates a new example *App instance.
-func NewApp(_ backend.AppInstanceSettings) (instancemgmt.Instance, error) {
+func NewApp(_ context.Context, _ backend.AppInstanceSettings) (instancemgmt.Instance, error) {
 	var app App
 
 	// Use a httpadapter (provided by the SDK) for resource calls. This allows us
@@ -50,4 +51,3 @@ func (a *App) CheckHealth(_ context.Context, _ *backend.CheckHealthRequest) (*ba
 		Message: "ok",
 	}, nil
 }
-

package/templates/common/.config/.eslintrc

@@ -1,6 +1,6 @@
 /*
  * ⚠️⚠️⚠️ THIS FILE WAS SCAFFOLDED BY `@grafana/create-plugin`. DO NOT EDIT THIS FILE DIRECTLY. ⚠️⚠️⚠️
- * <!== version: {{ packageVersion }} ==!>
+ *
  * In order to extend the configuration follow the steps in
  * https://grafana.com/developers/plugin-tools/create-a-plugin/extend-a-plugin/extend-configurations#extend-the-eslint-config
  */

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

@@ -82,7 +82,7 @@ const config = async (env): Promise<Configuration> => {
             loader: 'swc-loader',
             options: {
               jsc: {
-                baseUrl: './src',
+                baseUrl: path.resolve(__dirname, 'src'),
                 target: 'es2015',
                 loose: false,
                 parser: {

package/templates/common/package.json

@@ -23,7 +23,7 @@
     "@grafana/e2e-selectors": "{{ grafanaVersion }}",
     "@grafana/eslint-config": "^6.0.0",
     "@grafana/tsconfig": "^1.2.0-rc1",
-    "@swc/core": "1.3.75",
+    "@swc/core": "^1.3.90",
     "@swc/helpers": "^0.5.0",
     "@swc/jest": "^0.2.26",
     "@testing-library/jest-dom": "^5.16.5",

package/dist/utils/utils.version.js

@@ -1,15 +0,0 @@
-"use strict";
-exports.__esModule = true;
-exports.getVersion = void 0;
-var path_1 = require("path");
-var fs_1 = require("fs");
-var getVersion = function () {
-    var packageJsonPath = (0, path_1.resolve)(__dirname, '..', '..', 'package.json');
-    var pkg = (0, fs_1.readFileSync)(packageJsonPath, 'utf8');
-    var version = JSON.parse(pkg).version;
-    if (!version) {
-        throw "Could not find the version of create-plugin";
-    }
-    return version;
-};
-exports.getVersion = getVersion;

package/src/utils/utils.version.ts

@@ -1,12 +0,0 @@
-import { resolve } from 'path';
-import { readFileSync } from 'fs';
-
-export const getVersion = () => {
-  const packageJsonPath = resolve(__dirname, '..', '..', 'package.json');
-  const pkg = readFileSync(packageJsonPath, 'utf8');
-  const { version } = JSON.parse(pkg);
-  if (!version) {
-    throw `Could not find the version of create-plugin`;
-  }
-  return version;
-};