@grafana/create-plugin 6.2.0-canary.2233.19368311379.0 → 6.2.0-canary.2233.19500011348.0

package/src/codemods/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/codemods/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);
+  });
+});

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

@@ -0,0 +1,25 @@
+import type { Context } from '../../context.js';
+import { removeDependenciesFromPackageJson, isVersionGreater } from '../../utils.js';
+
+export default function migrate(context: 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';\n${setupTestsContent}`
+          );
+        }
+      } else {
+        context.addFile('./.config/types/setupTests.d.ts', "import '@testing-library/jest-dom';\n");
+      }
+
+      removeDependenciesFromPackageJson(context, [], ['@types/testing-library__jest-dom']);
+    }
+  }
+
+  return context;
+}

package/src/codemods/runner.ts

@@ -1,7 +1,6 @@
 import { Context } from './context.js';
 import { formatFiles, flushChanges, installNPMDependencies, printChanges } from './utils.js';
 import { parseAndValidateOptions } from './schema-parser.js';
-import { output } from '../utils/utils.console.js';
 import { Codemod } from './types.js';
 
 /**
@@ -32,11 +31,6 @@ export async function runCodemod(codemod: Codemod, options?: Record<string, any>
   const context = new Context(basePath);
 
   try {
-    output.log({
-      title: `Running ${codemod.name}`,
-      body: [codemod.description],
-    });
-
     const updatedContext = await codemodModule.default(context, codemodOptions);
 
     // standard post-processing pipeline

package/src/codemods/utils.ts

@@ -1,4 +1,4 @@
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { createRequire } from 'node:module';
 import { Context } from './context.js';
 import { mkdirSync, rmSync, writeFileSync } from 'node:fs';
@@ -7,7 +7,7 @@ import { output } from '../utils/utils.console.js';
 import { getPackageManagerSilentInstallCmd, getPackageManagerWithFallback } from '../utils/utils.packageManager.js';
 import { execSync } from 'node:child_process';
 import { clean, coerce, gt, gte } from 'semver';
-import { fileURLToPath } from 'node:url';
+import { debug } from '../utils/utils.cli.js';
 
 export function printChanges(context: Context, key: string, description: string) {
   const changes = context.listChanges();
@@ -299,15 +299,5 @@ function sortObjectByKeys<T extends Record<string, any>>(obj: T): T {
     .reduce((acc, key) => ({ ...acc, [key]: obj[key] }), {} as T);
 }
 
-/**
- * Resolves a script path relative to the caller's file location.
- *
- * @param callerUrl - The import.meta.url from the calling file
- * @param relativePath - The relative path to resolve (e.g., './scripts/example.js')
- * @returns The absolute resolved path
- */
-export function resolveScriptPath(callerUrl: string, relativePath: string): string {
-  const __filename = fileURLToPath(callerUrl);
-  const __dirname = dirname(__filename);
-  return resolve(__dirname, relativePath);
-}
+export const migrationsDebug = debug.extend('migrations');
+export const additionsDebug = debug.extend('additions');

package/src/commands/add.command.ts

@@ -22,11 +22,6 @@ export const add = async (argv: minimist.ParsedArgs) => {
       throw new Error(`Unknown addition: ${subCommand}\n\nAvailable additions: ${additionsList.join(', ')}`);
     }
 
-    output.log({
-      title: `Running addition: ${addition.name}`,
-      body: [addition.description],
-    });
-
     // filter out minimist internal properties (_ and $0) before passing to codemod
     const { _, $0, ...codemodOptions } = argv;
     await runCodemod(addition, codemodOptions);

package/src/utils/utils.config.ts

@@ -1,4 +1,5 @@
 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';
@@ -8,13 +9,12 @@ import path from 'node:path';
 import { writeFile } from 'node:fs/promises';
 import { EOL } from 'node:os';
 
-type FeatureFlags = {
+export type FeatureFlags = {
   bundleGrafanaUI?: boolean;
 
   // 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/templates/backend/go.mod

@@ -1,66 +1,86 @@
 module github.com/{{ kebabCase orgName }}/{{ kebabCase pluginName }}
 
-go 1.22
+go 1.24.6
 
-require github.com/grafana/grafana-plugin-sdk-go v0.156.0
+require github.com/grafana/grafana-plugin-sdk-go v0.283.0
 
 require (
-	github.com/BurntSushi/toml v1.2.1 // indirect
-	github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
+	github.com/BurntSushi/toml v1.5.0 // indirect
+	github.com/apache/arrow-go/v18 v18.4.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cheekybits/genny v1.0.0 // indirect
-	github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac // indirect
-	github.com/fatih/color v1.7.0 // indirect
-	github.com/getkin/kin-openapi v0.94.0 // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.19.15 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/golang/snappy v0.0.3 // indirect
-	github.com/google/flatbuffers v2.0.0+incompatible // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/hashicorp/go-hclog v0.14.1 // indirect
-	github.com/hashicorp/go-plugin v1.4.3 // indirect
-	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
-	github.com/josharian/intern v1.0.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
+	github.com/fatih/color v1.15.0 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/gogo/googleapis v1.4.1 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/flatbuffers v25.2.10+incompatible // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/grafana/otel-profiling-go v0.5.1 // indirect
+	github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
+	github.com/hashicorp/go-hclog v1.6.3 // indirect
+	github.com/hashicorp/go-plugin v1.7.0 // indirect
+	github.com/hashicorp/yamux v0.1.2 // indirect
+	github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.13.1 // indirect
-	github.com/magefile/mage v1.14.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
+	github.com/magefile/mage v1.15.0 // indirect
 	github.com/mattetti/filebuffer v1.0.1 // indirect
-	github.com/mattn/go-colorable v0.1.4 // indirect
-	github.com/mattn/go-isatty v0.0.10 // indirect
-	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/mitchellh/go-testing-interface v1.0.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/oklog/run v1.0.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/oklog/run v1.1.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/pierrec/lz4/v4 v4.1.8 // indirect
-	github.com/prometheus/client_golang v1.14.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.40.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/pierrec/lz4/v4 v4.1.22 // indirect
+	github.com/prometheus/client_golang v1.23.2 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.67.2 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
 	github.com/unknwon/com v1.0.1 // indirect
 	github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect
-	github.com/urfave/cli v1.22.12 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	github.com/urfave/cli v1.22.17 // indirect
+	github.com/zeebo/xxh3 v1.0.2 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // indirect
+	go.opentelemetry.io/contrib/propagators/jaeger v1.38.0 // indirect
+	go.opentelemetry.io/contrib/samplers/jaegerremote v0.32.0 // indirect
+	go.opentelemetry.io/otel v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
+	go.opentelemetry.io/otel/trace v1.38.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 // indirect
+	golang.org/x/mod v0.28.0 // indirect
+	golang.org/x/net v0.46.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
+	golang.org/x/text v0.30.0 // indirect
+	golang.org/x/tools v0.37.0 // indirect
+	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	google.golang.org/genproto v0.0.0-20210630183607-d20f26d13c79 // indirect
-	google.golang.org/grpc v1.41.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/grpc v1.76.0 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 )