@grafana/create-plugin 6.1.1 → 6.1.2

package/CHANGELOG.md

@@ -1,8 +1,24 @@
+# v6.1.2 (Tue Oct 21 2025)
+
+#### 🐛 Bug Fix
+
+- Create Plugin: Remove cypress support [#2232](https://github.com/grafana/plugin-tools/pull/2232) ([@sunker](https://github.com/sunker))
+- Update dependency @grafana/e2e-selectors to v12.2.0 [#2205](https://github.com/grafana/plugin-tools/pull/2205) ([@renovate[bot]](https://github.com/renovate[bot]) [@leventebalogh](https://github.com/leventebalogh) [@mckn](https://github.com/mckn))
+
+#### Authors: 4
+
+- [@renovate[bot]](https://github.com/renovate[bot])
+- Erik Sundell ([@sunker](https://github.com/sunker))
+- Levente Balogh ([@leventebalogh](https://github.com/leventebalogh))
+- Marcus Andersson ([@mckn](https://github.com/mckn))
+
+---
+
 # v6.1.1 (Wed Oct 15 2025)
 
 #### 🐛 Bug Fix
 
-- Fix: Use proper install command for legacy plugin migrations [#2221](https://github.com/grafana/plugin-tools/pull/2221) ([@sunker](https://github.com/sunker))
+- Fix: Use proper install command for legacy plugin migrations [#2221](https://github.com/grafana/plugin-tools/pull/2221) ([@sunker]https://github.com/sunker))
 
 #### Authors: 1
 

package/dist/constants.js

@@ -1,5 +1,5 @@
-import path from 'node:path';
 import { fileURLToPath } from 'node:url';
+import path from 'node:path';
 
 const __dirname = fileURLToPath(new URL(".", import.meta.url));
 const IS_DEV = process.env.CREATE_PLUGIN_DEV !== void 0;
@@ -32,18 +32,10 @@ const EXTRA_TEMPLATE_VARIABLES = {
 const DEFAULT_FEATURE_FLAGS = {
   useReactRouterV6: true,
   bundleGrafanaUI: false,
-  usePlaywright: true,
   useExperimentalRspack: false,
   useExperimentalUpdates: true
 };
-const GRAFANA_FE_PACKAGES = [
-  "@grafana/data",
-  "@grafana/e2e-selectors",
-  "@grafana/e2e",
-  "@grafana/runtime",
-  "@grafana/schema",
-  "@grafana/ui"
-];
+const GRAFANA_FE_PACKAGES = ["@grafana/data", "@grafana/runtime", "@grafana/schema", "@grafana/ui"];
 const MIGRATION_CONFIG = {
   // Files that should be overriden during a migration.
   // (paths are relative to the scaffolded projects root)

package/dist/utils/utils.config.js

@@ -1,11 +1,11 @@
-import fs from 'node:fs';
-import { writeFile } from 'node:fs/promises';
-import path from 'node:path';
-import { CURRENT_APP_VERSION } from './utils.version.js';
 import { argv, commandName } from './utils.cli.js';
+import { CURRENT_APP_VERSION } from './utils.version.js';
 import { DEFAULT_FEATURE_FLAGS } from '../constants.js';
+import fs from 'node:fs';
 import { output } from './utils.console.js';
 import { partitionArr } from './utils.helpers.js';
+import path from 'node:path';
+import { writeFile } from 'node:fs/promises';
 
 let hasShownConfigWarnings = false;
 function getConfig(workDir = process.cwd()) {

package/dist/utils/utils.templates.js

@@ -1,15 +1,14 @@
-import { lt } from 'semver';
-import { glob } from 'glob';
-import path from 'node:path';
-import fs from 'node:fs';
+import { DEFAULT_FEATURE_FLAGS, EXTRA_TEMPLATE_VARIABLES, PLUGIN_TYPES, TEMPLATE_PATHS, EXPORT_PATH_PREFIX } from '../constants.js';
 import { isFile, getExportFileName, filterOutCommonFiles, isFileStartingWith } from './utils.files.js';
+import { getPackageManagerFromUserAgent, getPackageManagerInstallCmd, getPackageManagerWithFallback } from './utils.packageManager.js';
 import { normalizeId, renderHandlebarsTemplate } from './utils.handlebars.js';
-import { getPluginJson } from './utils.plugin.js';
+import { CURRENT_APP_VERSION } from './utils.version.js';
 import { debug } from './utils.cli.js';
-import { DEFAULT_FEATURE_FLAGS, EXTRA_TEMPLATE_VARIABLES, PLUGIN_TYPES, TEMPLATE_PATHS, EXPORT_PATH_PREFIX } from '../constants.js';
-import { getPackageManagerFromUserAgent, getPackageManagerInstallCmd, getPackageManagerWithFallback } from './utils.packageManager.js';
-import { getGrafanaRuntimeVersion, CURRENT_APP_VERSION } from './utils.version.js';
+import fs from 'node:fs';
 import { getConfig } from './utils.config.js';
+import { getPluginJson } from './utils.plugin.js';
+import { glob } from 'glob';
+import path from 'node:path';
 
 const templatesDebugger = debug.extend("templates");
 function getTemplateFiles(pluginType, filter) {
@@ -57,9 +56,6 @@ function renderTemplateFromFile(templateFile, data) {
 function getTemplateData(cliArgs) {
   const { features } = getConfig();
   const currentVersion = CURRENT_APP_VERSION;
-  const grafanaVersion = getGrafanaRuntimeVersion();
-  const usePlaywright = features.usePlaywright === true || isFile(path.join(process.cwd(), "playwright.config.ts"));
-  const useCypress = !usePlaywright && lt(grafanaVersion, "11.0.0") && fs.existsSync(path.join(process.cwd(), "cypress"));
   const bundleGrafanaUI = features.bundleGrafanaUI ?? DEFAULT_FEATURE_FLAGS.bundleGrafanaUI;
   const getReactRouterVersion = () => features.useReactRouterV6 ? "6.22.0" : "5.2.0";
   const isAppType = (pluginType) => pluginType === PLUGIN_TYPES.app || pluginType === PLUGIN_TYPES.scenes;
@@ -86,8 +82,6 @@ function getTemplateData(cliArgs) {
       useReactRouterV6: features.useReactRouterV6 ?? DEFAULT_FEATURE_FLAGS.useReactRouterV6,
       reactRouterVersion: getReactRouterVersion(),
       scenesVersion: features.useReactRouterV6 ? "^6.10.4" : "^5.41.3",
-      usePlaywright,
-      useCypress,
       useExperimentalRspack: Boolean(features.useExperimentalRspack),
       frontendBundler
     };
@@ -111,8 +105,6 @@ function getTemplateData(cliArgs) {
       useReactRouterV6: features.useReactRouterV6 ?? DEFAULT_FEATURE_FLAGS.useReactRouterV6,
       reactRouterVersion: getReactRouterVersion(),
       scenesVersion: features.useReactRouterV6 ? "^6.10.4" : "^5.41.3",
-      usePlaywright,
-      useCypress,
       pluginExecutable: pluginJson.executable,
       useExperimentalRspack: Boolean(features.useExperimentalRspack),
       frontendBundler

package/dist/utils/utils.version.js

@@ -1,14 +1,8 @@
-import { readFileSync } from 'node:fs';
-import path from 'node:path';
+import 'node:fs';
+import 'node:path';
 import { getVersion } from '../libs/version/src/index.js';
-import { TEMPLATE_PATHS } from '../constants.js';
+import '../constants.js';
 
 const CURRENT_APP_VERSION = getVersion();
-function getGrafanaRuntimeVersion() {
-  const packageJsonPath = path.join(TEMPLATE_PATHS.common, "_package.json");
-  const pkg = readFileSync(packageJsonPath, "utf8");
-  const { version } = /\"(@grafana\/runtime)\":\s\"\^(?<version>.*)\"/.exec(pkg)?.groups ?? {};
-  return version;
-}
 
-export { CURRENT_APP_VERSION, getGrafanaRuntimeVersion };
+export { CURRENT_APP_VERSION };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -61,5 +61,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "6b891abe4df5c9c3c1e191b5286298182efa70a0"
+  "gitHead": "2922302c07d4bee23f4b4f13abafeef3274f4c30"
 }

package/src/constants.ts

@@ -1,5 +1,5 @@
-import path from 'node:path';
 import { fileURLToPath } from 'node:url';
+import path from 'node:path';
 
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
@@ -51,19 +51,11 @@ export const EXTRA_TEMPLATE_VARIABLES = {
 export const DEFAULT_FEATURE_FLAGS = {
   useReactRouterV6: true,
   bundleGrafanaUI: false,
-  usePlaywright: true,
   useExperimentalRspack: false,
   useExperimentalUpdates: true,
 };
 
-export const GRAFANA_FE_PACKAGES = [
-  '@grafana/data',
-  '@grafana/e2e-selectors',
-  '@grafana/e2e',
-  '@grafana/runtime',
-  '@grafana/schema',
-  '@grafana/ui',
-];
+export const GRAFANA_FE_PACKAGES = ['@grafana/data', '@grafana/runtime', '@grafana/schema', '@grafana/ui'];
 
 export const MIGRATION_CONFIG = {
   // Files that should be overriden during a migration.

package/src/types.ts

@@ -25,8 +25,6 @@ export type TemplateData = {
   useReactRouterV6: boolean;
   scenesVersion: string;
   reactRouterVersion: string;
-  usePlaywright: boolean;
-  useCypress: boolean;
   useExperimentalRspack: boolean;
   pluginExecutable?: string;
   frontendBundler: 'webpack' | 'rspack';

package/src/utils/utils.config.ts

@@ -1,11 +1,12 @@
-import fs from 'node:fs';
-import { writeFile } from 'node:fs/promises';
-import path from 'node:path';
-import { CURRENT_APP_VERSION } from './utils.version.js';
 import { argv, commandName } from './utils.cli.js';
+
+import { CURRENT_APP_VERSION } from './utils.version.js';
 import { DEFAULT_FEATURE_FLAGS } from '../constants.js';
+import fs from 'node:fs';
 import { output } from './utils.console.js';
 import { partitionArr } from './utils.helpers.js';
+import path from 'node:path';
+import { writeFile } from 'node:fs/promises';
 
 export type FeatureFlags = {
   bundleGrafanaUI?: boolean;
@@ -13,7 +14,6 @@ export type FeatureFlags = {
   // If set to true, the plugin will be scaffolded with React Router v6. Defaults to true.
   // (Attention! We always scaffold new projects with React Router v6, so if you are changing this to `false` manually you will need to make changes to the React code as well.)
   useReactRouterV6?: boolean;
-  usePlaywright?: boolean;
   useExperimentalRspack?: boolean;
   useExperimentalUpdates?: boolean;
 };

package/src/utils/utils.templates.ts

@@ -1,27 +1,27 @@
-import { lt as semverLt } from 'semver';
-import { glob } from 'glob';
-import path from 'node:path';
-import fs from 'node:fs';
-import { filterOutCommonFiles, isFile, isFileStartingWith } from './utils.files.js';
-import { normalizeId, renderHandlebarsTemplate } from './utils.handlebars.js';
-import { getPluginJson } from './utils.plugin.js';
-import { debug } from './utils.cli.js';
 import {
-  TEMPLATE_PATHS,
+  DEFAULT_FEATURE_FLAGS,
   EXPORT_PATH_PREFIX,
   EXTRA_TEMPLATE_VARIABLES,
   PLUGIN_TYPES,
-  DEFAULT_FEATURE_FLAGS,
+  TEMPLATE_PATHS,
 } from '../constants.js';
 import { GenerateCliArgs, TemplateData } from '../types.js';
+import { filterOutCommonFiles, isFile, isFileStartingWith } from './utils.files.js';
 import {
+  getPackageManagerFromUserAgent,
   getPackageManagerInstallCmd,
   getPackageManagerWithFallback,
-  getPackageManagerFromUserAgent,
 } from './utils.packageManager.js';
-import { getExportFileName } from '../utils/utils.files.js';
-import { getGrafanaRuntimeVersion, CURRENT_APP_VERSION } from './utils.version.js';
+import { normalizeId, renderHandlebarsTemplate } from './utils.handlebars.js';
+
+import { CURRENT_APP_VERSION } from './utils.version.js';
+import { debug } from './utils.cli.js';
+import fs from 'node:fs';
 import { getConfig } from './utils.config.js';
+import { getExportFileName } from '../utils/utils.files.js';
+import { getPluginJson } from './utils.plugin.js';
+import { glob } from 'glob';
+import path from 'node:path';
 
 const templatesDebugger = debug.extend('templates');
 
@@ -95,11 +95,6 @@ export function renderTemplateFromFile(templateFile: string, data?: any) {
 export function getTemplateData(cliArgs?: GenerateCliArgs): TemplateData {
   const { features } = getConfig();
   const currentVersion = CURRENT_APP_VERSION;
-  const grafanaVersion = getGrafanaRuntimeVersion();
-  const usePlaywright = features.usePlaywright === true || isFile(path.join(process.cwd(), 'playwright.config.ts'));
-  //@grafana/e2e was deprecated in Grafana 11
-  const useCypress =
-    !usePlaywright && semverLt(grafanaVersion, '11.0.0') && fs.existsSync(path.join(process.cwd(), 'cypress'));
   const bundleGrafanaUI = features.bundleGrafanaUI ?? DEFAULT_FEATURE_FLAGS.bundleGrafanaUI;
   const getReactRouterVersion = () => (features.useReactRouterV6 ? '6.22.0' : '5.2.0');
   const isAppType = (pluginType: string) => pluginType === PLUGIN_TYPES.app || pluginType === PLUGIN_TYPES.scenes;
@@ -130,8 +125,6 @@ export function getTemplateData(cliArgs?: GenerateCliArgs): TemplateData {
       useReactRouterV6: features.useReactRouterV6 ?? DEFAULT_FEATURE_FLAGS.useReactRouterV6,
       reactRouterVersion: getReactRouterVersion(),
       scenesVersion: features.useReactRouterV6 ? '^6.10.4' : '^5.41.3',
-      usePlaywright,
-      useCypress,
       useExperimentalRspack: Boolean(features.useExperimentalRspack),
       frontendBundler,
     };
@@ -158,8 +151,6 @@ export function getTemplateData(cliArgs?: GenerateCliArgs): TemplateData {
       useReactRouterV6: features.useReactRouterV6 ?? DEFAULT_FEATURE_FLAGS.useReactRouterV6,
       reactRouterVersion: getReactRouterVersion(),
       scenesVersion: features.useReactRouterV6 ? '^6.10.4' : '^5.41.3',
-      usePlaywright,
-      useCypress,
       pluginExecutable: pluginJson.executable,
       useExperimentalRspack: Boolean(features.useExperimentalRspack),
       frontendBundler,

package/templates/common/_package.json

@@ -8,22 +8,18 @@
     "test:ci": "jest --passWithNoTests --maxWorkers 4",
     "typecheck": "tsc --noEmit",
     "lint": "eslint --cache .",
-    "lint:fix": "{{ packageManagerName }} run lint{{#if isNPM}} --{{/if}} --fix && prettier --write --list-different .",{{#if usePlaywright}}
-    "e2e": "playwright test",{{/if}}{{#if useCypress}}
-    "e2e": "{{ packageManagerName }} exec cypress install && {{ packageManagerName }} exec grafana-e2e run",
-    "e2e:update": "{{ packageManagerName }} exec cypress install && {{ packageManagerName }} exec grafana-e2e run --update-screenshots",{{/if}}
+    "lint:fix": "{{ packageManagerName }} run lint{{#if isNPM}} --{{/if}} --fix && prettier --write --list-different .",
+    "e2e": "playwright test",
     "server": "docker compose up --build",
     "sign": "npx --yes @grafana/sign-plugin@latest"
   },
   "author": "{{ sentenceCase orgName }}",
   "license": "Apache-2.0",
   "devDependencies": {
-{{#if useCypress}}    "@grafana/e2e": "^11.0.7",
-    "@grafana/e2e-selectors": "^12.1.1",{{/if}}
-    "@grafana/eslint-config": "^8.2.0",{{#if usePlaywright}}
-    "@grafana/plugin-e2e": "^2.2.0",{{/if}}
-    "@grafana/tsconfig": "^2.0.0",{{#if usePlaywright}}
-    "@playwright/test": "^1.52.0",{{/if}}{{#if useExperimentalRspack}}
+    "@grafana/eslint-config": "^8.2.0",
+    "@grafana/plugin-e2e": "^2.2.0",
+    "@grafana/tsconfig": "^2.0.0",
+    "@playwright/test": "^1.52.0",{{#if useExperimentalRspack}}
     "@rspack/core": "^1.3.0",
     "@rspack/cli": "^1.3.0",{{/if}}
     "@stylistic/eslint-plugin-ts": "^2.9.0",
@@ -56,8 +52,8 @@
     "replace-in-file-webpack-plugin": "^1.0.6",{{#if useExperimentalRspack}}
     "rspack-plugin-virtual-module": "^0.1.13",{{/if}}
     "sass": "1.63.2",
-    "sass-loader": "13.3.1",{{#if usePlaywright}}
-    "semver": "^7.6.3",{{/if}}
+    "sass-loader": "13.3.1",
+    "semver": "^7.6.3",
     "style-loader": "3.3.3",{{#unless useExperimentalRspack}}
     "swc-loader": "^0.2.3",{{/unless}}
     "terser-webpack-plugin": "^5.3.10",

package/templates/common/npmrc

@@ -10,6 +10,3 @@ public-hoist-pattern[]="*prettier*"
 # Hoist all types packages to the root for better TS support
 public-hoist-pattern[]="@types/*"
 public-hoist-pattern[]="*terser-webpack-plugin*"
-{{#unless usePlaywright}}
-# @grafana/e2e expects cypress to exist in the root of the node_modules directory
-public-hoist-pattern[]="*cypress*"{{/unless}}