From 3824dc412d57fbbfc3d7163311bd89509b272148 Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Thu, 7 Nov 2024 16:40:35 +0100 Subject: [PATCH] [v11.3.x] Chore: Resolve duplicate e2e-selectors packages to workspace (#94945) chore(yarn): resolve scenes e2e selectors to workspace version --- package.json | 3 ++- yarn.lock | 38 -------------------------------------- 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index d3060e15378..fb7f384d9c1 100644 --- a/package.json +++ b/package.json @@ -426,7 +426,8 @@ "history@^4.9.0": "patch:history@npm%3A4.10.1#./.yarn/patches/history-npm-4.10.1-ee217563ae.patch", "redux": "^5.0.0", "@storybook/blocks@npm:8.1.6": "patch:@storybook/blocks@npm%3A8.1.6#~/.yarn/patches/@storybook-blocks-npm-8.1.6-892f57a6d7.patch", - "react-grid-layout": "patch:react-grid-layout@npm%3A1.4.4#~/.yarn/patches/react-grid-layout-npm-1.4.4-4024c5395b.patch" + "react-grid-layout": "patch:react-grid-layout@npm%3A1.4.4#~/.yarn/patches/react-grid-layout-npm-1.4.4-4024c5395b.patch", + "@grafana/scenes/@grafana/e2e-selectors": "workspace:*" }, "workspaces": { "packages": [ diff --git a/yarn.lock b/yarn.lock index 21709cd9001..c32c22014f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3662,17 +3662,6 @@ __metadata: languageName: unknown linkType: soft -"@grafana/e2e-selectors@npm:^11.0.0": - version: 11.2.0 - resolution: "@grafana/e2e-selectors@npm:11.2.0" - dependencies: - "@grafana/tsconfig": "npm:^1.3.0-rc1" - tslib: "npm:2.6.3" - typescript: "npm:5.4.5" - checksum: 10/aec06529dfedcd2611b4a0c25b256fdd860979105a7734309d8a06655c18a5915e7132ed99d110e4742adf904dc483c7bfb20fbda0b5668773a77f607351e49f - languageName: node - linkType: hard - "@grafana/eslint-config@npm:7.0.0": version: 7.0.0 resolution: "@grafana/eslint-config@npm:7.0.0" @@ -4204,13 +4193,6 @@ __metadata: languageName: unknown linkType: soft -"@grafana/tsconfig@npm:^1.3.0-rc1": - version: 1.3.0-rc1 - resolution: "@grafana/tsconfig@npm:1.3.0-rc1" - checksum: 10/3ed039967ae9e0c6ab70387b6aee648086aed00bf0c831ca4d82088cd829e15dac953387413e18941cc75958eec89e58c53ed1a6dedc02a34bbb794fa9658ea0 - languageName: node - linkType: hard - "@grafana/tsconfig@npm:^2.0.0": version: 2.0.0 resolution: "@grafana/tsconfig@npm:2.0.0" @@ -31927,16 +31909,6 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.4.5": - version: 5.4.5 - resolution: "typescript@npm:5.4.5" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10/d04a9e27e6d83861f2126665aa8d84847e8ebabcea9125b9ebc30370b98cb38b5dff2508d74e2326a744938191a83a69aa9fddab41f193ffa43eabfdf3f190a5 - languageName: node - linkType: hard - "typescript@npm:5.5.4, typescript@npm:>=2.7, typescript@npm:>=3 < 6, typescript@npm:^5.0.0, typescript@npm:^5.0.4, typescript@npm:^5.2.2": version: 5.5.4 resolution: "typescript@npm:5.5.4" @@ -31957,16 +31929,6 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.4.5#optional!builtin": - version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10/760f7d92fb383dbf7dee2443bf902f4365db2117f96f875cf809167f6103d55064de973db9f78fe8f31ec08fff52b2c969aee0d310939c0a3798ec75d0bca2e1 - languageName: node - linkType: hard - "typescript@patch:typescript@npm%3A5.5.4#optional!builtin, typescript@patch:typescript@npm%3A>=2.7#optional!builtin, typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin, typescript@patch:typescript@npm%3A^5.0.0#optional!builtin, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin, typescript@patch:typescript@npm%3A^5.2.2#optional!builtin": version: 5.5.4 resolution: "typescript@patch:typescript@npm%3A5.5.4#optional!builtin::version=5.5.4&hash=379a07"