@grafana/create-plugin 0.8.3 → 0.9.0

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+# v0.9.0 (Thu Jan 26 2023)
+
+#### 🚀 Enhancement
+
+- Create Plugin: Update jest config to support Grafana 9.4 packages [#188](https://github.com/grafana/plugin-tools/pull/188) ([@jackw](https://github.com/jackw))
+
+#### Authors: 1
+
+- Jack Westbrook ([@jackw](https://github.com/jackw))
+
+---
+
+# v0.8.4 (Fri Jan 13 2023)
+
+#### 🐛 Bug Fix
+
+- Create Plugin: Make sure nested plugins dist directory structure is correct [#182](https://github.com/grafana/plugin-tools/pull/182) ([@jackw](https://github.com/jackw))
+
+#### Authors: 1
+
+- Jack Westbrook ([@jackw](https://github.com/jackw))
+
+---
+
 # v0.8.3 (Thu Jan 12 2023)
 
 #### 🐛 Bug Fix

package/dist/commands/generate.plopfile.js

@@ -68,7 +68,7 @@ function default_1(plop) {
                 name: 'pluginType',
                 type: 'list',
                 choices: [constants_1.PLUGIN_TYPES.app, constants_1.PLUGIN_TYPES.datasource, constants_1.PLUGIN_TYPES.panel],
-                message: 'What kind of plugin would you like? '
+                message: 'What type of plugin would you like?'
             },
             {
                 name: 'hasBackend',
@@ -200,6 +200,6 @@ function printSuccessMessage(answers) {
         '- `docker-compose up` to start a grafana development server. Restart this command after each time you run mage to run your new backend code.',
         '- Open http://localhost:3000 in your browser to create a dashboard to begin developing your plugin.',
     ], false);
-    var msg = "\nCongratulations on scaffolding a Grafana ".concat(answers.pluginType, " plugin! \uD83D\uDE80\n\n## What's next?\n\nRun the following commands to get started:\n").concat(commands.map(function (command) { return command; }).join('\n'), "\n\n_Note: We strongly recommend creating a new Git repository by running `git init` in ./").concat(directory, " before continuing._\n\n- View ./").concat(directory, "/README.md\n- Learn more about Grafana Plugins at https://grafana.com/docs/grafana/latest/plugins/developing/development/\n");
+    var msg = "\nCongratulations on scaffolding a Grafana ".concat(answers.pluginType, " plugin! \uD83D\uDE80\n\n## What's next?\n\nRun the following commands to get started:\n").concat(commands.map(function (command) { return command; }).join('\n'), "\n\n_Note: We strongly recommend creating a new Git repository by running `git init` in ./").concat(directory, " before continuing._\n\n- View create-plugin documentation at https://grafana.github.io/plugin-tools/\n- Learn more about Grafana Plugins at https://grafana.com/docs/grafana/latest/plugins/developing/development/\n");
     return (0, utils_console_1.displayAsMarkdown)(msg);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "0.8.3",
+  "version": "0.9.0",
   "main": "index.js",
   "repository": {
     "directory": "packages/create-plugin",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "f8c0d2ac3a8b264aac4cf8cf4dbfaf60ae084ad4"
+  "gitHead": "f27f1333941079ea7e39799f8e6c8ca3e0c6cea3"
 }

package/src/commands/generate.plopfile.ts

@@ -65,7 +65,7 @@ export default function (plop: NodePlopAPI) {
         name: 'pluginType',
         type: 'list',
         choices: [PLUGIN_TYPES.app, PLUGIN_TYPES.datasource, PLUGIN_TYPES.panel],
-        message: 'What kind of plugin would you like? ',
+        message: 'What type of plugin would you like?',
       },
       {
         name: 'hasBackend',
@@ -272,7 +272,7 @@ ${commands.map((command) => command).join('\n')}
 
 _Note: We strongly recommend creating a new Git repository by running \`git init\` in ./${directory} before continuing._
 
-- View ./${directory}/README.md
+- View create-plugin documentation at https://grafana.github.io/plugin-tools/
 - Learn more about Grafana Plugins at https://grafana.com/docs/grafana/latest/plugins/developing/development/
 `;
 

package/templates/common/.config/jest/utils.js

@@ -11,7 +11,16 @@
 const nodeModulesToTransform = (moduleNames) => `node_modules\/(?!(${moduleNames.join('|')})\/)`;
 
 // Array of known nested grafana package dependencies that only bundle an ESM version
-const grafanaESModules = ['ol', 'react-colorful', 'uuid'];
+const grafanaESModules = [
+  'd3',
+  'd3-color',
+  'd3-force',
+  'd3-interpolate',
+  'd3-scale-chromatic',
+  'ol',
+  'react-colorful',
+  'uuid',
+];
 
 module.exports = {
   nodeModulesToTransform,

package/templates/common/.config/webpack/utils.ts

@@ -21,21 +21,22 @@ export function hasReadme() {
 }
 
 export async function getEntries(): Promise<Record<string, string>> {
-  const parent = '..';
-  const pluginsJson = await globAsync('**/src/**/plugin.json');
-  
-  const plugins = await Promise.all(pluginsJson.map(pluginJson => {
-    const folder = path.dirname(pluginJson);
-    return globAsync(`${folder}/module.{ts,tsx,js}`);
-  }));
+  const pluginsJson = await globAsync('**/src/**/plugin.json', { absolute: true });
+
+  const plugins = await Promise.all(pluginsJson.map((pluginJson) => {
+      const folder = path.dirname(pluginJson);
+      return globAsync(`${folder}/module.{ts,tsx,js}`, { absolute: true });
+    })
+  );
 
   return plugins.reduce((result, modules) => {
     return modules.reduce((result, module) => {
-      const pluginPath = path.resolve(path.dirname(module), parent);
+      const pluginPath = path.dirname(module);
       const pluginName = path.basename(pluginPath);
-      const entryName = plugins.length > 1 ? `${pluginName}/module` : 'module';
-  
-      result[entryName] = path.join(parent, module);
+      // support bundling nested plugins
+      const entryName = pluginName === 'src' ? 'module' : `${pluginName}/module`;
+
+      result[entryName] = module;
       return result;
     }, result);
   }, {});