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

package/dist/constants.js

@@ -30,6 +30,7 @@ const EXTRA_TEMPLATE_VARIABLES = {
   grafanaImage: "grafana-enterprise"
 };
 const DEFAULT_FEATURE_FLAGS = {
+  bundleGrafanaUI: false,
   useExperimentalRspack: false,
   useExperimentalUpdates: true
 };

package/dist/utils/utils.templates.js

@@ -1,4 +1,4 @@
-import { EXTRA_TEMPLATE_VARIABLES, PLUGIN_TYPES, TEMPLATE_PATHS, EXPORT_PATH_PREFIX } from '../constants.js';
+import { DEFAULT_FEATURE_FLAGS, EXTRA_TEMPLATE_VARIABLES, PLUGIN_TYPES, TEMPLATE_PATHS, EXPORT_PATH_PREFIX } from '../constants.js';
 import { isFile, getExportFileName, filterOutCommonFiles, isFileStartingWith } from './utils.files.js';
 import { getPackageManagerFromUserAgent, getPackageManagerInstallCmd, getPackageManagerWithFallback } from './utils.packageManager.js';
 import { normalizeId, renderHandlebarsTemplate } from './utils.handlebars.js';
@@ -56,6 +56,7 @@ function renderTemplateFromFile(templateFile, data) {
 function getTemplateData(cliArgs) {
   const { features } = getConfig();
   const currentVersion = CURRENT_APP_VERSION;
+  const bundleGrafanaUI = features.bundleGrafanaUI ?? DEFAULT_FEATURE_FLAGS.bundleGrafanaUI;
   const isAppType = (pluginType) => pluginType === PLUGIN_TYPES.app || pluginType === PLUGIN_TYPES.scenes;
   const isNPM = (packageManagerName) => packageManagerName === "npm";
   const frontendBundler = features.useExperimentalRspack ? "rspack" : "webpack";
@@ -76,6 +77,7 @@ function getTemplateData(cliArgs) {
       isAppType: isAppType(cliArgs.pluginType),
       isNPM: isNPM(packageManagerName),
       version: currentVersion,
+      bundleGrafanaUI,
       scenesVersion: "^6.10.4",
       useExperimentalRspack: Boolean(features.useExperimentalRspack),
       frontendBundler
@@ -96,6 +98,7 @@ function getTemplateData(cliArgs) {
       isAppType: isAppType(pluginJson.type),
       isNPM: isNPM(packageManagerName),
       version: currentVersion,
+      bundleGrafanaUI,
       scenesVersion: "^6.10.4",
       pluginExecutable: pluginJson.executable,
       useExperimentalRspack: Boolean(features.useExperimentalRspack),

package/package.json

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

package/src/constants.ts

@@ -49,6 +49,7 @@ export const EXTRA_TEMPLATE_VARIABLES = {
 };
 
 export const DEFAULT_FEATURE_FLAGS = {
+  bundleGrafanaUI: false,
   useExperimentalRspack: false,
   useExperimentalUpdates: true,
 };

package/src/types.ts

@@ -21,6 +21,7 @@ export type TemplateData = {
   isAppType: boolean;
   isNPM: boolean;
   version: string;
+  bundleGrafanaUI: boolean;
   scenesVersion: string;
   useExperimentalRspack: boolean;
   pluginExecutable?: string;

package/src/utils/tests/utils.config.test.ts

@@ -46,13 +46,13 @@ describe('getConfig', () => {
 
     it('should override default feature flags via cli args', async () => {
       mocks.argv = {
-        'feature-flags': 'useExperimentalRspack',
+        'feature-flags': 'bundleGrafanaUI',
       };
       const config = getConfig(tmpDir);
 
       expect(config).toEqual({
         version: CURRENT_APP_VERSION,
-        features: { ...DEFAULT_FEATURE_FLAGS, useExperimentalRspack: true },
+        features: { ...DEFAULT_FEATURE_FLAGS, bundleGrafanaUI: true },
       });
     });
   });
@@ -94,7 +94,7 @@ describe('getConfig', () => {
       const userConfigPath = path.join(tmpDir, '.cprc.json');
       const userConfig: UserConfig = {
         features: {
-          useExperimentalRspack: true,
+          bundleGrafanaUI: true,
         },
       };
 
@@ -107,5 +107,27 @@ describe('getConfig', () => {
         features: userConfig.features,
       });
     });
+
+    it('should give back the correct config when config files exist', async () => {
+      const rootConfigPath = path.join(tmpDir, '.config', '.cprc.json');
+      const userConfigPath = path.join(tmpDir, '.cprc.json');
+      const rootConfig: CreatePluginConfig = {
+        version: '1.0.0',
+        features: {},
+      };
+      const userConfig: UserConfig = {
+        features: {
+          bundleGrafanaUI: false,
+        },
+      };
+
+      await fs.mkdir(path.dirname(rootConfigPath), { recursive: true });
+      await fs.writeFile(rootConfigPath, JSON.stringify(rootConfig));
+      await fs.writeFile(userConfigPath, JSON.stringify(userConfig));
+
+      const config = getConfig(tmpDir);
+
+      expect(config).toEqual({ ...rootConfig, ...userConfig });
+    });
   });
 });

package/src/utils/utils.config.ts

@@ -10,6 +10,7 @@ import { writeFile } from 'node:fs/promises';
 import { EOL } from 'node:os';
 
 export type FeatureFlags = {
+  bundleGrafanaUI?: boolean;
   useExperimentalRspack?: boolean;
   useExperimentalUpdates?: boolean;
 };

package/src/utils/utils.templates.ts

@@ -1,4 +1,10 @@
-import { EXPORT_PATH_PREFIX, EXTRA_TEMPLATE_VARIABLES, PLUGIN_TYPES, TEMPLATE_PATHS } from '../constants.js';
+import {
+  DEFAULT_FEATURE_FLAGS,
+  EXPORT_PATH_PREFIX,
+  EXTRA_TEMPLATE_VARIABLES,
+  PLUGIN_TYPES,
+  TEMPLATE_PATHS,
+} from '../constants.js';
 import { GenerateCliArgs, TemplateData } from '../types.js';
 import { filterOutCommonFiles, isFile, isFileStartingWith } from './utils.files.js';
 import {
@@ -89,6 +95,7 @@ export function renderTemplateFromFile(templateFile: string, data?: any) {
 export function getTemplateData(cliArgs?: GenerateCliArgs): TemplateData {
   const { features } = getConfig();
   const currentVersion = CURRENT_APP_VERSION;
+  const bundleGrafanaUI = features.bundleGrafanaUI ?? DEFAULT_FEATURE_FLAGS.bundleGrafanaUI;
   const isAppType = (pluginType: string) => pluginType === PLUGIN_TYPES.app || pluginType === PLUGIN_TYPES.scenes;
   const isNPM = (packageManagerName: string) => packageManagerName === 'npm';
   const frontendBundler = features.useExperimentalRspack ? 'rspack' : 'webpack';
@@ -113,6 +120,7 @@ export function getTemplateData(cliArgs?: GenerateCliArgs): TemplateData {
       isAppType: isAppType(cliArgs.pluginType),
       isNPM: isNPM(packageManagerName),
       version: currentVersion,
+      bundleGrafanaUI,
       scenesVersion: '^6.10.4',
       useExperimentalRspack: Boolean(features.useExperimentalRspack),
       frontendBundler,
@@ -136,6 +144,7 @@ export function getTemplateData(cliArgs?: GenerateCliArgs): TemplateData {
       isAppType: isAppType(pluginJson.type),
       isNPM: isNPM(packageManagerName),
       version: currentVersion,
+      bundleGrafanaUI,
       scenesVersion: '^6.10.4',
       pluginExecutable: pluginJson.executable,
       useExperimentalRspack: Boolean(features.useExperimentalRspack),

package/templates/common/.cprc.json

@@ -1,5 +1,6 @@
 {
   "features": {
+    "bundleGrafanaUI": {{ bundleGrafanaUI }},
     "useExperimentalRspack": {{ useExperimentalRspack }}
   }
 }