@grafana/create-plugin 0.9.1 → 0.10.0-canary.197.f95c2c8.0

package/CHANGELOG.md

@@ -1,15 +1,3 @@
-# v0.9.1 (Thu Feb 02 2023)
-
-#### 🐛 Bug Fix
-
-- Create Plugin: Fix deeply nested plugins [#195](https://github.com/grafana/plugin-tools/pull/195) ([@jackw](https://github.com/jackw))
-
-#### Authors: 1
-
-- Jack Westbrook ([@jackw](https://github.com/jackw))
-
----
-
 # v0.9.0 (Thu Jan 26 2023)
 
 #### 🚀 Enhancement

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "0.9.1",
+  "version": "0.10.0-canary.197.f95c2c8.0",
   "main": "index.js",
   "repository": {
     "directory": "packages/create-plugin",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "cf5b9a9afc6bd925f47c95a9a155137301c0f9d4"
+  "gitHead": "f95c2c83cdb8953565ab7e0e1ac2fa2002894f1c"
 }

package/templates/common/.config/Dockerfile

@@ -1,6 +1,7 @@
 ARG grafana_version=latest
+ARG grafana_image=grafana-enterprise
 
-FROM grafana/grafana:${grafana_version}
+FROM grafana/${grafana_image}:${grafana_version}
 
 # Make it as simple as possible to access the grafana instance for development purposes
 # Do NOT enable these settings in a public facing / production grafana instance

package/templates/common/.config/README.md

@@ -139,3 +139,26 @@ We need to update the `scripts` in the `package.json` to use the extended Webpac
 -"dev": "webpack -w -c ./.config/webpack/webpack.config.ts --env development",
 +"dev": "webpack -w -c ./webpack.config.ts --env development",
 ```
+
+### Configure grafana image to use when running docker
+
+By default `grafana-enterprise` will be used as the docker image for all docker related commands. If you want to override this behaviour simply alter the `docker-compose.yaml` by adding the following build arg `grafana_image`. 
+
+**Example:**
+
+```yaml
+version: '3.7'
+
+services:
+  grafana:
+    container_name: 'myorg-basic-app'
+    build:
+      context: ./.config
+      args:
+        grafana_version: ${GRAFANA_VERSION:-9.1.2}
+        grafana_image: ${GRAFANA_IMAGE:-grafana}
+```
+
+In this example we are assigning the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will give you the possibility to set the value while running the docker-compose commands which might be convinent in some scenarios.
+
+---

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

@@ -20,25 +20,24 @@ export function hasReadme() {
   return fs.existsSync(path.resolve(process.cwd(), SOURCE_DIR, 'README.md'));
 }
 
-// Support bundling nested plugins by finding all plugin.json files in src directory
-// then checking for a sibling module.[jt]sx? file.
 export async function getEntries(): Promise<Record<string, string>> {
   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,jsx}`, { absolute: true });
+      return globAsync(`${folder}/module.{ts,tsx,js}`, { absolute: true });
     })
   );
 
   return plugins.reduce((result, modules) => {
     return modules.reduce((result, module) => {
       const pluginPath = path.dirname(module);
-      const pluginName = path.relative(process.cwd(), pluginPath).replace(/src\/?/i, '');
-      const entryName = pluginName === '' ? 'module' : `${pluginName}/module`;
+      const pluginName = path.basename(pluginPath);
+      // support bundling nested plugins
+      const entryName = pluginName === 'src' ? 'module' : `${pluginName}/module`;
 
       result[entryName] = module;
       return result;
     }, result);
   }, {});
-}
+}

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

@@ -96,6 +96,7 @@ const config = async (env): Promise<Configuration> => ({
         use: ["style-loader", "css-loader"]
       },
       {
+        exclude: /(node_modules)/,
         test: /\.s[ac]ss$/,
         use: ['style-loader', 'css-loader', 'sass-loader'],
       },