From 0e643f352b084f7902ba5d6ebcc0593df897ef9b Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Tue, 30 Apr 2024 10:08:47 +0200 Subject: [PATCH] build(frontend): add missing dependencies to core and decoupled plugins --- package.json | 1 + .../datasource/azuremonitor/package.json | 2 + .../app/plugins/datasource/tempo/package.json | 1 + yarn.lock | 104 +++++++++++++++++- 4 files changed, 103 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ab40063a93e..fa22689a8da 100644 --- a/package.json +++ b/package.json @@ -230,6 +230,7 @@ "typescript": "5.7.3", "vite": "5.1.5", "webpack": "5.97.1", + "webpack-cli": "5.1.4", "yaml": "^2.0.0", "yargs": "^17.5.1" }, diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json index 854abbb71e0..0b50cfc1516 100644 --- a/public/app/plugins/datasource/azuremonitor/package.json +++ b/public/app/plugins/datasource/azuremonitor/package.json @@ -37,7 +37,9 @@ "@types/prismjs": "1.26.5", "@types/react": "18.3.18", "@types/react-dom": "18.3.5", + "css-loader": "7.1.2", "react-select-event": "5.5.1", + "style-loader": "4.0.0", "ts-node": "10.9.2", "typescript": "5.7.3", "webpack": "5.97.1" diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json index 1cf120ff959..d1aca697b65 100644 --- a/public/app/plugins/datasource/tempo/package.json +++ b/public/app/plugins/datasource/tempo/package.json @@ -54,6 +54,7 @@ "@types/uuid": "10.0.0", "glob": "11.0.1", "react-select-event": "5.5.1", + "style-loader": "4.0.0", "ts-node": "10.9.2", "typescript": "5.7.3", "webpack": "5.97.1" diff --git a/yarn.lock b/yarn.lock index 98db9f87375..6915bbaa790 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1806,7 +1806,7 @@ __metadata: languageName: node linkType: hard -"@discoveryjs/json-ext@npm:0.5.7": +"@discoveryjs/json-ext@npm:0.5.7, @discoveryjs/json-ext@npm:^0.5.0": version: 0.5.7 resolution: "@discoveryjs/json-ext@npm:0.5.7" checksum: 10/b95682a852448e8ef50d6f8e3b7ba288aab3fd98a2bafbe46881a3db0c6e7248a2debe9e1ee0d4137c521e4743ca5bbcb1c0765c9d7b3e0ef53231506fec42b4 @@ -2754,6 +2754,7 @@ __metadata: "@types/prismjs": "npm:1.26.5" "@types/react": "npm:18.3.18" "@types/react-dom": "npm:18.3.5" + css-loader: "npm:7.1.2" fast-deep-equal: "npm:^3.1.3" i18next: "npm:^24.0.0" immer: "npm:10.1.1" @@ -2766,6 +2767,7 @@ __metadata: react-select-event: "npm:5.5.1" react-use: "npm:17.6.0" rxjs: "npm:7.8.1" + style-loader: "npm:4.0.0" ts-node: "npm:10.9.2" tslib: "npm:2.8.1" typescript: "npm:5.7.3" @@ -3117,6 +3119,7 @@ __metadata: semver: "npm:7.7.0" stream-browserify: "npm:3.0.0" string_decoder: "npm:1.3.0" + style-loader: "npm:4.0.0" ts-node: "npm:10.9.2" tslib: "npm:2.8.1" typescript: "npm:5.7.3" @@ -11555,6 +11558,39 @@ __metadata: languageName: node linkType: hard +"@webpack-cli/configtest@npm:^2.1.1": + version: 2.1.1 + resolution: "@webpack-cli/configtest@npm:2.1.1" + peerDependencies: + webpack: 5.x.x + webpack-cli: 5.x.x + checksum: 10/9f9f9145c2d05471fc83d426db1df85cf49f329836b0c4b9f46b6948bed4b013464c00622b136d2a0a26993ce2306976682592245b08ee717500b1db45009a72 + languageName: node + linkType: hard + +"@webpack-cli/info@npm:^2.0.2": + version: 2.0.2 + resolution: "@webpack-cli/info@npm:2.0.2" + peerDependencies: + webpack: 5.x.x + webpack-cli: 5.x.x + checksum: 10/8f9a178afca5c82e113aed1efa552d64ee5ae4fdff63fe747c096a981ec74f18a5d07bd6e89bbe6715c3e57d96eea024a410e58977169489fe1df044c10dd94e + languageName: node + linkType: hard + +"@webpack-cli/serve@npm:^2.0.5": + version: 2.0.5 + resolution: "@webpack-cli/serve@npm:2.0.5" + peerDependencies: + webpack: 5.x.x + webpack-cli: 5.x.x + peerDependenciesMeta: + webpack-dev-server: + optional: true + checksum: 10/20424e5c1e664e4d7ab11facee7033bb729f6acd86493138069532934c1299c1426da72942822dedb00caca8fc60cc8aec1626e610ee0e8a9679e3614f555860 + languageName: node + linkType: hard + "@welldone-software/why-did-you-render@npm:8.0.3": version: 8.0.3 resolution: "@welldone-software/why-did-you-render@npm:8.0.3" @@ -13682,7 +13718,7 @@ __metadata: languageName: node linkType: hard -"colorette@npm:^2.0.10, colorette@npm:^2.0.16": +"colorette@npm:^2.0.10, colorette@npm:^2.0.14, colorette@npm:^2.0.16": version: 2.0.20 resolution: "colorette@npm:2.0.20" checksum: 10/0b8de48bfa5d10afc160b8eaa2b9938f34a892530b2f7d7897e0458d9535a066e3998b49da9d21161c78225b272df19ae3a64d6df28b4c9734c0e55bbd02406f @@ -13750,7 +13786,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^10.0.0": +"commander@npm:^10.0.0, commander@npm:^10.0.1": version: 10.0.1 resolution: "commander@npm:10.0.1" checksum: 10/8799faa84a30da985802e661cc9856adfaee324d4b138413013ef7f087e8d7924b144c30a1f1405475f0909f467665cd9e1ce13270a2f41b141dab0b7a58f3fb @@ -15881,6 +15917,15 @@ __metadata: languageName: node linkType: hard +"envinfo@npm:^7.7.3": + version: 7.8.1 + resolution: "envinfo@npm:7.8.1" + bin: + envinfo: dist/cli.js + checksum: 10/e7a2d71c7dfe398a4ffda0e844e242d2183ef2627f98e74e4cd71edd2af691c8707a2b34aacef92538c27b3daf9a360d32202f33c0a9f27f767c4e1c6ba8b522 + languageName: node + linkType: hard + "eol@npm:^0.9.1": version: 0.9.1 resolution: "eol@npm:0.9.1" @@ -17047,7 +17092,7 @@ __metadata: languageName: node linkType: hard -"fastest-levenshtein@npm:^1.0.16": +"fastest-levenshtein@npm:^1.0.12, fastest-levenshtein@npm:^1.0.16": version: 1.0.16 resolution: "fastest-levenshtein@npm:1.0.16" checksum: 10/ee85d33b5cef592033f70e1c13ae8624055950b4eb832435099cd56aa313d7f251b873bedbc06a517adfaff7b31756d139535991e2406967438e03a1bf1b008e @@ -18510,6 +18555,7 @@ __metadata: visjs-network: "npm:4.25.0" vite: "npm:5.1.5" webpack: "npm:5.97.1" + webpack-cli: "npm:5.1.4" whatwg-fetch: "npm:3.6.20" yaml: "npm:^2.0.0" yargs: "npm:^17.5.1" @@ -19456,6 +19502,13 @@ __metadata: languageName: node linkType: hard +"interpret@npm:^3.1.1": + version: 3.1.1 + resolution: "interpret@npm:3.1.1" + checksum: 10/bc9e11126949c4e6ff49b0b819e923a9adc8e8bf3f9d4f2d782de6d5f592774f6fee4457c10bd08c6a2146b4baee460ccb242c99e5397defa9c846af0d00505a + languageName: node + linkType: hard + "intl-messageformat@npm:^10.1.0": version: 10.1.4 resolution: "intl-messageformat@npm:10.1.4" @@ -26738,6 +26791,15 @@ __metadata: languageName: node linkType: hard +"rechoir@npm:^0.8.0": + version: 0.8.0 + resolution: "rechoir@npm:0.8.0" + dependencies: + resolve: "npm:^1.20.0" + checksum: 10/ad3caed8afdefbc33fbc30e6d22b86c35b3d51c2005546f4e79bcc03c074df804b3640ad18945e6bef9ed12caedc035655ec1082f64a5e94c849ff939dc0a788 + languageName: node + linkType: hard + "redent@npm:^3.0.0": version: 3.0.0 resolution: "redent@npm:3.0.0" @@ -31015,6 +31077,38 @@ __metadata: languageName: node linkType: hard +"webpack-cli@npm:5.1.4": + version: 5.1.4 + resolution: "webpack-cli@npm:5.1.4" + dependencies: + "@discoveryjs/json-ext": "npm:^0.5.0" + "@webpack-cli/configtest": "npm:^2.1.1" + "@webpack-cli/info": "npm:^2.0.2" + "@webpack-cli/serve": "npm:^2.0.5" + colorette: "npm:^2.0.14" + commander: "npm:^10.0.1" + cross-spawn: "npm:^7.0.3" + envinfo: "npm:^7.7.3" + fastest-levenshtein: "npm:^1.0.12" + import-local: "npm:^3.0.2" + interpret: "npm:^3.1.1" + rechoir: "npm:^0.8.0" + webpack-merge: "npm:^5.7.3" + peerDependencies: + webpack: 5.x.x + peerDependenciesMeta: + "@webpack-cli/generators": + optional: true + webpack-bundle-analyzer: + optional: true + webpack-dev-server: + optional: true + bin: + webpack-cli: bin/cli.js + checksum: 10/9ac3ae7c43b032051de2803d751bd3b44e1f226b931dcd56066a8e01b12734d49730903df9235e1eb1b67b2ee7451faf24a219c8f4a229c4f42c42e827eac44c + languageName: node + linkType: hard + "webpack-dev-middleware@npm:^6.1.2": version: 6.1.3 resolution: "webpack-dev-middleware@npm:6.1.3" @@ -31044,7 +31138,7 @@ __metadata: languageName: node linkType: hard -"webpack-merge@npm:5.10.0": +"webpack-merge@npm:5.10.0, webpack-merge@npm:^5.7.3": version: 5.10.0 resolution: "webpack-merge@npm:5.10.0" dependencies: