@grafana/create-plugin 5.4.0-canary.999.f39e44c.0 → 5.4.0

package/CHANGELOG.md

@@ -1,3 +1,53 @@
+# v5.4.0 (Mon Sep 30 2024)
+
+#### 🚀 Enhancement
+
+- Create Plugin: Update go sdk when running update cmd [#1143](https://github.com/grafana/plugin-tools/pull/1143) ([@jackw](https://github.com/jackw))
+
+#### Authors: 1
+
+- Jack Westbrook ([@jackw](https://github.com/jackw))
+
+---
+
+# v5.3.12 (Mon Sep 30 2024)
+
+#### 🐛 Bug Fix
+
+- Switch to createDataFrame [#1133](https://github.com/grafana/plugin-tools/pull/1133) ([@tolzhabayev](https://github.com/tolzhabayev))
+
+#### Authors: 1
+
+- Timur Olzhabayev ([@tolzhabayev](https://github.com/tolzhabayev))
+
+---
+
+# v5.3.11 (Wed Sep 25 2024)
+
+#### 🐛 Bug Fix
+
+- Feat: Adding provenance publish config [#1127](https://github.com/grafana/plugin-tools/pull/1127) ([@tolzhabayev](https://github.com/tolzhabayev))
+- Update dependency @grafana/scenes to v5.14.7 [#1119](https://github.com/grafana/plugin-tools/pull/1119) ([@renovate[bot]](https://github.com/renovate[bot]))
+
+#### Authors: 2
+
+- [@renovate[bot]](https://github.com/renovate[bot])
+- Timur Olzhabayev ([@tolzhabayev](https://github.com/tolzhabayev))
+
+---
+
+# v5.3.10 (Mon Sep 09 2024)
+
+#### 🐛 Bug Fix
+
+- Update grafana dependencies [#1094](https://github.com/grafana/plugin-tools/pull/1094) ([@renovate[bot]](https://github.com/renovate[bot]))
+
+#### Authors: 1
+
+- [@renovate[bot]](https://github.com/renovate[bot])
+
+---
+
 # v5.3.9 (Thu Sep 05 2024)
 
 #### 🐛 Bug Fix

package/dist/commands/generate.command.js

@@ -10,7 +10,7 @@ import { renderTemplateFromFile, getTemplateData } from '../utils/utils.template
 import { prettifyFiles } from '../utils/utils.prettifyFiles.js';
 import { printGenerateSuccessMessage } from './generate/print-success-message.js';
 import { promptUser } from './generate/prompt-user.js';
-import { updateGoSdkAndModules } from './generate/update-go-sdk-and-packages.js';
+import { updateGoSdkAndModules } from '../utils/utils.goSdk.js';
 export const generate = async (argv) => {
     const answers = await promptUser(argv);
     const templateData = getTemplateData({ ...answers });

package/dist/commands/update.command.js

@@ -1,12 +1,13 @@
 import chalk from 'chalk';
-import { printRedBox, printBlueBox } from '../utils/utils.console.js';
-import { updatePackageJson, updateNpmScripts } from '../utils/utils.npm.js';
-import { isGitDirectory, isGitDirectoryClean } from '../utils/utils.git.js';
-import { isPluginDirectory, updateDotConfigFolder } from '../utils/utils.plugin.js';
-import { getVersion, getGrafanaRuntimeVersion } from '../utils/utils.version.js';
-import { getPackageManagerFromUserAgent } from '../utils/utils.packageManager.js';
 import { UDPATE_CONFIG } from '../constants.js';
+import { printBlueBox, printRedBox } from '../utils/utils.console.js';
 import { getOnlyExistingInCwd, removeFilesInCwd } from '../utils/utils.files.js';
+import { isGitDirectory, isGitDirectoryClean } from '../utils/utils.git.js';
+import { updateGoSdkAndModules } from '../utils/utils.goSdk.js';
+import { updateNpmScripts, updatePackageJson } from '../utils/utils.npm.js';
+import { getPackageManagerFromUserAgent } from '../utils/utils.packageManager.js';
+import { isPluginDirectory, updateDotConfigFolder } from '../utils/utils.plugin.js';
+import { getGrafanaRuntimeVersion, getVersion } from '../utils/utils.version.js';
 export const update = async (argv) => {
     const { packageManagerName } = getPackageManagerFromUserAgent();
     try {
@@ -42,6 +43,7 @@ In case you want to proceed as is please use the ${chalk.bold('--force')} flag.)
             onlyOutdated: true,
             ignoreGrafanaDependencies: false,
         });
+        await updateGoSdkAndModules(process.cwd());
         const filesToRemove = getOnlyExistingInCwd(UDPATE_CONFIG.filesToRemove);
         if (filesToRemove.length) {
             removeFilesInCwd(filesToRemove);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "5.4.0-canary.999.f39e44c.0",
+  "version": "5.4.0",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -17,7 +17,8 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "clean": "rm -rf ./dist ./generated",
@@ -87,5 +88,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "f39e44cf514af6636ecf1d48627453ee32a5e811"
+  "gitHead": "c6429b48ae503aac19c1c56f5ae2e3017514c6cb"
 }

package/src/commands/generate.command.ts

@@ -11,7 +11,7 @@ import { renderTemplateFromFile, getTemplateData } from '../utils/utils.template
 import { prettifyFiles } from '../utils/utils.prettifyFiles.js';
 import { printGenerateSuccessMessage } from './generate/print-success-message.js';
 import { promptUser } from './generate/prompt-user.js';
-import { updateGoSdkAndModules } from './generate/update-go-sdk-and-packages.js';
+import { updateGoSdkAndModules } from '../utils/utils.goSdk.js';
 import { TemplateData } from '../types.js';
 
 export const generate = async (argv: minimist.ParsedArgs) => {

package/src/commands/update.command.ts

@@ -1,13 +1,14 @@
-import minimist from 'minimist';
 import chalk from 'chalk';
-import { printRedBox, printBlueBox } from '../utils/utils.console.js';
-import { updatePackageJson, updateNpmScripts } from '../utils/utils.npm.js';
-import { isGitDirectory, isGitDirectoryClean } from '../utils/utils.git.js';
-import { isPluginDirectory, updateDotConfigFolder } from '../utils/utils.plugin.js';
-import { getVersion, getGrafanaRuntimeVersion } from '../utils/utils.version.js';
-import { getPackageManagerFromUserAgent } from '../utils/utils.packageManager.js';
+import minimist from 'minimist';
 import { UDPATE_CONFIG } from '../constants.js';
+import { printBlueBox, printRedBox } from '../utils/utils.console.js';
 import { getOnlyExistingInCwd, removeFilesInCwd } from '../utils/utils.files.js';
+import { isGitDirectory, isGitDirectoryClean } from '../utils/utils.git.js';
+import { updateGoSdkAndModules } from '../utils/utils.goSdk.js';
+import { updateNpmScripts, updatePackageJson } from '../utils/utils.npm.js';
+import { getPackageManagerFromUserAgent } from '../utils/utils.packageManager.js';
+import { isPluginDirectory, updateDotConfigFolder } from '../utils/utils.plugin.js';
+import { getGrafanaRuntimeVersion, getVersion } from '../utils/utils.version.js';
 
 export const update = async (argv: minimist.ParsedArgs) => {
   const { packageManagerName } = getPackageManagerFromUserAgent();
@@ -55,6 +56,7 @@ In case you want to proceed as is please use the ${chalk.bold('--force')} flag.)
       onlyOutdated: true,
       ignoreGrafanaDependencies: false,
     });
+    await updateGoSdkAndModules(process.cwd());
 
     const filesToRemove = getOnlyExistingInCwd(UDPATE_CONFIG.filesToRemove);
     if (filesToRemove.length) {

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

@@ -11,7 +11,6 @@ import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 import path from 'path';
 import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin';
 import TerserPlugin from 'terser-webpack-plugin';
-import { SubresourceIntegrityPlugin } from "webpack-subresource-integrity";
 import { type Configuration, BannerPlugin } from 'webpack';
 import LiveReloadPlugin from 'webpack-livereload-plugin';
 import VirtualModulesPlugin from 'webpack-virtual-modules';
@@ -183,7 +182,6 @@ const config = async (env): Promise<Configuration> => {
       path: path.resolve(process.cwd(), DIST_DIR),
       publicPath: `public/plugins/${pluginJson.id}/`,
       uniqueName: pluginJson.id,
-      crossOriginLoading: 'anonymous',
     },
 
     plugins: [
@@ -233,9 +231,6 @@ const config = async (env): Promise<Configuration> => {
           ],
         },
       ]),
-      new SubresourceIntegrityPlugin({
-        hashFuncNames: ["sha256"],
-      }),
       ...(env.development ? [
         new LiveReloadPlugin(),
         new ForkTsCheckerWebpackPlugin({

package/templates/common/_package.json

@@ -22,7 +22,7 @@
     "@grafana/e2e": "^11.0.4",
     "@grafana/e2e-selectors": "^11.2.0",{{/if}}
     "@grafana/eslint-config": "^7.0.0",{{#if usePlaywright}}
-    "@grafana/plugin-e2e": "^1.7.1",{{/if}}
+    "@grafana/plugin-e2e": "^1.7.2",{{/if}}
     "@grafana/tsconfig": "^2.0.0",{{#if usePlaywright}}
     "@playwright/test": "^1.41.2",{{/if}}
     "@swc/core": "^1.3.90",
@@ -31,7 +31,6 @@
     "@testing-library/jest-dom": "6.1.4",
     "@testing-library/react": "14.0.0",
     "@types/jest": "^29.5.0",
-    "@types/lodash": "^4.14.194",
     "@types/node": "^20.8.7",{{#unless useReactRouterV6}}
     "@types/react-router-dom": "^{{ reactRouterVersion }}",{{/unless}}
     "@types/testing-library__jest-dom": "5.14.8",
@@ -58,7 +57,6 @@
     "webpack": "^5.94.0",
     "webpack-cli": "^5.1.4",
     "webpack-livereload-plugin": "^3.0.2",
-    "webpack-subresource-integrity": "^5.1.0",
     "webpack-virtual-modules": "^0.6.2"
   },
   "engines": {
@@ -70,7 +68,7 @@
     "@grafana/runtime": "^11.2.0",
     "@grafana/ui": "^11.2.0",
     "@grafana/schema": "^10.4.0",{{#if_eq pluginType "scenesapp"}}
-    "@grafana/scenes": "^5.13.0",{{/if_eq}}
+    "@grafana/scenes": "^5.14.7",{{/if_eq}}
     "react": "18.2.0",
     "react-dom": "18.2.0",{{#if isAppType}}
     "react-router-dom": "^{{ reactRouterVersion }}",

package/templates/datasource/src/datasource.ts

@@ -5,13 +5,12 @@ import {
   DataQueryResponse,
   DataSourceApi,
   DataSourceInstanceSettings,
-  MutableDataFrame,
+  createDataFrame,
   FieldType,
 } from '@grafana/data';
 
 import { MyQuery, MyDataSourceOptions, DEFAULT_QUERY, DataSourceResponse } from './types';
 import { lastValueFrom } from 'rxjs';
-import _ from 'lodash';
 
 export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
   baseUrl: string;
@@ -37,7 +36,7 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
 
     // Return a constant for each query.
     const data = options.targets.map((target) => {
-      return new MutableDataFrame({
+      return createDataFrame({
         refId: target.refId,
         fields: [
           { name: 'Time', values: [from, to], type: FieldType.time },
@@ -77,7 +76,7 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
       }
     } catch (err) {
       let message = '';
-      if (_.isString(err)) {
+      if (typeof err === 'string') {
         message = err;
       } else if (isFetchError(err)) {
         message = 'Fetch error: ' + (err.statusText ? err.statusText : defaultErrorMessage);