diff --git a/packages/grafana-plugin-configs/package.json b/packages/grafana-plugin-configs/package.json index 3ed4a849e44..97e9fe06b36 100644 --- a/packages/grafana-plugin-configs/package.json +++ b/packages/grafana-plugin-configs/package.json @@ -15,6 +15,7 @@ "eslint-webpack-plugin": "4.2.0", "fork-ts-checker-webpack-plugin": "9.0.2", "glob": "11.0.1", + "imports-loader": "^5.0.0", "replace-in-file-webpack-plugin": "1.0.6", "rspack-plugin-virtual-module": "^0.1.13", "typescript": "5.7.3", diff --git a/packages/grafana-plugin-configs/rspack.config.ts b/packages/grafana-plugin-configs/rspack.config.ts index c11d4282f71..43a305e8334 100644 --- a/packages/grafana-plugin-configs/rspack.config.ts +++ b/packages/grafana-plugin-configs/rspack.config.ts @@ -90,7 +90,7 @@ const config = async (env: Record): Promise => { test: /src\/(?:.*\/)?module\.tsx?$/, use: [ { - loader: 'imports-loader', + loader: require.resolve('imports-loader'), options: { imports: `side-effects grafana-public-path`, }, diff --git a/yarn.lock b/yarn.lock index a1f900c62c8..7e8cdd7b4ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2746,6 +2746,8 @@ __metadata: "@grafana/schema": "npm:11.6.0-pre" "@grafana/ui": "npm:11.6.0-pre" "@kusto/monaco-kusto": "npm:^10.0.0" + "@rspack/cli": "npm:^1.0.0" + "@rspack/core": "npm:^1.0.0" "@testing-library/dom": "npm:10.4.0" "@testing-library/jest-dom": "npm:6.6.3" "@testing-library/react": "npm:16.2.0" @@ -2789,6 +2791,7 @@ __metadata: "@grafana/runtime": "npm:11.6.0-pre" "@grafana/sql": "npm:11.6.0-pre" "@grafana/ui": "npm:11.6.0-pre" + "@rspack/cli": "npm:^1.0.0" "@testing-library/dom": "npm:10.4.0" "@testing-library/react": "npm:16.2.0" "@testing-library/user-event": "npm:14.6.1" @@ -2802,7 +2805,6 @@ __metadata: ts-node: "npm:10.9.2" tslib: "npm:2.8.1" typescript: "npm:5.7.3" - webpack: "npm:5.97.1" peerDependencies: "@grafana/runtime": "*" languageName: unknown @@ -2818,6 +2820,7 @@ __metadata: "@grafana/runtime": "npm:11.6.0-pre" "@grafana/schema": "npm:11.6.0-pre" "@grafana/ui": "npm:11.6.0-pre" + "@rspack/cli": "npm:^1.0.0" "@testing-library/dom": "npm:10.4.0" "@testing-library/jest-dom": "npm:6.6.3" "@testing-library/react": "npm:16.2.0" @@ -2842,7 +2845,6 @@ __metadata: ts-node: "npm:10.9.2" tslib: "npm:2.8.1" typescript: "npm:5.7.3" - webpack: "npm:5.97.1" peerDependencies: "@grafana/runtime": "*" languageName: unknown @@ -2859,6 +2861,7 @@ __metadata: "@grafana/runtime": "npm:11.6.0-pre" "@grafana/schema": "npm:11.6.0-pre" "@grafana/ui": "npm:11.6.0-pre" + "@rspack/cli": "npm:^1.0.0" "@testing-library/dom": "npm:10.4.0" "@testing-library/react": "npm:16.2.0" "@testing-library/user-event": "npm:14.6.1" @@ -2881,7 +2884,6 @@ __metadata: tslib: "npm:2.8.1" typescript: "npm:5.7.3" uuid: "npm:11.0.5" - webpack: "npm:5.97.1" peerDependencies: "@grafana/runtime": "*" languageName: unknown @@ -2899,6 +2901,7 @@ __metadata: "@grafana/plugin-ui": "npm:0.10.1" "@grafana/runtime": "workspace:*" "@grafana/ui": "workspace:*" + "@rspack/cli": "npm:^1.0.0" "@testing-library/dom": "npm:10.4.0" "@testing-library/jest-dom": "npm:6.6.3" "@testing-library/react": "npm:16.2.0" @@ -2941,6 +2944,7 @@ __metadata: "@grafana/runtime": "npm:11.6.0-pre" "@grafana/sql": "npm:11.6.0-pre" "@grafana/ui": "npm:11.6.0-pre" + "@rspack/cli": "npm:^1.0.0" "@testing-library/dom": "npm:10.4.0" "@testing-library/react": "npm:16.2.0" "@testing-library/user-event": "npm:14.6.1" @@ -2954,7 +2958,6 @@ __metadata: ts-node: "npm:10.9.2" tslib: "npm:2.8.1" typescript: "npm:5.7.3" - webpack: "npm:5.97.1" peerDependencies: "@grafana/runtime": "*" languageName: unknown @@ -2972,6 +2975,7 @@ __metadata: "@grafana/runtime": "npm:11.6.0-pre" "@grafana/sql": "npm:11.6.0-pre" "@grafana/ui": "npm:11.6.0-pre" + "@rspack/cli": "npm:^1.0.0" "@testing-library/dom": "npm:10.4.0" "@testing-library/react": "npm:16.2.0" "@testing-library/user-event": "npm:14.6.1" @@ -3000,6 +3004,7 @@ __metadata: "@grafana/runtime": "npm:11.6.0-pre" "@grafana/schema": "npm:11.6.0-pre" "@grafana/ui": "npm:11.6.0-pre" + "@rspack/cli": "npm:^1.0.0" "@testing-library/dom": "npm:10.4.0" "@testing-library/react": "npm:16.2.0" "@testing-library/user-event": "npm:14.6.1" @@ -3016,7 +3021,6 @@ __metadata: ts-node: "npm:10.9.2" tslib: "npm:2.8.1" typescript: "npm:5.7.3" - webpack: "npm:5.97.1" peerDependencies: "@grafana/runtime": "*" languageName: unknown @@ -3035,6 +3039,7 @@ __metadata: "@grafana/runtime": "npm:11.6.0-pre" "@grafana/schema": "npm:11.6.0-pre" "@grafana/ui": "npm:11.6.0-pre" + "@rspack/cli": "npm:^1.0.0" "@testing-library/dom": "npm:10.4.0" "@testing-library/jest-dom": "npm:6.6.3" "@testing-library/react": "npm:16.2.0" @@ -3062,7 +3067,6 @@ __metadata: ts-node: "npm:10.9.2" tslib: "npm:2.8.1" typescript: "npm:5.7.3" - webpack: "npm:5.97.1" peerDependencies: "@grafana/runtime": "*" languageName: unknown @@ -3089,6 +3093,7 @@ __metadata: "@opentelemetry/api": "npm:1.9.0" "@opentelemetry/exporter-collector": "npm:0.25.0" "@opentelemetry/semantic-conventions": "npm:1.28.0" + "@rspack/cli": "npm:^1.0.0" "@testing-library/dom": "npm:10.4.0" "@testing-library/jest-dom": "npm:6.6.3" "@testing-library/react": "npm:16.2.0" @@ -3122,7 +3127,6 @@ __metadata: tslib: "npm:2.8.1" typescript: "npm:5.7.3" uuid: "npm:11.0.5" - webpack: "npm:5.97.1" peerDependencies: "@grafana/runtime": "*" languageName: unknown @@ -3140,6 +3144,7 @@ __metadata: "@grafana/plugin-ui": "npm:0.10.1" "@grafana/runtime": "workspace:*" "@grafana/ui": "workspace:*" + "@rspack/cli": "npm:^1.0.0" "@testing-library/dom": "npm:10.4.0" "@testing-library/jest-dom": "npm:6.6.3" "@testing-library/react": "npm:16.2.0" @@ -3157,7 +3162,6 @@ __metadata: ts-node: "npm:10.9.2" tslib: "npm:2.8.1" typescript: "npm:5.7.3" - webpack: "npm:5.97.1" peerDependencies: "@grafana/runtime": "*" languageName: unknown @@ -3543,6 +3547,7 @@ __metadata: eslint-webpack-plugin: "npm:4.2.0" fork-ts-checker-webpack-plugin: "npm:9.0.2" glob: "npm:11.0.1" + imports-loader: "npm:^5.0.0" replace-in-file-webpack-plugin: "npm:1.0.6" rspack-plugin-virtual-module: "npm:^0.1.13" tslib: "npm:2.8.1" @@ -20000,6 +20005,18 @@ __metadata: languageName: node linkType: hard +"imports-loader@npm:^5.0.0": + version: 5.0.0 + resolution: "imports-loader@npm:5.0.0" + dependencies: + source-map-js: "npm:^1.0.2" + strip-comments: "npm:^2.0.1" + peerDependencies: + webpack: ^5.0.0 + checksum: 10/b507436b7d2c7a6d6d8623b93b5a0fda2d13c48d4d0f310b74b8465c080d9fd07a2f8d0f896e264b4feff59effa9aef736a2b668d7a695cecd8bdc7cb817373e + languageName: node + linkType: hard + "imurmurhash@npm:^0.1.4": version: 0.1.4 resolution: "imurmurhash@npm:0.1.4" @@ -29797,7 +29814,7 @@ __metadata: languageName: node linkType: hard -"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.1": +"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.0.2, source-map-js@npm:^1.2.1": version: 1.2.1 resolution: "source-map-js@npm:1.2.1" checksum: 10/ff9d8c8bf096d534a5b7707e0382ef827b4dd360a577d3f34d2b9f48e12c9d230b5747974ee7c607f0df65113732711bb701fe9ece3c7edbd43cb2294d707df3 @@ -30401,6 +30418,13 @@ __metadata: languageName: node linkType: hard +"strip-comments@npm:^2.0.1": + version: 2.0.1 + resolution: "strip-comments@npm:2.0.1" + checksum: 10/43ea36189e4ba543c6ffb0384831e9e23c3b57ede5592c6edcbfc883f489f91d00328fe2670b4e467f61c7886eff68deae3e946f0f092346b2b3cb058b9cfdba + languageName: node + linkType: hard + "strip-final-newline@npm:^2.0.0": version: 2.0.0 resolution: "strip-final-newline@npm:2.0.0"