@grafana/create-plugin 0.5.2-canary.145.f69fd70.0 → 0.5.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# v0.5.2 (Thu Nov 17 2022)
+
+#### 🐛 Bug Fix
+
+- Create-Plugin: Bump dependencies to support node 18 [#144](https://github.com/grafana/plugin-tools/pull/144) ([@jackw](https://github.com/jackw))
+- Create-Plugin: Backend template: Switch from Info to Debug level [#146](https://github.com/grafana/plugin-tools/pull/146) ([@xnyo](https://github.com/xnyo))
+
+#### Authors: 2
+
+- Giuseppe Guerra ([@xnyo](https://github.com/xnyo))
+- Jack Westbrook ([@jackw](https://github.com/jackw))
+
+---
+
 # v0.5.1 (Mon Nov 14 2022)
 
 #### 🐛 Bug Fix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "0.5.2-canary.145.f69fd70.0",
+  "version": "0.5.2",
   "main": "index.js",
   "repository": {
     "directory": "packages/create-plugin",
@@ -59,5 +59,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "f69fd70639b88d3c9a5c85473d47f1039c6aeb1f"
+  "gitHead": "33c2b874ddfd16530302004a8089162f04d12c4d"
 }

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

@@ -44,7 +44,9 @@ 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) {
-	log.DefaultLogger.Info("QueryData called", "request", req)
+	// 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()
@@ -94,7 +96,9 @@ 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) {
-	log.DefaultLogger.Info("CheckHealth called", "request", req)
+	// 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/README.md

@@ -16,12 +16,11 @@ to issues around working with the project.
 Edit the `.eslintrc` file in the project root in order to extend the ESLint configuration.
 
 **Example:**
-
 ```json
 {
   "extends": "./.config/.eslintrc",
   "rules": {
-    "react/prop-types": "off"
+      "react/prop-types": "off"
   }
 }
 ```
@@ -33,11 +32,10 @@ Edit the `.eslintrc` file in the project root in order to extend the ESLint conf
 Edit the `.prettierrc.js` file in the project root in order to extend the Prettier configuration.
 
 **Example:**
-
 ```javascript
 module.exports = {
   // Prettier configuration provided by Grafana scaffolding
-  ...require('./.config/.prettierrc.js'),
+  ...require("./.config/.prettierrc.js"),
 
   semi: false,
 };
@@ -52,23 +50,7 @@ There are two configuration in the project root that belong to Jest: `jest-setup
 **`jest-setup.js`:** A file that is run before each test file in the suite is executed. We are using it to
 set up the Jest DOM for the testing library and to apply some polyfills. ([link to Jest docs](https://jestjs.io/docs/configuration#setupfilesafterenv-array))
 
-**`jest.config.js`:** The main Jest configuration file that extends the Grafana recommended setup. ([link to Jest docs](https://jestjs.io/docs/configuration))
-
-#### ESM errors with Jest
-
-A common issue found with the current jest config involves importing an npm package which only offers an ESM build. These packages cause jest to error with `SyntaxError: Cannot use import statement outside a module`. To work around this we provide a list of known packages to pass to the `[transformIgnorePatterns](https://jestjs.io/docs/configuration#transformignorepatterns-arraystring)` jest configuration property. If need be this can be extended in the following way:
-
-```javascript
-process.env.TZ = 'UTC';
-const { grafanaESModules, nodeModulesToTransform } = require('./jest/utils');
-
-module.exports = {
-  // Jest configuration provided by Grafana
-  ...require('./.config/jest.config'),
-  // Inform jest to only transform specific node_module packages.
-  transformIgnorePatterns: [nodeModulesToTransform([...grafanaESModules, 'packageName'])],
-};
-```
+**`jest.config.js`:** The main Jest configuration file that is extending our basic Grafana-tailored setup. ([link to Jest docs](https://jestjs.io/docs/configuration))
 
 ---
 
@@ -77,7 +59,6 @@ module.exports = {
 Edit the `tsconfig.json` file in the project root in order to extend the TypeScript configuration.
 
 **Example:**
-
 ```json
 {
   "extends": "./.config/tsconfig.json",
@@ -99,7 +80,6 @@ Create a new config file that is going to extend the basic one provided by Grafa
 It can live in the project root, e.g. `webpack.config.ts`.
 
 #### 2. Merge the basic config provided by Grafana and your custom setup
-
 We are going to use [`webpack-merge`](https://github.com/survivejs/webpack-merge) for this.
 
 ```typescript
@@ -120,6 +100,7 @@ const config = async (env): Promise<Configuration> => {
 };
 
 export default config;
+
 ```
 
 #### 3. Update the `package.json` to use the new Webpack config
@@ -127,14 +108,12 @@ export default config;
 We need to update the `scripts` in the `package.json` to use the extended Webpack configuration.
 
 **Update for `build`:**
-
 ```diff
 -"build": "webpack -c ./.config/webpack/webpack.config.ts --env production",
 +"build": "webpack -c ./webpack.config.ts --env production",
 ```
 
 **Update for `dev`:**
-
 ```diff
 -"dev": "webpack -w -c ./.config/webpack/webpack.config.ts --env development",
 +"dev": "webpack -w -c ./webpack.config.ts --env development",

package/templates/common/.config/jest.config.js

@@ -5,12 +5,11 @@
  */
 
 const path = require('path');
-const { grafanaESModules, nodeModulesToTransform } = require('./jest/utils');
 
 module.exports = {
   moduleNameMapper: {
-    '\\.(css|scss|sass)$': 'identity-obj-proxy',
-    'react-inlinesvg': path.resolve(__dirname, 'jest', 'mocks', 'react-inlinesvg.tsx'),
+    "\\.(css|scss|sass)$": "identity-obj-proxy",
+    "react-inlinesvg": path.resolve(__dirname, "mocks", "react-inlinesvg.tsx"),
   },
   modulePaths: ['<rootDir>/src'],
   setupFilesAfterEnv: ['<rootDir>/jest-setup.js'],
@@ -36,7 +35,5 @@ module.exports = {
       },
     ],
   },
-  // Jest will throw `Cannot use import statement outside module` if it tries to load an
-  // ES module without it being transformed first. ./config/README.md#esm-errors-with-jest
-  transformIgnorePatterns: [nodeModulesToTransform(grafanaESModules)],
+  transformIgnorePatterns: [],
 };

package/templates/common/package.json

@@ -20,40 +20,40 @@
     "@babel/core": "^7.16.7",
     "@grafana/e2e": "{{ grafanaVersion }}",
     "@grafana/e2e-selectors": "{{ grafanaVersion }}",
-    "@grafana/eslint-config": "^2.5.0",
+    "@grafana/eslint-config": "^5.1.0",
     "@grafana/tsconfig": "^1.2.0-rc1",
     "@swc/core": "^1.2.144",
-    "@swc/helpers": "^0.3.6",
+    "@swc/helpers": "^0.4.12",
     "@swc/jest": "^0.2.20",
     "@testing-library/jest-dom": "^5.16.2",
-    "@testing-library/react": "^12.1.3",
+    "@testing-library/react": "^13.4.0",
     "@types/glob": "^8.0.0",
-    "@types/jest": "^27.4.1",
-    "@types/lodash": "latest",{{#if_eq pluginType "app"}}
+    "@types/jest": "^29.2.2",
+    "@types/lodash": "^4.14.188",{{#if_eq pluginType "app"}}
     "@types/react-router-dom": "^5.3.3",{{/if_eq}}
-    "@types/node": "^17.0.19",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
-    "copy-webpack-plugin": "^10.0.0",
-    "css-loader": "6.7.1",
-    "eslint": "^7.32.0",
+    "@types/node": "^18.11.9",
+    "@typescript-eslint/eslint-plugin": "^5.42.1",
+    "@typescript-eslint/parser": "^5.42.1",
+    "copy-webpack-plugin": "^11.0.0",
+    "css-loader": "^6.7.1",
+    "eslint": "8.26.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-jsdoc": "^36.1.0",
+    "eslint-plugin-jsdoc": "^39.6.2",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-webpack-plugin": "^3.1.1",
+    "fork-ts-checker-webpack-plugin": "^7.2.0",
     "glob": "^8.0.3",
     "identity-obj-proxy": "3.0.0",
     "jest": "27.5.0",
-    "fork-ts-checker-webpack-plugin": "^7.2.0",
     "prettier": "^2.5.0",
     "replace-in-file-webpack-plugin": "^1.0.6",
-    "sass": "1.55.0",
-    "sass-loader": "13.1.0",
+    "sass": "1.56.1",
+    "sass-loader": "13.2.0",
     "style-loader": "3.3.1",
-    "swc-loader": "^0.1.15",
-    "tsconfig-paths": "^3.12.0",
+    "swc-loader": "^0.2.3",
+    "tsconfig-paths": "^4.1.0",
     "ts-node": "^10.5.0",
     "typescript": "^4.4.0",
     "webpack": "^5.69.1",

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

@@ -1,9 +0,0 @@
-/**
- * nodeModulesToTransform
- * This utility function is useful in combination with jest `transformIgnorePatterns` config
- * to transform specific packages (e.g.ES modules) in a projects node_modules folder.
- */
-export const nodeModulesToTransform = (moduleNames: string[]) => `node_modules\/(?!(${moduleNames.join('|')})\/)`;
-
-// Array of known nested grafana package dependencies that only bundle an ESM version
-export const grafanaESModules = ['ol', 'react-colorful'];