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

package/dist/codemods/additions/additions.js

@@ -1,10 +1,8 @@
-import { resolveScriptPath } from '../utils.js';
-
 var defaultAdditions = [
   {
     name: "example-addition",
     description: "Example addition demonstrating Valibot schema with type inference",
-    scriptPath: resolveScriptPath(import.meta.url, "./scripts/example-addition.js")
+    scriptPath: import.meta.resolve("./scripts/example-addition.js")
   }
 ];
 

package/dist/codemods/migrations/migrations.js

@@ -1,36 +1,35 @@
 import { LEGACY_UPDATE_CUTOFF_VERSION } from '../../constants.js';
-import { resolveScriptPath } from '../utils.js';
 
 var defaultMigrations = [
   {
     name: "001-update-grafana-compose-extend",
     version: LEGACY_UPDATE_CUTOFF_VERSION,
     description: "Update ./docker-compose.yaml to extend from ./.config/docker-compose-base.yaml.",
-    scriptPath: resolveScriptPath(import.meta.url, "./scripts/001-update-grafana-compose-extend.js")
+    scriptPath: import.meta.resolve("./scripts/001-update-grafana-compose-extend.js")
   },
   {
     name: "002-update-is-compatible-workflow",
     version: LEGACY_UPDATE_CUTOFF_VERSION,
     description: "Update ./.github/workflows/is-compatible.yml to use is-compatible github action instead of calling levitate directly",
-    scriptPath: resolveScriptPath(import.meta.url, "./scripts/002-update-is-compatible-workflow.js")
+    scriptPath: import.meta.resolve("./scripts/002-update-is-compatible-workflow.js")
   },
   {
     name: "003-update-eslint-deprecation-rule",
     version: LEGACY_UPDATE_CUTOFF_VERSION,
     description: "Replace deprecated eslint-plugin-deprecation with @typescript-eslint/no-deprecated rule.",
-    scriptPath: resolveScriptPath(import.meta.url, "./scripts/003-update-eslint-deprecation-rule.js")
+    scriptPath: import.meta.resolve("./scripts/003-update-eslint-deprecation-rule.js")
   },
   {
     name: "004-eslint9-flat-config",
     version: LEGACY_UPDATE_CUTOFF_VERSION,
     description: "Migrate eslint config to flat config format and update devDependencies to latest versions.",
-    scriptPath: resolveScriptPath(import.meta.url, "./scripts/004-eslint9-flat-config.js")
+    scriptPath: import.meta.resolve("./scripts/004-eslint9-flat-config.js")
   },
   {
     name: "005-react-18-3",
     version: "6.1.9",
     description: "Update React and ReactDOM 18.x versions to ^18.3.0 to surface React 19 compatibility issues.",
-    scriptPath: resolveScriptPath(import.meta.url, "./scripts/005-react-18-3.js")
+    scriptPath: import.meta.resolve("./scripts/005-react-18-3.js")
   }
   // Do not use LEGACY_UPDATE_CUTOFF_VERSION for new migrations. It is only used above to force migrations to run
   // for those written before the switch to updates as migrations.

package/dist/codemods/utils.js

@@ -1,4 +1,4 @@
-import { dirname, resolve, join } from 'node:path';
+import { join, dirname } from 'node:path';
 import { createRequire } from 'node:module';
 import { mkdirSync, writeFileSync, rmSync } from 'node:fs';
 import chalk from 'chalk';
@@ -6,7 +6,6 @@ import { output } from '../utils/utils.console.js';
 import { getPackageManagerWithFallback, getPackageManagerSilentInstallCmd } from '../utils/utils.packageManager.js';
 import { execSync } from 'node:child_process';
 import { gte, gt, clean, coerce } from 'semver';
-import { fileURLToPath } from 'node:url';
 
 function printChanges(context, key, description) {
   const changes = context.listChanges();
@@ -204,10 +203,5 @@ function cleanSemver(version) {
 function sortObjectByKeys(obj) {
   return Object.keys(obj).sort().reduce((acc, key) => ({ ...acc, [key]: obj[key] }), {});
 }
-function resolveScriptPath(callerUrl, relativePath) {
-  const __filename = fileURLToPath(callerUrl);
-  const __dirname = dirname(__filename);
-  return resolve(__dirname, relativePath);
-}
 
-export { addDependenciesToPackageJson, flushChanges, formatFiles, installNPMDependencies, isVersionGreater, printChanges, readJsonFile, removeDependenciesFromPackageJson, resolveScriptPath };
+export { addDependenciesToPackageJson, flushChanges, formatFiles, installNPMDependencies, isVersionGreater, printChanges, readJsonFile, removeDependenciesFromPackageJson };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "6.2.0-canary.2233.19368311379.0",
+  "version": "6.2.0-canary.2233.19424871609.0",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "265f74e1e4a843bdeaad5300a13b94391ffd5fff"
+  "gitHead": "0b0b05e102a885fb4fb16588c6cfbd0f0b69392f"
 }

package/src/codemods/additions/additions.ts

@@ -1,10 +1,9 @@
 import { Codemod } from '../types.js';
-import { resolveScriptPath } from '../utils.js';
 
 export default [
   {
     name: 'example-addition',
     description: 'Example addition demonstrating Valibot schema with type inference',
-    scriptPath: resolveScriptPath(import.meta.url, './scripts/example-addition.js'),
+    scriptPath: import.meta.resolve('./scripts/example-addition.js'),
   },
 ] satisfies Codemod[];

package/src/codemods/migrations/migrations.test.ts

@@ -1,4 +1,5 @@
 import { existsSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
 import defaultMigrations from './migrations.js';
 
 describe('migrations json', () => {
@@ -7,8 +8,9 @@ describe('migrations json', () => {
   // This test now only asserts that the migration script source file exists.
   defaultMigrations.forEach((migration) => {
     it(`should have a valid migration script path for ${migration.name}`, () => {
-      // ensure migration script exists
-      const sourceFilePath = migration.scriptPath.replace('.js', '.ts');
+      // import.meta.resolve() returns a file:// URL, convert to path
+      const filePath = fileURLToPath(migration.scriptPath);
+      const sourceFilePath = filePath.replace('.js', '.ts');
       expect(existsSync(sourceFilePath)).toBe(true);
     });
   });

package/src/codemods/migrations/migrations.ts

@@ -1,6 +1,5 @@
 import { LEGACY_UPDATE_CUTOFF_VERSION } from '../../constants.js';
 import { Codemod } from '../types.js';
-import { resolveScriptPath } from '../utils.js';
 
 export interface Migration extends Codemod {
   version: string;
@@ -11,32 +10,32 @@ export default [
     name: '001-update-grafana-compose-extend',
     version: LEGACY_UPDATE_CUTOFF_VERSION,
     description: 'Update ./docker-compose.yaml to extend from ./.config/docker-compose-base.yaml.',
-    scriptPath: resolveScriptPath(import.meta.url, './scripts/001-update-grafana-compose-extend.js'),
+    scriptPath: import.meta.resolve('./scripts/001-update-grafana-compose-extend.js'),
   },
   {
     name: '002-update-is-compatible-workflow',
     version: LEGACY_UPDATE_CUTOFF_VERSION,
     description:
       'Update ./.github/workflows/is-compatible.yml to use is-compatible github action instead of calling levitate directly',
-    scriptPath: resolveScriptPath(import.meta.url, './scripts/002-update-is-compatible-workflow.js'),
+    scriptPath: import.meta.resolve('./scripts/002-update-is-compatible-workflow.js'),
   },
   {
     name: '003-update-eslint-deprecation-rule',
     version: LEGACY_UPDATE_CUTOFF_VERSION,
     description: 'Replace deprecated eslint-plugin-deprecation with @typescript-eslint/no-deprecated rule.',
-    scriptPath: resolveScriptPath(import.meta.url, './scripts/003-update-eslint-deprecation-rule.js'),
+    scriptPath: import.meta.resolve('./scripts/003-update-eslint-deprecation-rule.js'),
   },
   {
     name: '004-eslint9-flat-config',
     version: LEGACY_UPDATE_CUTOFF_VERSION,
     description: 'Migrate eslint config to flat config format and update devDependencies to latest versions.',
-    scriptPath: resolveScriptPath(import.meta.url, './scripts/004-eslint9-flat-config.js'),
+    scriptPath: import.meta.resolve('./scripts/004-eslint9-flat-config.js'),
   },
   {
     name: '005-react-18-3',
     version: '6.1.9',
     description: 'Update React and ReactDOM 18.x versions to ^18.3.0 to surface React 19 compatibility issues.',
-    scriptPath: resolveScriptPath(import.meta.url, './scripts/005-react-18-3.js'),
+    scriptPath: import.meta.resolve('./scripts/005-react-18-3.js'),
   },
   // Do not use LEGACY_UPDATE_CUTOFF_VERSION for new migrations. It is only used above to force migrations to run
   // for those written before the switch to updates as migrations.

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,6 @@ 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';
 
 export function printChanges(context: Context, key: string, description: string) {
   const changes = context.listChanges();
@@ -298,16 +297,3 @@ function sortObjectByKeys<T extends Record<string, any>>(obj: T): T {
     .sort()
     .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);
-}