Skip to content

Commit 8ac29a9

Browse files
authored
Merge pull request #3321 from JedWatson/emotion-10
emotion 9 --> emotion 10
2 parents 292bad3 + 204219b commit 8ac29a9

34 files changed

+620
-366
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ module.exports = {
1414
argsIgnorePattern: '^event$',
1515
ignoreRestSiblings: true,
1616
vars: 'all',
17+
varsIgnorePattern: 'jsx|emotionJSX'
1718
},
1819
],
1920
curly: [2, 'multi-line'],

docs/App/Footer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// @flow
2-
3-
import React, { type Node } from 'react';
2+
/** @jsx jsx */
3+
import { type Node } from 'react';
4+
import { jsx } from '@emotion/core';
45

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

docs/App/GitHubButton.js

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

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

docs/App/Header.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// @flow
2-
2+
/** @jsx jsx */
33
import fetch from 'unfetch';
4-
import React, { Component, type Node } from 'react';
4+
import { Component, type Node } from 'react';
5+
import { jsx } from '@emotion/core';
56
import { withRouter } from 'react-router-dom';
67

78
import Select from '../../src';

docs/App/PageNav.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// @flow
2-
3-
import React, { Component, type ElementRef } from 'react';
2+
/** @jsx jsx */
3+
import { Component, type ElementRef } from 'react';
4+
import { jsx } from '@emotion/core';
45
import { Route, Switch } from 'react-router-dom';
56

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

docs/App/TwitterButton.js

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

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

docs/App/components.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// @flow
2-
3-
import React, { Component, type ElementConfig } from 'react';
2+
/** @jsx jsx */
3+
import { Component, type ElementConfig } from 'react';
44
import { Link, withRouter } from 'react-router-dom';
5+
import { jsx } from '@emotion/core';
56

67
const navWidth = 180;
78
const appWidth = 800;

docs/ExampleWrapper.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import React, { Component } from 'react';
1+
/** @jsx jsx */
2+
import { jsx } from '@emotion/core'; // eslint-disable-line no-unused-vars
3+
import { Component } from 'react';
24
import CodeSandboxer from 'react-codesandboxer';
35
import { replaceImports } from 'codesandboxer';
46
import { CodeBlock } from './markdown/renderer';

docs/Svg.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import React from 'react';
1+
// @flow
2+
/** @jsx jsx */
3+
import { jsx } from '@emotion/core';
24

35
const Svg = ({ size, ...props }: { size: number }) => (
46
<svg

docs/Tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ export default function Tests() {
240240
<div id={'cypress-long-values'}>
241241
<Select
242242
id="long-value-select"
243-
instsanceId="long-value-select"
243+
instanceId="long-value-select"
244244
classNamePrefix="react-select"
245245
defaultValue={optionLength[3]}
246246
options={optionLength}

0 commit comments

Comments
 (0)