Skip to content
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Evergreen v4 supports theming partially. It is still complex to theme Evergreen.

Evergreen offers easy Server Side Rendering (SSR) and automatic hydration.

Evergreen bundles 2 CSS-in-JS solutions, from glamor and ui-box. To make it super easy to do server side rendering and hydration, Evergreen exposes a `extractStyles()` function that will do SSR for both at once.
Evergreen provides a CSS-in-JS solution from `ui-box`. To make it super easy to do server side rendering and hydration, Evergreen exposes a `extractStyles()` function that will do SSR for both at once.

- How to use it with Next.js in the [ssr-next example app](examples/ssr-next).
- [How to use it with GatsbyJS](https://github.com/segmentio/evergreen/issues/154)
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"dependencies": {
"@babel/runtime": "^7.1.2",
"@blueprintjs/icons": "^3.2.0",
"@types/ui-box": "^1.4.0",
"arrify": "^1.0.1",
"classnames": "^2.2.6",
"dom-helpers": "^3.2.1",
Expand All @@ -60,7 +59,7 @@
"react-tiny-virtual-list": "^2.1.4",
"react-transition-group": "^2.5.0",
"tinycolor2": "^1.4.1",
"ui-box": "^1.4.0"
"ui-box": "^2.0.0"
},
"peerDependencies": {
"react": "^16.3.0",
Expand Down
4 changes: 2 additions & 2 deletions src/alert/src/Alert.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React, { PureComponent } from 'react'
import PropTypes from 'prop-types'
import { BoxProps } from 'ui-box'
import Box from 'ui-box'
import { withTheme } from '../../theme'
import { Pane } from '../../layers'
import { Heading, Paragraph } from '../../typography'
import { IconButton } from '../../buttons'
import { Icon } from '../../icon'

class Alert extends PureComponent<any & BoxProps> {
class Alert extends PureComponent<any & React.ComponentProps<typeof Box>> {
static propTypes = {
/**
* The content of the alert. When a string is passed it is wrapped in a `<Text size={400} />` component.
Expand Down
6 changes: 4 additions & 2 deletions src/alert/src/InlineAlert.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import React, { PureComponent } from 'react'
import PropTypes from 'prop-types'
import { BoxProps } from 'ui-box'
import Box from 'ui-box'
import { withTheme } from '../../theme'
import { Pane } from '../../layers'
import { Text } from '../../typography'
import { Icon } from '../../icon'

class InlineAlert extends PureComponent<any & BoxProps> {
class InlineAlert extends PureComponent<
any & React.ComponentProps<typeof Box>
> {
static propTypes = {
/**
* The content of the alert.
Expand Down
216 changes: 0 additions & 216 deletions src/alert/test/snapshots/index.ts.md

This file was deleted.

Binary file removed src/alert/test/snapshots/index.ts.snap
Binary file not shown.
Loading