@grafana/create-plugin 6.8.0-canary.2356.20814023201.0 → 6.8.0-canary.2356.20815895884.0

package/dist/codemods/additions/scripts/bundle-grafana-ui/index.js

@@ -2,13 +2,12 @@ import * as v from 'valibot';
 import * as recast from 'recast';
 import { coerce, gte } from 'semver';
 import { additionsDebug } from '../../../utils.js';
+import { getBundlerConfig } from '../../../utils.bundler-config.js';
 import { updateExternalsArray } from '../../../utils.externals.js';
 
 const { builders } = recast.types;
 const PLUGIN_JSON_PATH = "src/plugin.json";
 const MIN_GRAFANA_VERSION = "10.2.0";
-const WEBPACK_CONFIG_PATH = ".config/webpack/webpack.config.ts";
-const RSPACK_CONFIG_PATH = ".config/rspack/rspack.config.ts";
 const schema = v.object({});
 function bundleGrafanaUI(context, _options) {
   additionsDebug("Running bundle-grafana-ui addition...");
@@ -79,14 +78,11 @@ function createBundleGrafanaUIModifier() {
   };
 }
 function updateResolveExtensions(context) {
-  const configPath = context.doesFileExist(RSPACK_CONFIG_PATH) ? RSPACK_CONFIG_PATH : context.doesFileExist(WEBPACK_CONFIG_PATH) ? WEBPACK_CONFIG_PATH : null;
-  if (!configPath) {
-    return;
-  }
-  const content = context.getFile(configPath);
-  if (!content) {
+  const config = getBundlerConfig(context);
+  if (!config) {
     return;
   }
+  const { path: configPath, content } = config;
   if (content.includes("'.mjs'") || content.includes('".mjs"')) {
     return;
   }
@@ -102,14 +98,11 @@ function updateResolveExtensions(context) {
   }
 }
 function updateModuleRules(context) {
-  const configPath = context.doesFileExist(RSPACK_CONFIG_PATH) ? RSPACK_CONFIG_PATH : context.doesFileExist(WEBPACK_CONFIG_PATH) ? WEBPACK_CONFIG_PATH : null;
-  if (!configPath) {
-    return;
-  }
-  const content = context.getFile(configPath);
-  if (!content) {
+  const config = getBundlerConfig(context);
+  if (!config) {
     return;
   }
+  const { path: configPath, content } = config;
   if (content.includes("test: /\\.mjs$") || content.includes("test: /\\\\.mjs$")) {
     return;
   }

package/dist/codemods/utils.bundler-config.js

@@ -0,0 +1,19 @@
+import 'recast';
+import 'recast/parsers/typescript.js';
+import './utils.js';
+
+const WEBPACK_CONFIG_PATH = ".config/webpack/webpack.config.ts";
+const RSPACK_CONFIG_PATH = ".config/rspack/rspack.config.ts";
+function getBundlerConfig(context) {
+  const configPath = context.doesFileExist(RSPACK_CONFIG_PATH) ? RSPACK_CONFIG_PATH : context.doesFileExist(WEBPACK_CONFIG_PATH) ? WEBPACK_CONFIG_PATH : null;
+  if (!configPath) {
+    return null;
+  }
+  const content = context.getFile(configPath);
+  if (!content) {
+    return null;
+  }
+  return { path: configPath, content };
+}
+
+export { getBundlerConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "6.8.0-canary.2356.20814023201.0",
+  "version": "6.8.0-canary.2356.20815895884.0",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -55,5 +55,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "c56736e56659f6e4b808d59225f1807e32e94062"
+  "gitHead": "1aaf622fe62c06dcbbb9552d3e1d2432d3bd07ce"
 }

package/src/codemods/additions/scripts/bundle-grafana-ui/index.ts

@@ -4,14 +4,13 @@ import { coerce, gte } from 'semver';
 
 import type { Context } from '../../../context.js';
 import { additionsDebug } from '../../../utils.js';
+import { getBundlerConfig } from '../../../utils.bundler-config.js';
 import { updateExternalsArray, type ExternalsArrayModifier } from '../../../utils.externals.js';
 
 const { builders } = recast.types;
 
 const PLUGIN_JSON_PATH = 'src/plugin.json';
 const MIN_GRAFANA_VERSION = '10.2.0';
-const WEBPACK_CONFIG_PATH = '.config/webpack/webpack.config.ts';
-const RSPACK_CONFIG_PATH = '.config/rspack/rspack.config.ts';
 
 export const schema = v.object({});
 type BundleGrafanaUIOptions = v.InferOutput<typeof schema>;
@@ -135,20 +134,12 @@ function createBundleGrafanaUIModifier(): ExternalsArrayModifier {
  * Updates resolve extensions to add .mjs using string manipulation
  */
 function updateResolveExtensions(context: Context): void {
-  const configPath = context.doesFileExist(RSPACK_CONFIG_PATH)
-    ? RSPACK_CONFIG_PATH
-    : context.doesFileExist(WEBPACK_CONFIG_PATH)
-      ? WEBPACK_CONFIG_PATH
-      : null;
-
-  if (!configPath) {
+  const config = getBundlerConfig(context);
+  if (!config) {
     return;
   }
 
-  const content = context.getFile(configPath);
-  if (!content) {
-    return;
-  }
+  const { path: configPath, content } = config;
 
   // Check if .mjs already exists
   if (content.includes("'.mjs'") || content.includes('".mjs"')) {
@@ -173,20 +164,12 @@ function updateResolveExtensions(context: Context): void {
  * Updates module rules to add .mjs rule using string manipulation
  */
 function updateModuleRules(context: Context): void {
-  const configPath = context.doesFileExist(RSPACK_CONFIG_PATH)
-    ? RSPACK_CONFIG_PATH
-    : context.doesFileExist(WEBPACK_CONFIG_PATH)
-      ? WEBPACK_CONFIG_PATH
-      : null;
-
-  if (!configPath) {
+  const config = getBundlerConfig(context);
+  if (!config) {
     return;
   }
 
-  const content = context.getFile(configPath);
-  if (!content) {
-    return;
-  }
+  const { path: configPath, content } = config;
 
   // Check if rule already exists
   if (content.includes('test: /\\.mjs$') || content.includes('test: /\\\\.mjs$')) {

package/src/codemods/utils.bundler-config.ts

@@ -7,6 +7,29 @@ import { additionsDebug } from './utils.js';
 const WEBPACK_CONFIG_PATH = '.config/webpack/webpack.config.ts';
 const RSPACK_CONFIG_PATH = '.config/rspack/rspack.config.ts';
 
+/**
+ * Gets the bundler config file path and content, preferring rspack over webpack
+ * @returns Object with path and content, or null if no config file exists
+ */
+export function getBundlerConfig(context: Context): { path: string; content: string } | null {
+  const configPath = context.doesFileExist(RSPACK_CONFIG_PATH)
+    ? RSPACK_CONFIG_PATH
+    : context.doesFileExist(WEBPACK_CONFIG_PATH)
+      ? WEBPACK_CONFIG_PATH
+      : null;
+
+  if (!configPath) {
+    return null;
+  }
+
+  const content = context.getFile(configPath);
+  if (!content) {
+    return null;
+  }
+
+  return { path: configPath, content };
+}
+
 /**
  * Type for a function that modifies a resolve object expression
  * @param resolveObject - The AST node representing the resolve configuration

package/templates/common/.cprc.json

@@ -1,10 +1,5 @@
 {
   "features": {
-<<<<<<< HEAD
-    "bundleGrafanaUI": {{ bundleGrafanaUI }},
-=======
-    "useReactRouterV6": {{ useReactRouterV6 }},
->>>>>>> 91a41873 (renome var)
     "useExperimentalRspack": {{ useExperimentalRspack }}
   }
 }