@grafana/create-plugin 4.14.1-canary.990.ef60ecd.0 → 4.14.2-canary.971.cf99ca0.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v4.14.1 (Thu Jul 04 2024)
+
+#### 🐛 Bug Fix
+
+- Create Plugin: Fix backend dev env for arm64 hosts [#990](https://github.com/grafana/plugin-tools/pull/990) ([@jackw](https://github.com/jackw))
+
+#### Authors: 1
+
+- Jack Westbrook ([@jackw](https://github.com/jackw))
+
+---
+
 # v4.14.0 (Mon Jul 01 2024)
 
 #### 🚀 Enhancement

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "4.14.1-canary.990.ef60ecd.0",
+  "version": "4.14.2-canary.971.cf99ca0.0",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -87,5 +87,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "ef60ecd978d451f49cf5cb06a4ea18901931b7f6"
+  "gitHead": "cf99ca04b5540b15e128ef015024f3e6083ed354"
 }

package/templates/common/.config/Dockerfile

@@ -1,13 +1,14 @@
-ARG TARGETARCH
 ARG grafana_version=latest
 ARG grafana_image=grafana-enterprise
 
 FROM grafana/${grafana_image}:${grafana_version}
 
 ARG development=false
+ARG TARGETARCH
 
 {{#if hasBackend}}
 ARG GO_VERSION=1.21.6
+ARG GO_ARCH=${TARGETARCH:-amd64}
 {{/if}}
 
 ENV DEV "${development}"
@@ -49,11 +50,11 @@ COPY supervisord/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 {{#if hasBackend}}
 # Installing Go
 RUN if [ "${development}" = "true" ]; then \
-    curl -O -L https://golang.org/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz && \
+    curl -O -L https://golang.org/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \
     rm -rf /usr/local/go && \
-    tar -C /usr/local -xzf go${GO_VERSION}.linux-${TARGETARCH}.tar.gz && \
+    tar -C /usr/local -xzf go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \
     echo "export PATH=$PATH:/usr/local/go/bin:~/go/bin" >> ~/.bashrc && \
-    rm -f go${GO_VERSION}.linux-${TARGETARCH}.tar.gz; \
+    rm -f go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
     fi
 
 # Installing delve for debugging

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

@@ -0,0 +1,17 @@
+/*
+ * ⚠️⚠️⚠️ 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/{{ pluginId }}/';

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

@@ -36,6 +36,8 @@ const config = async (env): Promise<Configuration> => {
     entry: await getEntries(),
 
     externals: [
+      // Required for dynamic publicPath resolution
+      { 'amd-module': 'module' },
       'lodash',
       'jquery',
       'moment',
@@ -104,6 +106,17 @@ 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'],
@@ -116,9 +129,6 @@ 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]',
           },
         },
@@ -126,10 +136,7 @@ const config = async (env): Promise<Configuration> => {
           test: /\.(woff|woff2|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/,
           type: 'asset/resource',
           generator: {
-            // Keep publicPath relative for host.com/grafana/ deployments
-            publicPath: `public/plugins/${pluginJson.id}/fonts/`,
-            outputPath: 'fonts/',
-            filename: Boolean(env.production) ? '[hash][ext]' : '[name][ext]',
+            filename: Boolean(env.production) ? '[hash][ext]' : '[file]',
           },
         },
       ],

package/templates/common/_package.json

@@ -20,10 +20,10 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@babel/core": "^7.21.4",{{#if useCypress}}
-    "@grafana/e2e": "^10.4.0",
-    "@grafana/e2e-selectors": "^10.4.0",{{/if}}
+    "@grafana/e2e": "^11.0.1",
+    "@grafana/e2e-selectors": "^11.1.0",{{/if}}
     "@grafana/eslint-config": "^7.0.0",{{#if usePlaywright}}
-    "@grafana/plugin-e2e": "^1.2.0",{{/if}}
+    "@grafana/plugin-e2e": "^1.6.0",{{/if}}
     "@grafana/tsconfig": "^1.2.0-rc1",{{#if usePlaywright}}
     "@playwright/test": "^1.41.2",{{/if}}
     "@swc/core": "^1.3.90",
@@ -43,6 +43,7 @@
     "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",
@@ -63,11 +64,11 @@
   },
   "dependencies": {
     "@emotion/css": "11.10.6",
-    "@grafana/data": "^10.4.0",
-    "@grafana/runtime": "^10.4.0",
-    "@grafana/ui": "^10.4.0",
+    "@grafana/data": "^11.1.0",
+    "@grafana/runtime": "^11.1.0",
+    "@grafana/ui": "^11.1.0",
     "@grafana/schema": "^10.4.0",{{#if_eq pluginType "scenesapp"}}
-    "@grafana/scenes": "^3.6.0",{{/if_eq}}
+    "@grafana/scenes": "^5.3.7",{{/if_eq}}
     "react": "18.2.0",
     "react-dom": "18.2.0",{{#if isAppType}}
     "react-router-dom": "^{{ reactRouterVersion }}",

package/templates/common/docker-compose.yaml

@@ -7,7 +7,7 @@ services:
       context: ./.config
       args:
         grafana_image: ${GRAFANA_IMAGE:-{{~grafanaImage~}} }
-        grafana_version: ${GRAFANA_VERSION:-10.4.0}
+        grafana_version: ${GRAFANA_VERSION:-11.1.0}
         development: ${DEVELOPMENT:-false}
     ports:
       - 3000:3000/tcp