diff --git a/package-lock.json b/package-lock.json index 82f0e266..b587b04f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,11 @@ "@gravity-ui/prettier-config": "^1.0.1", "@gravity-ui/stylelint-config": "^1.0.1", "@gravity-ui/tsconfig": "^1.0.0", +<<<<<<< HEAD "@gravity-ui/uikit": "^4.2.0", +======= + "@gravity-ui/uikit": "^5.0.0", +>>>>>>> feat: update uikit to v5.0.0 (#206) "@storybook/addon-essentials": "^7.0.26", "@storybook/addon-knobs": "^7.0.2", "@storybook/cli": "^7.0.26", @@ -3149,10 +3153,17 @@ "integrity": "sha512-C7uWrCTD6g+rvSFYTPaOMMf4YUWyA5eRSXsJ1AsigGc7yQC/lhugGNqeUo5efz+zpmZ80oG/BIJPCx0nIZizDg==", "dev": true }, +<<<<<<< HEAD "@gravity-ui/uikit": { "version": "4.2.0", "resolved": "https://npm.yandex-team.ru/@gravity-ui%2fuikit/-/uikit-4.2.0.tgz?rbtorrent=c8f6f13f4cb5cbf558c5cb325b0f57090c3d470a", "integrity": "sha512-mJzjYyYKGDIGewBCLjiAD3OJZt/PvcKxHE/4ahr0Dje+uCKxZaGV1YOyzMdiEX8VJTl8mDRhLURMs/iCV09t7g==", +======= + "node_modules/@gravity-ui/uikit": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@gravity-ui/uikit/-/uikit-5.0.0.tgz", + "integrity": "sha512-upooCbxiMODP9mV86Z3Tp6hLW3p41ayw10O6i4Mrdu7XzK5gGqDL8s1UaSd+tUtJzsGw3szfhX30KZ16eCyoOg==", +>>>>>>> feat: update uikit to v5.0.0 (#206) "dev": true, "dependencies": { "@gravity-ui/i18n": "^1.1.0", diff --git a/package.json b/package.json index f8bdfd72..a34f297a 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@gravity-ui/prettier-config": "^1.0.1", "@gravity-ui/stylelint-config": "^1.0.1", "@gravity-ui/tsconfig": "^1.0.0", - "@gravity-ui/uikit": "^4.2.0", + "@gravity-ui/uikit": "^5.0.0", "@storybook/addon-essentials": "^7.0.26", "@storybook/addon-knobs": "^7.0.2", "@storybook/cli": "^7.0.26",