Skip to content

Commit ff74140

Browse files
committed
Merge branch 'master' into remove-build-menu-options-memoization
2 parents 2d5496d + 1c60ba4 commit ff74140

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+781
-591
lines changed

.changeset/dry-pumas-complain.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-select": major
3+
---
4+
5+
Standardized value passed to onChange

.changeset/olive-toys-try.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@react-select/docs': major
3+
'react-select': major
4+
---
5+
6+
Upgrades Emotion dependency to v11.0.0
7+
8+
BREAKING CHANGE: The NonceProvider component now requires a `cacheKey` prop that corresponds to the `key` for the Emotion cache.

.changeset/purple-moons-promise.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-select": major
3+
---
4+
5+
Removed usages of UNSAFE React methods

babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
plugins: [
3-
'emotion',
3+
'@emotion/babel-plugin',
44
['@babel/plugin-proposal-class-properties', { loose: true }],
55
'@babel/plugin-transform-runtime',
66
],

docs/App/Footer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// @flow
22
/** @jsx jsx */
33
import { type Node } from 'react';
4-
import { jsx } from '@emotion/core';
4+
import { jsx } from '@emotion/react';
55

66
// const smallDevice = '@media (max-width: 769px)';
77
const largeDevice = '@media (min-width: 770px)';

docs/App/GitHubButton.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @flow
22
/** @jsx jsx */
3-
import { jsx } from '@emotion/core';
3+
import { jsx } from '@emotion/react';
44

55
type Props = { count: number, repo: string };
66

docs/App/Header.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/** @jsx jsx */
33
import fetch from 'unfetch';
44
import { Component, type Node } from 'react';
5-
import { jsx } from '@emotion/core';
5+
import { jsx } from '@emotion/react';
66
import { withRouter } from 'react-router-dom';
77

88
import Select from 'react-select';

docs/App/PageNav.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// @flow
22
/** @jsx jsx */
33
import { Component, type ElementRef } from 'react';
4-
import { jsx } from '@emotion/core';
4+
import { jsx } from '@emotion/react';
55
import { Route, Switch } from 'react-router-dom';
66

77
import type { RouterProps } from '../types';

docs/App/TwitterButton.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @flow
22
/** @jsx jsx */
3-
import { jsx } from '@emotion/core';
3+
import { jsx } from '@emotion/react';
44

55
const TwitterButton = () => (
66
<div css={{ alignItems: 'center', display: 'inline-flex' }}>

docs/App/components.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/** @jsx jsx */
33
import { Component, type ElementConfig } from 'react';
44
import { Link, withRouter } from 'react-router-dom';
5-
import { jsx } from '@emotion/core';
5+
import { jsx } from '@emotion/react';
66

77
const navWidth = 180;
88
const appWidth = 800;

0 commit comments

Comments
 (0)