From a301c22e2ba36217df6840c84158ac2a1145ae16 Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Sun, 10 Nov 2024 12:25:50 +0100 Subject: [PATCH] feat(cloud-monitoring): migrate to rspack --- .../plugins/datasource/cloud-monitoring/package.json | 10 +++++----- .../datasource/cloud-monitoring/rspack.config.ts | 4 ++++ .../datasource/cloud-monitoring/webpack.config.ts | 3 --- 3 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 public/app/plugins/datasource/cloud-monitoring/rspack.config.ts delete mode 100644 public/app/plugins/datasource/cloud-monitoring/webpack.config.ts diff --git a/public/app/plugins/datasource/cloud-monitoring/package.json b/public/app/plugins/datasource/cloud-monitoring/package.json index 4b12136a513..625514abbb9 100644 --- a/public/app/plugins/datasource/cloud-monitoring/package.json +++ b/public/app/plugins/datasource/cloud-monitoring/package.json @@ -28,6 +28,7 @@ "devDependencies": { "@grafana/e2e-selectors": "11.6.0-pre", "@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", @@ -41,16 +42,15 @@ "@types/react-dom": "18.3.5", "react-select-event": "5.5.1", "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/cloud-monitoring/rspack.config.ts b/public/app/plugins/datasource/cloud-monitoring/rspack.config.ts new file mode 100644 index 00000000000..9360cb088d9 --- /dev/null +++ b/public/app/plugins/datasource/cloud-monitoring/rspack.config.ts @@ -0,0 +1,4 @@ +import config from '@grafana/plugin-configs/rspack.config'; + +// eslint-disable-next-line no-barrel-files/no-barrel-files +export default config; diff --git a/public/app/plugins/datasource/cloud-monitoring/webpack.config.ts b/public/app/plugins/datasource/cloud-monitoring/webpack.config.ts deleted file mode 100644 index 4da5a990cfa..00000000000 --- a/public/app/plugins/datasource/cloud-monitoring/webpack.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -import config from '@grafana/plugin-configs/webpack.config'; - -export default config;