Skip to content

Commit

Permalink
Extract from 53bbbac72089ea7a72ed4fe60d614e52432748ed
Browse files Browse the repository at this point in the history
  • Loading branch information
akeneo committed Jul 18, 2024
1 parent 9d85877 commit edab0cb
Show file tree
Hide file tree
Showing 44 changed files with 74 additions and 82 deletions.
2 changes: 1 addition & 1 deletion .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import {addDecorator, addParameters} from '@storybook/react';
import {withThemesProvider} from 'themeprovider-storybook';
import {themes} from '../src/theme';
import {themes} from '../src/themes';
import {StoryStyle} from '../src/storybook/PreviewGallery';

addDecorator(story => <StoryStyle>{story()}</StoryStyle>);
Expand Down
5 changes: 1 addition & 4 deletions lib/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,4 @@ export * from './icons';
export * from './illustrations';
export * from './shared';
export * from './theme';
export * from './theme/onboarder';
export * from './theme/pim';
export * from './theme/shared-catalogs';
export * from './theme/connector';
export * from './themes';
5 changes: 1 addition & 4 deletions lib/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions lib/storybook/test-util.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/storybook/test-util.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion lib/theme/connector/index.js.map

This file was deleted.

1 change: 0 additions & 1 deletion lib/theme/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from './common';
export * from './theme';
export * from './themes';
1 change: 0 additions & 1 deletion lib/theme/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/theme/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion lib/theme/onboarder/index.js.map

This file was deleted.

1 change: 0 additions & 1 deletion lib/theme/pim/index.js.map

This file was deleted.

1 change: 0 additions & 1 deletion lib/theme/shared-catalogs/index.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions lib/theme/themes.d.ts

This file was deleted.

10 changes: 0 additions & 10 deletions lib/theme/themes.js

This file was deleted.

1 change: 0 additions & 1 deletion lib/theme/themes.js.map

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { Theme } from '../theme';
import { Theme } from '../../theme';
declare const connectorTheme: Theme;
export { connectorTheme };
12 changes: 6 additions & 6 deletions lib/theme/connector/index.js → lib/themes/connector/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/themes/connector/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions lib/themes/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { pimTheme } from './pim';
import { onboarderTheme } from './onboarder';
import { sharedCatalogsTheme } from './shared-catalogs';
import { connectorTheme } from './connector';
declare const themes: import("../theme/theme").Theme[];
export { themes, pimTheme, onboarderTheme, sharedCatalogsTheme, connectorTheme };
14 changes: 14 additions & 0 deletions lib/themes/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/themes/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { Theme } from '../theme';
import { Theme } from '../../theme';
declare const onboarderTheme: Theme;
export { onboarderTheme };
12 changes: 6 additions & 6 deletions lib/theme/onboarder/index.js → lib/themes/onboarder/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/themes/onboarder/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/theme/pim/index.d.ts → lib/themes/pim/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { Theme } from '../theme';
import { Theme } from '../../theme';
declare const pimTheme: Theme;
export { pimTheme };
12 changes: 6 additions & 6 deletions lib/theme/pim/index.js → lib/themes/pim/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/themes/pim/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { Theme } from '../theme';
import { Theme } from '../../theme';
declare const sharedCatalogsTheme: Theme;
export { sharedCatalogsTheme };

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/themes/shared-catalogs/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "akeneo-design-system",
"version": "1.0.3",
"version": "1.0.4",
"description": "Akeneo design system",
"main": "lib/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/guidelines/Colors.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from 'styled-components';
import {Canvas, Meta, Story} from '@storybook/addon-docs';
import {PreviewGrid, PreviewCard, PreviewContainer, LabelContainer, Subtitle} from '../storybook/PreviewGallery';
import {themes} from '../theme';
import {themes} from '../themes';

<Meta title="Guidelines/Colors" />

Expand Down
2 changes: 1 addition & 1 deletion src/guidelines/Iconography.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Canvas, Meta, Story, ArgsTable} from '@storybook/addon-docs';
import {PreviewGrid, PreviewCard, PreviewContainer, LabelContainer} from '../storybook/PreviewGallery';
import {pimTheme} from '../theme/pim/index';
import {pimTheme} from '../themes';
import {colors} from './Colors.stories.mdx';
import * as Icons from '../icons';

Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useTheme.unit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, {ReactNode} from 'react';
import {ThemeProvider} from 'styled-components';
import {renderHook} from '@testing-library/react-hooks';
import {useTheme} from './useTheme';
import {pimTheme} from '../theme/pim';
import {pimTheme} from '../themes/pim';

const wrapper = ({children}: {children: ReactNode}) => <ThemeProvider theme={pimTheme}>{children}</ThemeProvider>;

Expand Down
5 changes: 1 addition & 4 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,4 @@ export * from './icons';
export * from './illustrations';
export * from './shared';
export * from './theme';
export * from './theme/onboarder';
export * from './theme/pim';
export * from './theme/shared-catalogs';
export * from './theme/connector';
export * from './themes';
2 changes: 1 addition & 1 deletion src/storybook/test-util.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {ComponentType, ReactElement, ReactNode} from 'react';
import {render, RenderOptions} from '@testing-library/react';
import {ThemeProvider} from 'styled-components';
import {pimTheme} from '../theme/pim';
import {pimTheme} from '../themes';

const wrapper: ComponentType = ({children}: {children?: ReactNode}) => (
<ThemeProvider theme={pimTheme}>{children}</ThemeProvider>
Expand Down
1 change: 0 additions & 1 deletion src/theme/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from './common';
export * from './theme';
export * from './themes';
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {Theme} from '../theme';
import {color, fontSize, palette, fontFamily, colorAlternative} from '../common';
import {Theme, color, fontSize, palette, fontFamily, colorAlternative} from '../../theme';

const connectorTheme: Theme = {
name: 'Connector',
Expand Down
2 changes: 1 addition & 1 deletion src/theme/themes.ts → src/themes/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ import {connectorTheme} from './connector';

const themes = [pimTheme, onboarderTheme, sharedCatalogsTheme, connectorTheme];

export {themes};
export {themes, pimTheme, onboarderTheme, sharedCatalogsTheme, connectorTheme};
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {Theme} from '../theme';
import {color, fontSize, palette, fontFamily, colorAlternative} from '../common';
import {Theme, color, fontSize, palette, fontFamily, colorAlternative} from '../../theme';

const onboarderTheme: Theme = {
name: 'Onboarder',
Expand Down
3 changes: 1 addition & 2 deletions src/theme/pim/index.ts → src/themes/pim/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {Theme} from '../theme';
import {color, colorAlternative, fontSize, palette, fontFamily} from '../common';
import {Theme, color, fontSize, palette, fontFamily, colorAlternative} from '../../theme';

const pimTheme: Theme = {
name: 'PIM',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {Theme} from '../theme';
import {color, fontSize, palette, fontFamily, colorAlternative} from '../common';
import {Theme, color, fontSize, palette, fontFamily, colorAlternative} from '../../theme';

const sharedCatalogsTheme: Theme = {
name: 'Shared Catalogs',
Expand Down

0 comments on commit edab0cb

Please sign in to comment.