@grafana/create-plugin 4.14.0 → 4.15.0-canary.984.dbba404.0

package/dist/utils/tests/utils.config.test.js

@@ -8,6 +8,7 @@ import { DEFAULT_FEATURE_FLAGS } from '../../constants.js';
 const mocks = vi.hoisted(() => {
     return {
         commandName: 'generate',
+        argv: {},
     };
 });
 vi.mock('../utils.cli.js', async () => mocks);
@@ -20,6 +21,7 @@ describe('getConfig', () => {
     describe('Command: Generate', () => {
         beforeEach(() => {
             mocks.commandName = 'generate';
+            mocks.argv = {};
         });
         it('should give back a default config', async () => {
             const config = getConfig(tmpDir);
@@ -28,6 +30,17 @@ describe('getConfig', () => {
                 features: DEFAULT_FEATURE_FLAGS,
             });
         });
+        it('should override default feature flags via cli args', async () => {
+            mocks.argv = {
+                useReactRouterV6: false,
+                bundleGrafanaUI: true,
+            };
+            const config = getConfig(tmpDir);
+            expect(config).toEqual({
+                version: getVersion(),
+                features: { ...DEFAULT_FEATURE_FLAGS, ...mocks.argv },
+            });
+        });
     });
     describe('Command: Update', () => {
         beforeEach(() => {

package/dist/utils/utils.config.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { getVersion } from './utils.version.js';
-import { commandName } from './utils.cli.js';
+import { argv, commandName } from './utils.cli.js';
 import { DEFAULT_FEATURE_FLAGS } from '../constants.js';
 export function getConfig(workDir = process.cwd()) {
     const rootConfig = getRootConfig(workDir);
@@ -59,7 +59,15 @@ function readRCFileSync(path) {
 }
 function createFeatureFlags(flags) {
     if (commandName === 'generate') {
-        return DEFAULT_FEATURE_FLAGS;
+        const flags = Object.entries(DEFAULT_FEATURE_FLAGS).reduce((acc, [flag, value]) => {
+            if (argv.hasOwnProperty(flag)) {
+                return { ...acc, [flag]: argv[flag] };
+            }
+            else {
+                return { ...acc, [flag]: value };
+            }
+        }, {});
+        return flags;
     }
     return flags ?? {};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "4.14.0",
+  "version": "4.15.0-canary.984.dbba404.0",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -87,5 +87,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "732bf7759cc0b6b2b696b9ca4451a9a65a6b732e"
+  "gitHead": "dbba404bbb705c8daf675fa82e19a3e197728bd6"
 }

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

@@ -9,6 +9,7 @@ import { DEFAULT_FEATURE_FLAGS } from '../../constants.js';
 const mocks = vi.hoisted(() => {
   return {
     commandName: 'generate',
+    argv: {},
   };
 });
 
@@ -25,6 +26,7 @@ describe('getConfig', () => {
   describe('Command: Generate', () => {
     beforeEach(() => {
       mocks.commandName = 'generate';
+      mocks.argv = {};
     });
 
     it('should give back a default config', async () => {
@@ -35,6 +37,19 @@ describe('getConfig', () => {
         features: DEFAULT_FEATURE_FLAGS,
       });
     });
+
+    it('should override default feature flags via cli args', async () => {
+      mocks.argv = {
+        useReactRouterV6: false,
+        bundleGrafanaUI: true,
+      };
+      const config = getConfig(tmpDir);
+
+      expect(config).toEqual({
+        version: getVersion(),
+        features: { ...DEFAULT_FEATURE_FLAGS, ...mocks.argv },
+      });
+    });
   });
 
   describe('Command: Update', () => {

package/src/utils/utils.config.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { getVersion } from './utils.version.js';
-import { commandName } from './utils.cli.js';
+import { argv, commandName } from './utils.cli.js';
 import { DEFAULT_FEATURE_FLAGS } from '../constants.js';
 
 export type FeatureFlags = {
@@ -84,9 +84,17 @@ function readRCFileSync(path: string): CreatePluginConfig | undefined {
 }
 
 function createFeatureFlags(flags?: FeatureFlags): FeatureFlags {
-  // Default values for new scaffoldings
+  // For new scaffolds override any defaults with args passed in the CLI.
   if (commandName === 'generate') {
-    return DEFAULT_FEATURE_FLAGS;
+    const flags = Object.entries(DEFAULT_FEATURE_FLAGS).reduce((acc, [flag, value]) => {
+      if (argv.hasOwnProperty(flag)) {
+        return { ...acc, [flag]: argv[flag] };
+      } else {
+        return { ...acc, [flag]: value };
+      }
+    }, {} as FeatureFlags);
+
+    return flags;
   }
 
   return flags ?? {};