@grafana/create-plugin 6.4.2 → 6.4.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# v6.4.3 (Fri Dec 05 2025)
+
+#### 🐛 Bug Fix
+
+- fix: only migrate eslint if plugin depends on eslint < 9.0.0 [#2338](https://github.com/grafana/plugin-tools/pull/2338) ([@jackw](https://github.com/jackw))
+- Update dependency @grafana/plugin-e2e to v3.0.3 [#2335](https://github.com/grafana/plugin-tools/pull/2335) ([@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot]))
+
+#### Authors: 2
+
+- [@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot])
+- Jack Westbrook ([@jackw](https://github.com/jackw))
+
+---
+
 # v6.4.2 (Thu Nov 27 2025)
 
 #### 🐛 Bug Fix

package/dist/codemods/migrations/scripts/004-eslint9-flat-config.js

@@ -4,7 +4,7 @@ import { parse } from 'jsonc-parser';
 import minimist from 'minimist';
 import { resolve, dirname, relative } from 'node:path';
 import * as recast from 'recast';
-import { addDependenciesToPackageJson, migrationsDebug } from '../../utils.js';
+import { isVersionGreater, addDependenciesToPackageJson, migrationsDebug } from '../../utils.js';
 
 const { builders } = recast.types;
 const legacyKeysToCopy = ["rules", "settings"];
@@ -18,7 +18,8 @@ const devDependenciesToUpdate = {
   "eslint-webpack-plugin": "^5.0.0"
 };
 function migrate(context) {
-  const needsMigration = context.doesFileExist(".eslintrc");
+  const packageJson = JSON.parse(context.getFile("package.json") || "");
+  const needsMigration = isVersionGreater(devDependenciesToUpdate.eslint, packageJson.devDependencies?.eslint);
   if (!needsMigration) {
     return context;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "6.4.2",
+  "version": "6.4.3",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -56,5 +56,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "7e86d444bc62f9a416e491932475e45170aad4fd"
+  "gitHead": "89b6bb2341555a8f965c88e5af71fa5bbc16537c"
 }

package/src/codemods/migrations/scripts/004-eslint9-flat-config.test.ts

@@ -2,9 +2,22 @@ import migrate from './004-eslint9-flat-config.js';
 import { Context } from '../../context.js';
 
 describe('004-eslint9-flat-config', () => {
+  let context: Context;
+
+  beforeEach(() => {
+    context = new Context('/virtual');
+  });
+
   describe('migration', () => {
     it('should migrate default create-plugin scaffolded configs', async () => {
-      const context = new Context('/virtual');
+      context.addFile(
+        'package.json',
+        JSON.stringify({
+          devDependencies: {
+            eslint: '^8.0.0',
+          },
+        })
+      );
       context.addFile('.eslintrc', JSON.stringify({ extends: ['./.config/.eslintrc'] }));
       context.addFile(
         '.config/.eslintrc',
@@ -73,11 +86,15 @@ describe('004-eslint9-flat-config', () => {
     });
 
     it('should migrate legacy eslint config with ignore patterns', async () => {
-      const context = new Context('/virtual');
       context.addFile('.eslintrc', JSON.stringify({ rules: { 'no-console': 'error' } }));
       context.addFile(
         'package.json',
-        JSON.stringify({ scripts: { lint: 'eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .' } })
+        JSON.stringify({
+          scripts: { lint: 'eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .' },
+          devDependencies: {
+            eslint: '^8.0.0',
+          },
+        })
       );
       context.addFile('.eslintignore', '*.test.ts');
       context.addFile('.gitignore', ['.github', '.vscode', 'playwright-report', '**/dist'].join('\n'));
@@ -103,8 +120,14 @@ describe('004-eslint9-flat-config', () => {
     });
 
     it('should attempt to migrate eslint configs with extends, plugins, rules, and overrides', async () => {
-      const context = new Context('/virtual');
-
+      context.addFile(
+        'package.json',
+        JSON.stringify({
+          devDependencies: {
+            eslint: '^8.0.0',
+          },
+        })
+      );
       context.addFile(
         '.eslintrc',
         JSON.stringify(
@@ -165,7 +188,6 @@ describe('004-eslint9-flat-config', () => {
     });
 
     it('should update package.json scripts and devDependencies', async () => {
-      const context = new Context('/virtual');
       context.addFile(
         'package.json',
         JSON.stringify({
@@ -217,7 +239,14 @@ describe('004-eslint9-flat-config', () => {
     });
 
     it('should not make additional changes when run multiple times', async () => {
-      const context = new Context('/virtual');
+      context.addFile(
+        'package.json',
+        JSON.stringify({
+          devDependencies: {
+            eslint: '^8.0.0',
+          },
+        })
+      );
       context.addFile('.eslintrc', JSON.stringify({ extends: ['./.config/.eslintrc'] }));
       context.addFile(
         '.config/.eslintrc',
@@ -226,5 +255,55 @@ describe('004-eslint9-flat-config', () => {
 
       await expect(migrate).toBeIdempotent(context);
     });
+
+    it('should not migrate when eslint version is already at target version', async () => {
+      const originalPackageJson = JSON.stringify({
+        devDependencies: {
+          eslint: '^9.0.0',
+        },
+      });
+      context.addFile('package.json', originalPackageJson);
+      context.addFile('.eslintrc', JSON.stringify({ extends: ['@grafana/eslint-config'] }));
+
+      const result = await migrate(context);
+
+      // Migration should not run - no flat config created, legacy config remains, package.json unchanged
+      expect(result.getFile('eslint.config.mjs')).toBeUndefined();
+      expect(result.getFile('.eslintrc')).toBeDefined();
+      expect(result.getFile('package.json')).toEqual(originalPackageJson);
+    });
+
+    it('should not migrate when eslint version is newer than target version', async () => {
+      const originalPackageJson = JSON.stringify({
+        devDependencies: {
+          eslint: '^10.0.0',
+        },
+      });
+      context.addFile('package.json', originalPackageJson);
+      context.addFile('.eslintrc', JSON.stringify({ extends: ['@grafana/eslint-config'] }));
+
+      const result = await migrate(context);
+
+      // Migration should not run - no flat config created, legacy config remains, package.json unchanged
+      expect(result.getFile('eslint.config.mjs')).toBeUndefined();
+      expect(result.getFile('.eslintrc')).toBeDefined();
+      expect(result.getFile('package.json')).toEqual(originalPackageJson);
+    });
+
+    it('should migrate when eslint version is older than target version', async () => {
+      context.addFile(
+        'package.json',
+        JSON.stringify({
+          devDependencies: {
+            eslint: '^8.57.0',
+          },
+        })
+      );
+      context.addFile('.eslintrc', JSON.stringify({ extends: ['@grafana/eslint-config'] }));
+
+      const result = await migrate(context);
+      expect(result.getFile('eslint.config.mjs')).toBeDefined();
+      expect(result.getFile('.eslintrc')).toBeUndefined();
+    });
   });
 });

package/src/codemods/migrations/scripts/004-eslint9-flat-config.ts

@@ -6,7 +6,7 @@ import minimist from 'minimist';
 import { dirname, relative, resolve } from 'node:path';
 import * as recast from 'recast';
 import type { Context } from '../../context.js';
-import { addDependenciesToPackageJson, migrationsDebug } from '../../utils.js';
+import { addDependenciesToPackageJson, isVersionGreater, migrationsDebug } from '../../utils.js';
 
 type Imports = Map<string, { name?: string; bindings?: string[] }>;
 
@@ -23,7 +23,8 @@ const devDependenciesToUpdate = {
 };
 
 export default function migrate(context: Context): Context {
-  const needsMigration = context.doesFileExist('.eslintrc');
+  const packageJson = JSON.parse(context.getFile('package.json') || '');
+  const needsMigration = isVersionGreater(devDependenciesToUpdate.eslint, packageJson.devDependencies?.eslint);
   if (!needsMigration) {
     return context;
   }

package/templates/common/_package.json

@@ -17,7 +17,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@grafana/eslint-config": "^9.0.0",
-    "@grafana/plugin-e2e": "^3.0.1",
+    "@grafana/plugin-e2e": "^3.0.3",
     "@grafana/tsconfig": "^2.0.1",
     "@playwright/test": "^1.52.0",{{#if useExperimentalRspack}}
     "@rspack/core": "^1.3.0",