Skip to content

Commit

Permalink
Merge pull request #535 from atls/feat/upgrade-emotion
Browse files Browse the repository at this point in the history
feat/upgrade-emotion
  • Loading branch information
TorinAsakura authored Jan 26, 2024
2 parents c5aacc5 + 346f6a4 commit 4481c53
Show file tree
Hide file tree
Showing 185 changed files with 1,936 additions and 1,876 deletions.
1,918 changes: 911 additions & 1,007 deletions .pnp.cjs

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .yarn/cache/fsevents-patch-19706e7e35-9.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
7 changes: 1 addition & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@
"postinstall": "yarn workspace @atls-ui-admin/icons build-icons"
},
"resolutions": {
"@emotion/css": "11.9.0",
"@emotion/react": "11.9.3",
"@emotion/styled": "11.9.3",
"@types/react": "17.0.39",
"@types/react-dom": "17.0.11",
"css-loader": "^5.0.0",
"dotenv-webpack": "^6.0.0",
"eslint": "8.17.0",
Expand All @@ -40,7 +35,7 @@
"@types/glob": "^7",
"@types/jest": "^28.1.2",
"@types/node": "^18.16.20",
"@types/react": "^18.0.14",
"@types/react": "^18.2.48",
"eslint": "^8.17.0",
"husky": "7.0.4",
"jest-environment-jsdom": "^28.1.1",
Expand Down
22 changes: 11 additions & 11 deletions ui-admin/button/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@atls-ui-admin/button",
"version": "0.0.21",
"version": "0.1.0",
"license": "BSD-3-Clause",
"files": [
"dist"
Expand All @@ -14,18 +14,18 @@
"@atls-ui-parts/button": "workspace:*"
},
"devDependencies": {
"@emotion/styled": "^11.9.3",
"@types/react": "^18.0.14",
"@types/styled-system": "^5.1.15",
"react": "^18.2.0",
"styled-system": "^5.1.5",
"styled-tools": "^1.7.2"
"@emotion/styled": "11.11.0",
"@types/react": "^18.2.48",
"@types/styled-system": "5.1.22",
"react": "18.2.0",
"styled-system": "5.1.5",
"styled-tools": "1.7.2"
},
"peerDependencies": {
"@emotion/styled": "^11.1.5",
"react": "^17.0.1",
"styled-system": "^5.1.5",
"styled-tools": "^1.7.2"
"@emotion/styled": "11.11.0",
"react": "18.2.0",
"styled-system": "5.1.5",
"styled-tools": "1.7.2"
},
"publishConfig": {
"access": "public",
Expand Down
2 changes: 1 addition & 1 deletion ui-admin/button/src/button.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export const Button = ({ containerWith, childrenPrefix, childrenSuffix, children
)

Button.args = {
containerWith: 200,
children: 'Кнопка',
containerWith: 200,
childrenPrefix: '',
childrenSuffix: '',
size: 'normal',
Expand Down
2 changes: 1 addition & 1 deletion ui-admin/button/src/button.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ const shapeNormalSizeStyles = createShapeStyles({ size: 32, fontSize: 12, roundi
const largeNormalSizeStyles = createShapeStyles({ size: 48, fontSize: 14, rounding: 3 })

const appearancePrimaryStyles = createAppearanceStyles({
backgroundColor: prop('theme.colors.button.primary.fill'),
fontColor: 'white',
backgroundColor: prop('theme.colors.button.primary.fill'),
invertedBorderWidth: 2,
})

Expand Down
10 changes: 5 additions & 5 deletions ui-admin/design/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"@atls-ui-admin/theme": "workspace:*",
"@babel/core": "^7.18.5",
"@emotion/babel-plugin": "^11.9.2",
"@emotion/css": "^11.9.0",
"@emotion/react": "^11.9.3",
"@emotion/styled": "^11.9.3",
"@emotion/css": "11.9.0",
"@emotion/react": "11.9.3",
"@emotion/styled": "11.9.3",
"@storybook/addon-actions": "^6.5.9",
"@storybook/addon-docs": "^6.5.9",
"@storybook/addon-essentials": "^6.5.9",
Expand All @@ -33,8 +33,8 @@
"@storybook/theming": "^6.5.9",
"@types/events": "^3.0.0",
"@types/express": "^4.17.13",
"@types/react": "^18.0.14",
"@types/react-dom": "^18.0.5",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"babel-loader": "^8.2.5",
"core-js": "^3.23.1",
"events": "^3.3.0",
Expand Down
16 changes: 8 additions & 8 deletions ui-admin/icon/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@atls-ui-admin/icon",
"version": "0.0.14",
"version": "0.1.0",
"license": "BSD-3-Clause",
"main": "src/index.ts",
"files": [
Expand All @@ -13,14 +13,14 @@
},
"devDependencies": {
"@admui/theme": "0.4.14",
"@emotion/css": "^11.9.0",
"@emotion/react": "^11.9.3",
"@emotion/styled": "^11.9.3",
"@emotion/css": "11.11.2",
"@emotion/react": "11.11.3",
"@emotion/styled": "11.11.0",
"@testing-library/react": "^13.3.0",
"@types/styled-system": "^5.1.15",
"react": "^18.2.0",
"styled-system": "^5.1.5",
"styled-tools": "^1.7.2",
"@types/styled-system": "^5.1.22",
"react": "18.2.0",
"styled-system": "5.1.5",
"styled-tools": "1.7.2",
"typescript": "4.6.2"
},
"peerDependencies": {
Expand Down
4 changes: 1 addition & 3 deletions ui-admin/icon/src/icon.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ import styled from '@emotion/styled'

import { ifSpinModifier } from './icon.styles'

const Icon = styled.svg(ifSpinModifier())

export { Icon }
export const Icon = styled.svg(ifSpinModifier())
4 changes: 2 additions & 2 deletions ui-admin/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@atls-ui-admin/icons",
"version": "0.0.14",
"version": "0.1.0",
"license": "BSD-3-Clause",
"main": "src/index.ts",
"files": [
Expand Down Expand Up @@ -31,7 +31,7 @@
"@atlantis-lab/prettier-config": "*",
"@atlantis-lab/tsconfig": "*",
"@atls-ui-admin/icon": "*",
"@emotion/styled": "^10.0.0",
"@emotion/styled": "11.11.0",
"prettier": "^1.18.0",
"react": "^16.12.0",
"styled-system": "^5.1.0",
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/bag.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const BagIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/chart.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const ChartIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/check.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const CheckIcon = (props: IconProps) => (
<Icon
xmlns='http://www.w3.org/2000/svg'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/close.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const CloseIcon = (props: IconProps) => (
<Icon
viewBox='0 0 24 24'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/drag.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const DragIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
2 changes: 1 addition & 1 deletion ui-admin/icons/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ export * from './ruby.icon'
export * from './trash.icon'
export * from './upload.icon'
export * from './user.icon'
export * from './users.icon'
export * from './users.icon'
6 changes: 4 additions & 2 deletions ui-admin/icons/src/loading.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const LoadingIcon = (props: IconProps) => (
<Icon
xmlns='http://www.w3.org/2000/svg'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/logo.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const LogoIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/pencil.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const PencilIcon = (props: IconProps) => (
<Icon
viewBox='0 0 24 24'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/ruby.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const RubyIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/trash.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const TrashIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/upload.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const UploadIcon = (props: IconProps) => (
<Icon width='1em' height='1em' viewBox='0 0 40 40' xmlns='http://www.w3.org/2000/svg' {...props}>
<path d='M19.5312 14.5313C19.2375 14.2375 18.7625 14.2375 18.4688 14.5313L12.325 20.675C12.0312 20.9688 12.0312 21.4438 12.325 21.7375L12.6812 22.0938C12.975 22.3875 13.45 22.3875 13.7437 22.0938L18.0063 17.8313V27.25C18.0063 27.6625 18.3438 28 18.7563 28H19.2563C19.6688 28 20.0063 27.6625 20.0063 27.25V17.8313L24.2687 22.0938C24.5625 22.3875 25.0375 22.3875 25.3312 22.0938L25.6875 21.7375C25.9813 21.4438 25.9813 20.9688 25.6875 20.675L19.5312 14.5313ZM35.7313 18.925C35.9062 18.3063 36 17.6625 36 17C36 13.1313 32.8688 10 29 10C27.9562 10 26.9438 10.225 26 10.675C24.025 7.8625 20.7313 6 17 6C11.1 6 6.26875 10.6563 6.0125 16.5125C2.45 17.7625 0 21.1438 0 25C0 29.975 4.025 34 9 34H32C36.4188 34 40 30.425 40 26C40 23.0625 38.3875 20.325 35.7313 18.925ZM32 32H9C5.13125 32 2 28.8688 2 25C2 21.45 4.6375 18.5188 8.0625 18.0625C8.01875 17.7125 8 17.3563 8 17C8 12.0313 12.0312 8 17 8C20.7687 8 23.9937 10.3125 25.3375 13.6C26.25 12.6188 27.55 12 29 12C31.7625 12 34 14.2375 34 17C34 18.1563 33.6062 19.225 32.9437 20.075C35.8125 20.525 38 23.0063 38 26C38 29.3125 35.3125 32 32 32Z' />
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/user.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const UserIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
6 changes: 4 additions & 2 deletions ui-admin/icons/src/users.icon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
import React from 'react'

import { Icon } from '@atls-ui-admin/icon'
import { IconProps } from '@atls-ui-admin/icon'
export const UsersIcon = (props: IconProps) => (
<Icon
width='1em'
Expand Down
1 change: 1 addition & 0 deletions ui-admin/icons/svgr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const svgrTemplate = ({ template }, opts, { componentName, jsx }) => {

return typeScriptTpl.ast`
import React from 'react'
import { Icon, IconProps } from '@atls-ui-admin/icon'
export const ${componentName.name} = (props: IconProps) => ${jsx}
${componentName.name}.displayName = '${componentName.name}'
Expand Down
12 changes: 6 additions & 6 deletions ui-admin/theme/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@atls-ui-admin/theme",
"version": "0.0.7",
"version": "0.1.0",
"license": "BSD-3-Clause",
"main": "src/index.ts",
"files": [
Expand All @@ -12,14 +12,14 @@
"postpack": "rm -rf dist"
},
"devDependencies": {
"@emotion/react": "^11.9.3",
"@emotion/react": "11.11.3",
"@types/node": "^18.0.0",
"@types/react": "^18.0.14",
"react": "^18.2.0"
"@types/react": "^18.2.48",
"react": "18.2.0"
},
"peerDependencies": {
"@emotion/react": "^11.1.5",
"react": "^17.0.1"
"@emotion/react": "11.11.3",
"react": "18.2.0"
},
"publishConfig": {
"access": "public",
Expand Down
1 change: 0 additions & 1 deletion ui-admin/theme/src/theme.provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { useThemeMode } from './mode'

export const BaseThemeProvider = (props) => {
const [mode] = useThemeMode()

return <EmotionThemeProvider {...props} theme={() => (mode === 'dark' ? dark : light)} />
}

Expand Down
14 changes: 7 additions & 7 deletions ui-admin/upload/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@atls-ui-admin/upload",
"version": "0.0.14",
"version": "0.1.0",
"license": "MIT",
"main": "src/index.ts",
"files": [
Expand All @@ -13,21 +13,21 @@
},
"dependencies": {
"@atls/react-upload": "^0.0.3",
"react-dropzone": "^14.2.1"
"react-dropzone": "14.2.3"
},
"devDependencies": {
"@apollo/client": "3.6.6",
"@atls-ui-admin/icon": "workspace:*",
"@atls-ui-admin/icons": "workspace:*",
"@emotion/react": "^11.9.3",
"@emotion/styled": "^11.9.3",
"@emotion/react": "11.11.3",
"@emotion/styled": "11.11.0",
"@testing-library/react": "^13.3.0",
"@types/node": "^18.0.0",
"@types/react": "^18.0.14",
"@types/react": "^18.2.48",
"graphql": "^16.5.0",
"graphql-tag": "^2.12.5",
"react": "^18.2.0",
"styled-tools": "^1.7.2",
"react": "18.2.0",
"styled-tools": "1.7.2",
"typescript": "4.6.2"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion ui-admin/upload/src/dropzone-placeholder.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { PlaceholderIcon } from './placeholder-icon'
import { PlaceholderLink } from './placeholder-link'

const Container = styled.div({
display: 'flex',
flexDirection: 'column',
display: 'flex',
alignItems: 'center',
})

Expand Down
Loading

0 comments on commit 4481c53

Please sign in to comment.