From 6c31fe645ca6b695c680e8ec99c5c3cee9b58ef2 Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Sun, 10 Nov 2024 12:26:34 +0100 Subject: [PATCH] feat(pyroscope): migrate to rspack --- .../grafana-pyroscope-datasource/package.json | 10 +++++----- .../{webpack.config.ts => rspack.config.ts} | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) rename public/app/plugins/datasource/grafana-pyroscope-datasource/{webpack.config.ts => rspack.config.ts} (85%) diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json index d75bed9c7ca..763c5a1ebf8 100644 --- a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json +++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json @@ -21,6 +21,7 @@ }, "devDependencies": { "@grafana/plugin-configs": "11.6.0-pre", + "@rspack/cli": "^1.0.0", "@testing-library/dom": "10.4.0", "@testing-library/jest-dom": "6.6.3", "@testing-library/react": "16.2.0", @@ -35,16 +36,15 @@ "jest": "29.7.0", "style-loader": "4.0.0", "ts-node": "10.9.2", - "typescript": "5.7.3", - "webpack": "5.97.1" + "typescript": "5.7.3" }, "peerDependencies": { "@grafana/runtime": "*" }, "scripts": { - "build": "webpack -c ./webpack.config.ts --env production", - "build:commit": "webpack -c ./webpack.config.ts --env production --env commit=$(git rev-parse --short HEAD)", - "dev": "webpack -w -c ./webpack.config.ts --env development" + "build": "rspack -c ./rspack.config.ts --env production", + "build:commit": "rspack -c ./rspack.config.ts --env production --env commit=$(git rev-parse --short HEAD)", + "dev": "rspack -w -c ./rspack.config.ts --env development" }, "packageManager": "yarn@4.6.0" } diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/rspack.config.ts similarity index 85% rename from public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts rename to public/app/plugins/datasource/grafana-pyroscope-datasource/rspack.config.ts index 8e03497ddb2..8baadc87b27 100644 --- a/public/app/plugins/datasource/grafana-pyroscope-datasource/webpack.config.ts +++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/rspack.config.ts @@ -1,4 +1,4 @@ -import config from '@grafana/plugin-configs/webpack.config'; +import config from '@grafana/plugin-configs/rspack.config'; const configWithFallback = async (env: Record) => { const response = await config(env);