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

package/package.json

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

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

@@ -21,7 +21,8 @@ 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';

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

@@ -24,7 +24,8 @@ 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';
@@ -36,18 +37,6 @@ __webpack_public_path__ =
 `,
 });
 
-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) => s.path))
-  ).filter(Boolean) || [];
-
 export type Env = {
   [key: string]: true | string | Env;
 };
@@ -187,9 +176,11 @@ const config = async (env: Env): Promise<Configuration> => {
           { from: '../CHANGELOG.md', to: '.', force: true },
           { from: '**/*.json', to: '.' },
           { from: '**/query_help.md', to: '.', noErrorOnMissing: true },
-          ...logoPaths.map((logoPath) => ({ from: logoPath, to: '.', noErrorOnMissing: true })),
+          ...logoPaths.map((logoPath) => ({ from: logoPath, to: logoPath })),
           ...screenshotPaths.map((screenshotPath) => ({
-            from: screenshotPath, to: '.', noErrorOnMissing: true })),
+            from: screenshotPath,
+            to: screenshotPath,
+          })),
         ],
       }),
       // Replace certain template-variables in the README and plugin.json