@grafana/create-plugin 6.5.0-canary.2320.20267963205.0 → 6.5.0-canary.2320.20268376971.0

package/dist/codemods/additions/scripts/i18n/code-generation.js

@@ -54,23 +54,23 @@ function addI18nInitialization(context, needsBackwardCompatibility) {
         )
       );
     }
-    const firstImportIndex = ast.program.body.findIndex((node) => node.type === "ImportDeclaration");
-    if (firstImportIndex !== -1) {
-      ast.program.body.splice(firstImportIndex + 1, 0, ...imports);
+    const lastImportIndex = ast.program.body.findLastIndex((node) => node.type === "ImportDeclaration");
+    if (lastImportIndex !== -1) {
+      ast.program.body.splice(lastImportIndex + 1, 0, ...imports);
     } else {
       ast.program.body.unshift(...imports);
     }
     const i18nInitCode = needsBackwardCompatibility ? `// Before Grafana version 12.1.0 the plugin is responsible for loading translation resources
 // In Grafana version 12.1.0 and later Grafana is responsible for loading translation resources
-const loaders = semver.lt(config?.buildInfo?.version, '12.1.0') ? [loadResources] : [];
+const loaders = semver.lt(config?.buildInfo?.version || '0.0.0', '12.1.0') ? [loadResources] : [];
 
 await initPluginTranslations(pluginJson.id, loaders);` : `await initPluginTranslations(pluginJson.id);`;
     const initAst = recast.parse(i18nInitCode, {
       parser: babelParser
     });
-    const lastImportIndex = ast.program.body.findLastIndex((node) => node.type === "ImportDeclaration");
-    if (lastImportIndex !== -1) {
-      ast.program.body.splice(lastImportIndex + 1, 0, ...initAst.program.body);
+    const finalLastImportIndex = ast.program.body.findLastIndex((node) => node.type === "ImportDeclaration");
+    if (finalLastImportIndex !== -1) {
+      ast.program.body.splice(finalLastImportIndex + 1, 0, ...initAst.program.body);
     } else {
       ast.program.body.unshift(...initAst.program.body);
     }
@@ -100,7 +100,7 @@ function createLoadResourcesFile(context) {
 import pluginJson from 'plugin.json';
 
 const resources = LANGUAGES.reduce<Record<string, () => Promise<{ default: Resources }>>>((acc, lang) => {
-  acc[lang.code] = async () => await import(\`./locales/\${lang.code}/\${pluginJson.id}.json\`);
+  acc[lang.code] = () => import(\`./locales/\${lang.code}/\${pluginJson.id}.json\`);
   return acc;
 }, {});
 

package/dist/codemods/additions/scripts/i18n/tooling.js

@@ -52,13 +52,15 @@ function updateEslintConfig(context) {
     });
     const imports = ast.program.body.filter((node) => node.type === "ImportDeclaration");
     const lastImport = imports[imports.length - 1];
+    const pluginImport = builders.importDeclaration(
+      [builders.importDefaultSpecifier(builders.identifier("grafanaI18nPlugin"))],
+      builders.literal("@grafana/i18n/eslint-plugin")
+    );
     if (lastImport) {
-      const pluginImport = builders.importDeclaration(
-        [builders.importDefaultSpecifier(builders.identifier("grafanaI18nPlugin"))],
-        builders.literal("@grafana/i18n/eslint-plugin")
-      );
       const lastImportIndex = ast.program.body.indexOf(lastImport);
       ast.program.body.splice(lastImportIndex + 1, 0, pluginImport);
+    } else {
+      ast.program.body.unshift(pluginImport);
     }
     recast.visit(ast, {
       visitCallExpression(path) {

package/dist/codemods/additions/scripts/i18n/utils.js

@@ -31,11 +31,17 @@ Update your package.json to use "react": "^18.3.0" and "react-dom": "^18.3.0".`
 function checkNeedsBackwardCompatibility(context) {
   const pluginJsonRaw = context.getFile("src/plugin.json");
   if (!pluginJsonRaw) {
-    return false;
+    return true;
   }
   try {
     const pluginJson = JSON.parse(pluginJsonRaw);
-    const currentGrafanaDep = pluginJson.dependencies?.grafanaDependency || ">=11.0.0";
+    const currentGrafanaDep = pluginJson.dependencies?.grafanaDependency;
+    if (!currentGrafanaDep) {
+      additionsDebug(
+        "Warning: grafanaDependency is missing from plugin.json. Assuming backward compatibility mode is needed."
+      );
+      return true;
+    }
     const minVersion = coerce("12.1.0");
     const currentVersion = coerce(currentGrafanaDep.replace(/^[><=]+/, ""));
     if (currentVersion && minVersion && gte(currentVersion, minVersion)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "6.5.0-canary.2320.20267963205.0",
+  "version": "6.5.0-canary.2320.20268376971.0",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -56,5 +56,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "2d7dc3b835015e2b3c24f53907ad874b344446af"
+  "gitHead": "47d4c2ff4f55df3a644771982994d0c85ec7d96d"
 }

package/src/codemods/AGENTS.md

@@ -38,7 +38,7 @@ Additions are optional features that developers choose to add via `create-plugin
 ### Addition Behavior
 
 - Additions add new features or capabilities to a plugin (e.g., i18n support, testing frameworks, etc.)
-- it should be safe to run multiple times
+- It should be safe to run multiple times
 - Always use defensive programming: check if features already exist before adding them
 - Use `additionsDebug()` for logging to help with troubleshooting
 - If the addition accepts user input, export a `schema` object using `valibot` for input validation

package/src/codemods/additions/scripts/i18n/README.md

@@ -10,7 +10,7 @@ npx @grafana/create-plugin add i18n --locales <locales>
 
 ## Requirements
 
-- **Grafana >= 11.0.0**: i18n is not supported for Grafana versions prior to 11.0.0. If your plugin's `grafanaDependency` is set to a version < 11.0.0, the script will automatically update it to `>=11.0.0`.
+- **Grafana >= 11.0.0**: i18n is not supported for Grafana versions prior to 11.0.0. If your plugin's `grafanaDependency` is set to a version < 11.0.0, the script will automatically update it to `>=11.0.0` (it will not exit with an error).
 - **React >= 18**: The `@grafana/i18n` package requires React 18 or higher. If your plugin uses React < 18, the script will exit with an error and prompt you to upgrade.
 
 ## Required Flags

package/src/codemods/additions/scripts/i18n/code-generation.ts

@@ -73,10 +73,12 @@ export function addI18nInitialization(context: Context, needsBackwardCompatibili
       );
     }
 
-    // Add imports after the first import statement
-    const firstImportIndex = ast.program.body.findIndex((node: any) => node.type === 'ImportDeclaration');
-    if (firstImportIndex !== -1) {
-      ast.program.body.splice(firstImportIndex + 1, 0, ...imports);
+    // Find the last import index (use consistent approach for both imports and initialization)
+    const lastImportIndex = ast.program.body.findLastIndex((node: any) => node.type === 'ImportDeclaration');
+
+    // Add imports after the last import statement
+    if (lastImportIndex !== -1) {
+      ast.program.body.splice(lastImportIndex + 1, 0, ...imports);
     } else {
       ast.program.body.unshift(...imports);
     }
@@ -85,7 +87,7 @@ export function addI18nInitialization(context: Context, needsBackwardCompatibili
     const i18nInitCode = needsBackwardCompatibility
       ? `// Before Grafana version 12.1.0 the plugin is responsible for loading translation resources
 // In Grafana version 12.1.0 and later Grafana is responsible for loading translation resources
-const loaders = semver.lt(config?.buildInfo?.version, '12.1.0') ? [loadResources] : [];
+const loaders = semver.lt(config?.buildInfo?.version || '0.0.0', '12.1.0') ? [loadResources] : [];
 
 await initPluginTranslations(pluginJson.id, loaders);`
       : `await initPluginTranslations(pluginJson.id);`;
@@ -95,10 +97,10 @@ await initPluginTranslations(pluginJson.id, loaders);`
       parser: babelParser,
     });
 
-    // Find the last import index
-    const lastImportIndex = ast.program.body.findLastIndex((node: any) => node.type === 'ImportDeclaration');
-    if (lastImportIndex !== -1) {
-      ast.program.body.splice(lastImportIndex + 1, 0, ...initAst.program.body);
+    // Find the last import index again (after adding new imports)
+    const finalLastImportIndex = ast.program.body.findLastIndex((node: any) => node.type === 'ImportDeclaration');
+    if (finalLastImportIndex !== -1) {
+      ast.program.body.splice(finalLastImportIndex + 1, 0, ...initAst.program.body);
     } else {
       ast.program.body.unshift(...initAst.program.body);
     }
@@ -135,7 +137,7 @@ export function createLoadResourcesFile(context: Context): void {
 import pluginJson from 'plugin.json';
 
 const resources = LANGUAGES.reduce<Record<string, () => Promise<{ default: Resources }>>>((acc, lang) => {
-  acc[lang.code] = async () => await import(\`./locales/\${lang.code}/\${pluginJson.id}.json\`);
+  acc[lang.code] = () => import(\`./locales/\${lang.code}/\${pluginJson.id}.json\`);
   return acc;
 }, {});
 

package/src/codemods/additions/scripts/i18n/tooling.ts

@@ -73,14 +73,18 @@ export function updateEslintConfig(context: Context): void {
     const imports = ast.program.body.filter((node: any) => node.type === 'ImportDeclaration');
     const lastImport = imports[imports.length - 1];
 
-    if (lastImport) {
-      const pluginImport = builders.importDeclaration(
-        [builders.importDefaultSpecifier(builders.identifier('grafanaI18nPlugin'))],
-        builders.literal('@grafana/i18n/eslint-plugin')
-      );
+    // Always create the plugin import
+    const pluginImport = builders.importDeclaration(
+      [builders.importDefaultSpecifier(builders.identifier('grafanaI18nPlugin'))],
+      builders.literal('@grafana/i18n/eslint-plugin')
+    );
 
+    if (lastImport) {
       const lastImportIndex = ast.program.body.indexOf(lastImport);
       ast.program.body.splice(lastImportIndex + 1, 0, pluginImport);
+    } else {
+      // No imports found, insert at the beginning
+      ast.program.body.unshift(pluginImport);
     }
 
     // Find the defineConfig array and add the plugin config

package/src/codemods/additions/scripts/i18n/utils.ts

@@ -43,12 +43,21 @@ export function checkReactVersion(context: Context): void {
 export function checkNeedsBackwardCompatibility(context: Context): boolean {
   const pluginJsonRaw = context.getFile('src/plugin.json');
   if (!pluginJsonRaw) {
-    return false;
+    // Default to backward compat for safety when plugin.json is missing
+    return true;
   }
 
   try {
     const pluginJson = JSON.parse(pluginJsonRaw);
-    const currentGrafanaDep = pluginJson.dependencies?.grafanaDependency || '>=11.0.0';
+    const currentGrafanaDep = pluginJson.dependencies?.grafanaDependency;
+
+    if (!currentGrafanaDep) {
+      additionsDebug(
+        'Warning: grafanaDependency is missing from plugin.json. Assuming backward compatibility mode is needed.'
+      );
+      return true;
+    }
+
     const minVersion = coerce('12.1.0');
     const currentVersion = coerce(currentGrafanaDep.replace(/^[><=]+/, ''));