From 1dfbd215cddfc625bdca537c581411d9c9e27bef Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Tue, 17 Jun 2025 15:06:53 +0100 Subject: [PATCH] I18n: Add rollup plugin to handle dynamic imports in prom package (#106837) I81n: Add rollup plugin to handle dynamic imports in prom package --- packages/grafana-prometheus/package.json | 2 + packages/grafana-prometheus/rollup.config.ts | 4 +- yarn.lock | 77 +++++++++++++++++++- 3 files changed, 81 insertions(+), 2 deletions(-) diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json index ee1b6f00ec3..00cd6d5ab31 100644 --- a/packages/grafana-prometheus/package.json +++ b/packages/grafana-prometheus/package.json @@ -79,7 +79,9 @@ }, "devDependencies": { "@grafana/tsconfig": "^2.0.0", + "@rollup/plugin-dynamic-import-vars": "2.1.5", "@rollup/plugin-image": "3.0.3", + "@rollup/plugin-json": "6.1.0", "@rollup/plugin-node-resolve": "16.0.0", "@testing-library/jest-dom": "6.6.3", "@testing-library/react": "16.2.0", diff --git a/packages/grafana-prometheus/rollup.config.ts b/packages/grafana-prometheus/rollup.config.ts index 509884c7a1a..be421e6c7aa 100644 --- a/packages/grafana-prometheus/rollup.config.ts +++ b/packages/grafana-prometheus/rollup.config.ts @@ -1,4 +1,6 @@ +import dynamicImportVars from '@rollup/plugin-dynamic-import-vars'; import image from '@rollup/plugin-image'; +import json from '@rollup/plugin-json'; import { createRequire } from 'node:module'; import { cjsOutput, entryPoint, esmOutput, plugins } from '../rollup.config.parts'; @@ -9,7 +11,7 @@ const pkg = rq('./package.json'); export default [ { input: entryPoint, - plugins: [...plugins, image()], + plugins: [...plugins, image(), json(), dynamicImportVars()], output: [cjsOutput(pkg), esmOutput(pkg, 'grafana-prometheus')], }, ]; diff --git a/yarn.lock b/yarn.lock index ae7e86d14aa..c346ac4dc98 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3399,7 +3399,9 @@ __metadata: "@lezer/lr": "npm:1.4.2" "@prometheus-io/lezer-promql": "npm:0.304.1" "@reduxjs/toolkit": "npm:2.5.1" + "@rollup/plugin-dynamic-import-vars": "npm:2.1.5" "@rollup/plugin-image": "npm:3.0.3" + "@rollup/plugin-json": "npm:6.1.0" "@rollup/plugin-node-resolve": "npm:16.0.0" "@testing-library/jest-dom": "npm:6.6.3" "@testing-library/react": "npm:16.2.0" @@ -4568,6 +4570,13 @@ __metadata: languageName: node linkType: hard +"@jridgewell/sourcemap-codec@npm:^1.5.0": + version: 1.5.0 + resolution: "@jridgewell/sourcemap-codec@npm:1.5.0" + checksum: 10/4ed6123217569a1484419ac53f6ea0d9f3b57e5b57ab30d7c267bdb27792a27eb0e4b08e84a2680aa55cc2f2b411ffd6ec3db01c44fdc6dc43aca4b55f8374fd + languageName: node + linkType: hard + "@jridgewell/trace-mapping@npm:0.3.9": version: 0.3.9 resolution: "@jridgewell/trace-mapping@npm:0.3.9" @@ -6601,6 +6610,24 @@ __metadata: languageName: node linkType: hard +"@rollup/plugin-dynamic-import-vars@npm:2.1.5": + version: 2.1.5 + resolution: "@rollup/plugin-dynamic-import-vars@npm:2.1.5" + dependencies: + "@rollup/pluginutils": "npm:^5.0.1" + astring: "npm:^1.8.5" + estree-walker: "npm:^2.0.2" + fast-glob: "npm:^3.2.12" + magic-string: "npm:^0.30.3" + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + checksum: 10/55e0fe0adc79e5f208b11479175607cd512743573dbdfee00fccf894304349d2e5a99edc6d269bbbbfbcae2a8fb7d5b7718fe8e517f79ca93003089a5c94b806 + languageName: node + linkType: hard + "@rollup/plugin-image@npm:3.0.3": version: 3.0.3 resolution: "@rollup/plugin-image@npm:3.0.3" @@ -6616,6 +6643,20 @@ __metadata: languageName: node linkType: hard +"@rollup/plugin-json@npm:6.1.0": + version: 6.1.0 + resolution: "@rollup/plugin-json@npm:6.1.0" + dependencies: + "@rollup/pluginutils": "npm:^5.1.0" + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + checksum: 10/cc018d20c80242a2b8b44fae61a968049cf31bb8406218187cc7cda35747616594e79452dd65722e7da6dd825b392e90d4599d43cd4461a02fefa2865945164e + languageName: node + linkType: hard + "@rollup/plugin-node-resolve@npm:16.0.0": version: 16.0.0 resolution: "@rollup/plugin-node-resolve@npm:16.0.0" @@ -6679,6 +6720,22 @@ __metadata: languageName: node linkType: hard +"@rollup/pluginutils@npm:^5.1.0": + version: 5.1.4 + resolution: "@rollup/pluginutils@npm:5.1.4" + dependencies: + "@types/estree": "npm:^1.0.0" + estree-walker: "npm:^2.0.2" + picomatch: "npm:^4.0.2" + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + checksum: 10/598f628988af25541a9a6c6ef154aaf350f8be3238884e500cc0e47138684071abe490563c953f9bda9e8b113ecb1f99c11abfb9dbaf4f72cdd62e257a673fa3 + languageName: node + linkType: hard + "@rollup/rollup-android-arm-eabi@npm:4.26.0": version: 4.26.0 resolution: "@rollup/rollup-android-arm-eabi@npm:4.26.0" @@ -11606,6 +11663,15 @@ __metadata: languageName: node linkType: hard +"astring@npm:^1.8.5": + version: 1.9.0 + resolution: "astring@npm:1.9.0" + bin: + astring: bin/astring + checksum: 10/ee88f71d8534557b27993d6d035ae85d78488d8dbc6429cd8e8fdfcafec3c65928a3bdc518cf69767a1298d3361490559a4819cd4b314007edae1e94cf1f9e4c + languageName: node + linkType: hard + "async@npm:^2.6.4": version: 2.6.4 resolution: "async@npm:2.6.4" @@ -16657,7 +16723,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.0.3, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.2, fast-glob@npm:^3.3.3": +"fast-glob@npm:^3.0.3, fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.2, fast-glob@npm:^3.3.3": version: 3.3.3 resolution: "fast-glob@npm:3.3.3" dependencies: @@ -22045,6 +22111,15 @@ __metadata: languageName: node linkType: hard +"magic-string@npm:^0.30.3": + version: 0.30.17 + resolution: "magic-string@npm:0.30.17" + dependencies: + "@jridgewell/sourcemap-codec": "npm:^1.5.0" + checksum: 10/2f71af2b0afd78c2e9012a29b066d2c8ba45a9cd0c8070f7fd72de982fb1c403b4e3afdb1dae00691d56885ede66b772ef6bedf765e02e3a7066208fe2fec4aa + languageName: node + linkType: hard + "magic-string@npm:^0.30.5": version: 0.30.10 resolution: "magic-string@npm:0.30.10"