@grafana/create-plugin 4.13.0-canary.966.44ebd48.0 → 4.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "4.13.0-canary.966.44ebd48.0",
+  "version": "4.13.0",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -87,5 +87,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "44ebd486ea39e107873ea0913b8d7f0bfc9a4c49"
+  "gitHead": "0d126394b9c16cdbd47e3749cb25f258a233ac1a"
 }

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

@@ -11,7 +11,7 @@ import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
 import LiveReloadPlugin from 'webpack-livereload-plugin';
 import path from 'path';
 import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin';
-import { type Configuration } from 'webpack';
+import { Configuration } from 'webpack';
 
 import { getPackageJson, getPluginJson, hasReadme, getEntries, isWSL } from './utils';
 import { SOURCE_DIR, DIST_DIR } from './constants';
@@ -34,8 +34,6 @@ const config = async (env): Promise<Configuration> => {
     entry: await getEntries(),
 
     externals: [
-      // Required for dynamic publicPath resolution
-      { 'amd-module': 'module' },
       'lodash',
       'jquery',
       'moment',
@@ -104,17 +102,6 @@ const config = async (env): Promise<Configuration> => {
             },
           },
         },
-        {
-          test: /src\/(?:.*\/)?module\.tsx?$/,
-          use: [
-            {
-              loader: 'imports-loader',
-              options: {
-                imports: `side-effects ${path.join(__dirname, 'publicPath.ts')}`,
-              },
-            },
-          ],
-        },
         {
           test: /\.css$/,
           use: ['style-loader', 'css-loader'],
@@ -127,6 +114,9 @@ const config = async (env): Promise<Configuration> => {
           test: /\.(png|jpe?g|gif|svg)$/,
           type: 'asset/resource',
           generator: {
+            // Keep publicPath relative for host.com/grafana/ deployments
+            publicPath: `public/plugins/${pluginJson.id}/img/`,
+            outputPath: 'img/',
             filename: Boolean(env.production) ? '[hash][ext]' : '[file]',
           },
         },
@@ -134,7 +124,10 @@ const config = async (env): Promise<Configuration> => {
           test: /\.(woff|woff2|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/,
           type: 'asset/resource',
           generator: {
-            filename: Boolean(env.production) ? '[hash][ext]' : '[file]',
+            // Keep publicPath relative for host.com/grafana/ deployments
+            publicPath: `public/plugins/${pluginJson.id}/fonts/`,
+            outputPath: 'fonts/',
+            filename: Boolean(env.production) ? '[hash][ext]' : '[name][ext]',
           },
         },
       ],

package/templates/common/_package.json

@@ -43,7 +43,6 @@
     "fork-ts-checker-webpack-plugin": "^8.0.0",
     "glob": "^10.2.7",
     "identity-obj-proxy": "3.0.0",
-    "imports-loader": "^5.0.0",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "prettier": "^2.8.7",

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

@@ -1,17 +0,0 @@
-/*
- * ⚠️⚠️⚠️ THIS FILE WAS SCAFFOLDED BY `@grafana/create-plugin`. DO NOT EDIT THIS FILE DIRECTLY. ⚠️⚠️⚠️
- *
- * This file dynamically sets the public path at runtime based on the location of the plugin's AMD module.
- * It relies on the magic `module` which is defined by the AMD loader.
- * https://github.com/requirejs/requirejs/wiki/Differences-between-the-simplified-CommonJS-wrapper-and-standard-AMD-define#module
- *
- * We fallback to the plugin root so that older versions of Grafana will continue to load the plugin correctly.
- */
-
-// @ts-nocheck
-import amdMetaModule from 'amd-module';
-
-__webpack_public_path__ =
-  amdMetaModule && amdMetaModule.uri
-    ? amdMetaModule.uri.slice(0, amdMetaModule.uri.lastIndexOf('/') + 1)
-    : 'public/plugins/heywesty-trafficlight-panel/';