@grafana/create-plugin 6.2.0-canary.2233.18946638834.0 → 6.2.0-canary.2233.19097561440.0

package/src/{migrations → codemods}/context.test.ts

@@ -3,7 +3,7 @@ import { Context } from './context.js';
 describe('Context', () => {
   describe('getFile', () => {
     it('should read a file from the file system', () => {
-      const context = new Context(`${__dirname}/fixtures`);
+      const context = new Context(`${__dirname}/migrations/fixtures`);
       const content = context.getFile('foo/bar.ts');
       expect(content).toEqual("console.log('foo/bar.ts');\n");
     });
@@ -16,14 +16,14 @@ describe('Context', () => {
     });
 
     it('should get a file that was updated in the current context', () => {
-      const context = new Context(`${__dirname}/fixtures`);
+      const context = new Context(`${__dirname}/migrations/fixtures`);
       context.updateFile('foo/bar.ts', 'content');
       const content = context.getFile('foo/bar.ts');
       expect(content).toEqual('content');
     });
 
     it('should not return a file that was marked for deletion', () => {
-      const context = new Context(`${__dirname}/fixtures`);
+      const context = new Context(`${__dirname}/migrations/fixtures`);
       context.deleteFile('foo/bar.ts');
       const content = context.getFile('foo/bar.ts');
       expect(content).toEqual(undefined);
@@ -77,7 +77,7 @@ describe('Context', () => {
 
   describe('renameFile', () => {
     it('should rename a file', () => {
-      const context = new Context(`${__dirname}/fixtures`);
+      const context = new Context(`${__dirname}/migrations/fixtures`);
       context.renameFile('foo/bar.ts', 'new-file.txt');
       expect(context.listChanges()).toEqual({
         'new-file.txt': { content: "console.log('foo/bar.ts');\n", changeType: 'add' },
@@ -102,20 +102,20 @@ describe('Context', () => {
 
   describe('readDir', () => {
     it('should read the directory', () => {
-      const context = new Context(`${__dirname}/fixtures`);
+      const context = new Context(`${__dirname}/migrations/fixtures`);
       const files = context.readDir('foo');
       expect(files).toEqual(['foo/bar.ts', 'foo/baz.ts']);
     });
 
     it('should filter out deleted files', () => {
-      const context = new Context(`${__dirname}/fixtures`);
+      const context = new Context(`${__dirname}/migrations/fixtures`);
       context.deleteFile('foo/bar.ts');
       const files = context.readDir('foo');
       expect(files).toEqual(['foo/baz.ts']);
     });
 
     it('should include files that are only added to the context', () => {
-      const context = new Context(`${__dirname}/fixtures`);
+      const context = new Context(`${__dirname}/migrations/fixtures`);
       context.addFile('foo/foo.txt', '');
       const files = context.readDir('foo');
       expect(files).toEqual(['foo/bar.ts', 'foo/baz.ts', 'foo/foo.txt']);
@@ -124,7 +124,7 @@ describe('Context', () => {
 
   describe('normalisePath', () => {
     it('should normalise the path', () => {
-      const context = new Context(`${__dirname}/fixtures`);
+      const context = new Context(`${__dirname}/migrations/fixtures`);
       expect(context.normalisePath('foo/bar.ts')).toEqual('foo/bar.ts');
       expect(context.normalisePath('./foo/bar.ts')).toEqual('foo/bar.ts');
       expect(context.normalisePath('/foo/bar.ts')).toEqual('foo/bar.ts');
@@ -133,12 +133,12 @@ describe('Context', () => {
 
   describe('hasChanges', () => {
     it('should return FALSE if the context has no changes', () => {
-      const context = new Context(`${__dirname}/fixtures`);
+      const context = new Context(`${__dirname}/migrations/fixtures`);
       expect(context.hasChanges()).toEqual(false);
     });
 
     it('should return TRUE if the context has changes', () => {
-      const context = new Context(`${__dirname}/fixtures`);
+      const context = new Context(`${__dirname}/migrations/fixtures`);
 
       context.addFile('foo.ts', '');
 

package/src/{migrations → codemods}/context.ts

@@ -1,6 +1,8 @@
 import { constants, accessSync, readFileSync, readdirSync } from 'node:fs';
 import { relative, normalize, join, dirname } from 'node:path';
-import { migrationsDebug } from './utils.js';
+import { debug } from '../utils/utils.cli.js';
+
+const codemodsDebug = debug.extend('codemods');
 
 export type ContextFile = Record<
   string,
@@ -58,7 +60,7 @@ export class Context {
     if (originalContent !== content) {
       this.files[path] = { content, changeType: 'update' };
     } else {
-      migrationsDebug(`Context.updateFile() - no updates for ${filePath}`);
+      codemodsDebug(`Context.updateFile() - no updates for ${filePath}`);
     }
   }
 

package/src/{migrations → codemods/migrations}/manager.test.ts

@@ -1,22 +1,27 @@
-import { vi } from 'vitest';
+import { flushChanges, formatFiles } from '../utils.js';
 import { getMigrationsToRun, runMigration, runMigrations } from './manager.js';
-import migrationFixtures from './fixtures/migrations.js';
-import { Context } from './context.js';
-import { gitCommitNoVerify } from '../utils/utils.git.js';
-import { flushChanges, printChanges, formatFiles } from './utils.js';
-import { setRootConfig } from '../utils/utils.config.js';
+
+import { Context } from '../context.js';
 import { MigrationMeta } from './migrations.js';
+import { gitCommitNoVerify } from '../../utils/utils.git.js';
+import migrationFixtures from './fixtures/migrations.js';
+import { printChanges } from './utils.js';
+import { setRootConfig } from '../../utils/utils.config.js';
+import { vi } from 'vitest';
 
 vi.mock('./utils.js', () => ({
-  flushChanges: vi.fn(),
   printChanges: vi.fn(),
   migrationsDebug: vi.fn(),
+}));
+
+vi.mock('../utils.js', () => ({
+  flushChanges: vi.fn(),
   formatFiles: vi.fn(),
   installNPMDependencies: vi.fn(),
 }));
 
 // Silence terminal output during tests.
-vi.mock('../utils/utils.console.js', () => ({
+vi.mock('../../utils/utils.console.js', () => ({
   output: {
     log: vi.fn(),
     addHorizontalLine: vi.fn(),
@@ -25,10 +30,10 @@ vi.mock('../utils/utils.console.js', () => ({
   },
 }));
 
-vi.mock('../utils/utils.config.js', () => ({
+vi.mock('../../utils/utils.config.js', () => ({
   setRootConfig: vi.fn(),
 }));
-vi.mock('../utils/utils.git.js', () => ({
+vi.mock('../../utils/utils.git.js', () => ({
   gitCommitNoVerify: vi.fn(),
 }));
 

package/src/{migrations → codemods/migrations}/manager.ts

@@ -1,13 +1,14 @@
-import { satisfies, gte } from 'semver';
-import { Context } from './context.js';
 import defaultMigrations, { MigrationMeta } from './migrations.js';
-import { flushChanges, printChanges, migrationsDebug, formatFiles, installNPMDependencies } from './utils.js';
-import { gitCommitNoVerify } from '../utils/utils.git.js';
-import { setRootConfig } from '../utils/utils.config.js';
-import { output } from '../utils/utils.console.js';
-import { CURRENT_APP_VERSION } from '../utils/utils.version.js';
+import { flushChanges, formatFiles, installNPMDependencies } from '../utils.js';
+import { gte, satisfies } from 'semver';
+import { migrationsDebug, printChanges } from './utils.js';
 
-export type MigrationFn = (context: Context) => Context | Promise<Context>;
+import { CURRENT_APP_VERSION } from '../../utils/utils.version.js';
+import { Context } from '../context.js';
+import type { MigrationModule } from '../types.js';
+import { gitCommitNoVerify } from '../../utils/utils.git.js';
+import { output } from '../../utils/utils.console.js';
+import { setRootConfig } from '../../utils/utils.config.js';
 
 export function getMigrationsToRun(
   fromVersion: string,
@@ -76,7 +77,7 @@ export async function runMigrations(migrations: Record<string, MigrationMeta>, o
 }
 
 export async function runMigration(migration: MigrationMeta, context: Context): Promise<Context> {
-  const module: { default: MigrationFn } = await import(migration.migrationScript);
+  const module = (await import(migration.migrationScript)) as MigrationModule;
 
   return module.default(context);
 }

package/src/{migrations → codemods/migrations}/migrations.ts

@@ -1,4 +1,4 @@
-import { LEGACY_UPDATE_CUTOFF_VERSION } from '../constants.js';
+import { LEGACY_UPDATE_CUTOFF_VERSION } from '../../constants.js';
 
 export type MigrationMeta = {
   version: string;

package/src/{migrations → codemods/migrations}/scripts/001-update-grafana-compose-extend.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { Context } from '../context.js';
+import { Context } from '../../context.js';
 import migrate from './001-update-grafana-compose-extend.js';
 import { parse, stringify } from 'yaml';
 

package/src/{migrations → codemods/migrations}/scripts/001-update-grafana-compose-extend.ts

@@ -1,5 +1,5 @@
 import { resolve } from 'node:path';
-import { type Context } from '../context.js';
+import { type Context } from '../../context.js';
 import { Node, Pair, parseDocument, Scalar, stringify, visit, YAMLMap, Document, YAMLSeq, visitorFn } from 'yaml';
 
 export default async function migrate(context: Context) {

package/src/{migrations → codemods/migrations}/scripts/002-update-is-compatible-workflow.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { Context } from '../context.js';
+import { Context } from '../../context.js';
 import migrate from './002-update-is-compatible-workflow.js';
 import { parse } from 'yaml';
 

package/src/{migrations → codemods/migrations}/scripts/002-update-is-compatible-workflow.ts

@@ -1,4 +1,4 @@
-import { type Context } from '../context.js';
+import { type Context } from '../../context.js';
 import { parseDocument, stringify, YAMLSeq } from 'yaml';
 
 export default async function migrate(context: Context) {

package/src/{migrations → codemods/migrations}/scripts/003-update-eslint-deprecation-rule.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import migrate from './003-update-eslint-deprecation-rule.js';
-import { Context } from '../context.js';
+import { Context } from '../../context.js';
 
 describe('003-update-eslint-deprecation-rule', () => {
   it('should not update ESLint config if no deprecation rule is present', () => {

package/src/{migrations → codemods/migrations}/scripts/003-update-eslint-deprecation-rule.ts

@@ -1,5 +1,5 @@
-import type { Context } from '../context.js';
-import { addDependenciesToPackageJson, removeDependenciesFromPackageJson } from '../utils.js';
+import type { Context } from '../../context.js';
+import { addDependenciesToPackageJson, removeDependenciesFromPackageJson } from '../../utils.js';
 
 export default function migrate(context: Context) {
   if (context.doesFileExist('.config/.eslintrc') && context.doesFileExist('package.json')) {

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

@@ -1,5 +1,5 @@
 import migrate from './004-eslint9-flat-config.js';
-import { Context } from '../context.js';
+import { Context } from '../../context.js';
 
 describe('004-eslint9-flat-config', () => {
   describe('migration', () => {

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

@@ -5,8 +5,9 @@ import { parse } from 'jsonc-parser';
 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 type { Context } from '../../context.js';
+import { addDependenciesToPackageJson } from '../../utils.js';
+import { migrationsDebug } from '../utils.js';
 
 type Imports = Map<string, { name?: string; bindings?: string[] }>;
 

package/src/{migrations → codemods/migrations}/scripts/example-migration.test.ts

@@ -1,5 +1,5 @@
 import migrate from './example-migration.js';
-import { createDefaultContext } from '../test-utils.js';
+import { createDefaultContext } from '../../test-utils.js';
 
 describe('Migration - append profile to webpack', () => {
   test('should update the package.json', async () => {

package/src/{migrations → codemods/migrations}/scripts/example-migration.ts

@@ -1,4 +1,4 @@
-import type { Context } from '../context.js';
+import type { Context } from '../../context.js';
 
 export default function migrate(context: Context): Context {
   const rawPkgJson = context.getFile('./package.json') ?? '{}';

package/src/{migrations → codemods/migrations}/utils.test.ts

@@ -1,18 +1,18 @@
 import { dirSync } from 'tmp';
-import { Context } from './context.js';
+import { Context } from '../context.js';
 import {
   addDependenciesToPackageJson,
   removeDependenciesFromPackageJson,
   flushChanges,
   formatFiles,
-  printChanges,
   readJsonFile,
   isVersionGreater,
-} from './utils.js';
+} from '../utils.js';
+import { printChanges } from './utils.js';
 import { join } from 'node:path';
 import { mkdir, rm, writeFile } from 'node:fs/promises';
 import { readFileSync } from 'node:fs';
-import { output } from '../utils/utils.console.js';
+import { output } from '../../utils/utils.console.js';
 
 describe('utils', () => {
   const tmpObj = dirSync({ unsafeCleanup: true });

package/src/codemods/migrations/utils.ts

@@ -0,0 +1,12 @@
+import type { Context } from '../context.js';
+import type { MigrationMeta } from './migrations.js';
+import { debug } from '../../utils/utils.cli.js';
+import { printChanges as sharedPrintChanges } from '../utils.js';
+
+export const migrationsDebug = debug.extend('migrations');
+
+// migration-specific wrapper for printChanges
+export function printChanges(context: Context, key: string, migration: MigrationMeta) {
+  migrationsDebug('printChanges for migration: %s', key);
+  sharedPrintChanges(context, key, migration);
+}

package/src/codemods/types.ts

@@ -0,0 +1,21 @@
+import type { Context } from './context.js';
+
+export interface CodemodModule {
+  default: (context: Context) => Context | Promise<Context>;
+}
+
+export interface FlagDefinition {
+  name: string;
+  description: string;
+  required: boolean;
+}
+
+export interface AdditionModule<TOptions = any> extends CodemodModule {
+  default: (context: Context, options?: TOptions) => Context | Promise<Context>;
+  flags?: FlagDefinition[];
+  parseFlags?: (argv: any) => TOptions;
+}
+
+export interface MigrationModule extends CodemodModule {
+  default: (context: Context) => Context | Promise<Context>;
+}

package/src/{migrations → codemods}/utils.ts

@@ -1,16 +1,30 @@
+/**
+ * Shared utilities for codemods (migrations and additions).
+ * These functions work with the Context class to modify plugin codebases.
+ */
+
 import { dirname, join } from 'node:path';
 import { createRequire } from 'node:module';
 import { Context } from './context.js';
 import { mkdirSync, rmSync, writeFileSync } from 'node:fs';
-import { debug } from '../utils/utils.cli.js';
 import chalk from 'chalk';
-import { MigrationMeta } from './migrations.js';
 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 } from 'semver';
 
-export function printChanges(context: Context, key: string, migration: MigrationMeta) {
+/**
+ * Generic metadata type for printChanges
+ */
+type ChangeMetadata = {
+  description: string;
+};
+
+/**
+ * Prints changes made to the context in a formatted way.
+ * Works with both migrations and additions.
+ */
+export function printChanges(context: Context, key: string, meta: ChangeMetadata) {
   const changes = context.listChanges();
   const lines = [];
 
@@ -25,7 +39,7 @@ export function printChanges(context: Context, key: string, migration: Migration
   }
 
   output.addHorizontalLine('gray');
-  output.logSingleLine(`${key} (${migration.description})`);
+  output.logSingleLine(`${key} (${meta.description})`);
 
   if (lines.length === 0) {
     output.logSingleLine('No changes were made');
@@ -34,6 +48,9 @@ export function printChanges(context: Context, key: string, migration: Migration
   }
 }
 
+/**
+ * Writes all changes from the context to the filesystem.
+ */
 export function flushChanges(context: Context) {
   const basePath = context.basePath;
   const changes = context.listChanges();
@@ -51,10 +68,8 @@ export function flushChanges(context: Context) {
   }
 }
 
-export const migrationsDebug = debug.extend('migrations');
-
 /**
- * Formats the files in the migration context using the version of prettier found in the local node_modules.
+ * Formats the files in the context using the version of prettier found in the local node_modules.
  * If prettier isn't installed or the file is ignored or has no parser, it will not be formatted.
  *
  * @param context - The context to format.
@@ -104,9 +119,12 @@ export async function formatFiles(context: Context) {
 }
 
 // Cache the package.json contents to avoid re-installing dependencies if the package.json hasn't changed
-// (This runs for each migration used in an update)
+// (This runs for each codemod used in an update)
 let packageJsonInstallCache: string;
 
+/**
+ * Installs NPM dependencies if package.json has changed.
+ */
 export function installNPMDependencies(context: Context) {
   const hasPackageJsonChanges = Object.entries(context.listChanges()).some(
     ([filePath, { changeType }]) => filePath === 'package.json' && changeType === 'update'
@@ -134,6 +152,9 @@ export function installNPMDependencies(context: Context) {
   }
 }
 
+/**
+ * Reads and parses a JSON file from the context.
+ */
 export function readJsonFile<T extends object = any>(context: Context, path: string): T {
   if (!context.doesFileExist(path)) {
     throw new Error(`Cannot find ${path}`);
@@ -145,6 +166,9 @@ export function readJsonFile<T extends object = any>(context: Context, path: str
   }
 }
 
+/**
+ * Adds or updates dependencies in package.json, preventing downgrades.
+ */
 export function addDependenciesToPackageJson(
   context: Context,
   dependencies: Record<string, string>,
@@ -160,14 +184,10 @@ export function addDependenciesToPackageJson(
     if (currentDeps[dep]) {
       if (isVersionGreater(newVersion, currentDeps[dep])) {
         currentDeps[dep] = newVersion;
-      } else {
-        migrationsDebug('would downgrade dependency %s to %s', dep, newVersion);
       }
     } else if (currentDevDeps[dep]) {
       if (isVersionGreater(newVersion, currentDevDeps[dep])) {
         currentDevDeps[dep] = newVersion;
-      } else {
-        migrationsDebug('would downgrade devDependency %s to %s', dep, newVersion);
       }
     } else {
       // Not present, add to dependencies
@@ -180,14 +200,10 @@ export function addDependenciesToPackageJson(
     if (currentDeps[dep]) {
       if (isVersionGreater(newVersion, currentDeps[dep])) {
         currentDeps[dep] = newVersion;
-      } else {
-        migrationsDebug('would downgrade dependency %s to %s', dep, newVersion);
       }
     } else if (currentDevDeps[dep]) {
       if (isVersionGreater(newVersion, currentDevDeps[dep])) {
         currentDevDeps[dep] = newVersion;
-      } else {
-        migrationsDebug('would downgrade devDependency %s to %s', dep, newVersion);
       }
     } else {
       // Not present, add to devDependencies
@@ -214,11 +230,12 @@ export function addDependenciesToPackageJson(
     ...(Object.keys(sortedDevDeps).length > 0 && { devDependencies: sortedDevDeps }),
   };
 
-  migrationsDebug('updated package.json', updatedPackageJson);
-
   context.updateFile(packageJsonPath, JSON.stringify(updatedPackageJson, null, 2));
 }
 
+/**
+ * Removes dependencies from package.json.
+ */
 export function removeDependenciesFromPackageJson(
   context: Context,
   dependencies: string[],
@@ -232,7 +249,6 @@ export function removeDependenciesFromPackageJson(
   for (const dep of dependencies) {
     if (currentPackageJson.dependencies?.[dep]) {
       delete currentPackageJson.dependencies[dep];
-      migrationsDebug('removed dependency %s', dep);
       hasChanges = true;
     }
   }
@@ -240,7 +256,6 @@ export function removeDependenciesFromPackageJson(
   for (const dep of devDependencies) {
     if (currentPackageJson.devDependencies?.[dep]) {
       delete currentPackageJson.devDependencies[dep];
-      migrationsDebug('removed devDependency %s', dep);
       hasChanges = true;
     }
   }
@@ -249,8 +264,6 @@ export function removeDependenciesFromPackageJson(
     return;
   }
 
-  migrationsDebug('updated package.json', currentPackageJson);
-
   context.updateFile(packageJsonPath, JSON.stringify(currentPackageJson, null, 2));
 }
 

package/src/commands/add.command.ts

@@ -1,4 +1,4 @@
-import { getAdditionFlags, getAvailableAdditions, runAdditionByName } from '../additions/manager.js';
+import { getAdditionFlags, getAvailableAdditions, runAdditionByName } from '../codemods/additions/manager.js';
 import { isGitDirectory, isGitDirectoryClean } from '../utils/utils.git.js';
 
 import { isPluginDirectory } from '../utils/utils.plugin.js';
@@ -16,7 +16,7 @@ export const add = async (argv: minimist.ParsedArgs) => {
   await performPreAddChecks(argv);
 
   try {
-    await runAdditionByName(subCommand, argv, { commitChanges: argv.commit });
+    await runAdditionByName(subCommand, argv);
   } catch (error) {
     if (error instanceof Error) {
       output.error({

package/src/commands/update.command.ts

@@ -1,4 +1,4 @@
-import { getMigrationsToRun, runMigrations } from '../migrations/manager.js';
+import { getMigrationsToRun, runMigrations } from '../codemods/migrations/manager.js';
 import {
   getPackageManagerExecCmd,
   getPackageManagerSilentInstallCmd,

package/src/utils/utils.config.ts

@@ -1,14 +1,14 @@
 import { argv, commandName } from './utils.cli.js';
 
-import type { AdditionFeatureName } from '../additions/additions.js';
+import type { AdditionFeatureName } from '../codemods/additions/additions.js';
 import { CURRENT_APP_VERSION } from './utils.version.js';
 import { DEFAULT_FEATURE_FLAGS } from '../constants.js';
-import { EOL } from 'node:os';
 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';
+import { EOL } from 'node:os';
 
 type CoreFeatureFlags = {
   bundleGrafanaUI?: boolean;
@@ -27,8 +27,8 @@ type AdditionFeatureFlags = {
 
 export type FeatureFlags = CoreFeatureFlags & AdditionFeatureFlags;
 
-export function isFeatureEnabled(features: FeatureFlags, featureName: string): boolean {
-  return features[featureName as AdditionFeatureName] === true;
+export function isFeatureEnabled(features: FeatureFlags, featureName: AdditionFeatureName): boolean {
+  return features[featureName] === true;
 }
 
 export type CreatePluginConfig = UserConfig & {

package/templates/common/.config/docker-compose-base.yaml

@@ -7,7 +7,7 @@ services:
       context: .
       args:
         grafana_image: ${GRAFANA_IMAGE:-{{~grafanaImage~}} }
-        grafana_version: ${GRAFANA_VERSION:-12.2.0}
+        grafana_version: ${GRAFANA_VERSION:-12.2.1}
         development: ${DEVELOPMENT:-false}
         anonymous_auth_enabled: ${ANONYMOUS_AUTH_ENABLED:-true}
     ports:

package/templates/common/_package.json

@@ -17,8 +17,8 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@grafana/eslint-config": "^8.2.0",
-    "@grafana/plugin-e2e": "^2.2.0",
-    "@grafana/tsconfig": "^2.0.0",
+    "@grafana/plugin-e2e": "^3.0.1",
+    "@grafana/tsconfig": "^2.0.1",
     "@playwright/test": "^1.52.0",{{#if useExperimentalRspack}}
     "@rspack/core": "^1.3.0",
     "@rspack/cli": "^1.3.0",{{/if}}
@@ -71,11 +71,11 @@
   },
   "dependencies": {
     "@emotion/css": "11.10.6",
-    "@grafana/data": "^12.2.0",
-    "@grafana/i18n": "^12.2.0",
-    "@grafana/runtime": "^12.2.0",
-    "@grafana/ui": "^12.2.0",
-    "@grafana/schema": "^12.2.0",{{#if_eq pluginType "scenesapp" }}
+    "@grafana/data": "^12.2.1",
+    "@grafana/i18n": "^12.2.1",
+    "@grafana/runtime": "^12.2.1",
+    "@grafana/ui": "^12.2.1",
+    "@grafana/schema": "^12.2.1",{{#if_eq pluginType "scenesapp" }}
     "@grafana/scenes": "{{ scenesVersion }}",{{/if_eq}}
     "react": "18.2.0",
     "react-dom": "18.2.0"{{#if isAppType}},

package/templates/github/workflows/bundle-stats.yml

@@ -24,4 +24,4 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: grafana/plugin-actions/bundle-size@v1.0.2
+      - uses: grafana/plugin-actions/bundle-size@bundle-size/v1.0.2

package/templates/github/workflows/ci.yml

@@ -146,7 +146,7 @@ jobs:
 
       - name: Resolve Grafana E2E versions
         id: resolve-versions
-        uses: grafana/plugin-actions/e2e-version@v1.1.2
+        uses: grafana/plugin-actions/e2e-version@e2e-version/v1.1.2
 
   playwright-tests:
     needs: [resolve-versions, build]
@@ -197,7 +197,7 @@ jobs:
           ANONYMOUS_AUTH_ENABLED=false DEVELOPMENT=false GRAFANA_VERSION=$\{{ matrix.GRAFANA_IMAGE.VERSION }} GRAFANA_IMAGE=$\{{ matrix.GRAFANA_IMAGE.NAME }} docker compose up -d
 
       - name: Wait for grafana server
-        uses: grafana/plugin-actions/wait-for-grafana@v1.0.2
+        uses: grafana/plugin-actions/wait-for-grafana@wait-for-grafana/v1.0.2
         with:
           url: http://localhost:3000/login
 
@@ -209,7 +209,7 @@ jobs:
         run: {{ packageManagerName }} run e2e
 
       - name: Upload e2e test summary
-        uses: grafana/plugin-actions/playwright-gh-pages/upload-report-artifacts@v1.0.1
+        uses: grafana/plugin-actions/playwright-gh-pages/upload-report-artifacts@upload-report-artifacts/v1.0.1
         if: $\{{ always() && !cancelled() }}
         with:
           upload-report: false
@@ -247,7 +247,7 @@ jobs:
           # required for playwright-gh-pages
           persist-credentials: true
       - name: Publish report
-        uses: grafana/plugin-actions/playwright-gh-pages/deploy-report-pages@v1.0.1
+        uses: grafana/plugin-actions/playwright-gh-pages/deploy-report-pages@deploy-report-pages/v1.0.1
         with:
           github-token: $\{{ secrets.GITHUB_TOKEN }}
 

package/templates/github/workflows/cp-update.yml

@@ -18,7 +18,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: grafana/plugin-actions/create-plugin-update@v1.1.0
+      - uses: grafana/plugin-actions/create-plugin-update@create-plugin-update/v1.1.0
         # Uncomment to use a fine-grained personal access token instead of default github token
         # (For more info on how to generate the token see https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens)
         # with: