feat!: up @gravity-ui/uikit to 4 version (#39)

gravity-ui · Feb 1, 2023 · 8b4c123 · 8b4c123
1 parent a936806
commit 8b4c123
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 107 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,25 +41,25 @@
     "react-grid-layout": "^1.3.4"
   },
   "peerDependencies": {
-    "@gravity-ui/uikit": "^3.0.0",
+    "@gravity-ui/uikit": "^4.0.0",
     "bem-cn-lite": "^4.0.0",
-    "react": "^16.0.0  || ^17.0.0"
+    "react": "^16.8.0  || ^17 || ^18"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.0.3",
     "@commitlint/config-conventional": "^17.0.3",
+    "@gravity-ui/eslint-config": "^1.0.2",
+    "@gravity-ui/prettier-config": "^1.0.1",
+    "@gravity-ui/stylelint-config": "^1.0.1",
+    "@gravity-ui/tsconfig": "^1.0.0",
+    "@gravity-ui/uikit": "^4.0.5",
     "@storybook/addon-essentials": "^6.5.9",
     "@storybook/preset-scss": "^1.0.3",
     "@storybook/react": "^6.5.9",
     "@types/enzyme": "^3.10.8",
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.170",
-    "@types/react": "^17.0.47",
-    "@gravity-ui/eslint-config": "^1.0.2",
-    "@gravity-ui/prettier-config": "^1.0.1",
-    "@gravity-ui/stylelint-config": "^1.0.1",
-    "@gravity-ui/tsconfig": "^1.0.0",
-    "@gravity-ui/uikit": "^3.0.0",
+    "@types/react": "^18.0.27",
     "babel-jest": "^26.6.3",
     "bem-cn-lite": "^4.0.0",
     "copyfiles": "^2.4.1",
@@ -78,15 +78,15 @@
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.12",
     "prettier": "^2.6.0",
-    "react": "^17.0.2",
+    "react": "^18.2.0",
     "react-docgen-typescript": "^2.2.2",
-    "react-dom": "^17.0.2",
+    "react-dom": "^18.2.0",
     "rimraf": "^3.0.2",
     "sass": "^1.53.0",
     "sass-loader": "^10.3.1",
     "stylelint": "^14.6.0",
     "ts-jest": "^26.5.3",
-    "typescript": "^4.7.4"
+    "typescript": "^4.9.5"
   },
   "husky": {
     "hooks": {

diff --git a/src/components/DashKit/__stories__/DashKitShowcase.tsx b/src/components/DashKit/__stories__/DashKitShowcase.tsx
@@ -8,7 +8,7 @@ import {DeleteIcon} from '../../../icons/DeleteIcon';
 import {WarningIcon} from '../../../icons/WarningIcon';
 import i18n from '../../../i18n';
 import {getConfig, makeid, titleId} from './utils';
-import Demo from './Demo';
+import {Demo, DemoRow} from './Demo';
 
 type DashKitDemoState = {
     editMode: boolean;
@@ -83,7 +83,7 @@ export class DashKitShowcase extends React.Component<{}, DashKitDemoState> {
 
         return (
             <Demo title="DashKit">
-                <Demo.Row title="Внешнее взаимодействие">
+                <DemoRow title="Внешнее взаимодействие">
                     <Button
                         view="normal"
                         size="m"
@@ -117,9 +117,9 @@ export class DashKitShowcase extends React.Component<{}, DashKitDemoState> {
                     <Button view="action" size="m" onClick={this.getItemsMeta}>
                         {'ref.getItemsMeta'}
                     </Button>
-                </Demo.Row>
-                <Demo.Row title="Изменения из DashKit">{this.state.lastAction}</Demo.Row>
-                <Demo.Row title="Компонент">
+                </DemoRow>
+                <DemoRow title="Изменения из DashKit">{this.state.lastAction}</DemoRow>
+                <DemoRow title="Компонент">
                     <DashKit
                         config={this.state.config}
                         editMode={editMode}
@@ -132,7 +132,7 @@ export class DashKitShowcase extends React.Component<{}, DashKitDemoState> {
                         ref={this.dashKitRef}
                         overlayControls={controls}
                     />
-                </Demo.Row>
+                </DemoRow>
             </Demo>
         );
     }