Skip to content

Commit 2e9fcbb

Browse files
authored
Merge pull request #19 from facebook/next
Update Upstream
2 parents 73d7292 + 9c167a4 commit 2e9fcbb

File tree

8 files changed

+28
-6
lines changed

8 files changed

+28
-6
lines changed

packages/create-react-app/createReactApp.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ const program = new commander.Command(packageJson.name)
8989
'my-react-scripts'
9090
)}`
9191
);
92+
console.log(
93+
` - a local path relative to the current working directory: ${chalk.green(
94+
'file:../my-react-scripts'
95+
)}`
96+
);
9297
console.log(
9398
` - a .tgz archive: ${chalk.green(
9499
'https://mysite.com/my-react-scripts-0.8.2.tgz'

packages/eslint-config-react-app/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ module.exports = {
186186
'import/no-webpack-loader-syntax': 'error',
187187

188188
// https://github.com/yannickcr/eslint-plugin-react/tree/master/docs/rules
189+
'react/forbid-foreign-prop-types': ['warn', { allowInPropTypes: true }],
189190
'react/jsx-no-comment-textnodes': 'warn',
190191
'react/jsx-no-duplicate-props': ['warn', { ignoreCase: true }],
191192
'react/jsx-no-target-blank': 'warn',

packages/eslint-config-react-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"eslint-plugin-flowtype": "^2.34.1",
1717
"eslint-plugin-import": "^2.6.0",
1818
"eslint-plugin-jsx-a11y": "^6.0.2",
19-
"eslint-plugin-react": "^7.1.0"
19+
"eslint-plugin-react": "^7.7.0"
2020
},
2121
"dependencies": {
2222
"confusing-browser-globals": "^1.0.0"

packages/react-error-overlay/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"eslint-plugin-flowtype": "2.41.0",
4848
"eslint-plugin-import": "2.8.0",
4949
"eslint-plugin-jsx-a11y": "6.0.3",
50-
"eslint-plugin-react": "7.5.1",
50+
"eslint-plugin-react": "7.7.0",
5151
"flow-bin": "^0.63.1",
5252
"html-entities": "1.2.1",
5353
"jest": "22.1.2",

packages/react-error-overlay/src/effects/proxyConsole.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const registerReactStack = () => {
2828
// $FlowFixMe
2929
console.reactStack = frames => reactFrameStack.push(frames);
3030
// $FlowFixMe
31-
console.reactStackEnd = () => reactFrameStack.pop();
31+
console.reactStackEnd = frames => reactFrameStack.pop();
3232
}
3333
};
3434

packages/react-error-overlay/src/utils/getStackFrames.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { unmap } from './unmapper';
1313

1414
function getStackFrames(
1515
error: Error,
16-
unhandledRejection: boolean = false, // eslint-disable-line
16+
unhandledRejection: boolean = false,
1717
contextSize: number = 3
1818
): Promise<StackFrame[] | null> {
1919
const parsedFrames = parse(error);
Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
import React from 'react';
22

3-
const Comp1 = () => <div>Comp1</div>;
3+
class Comp1 extends React.Component {
4+
static parts = {
5+
greeting: 'hello',
6+
region: 'world',
7+
};
8+
9+
render() {
10+
const { greeting, region } = Comp1.parts;
11+
12+
return (
13+
<div {...this.props}>
14+
Comp1
15+
{greeting} {region}
16+
</div>
17+
);
18+
}
19+
}
420

521
export default Comp1;

packages/react-scripts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"eslint-plugin-flowtype": "2.41.0",
4242
"eslint-plugin-import": "2.8.0",
4343
"eslint-plugin-jsx-a11y": "6.0.3",
44-
"eslint-plugin-react": "7.5.1",
44+
"eslint-plugin-react": "7.7.0",
4545
"extract-text-webpack-plugin": "3.0.2",
4646
"file-loader": "1.1.6",
4747
"fs-extra": "5.0.0",

0 commit comments

Comments
 (0)