@grafana/create-plugin 6.2.0-canary.2283.19226023221.0 → 6.2.0-canary.2314.19503588692.0

package/CHANGELOG.md

@@ -1,3 +1,77 @@
+# v6.1.14 (Wed Nov 19 2025)
+
+#### 🐛 Bug Fix
+
+- Create plugin: Update go templates [#2313](https://github.com/grafana/plugin-tools/pull/2313) ([@jackw](https://github.com/jackw))
+
+#### Authors: 1
+
+- Jack Westbrook ([@jackw](https://github.com/jackw))
+
+---
+
+# v6.1.13 (Wed Nov 19 2025)
+
+#### 🐛 Bug Fix
+
+- Create Plugin: remove types/testing-library__jest-dom [#2250](https://github.com/grafana/plugin-tools/pull/2250) ([@jackw](https://github.com/jackw))
+
+#### Authors: 1
+
+- Jack Westbrook ([@jackw](https://github.com/jackw))
+
+---
+
+# v6.1.12 (Mon Nov 17 2025)
+
+#### 🐛 Bug Fix
+
+- Create Plugin: fix replacing version and plugin id in nested plugins [#2287](https://github.com/grafana/plugin-tools/pull/2287) ([@jackw](https://github.com/jackw))
+
+#### Authors: 1
+
+- Jack Westbrook ([@jackw](https://github.com/jackw))
+
+---
+
+# v6.1.11 (Fri Nov 14 2025)
+
+#### 🐛 Bug Fix
+
+- chore(deps): update create-plugin template github actions [#2301](https://github.com/grafana/plugin-tools/pull/2301) ([@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot]))
+- chore(deps): update dependency @grafana/eslint-config to v9 [#2285](https://github.com/grafana/plugin-tools/pull/2285) ([@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot]) [@jackw](https://github.com/jackw))
+
+#### Authors: 2
+
+- [@renovate-sh-app[bot]](https://github.com/renovate-sh-app[bot])
+- Jack Westbrook ([@jackw](https://github.com/jackw))
+
+---
+
+# v6.1.10 (Thu Nov 13 2025)
+
+#### 🐛 Bug Fix
+
+- Feat: use latest create-plugin-update workflow [#2299](https://github.com/grafana/plugin-tools/pull/2299) ([@jackw](https://github.com/jackw))
+
+#### Authors: 1
+
+- Jack Westbrook ([@jackw](https://github.com/jackw))
+
+---
+
+# v6.1.9 (Wed Nov 12 2025)
+
+#### 🐛 Bug Fix
+
+- Create plugin: use react 18.3.x [#2283](https://github.com/grafana/plugin-tools/pull/2283) ([@jackw](https://github.com/jackw))
+
+#### Authors: 1
+
+- Jack Westbrook ([@jackw](https://github.com/jackw))
+
+---
+
 # v6.1.8 (Fri Nov 07 2025)
 
 ### Release Notes

package/dist/migrations/migrations.js

@@ -23,9 +23,19 @@ var defaultMigrations = {
       migrationScript: "./scripts/004-eslint9-flat-config.js"
     },
     "005-react-18-3": {
-      version: "6.1.7-beta.1",
+      version: "6.1.9",
       description: "Update React and ReactDOM 18.x versions to ^18.3.0 to surface React 19 compatibility issues.",
       migrationScript: "./scripts/005-react-18-3.js"
+    },
+    "006-webpack-nested-fix": {
+      version: "6.1.11",
+      description: "Fix webpack variable replacement in nested plugins files.",
+      migrationScript: "./scripts/006-webpack-nested-fix.js"
+    },
+    "007-remove-testing-library-types": {
+      version: "6.1.13",
+      description: "Add setupTests.d.ts for @testing-library/jest-dom types and remove @types/testing-library__jest-dom npm package.",
+      migrationScript: "./scripts/007-remove-testing-library-types.js"
     }
   }
 };

package/dist/migrations/scripts/006-webpack-nested-fix.js

@@ -0,0 +1,80 @@
+import { join } from 'node:path';
+import * as recast from 'recast';
+import * as typeScriptParser from 'recast/parsers/typescript.js';
+
+const { builders } = recast.types;
+function migrate(context) {
+  const webpackConfigPath = join(".config", "webpack", "webpack.config.ts");
+  if (!context.doesFileExist(webpackConfigPath)) {
+    return context;
+  }
+  const webpackConfigContent = context.getFile(webpackConfigPath);
+  if (!webpackConfigContent) {
+    return context;
+  }
+  let hasChanges = false;
+  const ast = recast.parse(webpackConfigContent, {
+    parser: typeScriptParser
+  });
+  recast.visit(ast, {
+    visitNewExpression(path) {
+      const { node } = path;
+      if (node.callee.type === "Identifier" && node.callee.name === "ReplaceInFileWebpackPlugin" && node.arguments.length > 0) {
+        const firstArg = node.arguments[0];
+        if (firstArg.type === "ArrayExpression" && firstArg.elements) {
+          firstArg.elements.forEach((element) => {
+            if (element && element.type === "ObjectExpression") {
+              const changed = transformFilesProperty(element);
+              if (changed) {
+                hasChanges = true;
+              }
+            }
+          });
+        }
+      }
+      return this.traverse(path);
+    }
+  });
+  if (hasChanges) {
+    const output = recast.print(ast, {
+      tabWidth: 2,
+      trailingComma: true,
+      lineTerminator: "\n"
+    });
+    context.updateFile(webpackConfigPath, output.code);
+  }
+  return context;
+}
+function transformFilesProperty(objectExpression) {
+  const properties = objectExpression.properties;
+  if (!properties) {
+    return false;
+  }
+  const filesPropertyIndex = properties.findIndex(
+    (prop) => (prop.type === "Property" || prop.type === "ObjectProperty") && prop.key.type === "Identifier" && prop.key.name === "files"
+  );
+  if (filesPropertyIndex === -1) {
+    return false;
+  }
+  const filesProperty = properties[filesPropertyIndex];
+  if (filesProperty.type !== "Property" && filesProperty.type !== "ObjectProperty" || !("value" in filesProperty)) {
+    return false;
+  }
+  if (filesProperty.value.type === "ArrayExpression" && filesProperty.value.elements.length === 2) {
+    const elements = filesProperty.value.elements;
+    const values = elements.map((el) => el?.type === "Literal" || el?.type === "StringLiteral" ? el?.value : null).filter((v) => v !== null);
+    if (values.length === 2 && values.includes("plugin.json") && values.includes("README.md")) {
+      properties.splice(filesPropertyIndex, 1);
+      const testProperty = builders.property(
+        "init",
+        builders.identifier("test"),
+        builders.arrayExpression([builders.literal(/(^|\/)plugin\.json$/), builders.literal(/(^|\/)README\.md$/)])
+      );
+      properties.splice(filesPropertyIndex, 0, testProperty);
+      return true;
+    }
+  }
+  return false;
+}
+
+export { migrate as default };

package/dist/migrations/scripts/007-remove-testing-library-types.js

@@ -0,0 +1,25 @@
+import { isVersionGreater, removeDependenciesFromPackageJson } from '../utils.js';
+
+function migrate(context) {
+  if (context.doesFileExist("package.json")) {
+    const packageJson = JSON.parse(context.getFile("package.json") || "{}");
+    if (isVersionGreater(packageJson.devDependencies["@testing-library/jest-dom"], "6.0.0", true)) {
+      if (context.doesFileExist("./.config/types/setupTests.d.ts")) {
+        const setupTestsContent = context.getFile("./.config/types/setupTests.d.ts");
+        if (!setupTestsContent?.includes("@testing-library/jest-dom")) {
+          context.updateFile(
+            "./.config/types/setupTests.d.ts",
+            `import '@testing-library/jest-dom';
+${setupTestsContent}`
+          );
+        }
+      } else {
+        context.addFile("./.config/types/setupTests.d.ts", "import '@testing-library/jest-dom';\n");
+      }
+      removeDependenciesFromPackageJson(context, [], ["@types/testing-library__jest-dom"]);
+    }
+  }
+  return context;
+}
+
+export { migrate as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "6.2.0-canary.2283.19226023221.0",
+  "version": "6.2.0-canary.2314.19503588692.0",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -25,6 +25,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
+    "@babel/parser": "^7.28.5",
     "@ivanmaxlogiudice/gitignore": "^0.0.2",
     "chalk": "^5.3.0",
     "change-case": "^5.4.0",
@@ -59,5 +60,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "b99d0d3685fce01c64f6aa865ee1944e7fe849d1"
+  "gitHead": "b9573cf309c5c96eb18b90a871862c4279398902"
 }

package/src/migrations/migrations.ts

@@ -36,9 +36,20 @@ export default {
       migrationScript: './scripts/004-eslint9-flat-config.js',
     },
     '005-react-18-3': {
-      version: '6.1.7-beta.1',
+      version: '6.1.9',
       description: 'Update React and ReactDOM 18.x versions to ^18.3.0 to surface React 19 compatibility issues.',
       migrationScript: './scripts/005-react-18-3.js',
     },
+    '006-webpack-nested-fix': {
+      version: '6.1.11',
+      description: 'Fix webpack variable replacement in nested plugins files.',
+      migrationScript: './scripts/006-webpack-nested-fix.js',
+    },
+    '007-remove-testing-library-types': {
+      version: '6.1.13',
+      description:
+        'Add setupTests.d.ts for @testing-library/jest-dom types and remove @types/testing-library__jest-dom npm package.',
+      migrationScript: './scripts/007-remove-testing-library-types.js',
+    },
   },
 } as Migrations;

package/src/migrations/scripts/006-webpack-nested-fix.test.ts

@@ -0,0 +1,169 @@
+import migrate from './006-webpack-nested-fix.js';
+import { createDefaultContext } from '../test-utils.js';
+
+describe('Migration - webpack nested fix', () => {
+  test('should transform files property to test property', () => {
+    const context = createDefaultContext();
+
+    const webpackConfigContent = `
+import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin';
+
+const config = {
+  plugins: [
+    new ReplaceInFileWebpackPlugin([
+      {
+        dir: 'dist',
+        files: ['plugin.json', 'README.md'],
+        rules: [
+          { search: /VERSION/g, replace: '1.0.0' }
+        ]
+      }
+    ])
+  ]
+};
+`;
+
+    context.addFile('.config/webpack/webpack.config.ts', webpackConfigContent);
+
+    const updatedContext = migrate(context);
+    const webpackConfig = updatedContext.getFile('.config/webpack/webpack.config.ts');
+
+    expect(webpackConfig).toContain('test: [/(^|\\/)plugin\\.json$/, /(^|\\/)README\\.md$/]');
+    expect(webpackConfig).not.toContain('files:');
+    expect(webpackConfig).toContain('dir:');
+    expect(webpackConfig).toContain('rules:');
+  });
+
+  test('should not transform if files array has different values', () => {
+    const context = createDefaultContext();
+
+    const webpackConfigContent = `
+import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin';
+
+const config = {
+  plugins: [
+    new ReplaceInFileWebpackPlugin([
+      {
+        dir: 'dist',
+        files: ['custom.json', 'other.md'],
+        rules: []
+      }
+    ])
+  ]
+};
+`;
+
+    context.addFile('.config/webpack/webpack.config.ts', webpackConfigContent);
+
+    const updatedContext = migrate(context);
+    const webpackConfig = updatedContext.getFile('.config/webpack/webpack.config.ts');
+
+    expect(webpackConfig).toBe(webpackConfigContent);
+  });
+
+  test('should not transform if already using test property', () => {
+    const context = createDefaultContext();
+
+    const webpackConfigContent = `
+import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin';
+
+const config = {
+  plugins: [
+    new ReplaceInFileWebpackPlugin([
+      {
+        dir: 'dist',
+        test: [/(^|\\/)plugin\\.json$/, /(^|\\/)README\\.md$/],
+        rules: []
+      }
+    ])
+  ]
+};
+`;
+
+    context.addFile('.config/webpack/webpack.config.ts', webpackConfigContent);
+
+    const updatedContext = migrate(context);
+    const webpackConfig = updatedContext.getFile('.config/webpack/webpack.config.ts');
+
+    expect(webpackConfig).toBe(webpackConfigContent);
+  });
+
+  test('should handle multiple ReplaceInFileWebpackPlugin instances', () => {
+    const context = createDefaultContext();
+
+    const webpackConfigContent = `
+import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin';
+
+const config = {
+  plugins: [
+    new ReplaceInFileWebpackPlugin([
+      {
+        dir: 'dist',
+        files: ['plugin.json', 'README.md'],
+        rules: [],
+      }
+    ]),
+    new ReplaceInFileWebpackPlugin([
+      {
+        dir: 'other',
+        files: ['custom.json'],
+        rules: [],
+      }
+    ])
+  ]
+};
+`;
+
+    const expectedConfig = `
+import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin';
+
+const config = {
+  plugins: [
+    new ReplaceInFileWebpackPlugin([
+      {
+        dir: 'dist',
+        test: [/(^|\\/)plugin\\.json$/, /(^|\\/)README\\.md$/],
+        rules: [],
+      }
+    ]),
+    new ReplaceInFileWebpackPlugin([
+      {
+        dir: 'other',
+        files: ['custom.json'],
+        rules: [],
+      }
+    ])
+  ]
+};
+`;
+
+    context.addFile('.config/webpack/webpack.config.ts', webpackConfigContent);
+    const updatedContext = migrate(context);
+    const webpackConfig = updatedContext.getFile('.config/webpack/webpack.config.ts');
+    expect(webpackConfig).toBe(expectedConfig);
+  });
+
+  test('should be idempotent', () => {
+    const context = createDefaultContext();
+
+    const webpackConfigContent = `
+import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin';
+
+const config = {
+  plugins: [
+    new ReplaceInFileWebpackPlugin([
+      {
+        dir: 'dist',
+        files: ['plugin.json', 'README.md'],
+        rules: []
+      }
+    ])
+  ]
+};
+`;
+
+    context.addFile('.config/webpack/webpack.config.ts', webpackConfigContent);
+
+    expect(migrate).toBeIdempotent(context);
+  });
+});

package/src/migrations/scripts/006-webpack-nested-fix.ts

@@ -0,0 +1,117 @@
+import { join } from 'node:path';
+import * as recast from 'recast';
+import * as typeScriptParser from 'recast/parsers/typescript.js';
+import type { Context } from '../context.js';
+
+const { builders } = recast.types;
+
+export default function migrate(context: Context): Context {
+  const webpackConfigPath = join('.config', 'webpack', 'webpack.config.ts');
+  if (!context.doesFileExist(webpackConfigPath)) {
+    return context;
+  }
+
+  const webpackConfigContent = context.getFile(webpackConfigPath);
+  if (!webpackConfigContent) {
+    return context;
+  }
+
+  let hasChanges = false;
+  const ast = recast.parse(webpackConfigContent, {
+    parser: typeScriptParser,
+  });
+
+  recast.visit(ast, {
+    visitNewExpression(path) {
+      const { node } = path;
+
+      // Check if this is a ReplaceInFileWebpackPlugin constructor
+      if (
+        node.callee.type === 'Identifier' &&
+        node.callee.name === 'ReplaceInFileWebpackPlugin' &&
+        node.arguments.length > 0
+      ) {
+        const firstArg = node.arguments[0];
+
+        // The first argument should be an array of config objects
+        if (firstArg.type === 'ArrayExpression' && firstArg.elements) {
+          firstArg.elements.forEach((element) => {
+            if (element && element.type === 'ObjectExpression') {
+              const changed = transformFilesProperty(element);
+              if (changed) {
+                hasChanges = true;
+              }
+            }
+          });
+        }
+      }
+
+      return this.traverse(path);
+    },
+  });
+
+  // Only update the file if we made changes
+  if (hasChanges) {
+    const output = recast.print(ast, {
+      tabWidth: 2,
+      trailingComma: true,
+      lineTerminator: '\n',
+    });
+    context.updateFile(webpackConfigPath, output.code);
+  }
+
+  return context;
+}
+
+function transformFilesProperty(objectExpression: recast.types.namedTypes.ObjectExpression): boolean {
+  const properties = objectExpression.properties;
+  if (!properties) {
+    return false;
+  }
+
+  // Find the 'files' property
+  const filesPropertyIndex = properties.findIndex(
+    (prop) =>
+      (prop.type === 'Property' || prop.type === 'ObjectProperty') &&
+      prop.key.type === 'Identifier' &&
+      prop.key.name === 'files'
+  );
+
+  if (filesPropertyIndex === -1) {
+    return false;
+  }
+
+  const filesProperty = properties[filesPropertyIndex];
+
+  // Type guard: ensure it's a Property or ObjectProperty (which have a value)
+  if ((filesProperty.type !== 'Property' && filesProperty.type !== 'ObjectProperty') || !('value' in filesProperty)) {
+    return false;
+  }
+
+  // Check if it's an array with the expected values
+  if (filesProperty.value.type === 'ArrayExpression' && filesProperty.value.elements.length === 2) {
+    const elements = filesProperty.value.elements;
+    const values = elements
+      .map((el) => (el?.type === 'Literal' || el?.type === 'StringLiteral' ? el?.value : null))
+      .filter((v) => v !== null);
+
+    // Only transform if it matches the exact pattern we're looking for
+    if (values.length === 2 && values.includes('plugin.json') && values.includes('README.md')) {
+      // Remove the 'files' property
+      properties.splice(filesPropertyIndex, 1);
+
+      // Add the 'test' property with regex array
+      const testProperty = builders.property(
+        'init',
+        builders.identifier('test'),
+        builders.arrayExpression([builders.literal(/(^|\/)plugin\.json$/), builders.literal(/(^|\/)README\.md$/)])
+      );
+
+      // Insert at the same position
+      properties.splice(filesPropertyIndex, 0, testProperty);
+      return true;
+    }
+  }
+
+  return false;
+}

package/src/migrations/scripts/007-remove-testing-library-types.test.ts

@@ -0,0 +1,137 @@
+import { describe, expect, it } from 'vitest';
+import migrate from './007-remove-testing-library-types.js';
+import { Context } from '../context.js';
+
+describe('006-remove-testing-library-types', () => {
+  it('should create setupTests.d.ts, remove types package, and add @testing-library/jest-dom when file does not exist', () => {
+    const context = new Context('/virtual');
+
+    context.addFile(
+      'package.json',
+      JSON.stringify({
+        devDependencies: {
+          '@types/testing-library__jest-dom': '^6.0.0',
+          '@testing-library/jest-dom': '6.0.0',
+          '@testing-library/react': '14.0.0',
+        },
+      })
+    );
+
+    const result = migrate(context);
+    const setupTestsContent = result.getFile('./.config/types/setupTests.d.ts');
+    expect(setupTestsContent).toBe("import '@testing-library/jest-dom';\n");
+
+    const packageJson = JSON.parse(result.getFile('package.json') || '{}');
+    expect(packageJson.devDependencies).toEqual({
+      '@testing-library/jest-dom': '6.0.0',
+      '@testing-library/react': '14.0.0',
+    });
+  });
+
+  it('should add import to existing setupTests.d.ts, remove types package, and add @testing-library/jest-dom if missing', () => {
+    const context = new Context('/virtual');
+
+    const existingContent = '// Some other type declarations\n';
+    context.addFile('./.config/types/setupTests.d.ts', existingContent);
+    context.addFile(
+      'package.json',
+      JSON.stringify({
+        devDependencies: {
+          '@types/testing-library__jest-dom': '^6.0.0',
+          '@testing-library/jest-dom': '6.1.4',
+          '@testing-library/react': '14.0.0',
+        },
+      })
+    );
+
+    const result = migrate(context);
+    const setupTestsContent = result.getFile('./.config/types/setupTests.d.ts');
+    expect(setupTestsContent).toBe(`import '@testing-library/jest-dom';\n${existingContent}`);
+
+    const packageJson = JSON.parse(result.getFile('package.json') || '{}');
+    expect(packageJson.devDependencies).toEqual({
+      '@testing-library/jest-dom': '6.1.4',
+      '@testing-library/react': '14.0.0',
+    });
+  });
+
+  it('should not modify setupTests.d.ts if import already exists', () => {
+    const context = new Context('/virtual');
+
+    const existingContent = "// Other content\nimport 'react';\nimport '@testing-library/jest-dom';\n";
+    context.addFile('./.config/types/setupTests.d.ts', existingContent);
+    context.addFile(
+      'package.json',
+      JSON.stringify({
+        devDependencies: {
+          '@types/testing-library__jest-dom': '^6.0.0',
+          '@testing-library/jest-dom': '6.1.4',
+          '@testing-library/react': '14.0.0',
+        },
+      })
+    );
+
+    const result = migrate(context);
+
+    const setupTestsContent = result.getFile('./.config/types/setupTests.d.ts');
+    expect(setupTestsContent).toBe(existingContent);
+
+    const packageJson = JSON.parse(result.getFile('package.json') || '{}');
+    expect(packageJson.devDependencies).toEqual({
+      '@testing-library/jest-dom': '6.1.4',
+      '@testing-library/react': '14.0.0',
+    });
+  });
+
+  it('should not modify anything if @testing-library/jest-dom is not greater than 6.0.0', () => {
+    const context = new Context('/virtual');
+    const packageJsonContent = JSON.stringify({
+      devDependencies: { '@testing-library/jest-dom': '5.14.2' },
+    });
+    context.addFile('package.json', packageJsonContent);
+
+    const result = migrate(context);
+    expect(result.getFile('package.json')).toEqual(packageJsonContent);
+  });
+
+  it('should handle package.json without the types package', () => {
+    const context = new Context('/virtual');
+
+    context.addFile(
+      'package.json',
+      JSON.stringify({
+        devDependencies: {
+          '@testing-library/react': '14.0.0',
+          '@testing-library/jest-dom': '6.1.4',
+        },
+      })
+    );
+
+    const result = migrate(context);
+    const setupTestsContent = result.getFile('./.config/types/setupTests.d.ts');
+    expect(setupTestsContent).toBe("import '@testing-library/jest-dom';\n");
+
+    const packageJson = JSON.parse(result.getFile('package.json') || '{}');
+    expect(packageJson.devDependencies).toEqual({
+      '@testing-library/jest-dom': '6.1.4',
+      '@testing-library/react': '14.0.0',
+    });
+  });
+
+  it('should be idempotent', async () => {
+    const context = new Context('/virtual');
+
+    context.addFile(
+      'package.json',
+      JSON.stringify({
+        devDependencies: {
+          '@types/testing-library__jest-dom': '^6.0.0',
+          '@testing-library/jest-dom': '6.1.4',
+          '@testing-library/react': '14.0.0',
+        },
+      })
+    );
+
+    await expect(migrate).toBeIdempotent(context);
+  });
+});