@grafana/create-plugin 6.7.1-canary.2369.20789853616.0 → 6.7.1-canary.2370.20798217827.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "6.7.1-canary.2369.20789853616.0",
+  "version": "6.7.1-canary.2370.20798217827.0",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -55,5 +55,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "779eacef0db77c47e8fadaead53cdebbe208fe24"
+  "gitHead": "bb9cbddbe1ddc57c7343dcaa5671238c128be212"
 }

package/templates/common/.config/rspack/rspack.config.ts

@@ -21,8 +21,7 @@ import { externals } from '../bundler/externals';
 const { SubresourceIntegrityPlugin } = rspack.experiments;
 const pluginJson = getPluginJson();
 const cpVersion = getCPConfigVersion();
-const logoPaths = Array.from(new Set([pluginJson.info?.logos?.large, pluginJson.info?.logos?.small])).filter(Boolean);
-const screenshotPaths = Array.from(new Set(pluginJson.info?.screenshots?.map((s: { path: string }) => s.path)));
+
 const virtualPublicPath = new RspackVirtualModulePlugin({
   'grafana-public-path': `
 import amdMetaModule from 'amd-module';
@@ -162,10 +161,14 @@ const config = async (env): Promise<Configuration> => {
           { from: 'plugin.json', to: '.' },
           { from: '../LICENSE', to: '.' },
           { from: '../CHANGELOG.md', to: '.', force: true },
-          { from: '**/*.json', to: '.' },
-          { from: 'img/logo.svg', to: '.', noErrorOnMissing: true },
-          { from: 'img/screenshots/**/*', to: '.', noErrorOnMissing: true },
-          { from: '**/query_help.md', to: '.', noErrorOnMissing: true },
+          { from: '**/*.json', to: '.' }, // TODO<Add an error for checking the basic structure of the repo>
+          { from: '**/*.svg', to: '.', noErrorOnMissing: true }, // Optional
+          { from: '**/*.png', to: '.', noErrorOnMissing: true }, // Optional
+          { from: '**/*.html', to: '.', noErrorOnMissing: true }, // Optional
+          { from: 'img/**/*', to: '.', noErrorOnMissing: true }, // Optional
+          { from: 'libs/**/*', to: '.', noErrorOnMissing: true }, // Optional
+          { from: 'static/**/*', to: '.', noErrorOnMissing: true }, // Optional
+          { from: '**/query_help.md', to: '.', noErrorOnMissing: true }, // Optional
         ],
       }),
       // Replace certain template-variables in the README and plugin.json

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

@@ -1,4 +1,4 @@
-import webpack, { type Compiler } from 'webpack';
+import webpack from 'webpack';
 
 const PLUGIN_NAME = 'BuildModeWebpack';
 

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

@@ -24,8 +24,7 @@ import { externals } from '../bundler/externals.ts';
 const pluginJson = getPluginJson();
 const cpVersion = getCPConfigVersion();
 const pluginVersion = getPackageJson().version;
-const logoPaths = Array.from(new Set([pluginJson.info?.logos?.large, pluginJson.info?.logos?.small])).filter(Boolean);
-const screenshotPaths = Array.from(new Set(pluginJson.info?.screenshots?.map((s: { path: string }) => s.path)));
+
 const virtualPublicPath = new VirtualModulesPlugin({
   'node_modules/grafana-public-path.js': `
 import amdMetaModule from 'amd-module';
@@ -175,12 +174,13 @@ const config = async (env: Env): Promise<Configuration> => {
           { from: '../LICENSE', to: '.' },
           { from: '../CHANGELOG.md', to: '.', force: true },
           { from: '**/*.json', to: '.' },
+          { from: '**/*.svg', to: '.', noErrorOnMissing: true },
+          { from: '**/*.png', to: '.', noErrorOnMissing: true },
+          { from: '**/*.html', to: '.', noErrorOnMissing: true },
+          { from: 'img/**/*', to: '.', noErrorOnMissing: true },
+          { from: 'libs/**/*', to: '.', noErrorOnMissing: true },
+          { from: 'static/**/*', to: '.', noErrorOnMissing: true },
           { from: '**/query_help.md', to: '.', noErrorOnMissing: true },
-          ...logoPaths.map((logoPath) => ({ from: logoPath, to: logoPath })),
-          ...screenshotPaths.map((screenshotPath) => ({
-            from: screenshotPath,
-            to: screenshotPath,
-          })),
         ],
       }),
       // Replace certain template-variables in the README and plugin.json