From a76a302004a63a1c247d0d2d20f9ed6ee730338c Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Sun, 10 Nov 2024 12:28:09 +0100 Subject: [PATCH] feat(jaeger): migrate to rspack --- public/app/plugins/datasource/jaeger/package.json | 7 ++++--- .../jaeger/{webpack.config.ts => rspack.config.ts} | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) rename public/app/plugins/datasource/jaeger/{webpack.config.ts => rspack.config.ts} (75%) diff --git a/public/app/plugins/datasource/jaeger/package.json b/public/app/plugins/datasource/jaeger/package.json index 99574d165d1..c5107afcd66 100644 --- a/public/app/plugins/datasource/jaeger/package.json +++ b/public/app/plugins/datasource/jaeger/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@grafana/plugin-configs": "workspace:*", + "@rspack/cli": "^1.0.0", "@testing-library/dom": "10.4.0", "@testing-library/jest-dom": "6.6.3", "@testing-library/react": "16.2.0", @@ -44,9 +45,9 @@ "@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/jaeger/webpack.config.ts b/public/app/plugins/datasource/jaeger/rspack.config.ts similarity index 75% rename from public/app/plugins/datasource/jaeger/webpack.config.ts rename to public/app/plugins/datasource/jaeger/rspack.config.ts index 10ef5bd69a2..e2c6b851488 100644 --- a/public/app/plugins/datasource/jaeger/webpack.config.ts +++ b/public/app/plugins/datasource/jaeger/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); @@ -11,4 +11,5 @@ const configWithFallback = async (env: Record) => { return response; }; +// eslint-disable-next-line no-barrel-files/no-barrel-files export default configWithFallback;