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.

Sign up for GitHub

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

fix: Use default export from package instead of named export version #1141

Merged
merged 1 commit into from
Sep 3, 2020
Merged

fix: Use default export from package instead of named export version #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion packages/core/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ import {
import { css, Theme } from '@theme-ui/css'
import * as React from 'react'
import deepmerge from 'deepmerge'
import { version as __EMOTION_VERSION__ } from '@emotion/core/package.json'
import packageInfo from '@emotion/core/package.json'

import './react-jsx'

export * from '@theme-ui/css/dist/types'
export * from './types'

const __EMOTION_VERSION__ = packageInfo.version

const getCSS = (props) => {
if (!props.sx && !props.css) return undefined
return (theme) => {
Expand Down
3 changes: 2 additions & 1 deletion packages/theme-ui/test/color-modes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import renderer from 'react-test-renderer'
import { render, fireEvent, cleanup, act } from '@testing-library/react'
import { matchers } from 'jest-emotion'
import mockConsole from 'jest-mock-console'
import { version as emotionVersion } from '@emotion/core/package.json'
import packageInfo from '@emotion/core/package.json'
import { jsx, ThemeProvider, useColorMode, useThemeUI } from '../src/index'

const emotionVersion = packageInfo.version
const STORAGE_KEY = 'theme-ui-color-mode'

afterEach(cleanup)
Expand Down