Skip to content

Commit

Permalink
Merge pull request #12 from yandex-cloud/uikit-update
Browse files Browse the repository at this point in the history
migrate to @gravity-ui deps and use react@17 for storybook

* feat!: update to uikit@3
* chore: update tsconfig
* chore: update linters configs
  • Loading branch information
d3m1d0v authored Oct 4, 2022
2 parents 1243b61 + f94f0aa commit ae69736
Show file tree
Hide file tree
Showing 23 changed files with 251 additions and 214 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": ["@yandex-cloud/eslint-config", "@yandex-cloud/eslint-config/prettier"],
"extends": ["@gravity-ui/eslint-config", "@gravity-ui/eslint-config/prettier"],
"root": true
}
2 changes: 1 addition & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require("@yandex-cloud/prettier-config");
module.exports = require("@gravity-ui/prettier-config");
1 change: 0 additions & 1 deletion .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {withTheme, withThemeProvider, backgrounds} from '../demo/utils/preview';
import '@yandex-cloud/uikit/styles/styles.scss';

export const parameters = {
actions: {argTypesRegex: '^on[A-Z].*'},
Expand Down
6 changes: 5 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{
"extends": ["@yandex-cloud/stylelint-config", "@yandex-cloud/stylelint-config/prettier"]
"extends": [
"@gravity-ui/stylelint-config",
"@gravity-ui/stylelint-config/order",
"@gravity-ui/stylelint-config/prettier"
]
}
2 changes: 1 addition & 1 deletion demo/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "@yandex-cloud/eslint-config/client"
"extends": "@gravity-ui/eslint-config/client"
}
6 changes: 4 additions & 2 deletions demo/Playground.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
@import '~@yandex-cloud/uikit/styles/mixins.scss';
@import '~@gravity-ui/uikit/styles/mixins.scss';

.playground {
max-width: 1296px;
margin: 0 auto;

&__header {
position: relative;

margin-top: 16px;
margin-bottom: 40px;

text-align: center;

@include text-header-2();
Expand All @@ -24,7 +26,7 @@
}

&__editor-view {
margin: 20px 0;
min-height: 100px;
margin: 20px 0;
}
}
2 changes: 1 addition & 1 deletion demo/Playground.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import block from 'bem-cn-lite';
import {RadioButton, TextInput} from '@yandex-cloud/uikit';
import {RadioButton, TextInput} from '@gravity-ui/uikit';

import {
BasePreset,
Expand Down
4 changes: 2 additions & 2 deletions demo/utils/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import {Story, StoryContext} from '@storybook/react/types-6-0';
import {useTheme, ThemeProvider, Theme} from '@yandex-cloud/uikit';
import {useTheme, ThemeProvider, Theme} from '@gravity-ui/uikit';

import '@yandex-cloud/uikit/styles/styles.scss';
import '@gravity-ui/uikit/styles/styles.scss';

const light = {name: 'light', value: '#FFFFFF'};
const dark = {name: 'dark', value: '#2D2C33'};
Expand Down
Loading

0 comments on commit ae69736

Please sign in to comment.