Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(components): Move Marigold to components #1198

Merged
merged 3 commits into from
Aug 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/src/wrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { GatsbyBrowser } from 'gatsby';
import { MDXProvider } from '@mdx-js/react';

import { MarigoldProvider } from '@marigold/system';
import { MarigoldProvider } from '@marigold/components';
import { theme } from './theme';

import { Layout } from './components/Layout';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { useTheme } from '@marigold/system';
import { render, screen } from '@testing-library/react';
import { useModal } from '@react-aria/overlays';

import { MarigoldProvider } from './MarigoldProvider';
import { useTheme } from './useTheme';

// Setup
// ---------------
Expand Down
2 changes: 2 additions & 0 deletions packages/components/src/Provider/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { useTheme, ThemeProvider } from '@marigold/system';
export * from './MarigoldProvider';
4 changes: 1 addition & 3 deletions packages/components/src/Select/Select.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import React from 'react';
import { fireEvent, render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';

import { MarigoldProvider } from '@marigold/system';
import { Item } from '@marigold/components';

import { Item, MarigoldProvider } from '..';
import { Select } from './Select';

const theme = {
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export * from './Link';
export * from './Menu';
export * from './MenuItem';
export * from './Message';
export * from './Provider';
export * from './Radio';
export * from './Slider';
export * from './Select';
Expand Down
8 changes: 3 additions & 5 deletions packages/system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
"license": "MIT",
"dependencies": {
"@emotion/css": "11.1.3",
"@react-aria/overlays": "^3.7.1",
"@theme-ui/css": "0.10.1"
"@emotion/react": "11.4.0",
"@theme-ui/css": "0.10.1",
"csstype": "3.0.8"
},
"peerDependencies": {
"react": "^16.x || ^17.0.0",
"react-dom": "^16.x || ^17.0.0"
},
"devDependencies": {
"csstype": "3.0.8"
},
"scripts": {
"build": "tsdx build --tsconfig tsconfig.build.json --transpileOnly",
"watch": "tsdx watch --tsconfig tsconfig.build.json --transpileOnly"
Expand Down
1 change: 0 additions & 1 deletion packages/system/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ export * from './types';
export * from './useClassname';
export * from './useStyles';
export * from './useTheme';
export * from './MarigoldProvider';
38 changes: 37 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3975,6 +3975,19 @@ __metadata:
languageName: node
linkType: hard

"@emotion/cache@npm:^11.4.0":
version: 11.4.0
resolution: "@emotion/cache@npm:11.4.0"
dependencies:
"@emotion/memoize": ^0.7.4
"@emotion/sheet": ^1.0.0
"@emotion/utils": ^1.0.0
"@emotion/weak-memoize": ^0.2.5
stylis: ^4.0.3
checksum: bdef4c0ccc9bb87e99e4d48ff4855afe684035e9233a54bb339eb6aeafef35bd34fbed8ddb0d5ee440abd42c598043a87ebb0a324f2a1d732edf9c6b1709f9ed
languageName: node
linkType: hard

"@emotion/core@npm:^10.1.1":
version: 10.1.1
resolution: "@emotion/core@npm:10.1.1"
Expand Down Expand Up @@ -4050,6 +4063,29 @@ __metadata:
languageName: node
linkType: hard

"@emotion/react@npm:11.4.0":
version: 11.4.0
resolution: "@emotion/react@npm:11.4.0"
dependencies:
"@babel/runtime": ^7.13.10
"@emotion/cache": ^11.4.0
"@emotion/serialize": ^1.0.2
"@emotion/sheet": ^1.0.1
"@emotion/utils": ^1.0.0
"@emotion/weak-memoize": ^0.2.5
hoist-non-react-statics: ^3.3.1
peerDependencies:
"@babel/core": ^7.0.0
react: ">=16.8.0"
peerDependenciesMeta:
"@babel/core":
optional: true
"@types/react":
optional: true
checksum: af2abadbaeb762dd09be6f34036a769373fb8625116420c546592a33643e967942769ee23289d160977ae74922ff5dfac5bc5fdbe9c893fc3415fbb4d25c2318
languageName: node
linkType: hard

"@emotion/react@npm:^11.1.1":
version: 11.1.5
resolution: "@emotion/react@npm:11.1.5"
Expand Down Expand Up @@ -5667,7 +5703,7 @@ __metadata:
resolution: "@marigold/system@workspace:packages/system"
dependencies:
"@emotion/css": 11.1.3
"@react-aria/overlays": ^3.7.1
"@emotion/react": 11.4.0
"@theme-ui/css": 0.10.1
csstype: 3.0.8
peerDependencies:
Expand Down