From 3a48eef3c8d9a72123fce71bef520ef6fc60f5e6 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Mon, 25 Apr 2016 20:16:52 +0100 Subject: [PATCH 001/101] Merge pull request #6605 from gaearon/fix-warning-condition Fix the warning condition in ReactDebugTool and ReactDOMDebugTool (cherry picked from commit 7dbc95f379780d0802b482abffcafac11dcd9d08) --- src/isomorphic/ReactDebugTool.js | 5 +- .../__tests__/ReactDebugTool-test.js | 75 +++++++++++++++++++ src/renderers/dom/shared/ReactDOMDebugTool.js | 5 +- .../__tests__/ReactDOMDebugTool-test.js | 75 +++++++++++++++++++ 4 files changed, 158 insertions(+), 2 deletions(-) create mode 100644 src/isomorphic/__tests__/ReactDebugTool-test.js create mode 100644 src/renderers/dom/shared/__tests__/ReactDOMDebugTool-test.js diff --git a/src/isomorphic/ReactDebugTool.js b/src/isomorphic/ReactDebugTool.js index 9c084ad52f..f88513b387 100644 --- a/src/isomorphic/ReactDebugTool.js +++ b/src/isomorphic/ReactDebugTool.js @@ -28,7 +28,7 @@ function emitEvent(handlerFunctionName, arg1, arg2, arg3, arg4, arg5) { } } catch (e) { warning( - !handlerDoesThrowForEvent[handlerFunctionName], + handlerDoesThrowForEvent[handlerFunctionName], 'exception thrown by devtool while handling %s: %s', handlerFunctionName, e.message @@ -253,6 +253,9 @@ var ReactDebugTool = { checkDebugID(debugID); emitEvent('onUnmountComponent', debugID); }, + onTestEvent() { + emitEvent('onTestEvent'); + }, }; if (__DEV__) { diff --git a/src/isomorphic/__tests__/ReactDebugTool-test.js b/src/isomorphic/__tests__/ReactDebugTool-test.js new file mode 100644 index 0000000000..bae09516f5 --- /dev/null +++ b/src/isomorphic/__tests__/ReactDebugTool-test.js @@ -0,0 +1,75 @@ +/** + * Copyright 2016-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @emails react-core + */ + +'use strict'; + +describe('ReactDebugTool', function() { + var ReactDebugTool; + + beforeEach(function() { + jest.resetModuleRegistry(); + ReactDebugTool = require('ReactDebugTool'); + }); + + it('should add and remove devtools', () => { + var handler1 = jasmine.createSpy('spy'); + var handler2 = jasmine.createSpy('spy'); + var devtool1 = {onTestEvent: handler1}; + var devtool2 = {onTestEvent: handler2}; + + ReactDebugTool.addDevtool(devtool1); + ReactDebugTool.onTestEvent(); + expect(handler1.calls.length).toBe(1); + expect(handler2.calls.length).toBe(0); + + ReactDebugTool.onTestEvent(); + expect(handler1.calls.length).toBe(2); + expect(handler2.calls.length).toBe(0); + + ReactDebugTool.addDevtool(devtool2); + ReactDebugTool.onTestEvent(); + expect(handler1.calls.length).toBe(3); + expect(handler2.calls.length).toBe(1); + + ReactDebugTool.onTestEvent(); + expect(handler1.calls.length).toBe(4); + expect(handler2.calls.length).toBe(2); + + ReactDebugTool.removeDevtool(devtool1); + ReactDebugTool.onTestEvent(); + expect(handler1.calls.length).toBe(4); + expect(handler2.calls.length).toBe(3); + + ReactDebugTool.removeDevtool(devtool2); + ReactDebugTool.onTestEvent(); + expect(handler1.calls.length).toBe(4); + expect(handler2.calls.length).toBe(3); + }); + + it('warns once when an error is thrown in devtool', () => { + spyOn(console, 'error'); + ReactDebugTool.addDevtool({ + onTestEvent() { + throw new Error('Hi.'); + }, + }); + + ReactDebugTool.onTestEvent(); + expect(console.error.calls.length).toBe(1); + expect(console.error.argsForCall[0][0]).toContain( + 'exception thrown by devtool while handling ' + + 'onTestEvent: Hi.' + ); + + ReactDebugTool.onTestEvent(); + expect(console.error.calls.length).toBe(1); + }); +}); diff --git a/src/renderers/dom/shared/ReactDOMDebugTool.js b/src/renderers/dom/shared/ReactDOMDebugTool.js index 9fcc3763fa..25d72c7ee0 100644 --- a/src/renderers/dom/shared/ReactDOMDebugTool.js +++ b/src/renderers/dom/shared/ReactDOMDebugTool.js @@ -27,7 +27,7 @@ function emitEvent(handlerFunctionName, arg1, arg2, arg3, arg4, arg5) { } } catch (e) { warning( - !handlerDoesThrowForEvent[handlerFunctionName], + handlerDoesThrowForEvent[handlerFunctionName], 'exception thrown by devtool while handling %s: %s', handlerFunctionName, e.message @@ -59,6 +59,9 @@ var ReactDOMDebugTool = { onDeleteValueForProperty(node, name) { emitEvent('onDeleteValueForProperty', node, name); }, + onTestEvent() { + emitEvent('onTestEvent'); + }, }; ReactDOMDebugTool.addDevtool(ReactDOMUnknownPropertyDevtool); diff --git a/src/renderers/dom/shared/__tests__/ReactDOMDebugTool-test.js b/src/renderers/dom/shared/__tests__/ReactDOMDebugTool-test.js new file mode 100644 index 0000000000..b4a94ec837 --- /dev/null +++ b/src/renderers/dom/shared/__tests__/ReactDOMDebugTool-test.js @@ -0,0 +1,75 @@ +/** + * Copyright 2016-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @emails react-core + */ + +'use strict'; + +describe('ReactDOMDebugTool', function() { + var ReactDOMDebugTool; + + beforeEach(function() { + jest.resetModuleRegistry(); + ReactDOMDebugTool = require('ReactDOMDebugTool'); + }); + + it('should add and remove devtools', () => { + var handler1 = jasmine.createSpy('spy'); + var handler2 = jasmine.createSpy('spy'); + var devtool1 = {onTestEvent: handler1}; + var devtool2 = {onTestEvent: handler2}; + + ReactDOMDebugTool.addDevtool(devtool1); + ReactDOMDebugTool.onTestEvent(); + expect(handler1.calls.length).toBe(1); + expect(handler2.calls.length).toBe(0); + + ReactDOMDebugTool.onTestEvent(); + expect(handler1.calls.length).toBe(2); + expect(handler2.calls.length).toBe(0); + + ReactDOMDebugTool.addDevtool(devtool2); + ReactDOMDebugTool.onTestEvent(); + expect(handler1.calls.length).toBe(3); + expect(handler2.calls.length).toBe(1); + + ReactDOMDebugTool.onTestEvent(); + expect(handler1.calls.length).toBe(4); + expect(handler2.calls.length).toBe(2); + + ReactDOMDebugTool.removeDevtool(devtool1); + ReactDOMDebugTool.onTestEvent(); + expect(handler1.calls.length).toBe(4); + expect(handler2.calls.length).toBe(3); + + ReactDOMDebugTool.removeDevtool(devtool2); + ReactDOMDebugTool.onTestEvent(); + expect(handler1.calls.length).toBe(4); + expect(handler2.calls.length).toBe(3); + }); + + it('warns once when an error is thrown in devtool', () => { + spyOn(console, 'error'); + ReactDOMDebugTool.addDevtool({ + onTestEvent() { + throw new Error('Hi.'); + }, + }); + + ReactDOMDebugTool.onTestEvent(); + expect(console.error.calls.length).toBe(1); + expect(console.error.argsForCall[0][0]).toContain( + 'exception thrown by devtool while handling ' + + 'onTestEvent: Hi.' + ); + + ReactDOMDebugTool.onTestEvent(); + expect(console.error.calls.length).toBe(1); + }); +}); From dd29092472d367c78e24f87d62637ab4cf06103d Mon Sep 17 00:00:00 2001 From: Stolenkid Date: Tue, 26 Apr 2016 03:07:52 +0530 Subject: [PATCH 002/101] fixed a minor typo (#6600) (cherry picked from commit aeda84602ffad382c48c73e670a2065ba0b78fdd) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58f370c821..fbe857f3f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -881,7 +881,7 @@ Each of these changes will continue to work as before with a new warning until t ### JSX -* Improved compatability with other coding styles (specifically, multiple assignments with a single `var`). +* Improved compatibility with other coding styles (specifically, multiple assignments with a single `var`). ### react-tools From 571d1f7314b54e082d5175a83af5b81d7b4aaf86 Mon Sep 17 00:00:00 2001 From: Christoph Pojer Date: Thu, 28 Apr 2016 16:21:54 +0900 Subject: [PATCH 003/101] Merge pull request #6638 from cpojer/master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update Jest’s grunt task. (cherry picked from commit 64401150a08ca538e5bbb5a53e76f63b96609fb4) --- grunt/tasks/jest.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/grunt/tasks/jest.js b/grunt/tasks/jest.js index fb8c1113ab..fddabd1a3d 100644 --- a/grunt/tasks/jest.js +++ b/grunt/tasks/jest.js @@ -1,9 +1,3 @@ -// We run our own grunt task instead of using grunt-jest so that we can have -// more control. Specifically we want to set NODE_ENV and make sure stdio is -// inherited. We also run with --harmony directly so that we don't have to -// respawn immediately. We should be able to reduce some of this complexity -// when jest 0.5 is run on top of iojs. - 'use strict'; var async = require('async'); @@ -52,8 +46,10 @@ function getJestConfig(callback) { getCollectCoverageOnlyFrom(function(err, data) { callback(err, Object.assign({}, config, { rootDir: rootDir, + name: 'react', collectCoverage: true, collectCoverageOnlyFrom: data, + watchman: false, })); }); } @@ -75,9 +71,9 @@ function writeTempConfig(callback) { } function run(done, configPath) { - grunt.log.writeln('running jest (this may take a while)'); + grunt.log.writeln('running jest'); - var args = ['--harmony', path.join('node_modules', 'jest-cli', 'bin', 'jest'), '--runInBand']; + var args = [path.join('node_modules', 'jest-cli', 'bin', 'jest'), '--runInBand']; if (configPath) { args.push('--config', configPath); } From 6af9f5901008b156b12f174a757e30e59191a273 Mon Sep 17 00:00:00 2001 From: Ryan Lahfa Date: Thu, 28 Apr 2016 20:33:26 +0200 Subject: [PATCH 004/101] package(node-engine-version): accept 6.x versions (#6645) (cherry picked from commit 9d201abb2bc45d1399cc5f0152087955f2934485) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f01de2c8e4..71b5b11617 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "uglifyify": "^3.0.1" }, "devEngines": { - "node": "4.x || 5.x", + "node": "4.x || 5.x || 6.x", "npm": "2.x || 3.x" }, "commonerConfig": { From 23c4d312914abd68adb4c8049dc4f8b88973ea1b Mon Sep 17 00:00:00 2001 From: Greg Hurrell Date: Sat, 30 Apr 2016 07:45:23 -0700 Subject: [PATCH 005/101] Remove errant console.log (#6664) That crept in in c1e3f7ec14971dbf6. (cherry picked from commit 4f01b4b186368fe70cdd3853262f2b1856541b06) --- src/renderers/shared/reconciler/__tests__/ReactUpdates-test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/renderers/shared/reconciler/__tests__/ReactUpdates-test.js b/src/renderers/shared/reconciler/__tests__/ReactUpdates-test.js index 96ff9d1835..9a397dbc9f 100644 --- a/src/renderers/shared/reconciler/__tests__/ReactUpdates-test.js +++ b/src/renderers/shared/reconciler/__tests__/ReactUpdates-test.js @@ -1083,7 +1083,6 @@ describe('ReactUpdates', function() { this.state = { showChild: true }; } componentDidMount() { - console.log('about to remove child via set state'); this.setState({ showChild: false }); } render() { From 6d378bf78e4b5f277885f196c870756e9d0b54bf Mon Sep 17 00:00:00 2001 From: Sasha Aickin Date: Sat, 30 Apr 2016 11:21:34 -0700 Subject: [PATCH 006/101] Add test logic to make sure that events get tested when rendering on top of server-generated markup. (#6668) (cherry picked from commit 256753b83011f18dab8f6f12535afc78c5652b69) --- .../__tests__/ReactServerRendering-test.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/renderers/dom/server/__tests__/ReactServerRendering-test.js b/src/renderers/dom/server/__tests__/ReactServerRendering-test.js index c679e03793..d3919e7b93 100644 --- a/src/renderers/dom/server/__tests__/ReactServerRendering-test.js +++ b/src/renderers/dom/server/__tests__/ReactServerRendering-test.js @@ -232,9 +232,15 @@ describe('ReactServerRendering', function() { ExecutionEnvironment.canUseDOM = true; element.innerHTML = lastMarkup; - ReactDOM.render(, element); + var instance = ReactDOM.render(, element); expect(mountCount).toEqual(3); expect(element.innerHTML).toBe(lastMarkup); + + // Ensure the events system works after mount into server markup + expect(numClicks).toEqual(0); + ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance.refs.span)); + expect(numClicks).toEqual(1); + ReactDOM.unmountComponentAtNode(element); expect(element.innerHTML).toEqual(''); @@ -242,16 +248,16 @@ describe('ReactServerRendering', function() { // warn but do the right thing. element.innerHTML = lastMarkup; spyOn(console, 'error'); - var instance = ReactDOM.render(, element); + instance = ReactDOM.render(, element); expect(mountCount).toEqual(4); expect(console.error.argsForCall.length).toBe(1); expect(element.innerHTML.length > 0).toBe(true); expect(element.innerHTML).not.toEqual(lastMarkup); - // Ensure the events system works - expect(numClicks).toEqual(0); - ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance.refs.span)); + // Ensure the events system works after markup mismatch. expect(numClicks).toEqual(1); + ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance.refs.span)); + expect(numClicks).toEqual(2); }); it('should throw with silly args', function() { From c595c2735790e36314606d2be7ebcc67b884f8f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= Date: Tue, 3 May 2016 14:37:13 -0700 Subject: [PATCH 007/101] Set up Flow - Yay! (#6682) This just configures flow to be checked and fixes our existing Flow typed files. Possible enhancements: Export .js.flow declarations from the build. Unclear whether this will be a supported workflow in the future or not, so let's wait on that. We should fail builds and CI on Flow errors. Ideally we should lint for Flow style guides (like no space before colon). (cherry picked from commit 771d938fc01b2f18e15b4c755b67896bbf5a1da9) --- .flowconfig | 34 ++++++++++++++ flow/environment.js | 20 +++++++++ flow/react-native-host-hooks.js | 44 +++++++++++++++++++ .../native/ReactNativeAttributePayload.js | 1 + .../native/ReactNativeBridgeEventPlugin.js | 8 ++-- .../native/ReactNativeContainerInfo.js | 2 +- src/renderers/native/ReactNativeMount.js | 2 +- 7 files changed, 105 insertions(+), 6 deletions(-) create mode 100644 .flowconfig create mode 100644 flow/environment.js create mode 100644 flow/react-native-host-hooks.js diff --git a/.flowconfig b/.flowconfig new file mode 100644 index 0000000000..72d5fe7925 --- /dev/null +++ b/.flowconfig @@ -0,0 +1,34 @@ +[ignore] + +.*/build/.* +.*/node_modules/y18n/.* +.*/__mocks__/.* +.*/__tests__/.* + +# Ignore Docs +.*/docs/.* + +[include] + +[libs] +./node_modules/fbjs/flow/lib +./flow + +[options] +module.system=haste + +esproposal.class_static_fields=enable +esproposal.class_instance_fields=enable + +munge_underscores=false + +suppress_type=$FlowIssue +suppress_type=$FlowFixMe +suppress_type=$FixMe + +suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-4]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*\\)?)\\) +suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-4]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*\\)?)\\)? #[0-9]+ +suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy + +[version] +0.24.0 diff --git a/flow/environment.js b/flow/environment.js new file mode 100644 index 0000000000..fa020bf8aa --- /dev/null +++ b/flow/environment.js @@ -0,0 +1,20 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @flow + */ + +/* eslint-disable */ + +declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: any; /*?{ + inject: ?((stuff: Object) => void) +};*/ + +// temporary patches for React.Component and React.Element +declare var ReactComponent: typeof React$Component; +declare var ReactElement: typeof React$Element; diff --git a/flow/react-native-host-hooks.js b/flow/react-native-host-hooks.js new file mode 100644 index 0000000000..7c611324bb --- /dev/null +++ b/flow/react-native-host-hooks.js @@ -0,0 +1,44 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @flow + */ + +/* eslint-disable */ + +declare module 'deepDiffer' { + declare function exports(one: any, two: any): bool; +} +declare module 'deepFreezeAndThrowOnMutationInDev' { + declare function exports(obj : T) : T; +} +declare module 'flattenStyle' { } +declare module 'InitializeJavaScriptAppEngine' { } +declare module 'RCTEventEmitter' { + declare function register() : void; +} +declare module 'TextInputState' { + declare function blurTextInput(object : any) : void; + declare function focusTextInput(object : any) : void; +} +declare module 'UIManager' { + declare var customBubblingEventTypes : Object; + declare var customDirectEventTypes : Object; + declare function createView() : void; + declare function manageChildren() : void; + declare function measure() : void; + declare function measureInWindow() : void; + declare function measureLayout() : void; + declare function removeRootView() : void; + declare function removeSubviewsFromContainerWithID() : void; + declare function replaceExistingNonRootView() : void; + declare function setChildren() : void; + declare function setChildren() : void; + declare function updateView() : void; +} +declare module 'View' { } diff --git a/src/renderers/native/ReactNativeAttributePayload.js b/src/renderers/native/ReactNativeAttributePayload.js index a2976c6025..4aaa806449 100644 --- a/src/renderers/native/ReactNativeAttributePayload.js +++ b/src/renderers/native/ReactNativeAttributePayload.js @@ -394,6 +394,7 @@ function diffProperties( // default: fallthrough case when nested properties are defined removedKeys = null; removedKeyCount = 0; + // $FlowFixMe - We think that attributeConfig is not CustomAttributeConfiguration at this point so we assume it must be AttributeConfiguration. updatePayload = diffNestedProperty( updatePayload, prevProp, diff --git a/src/renderers/native/ReactNativeBridgeEventPlugin.js b/src/renderers/native/ReactNativeBridgeEventPlugin.js index 97c6496c6a..1e5f4ee7af 100644 --- a/src/renderers/native/ReactNativeBridgeEventPlugin.js +++ b/src/renderers/native/ReactNativeBridgeEventPlugin.js @@ -43,10 +43,10 @@ var ReactNativeBridgeEventPlugin = { * @see {EventPluginHub.extractEvents} */ extractEvents: function( - topLevelType, - targetInst, - nativeEvent, - nativeEventTarget + topLevelType: string, + targetInst: Object, + nativeEvent: Event, + nativeEventTarget: Object ): ?Object { var bubbleDispatchConfig = customBubblingEventTypes[topLevelType]; var directDispatchConfig = customDirectEventTypes[topLevelType]; diff --git a/src/renderers/native/ReactNativeContainerInfo.js b/src/renderers/native/ReactNativeContainerInfo.js index cc37ede4a0..6d24f4c751 100644 --- a/src/renderers/native/ReactNativeContainerInfo.js +++ b/src/renderers/native/ReactNativeContainerInfo.js @@ -11,7 +11,7 @@ */ 'use strict'; -function ReactNativeContainerInfo(tag) { +function ReactNativeContainerInfo(tag: number) { var info = { _tag: tag, }; diff --git a/src/renderers/native/ReactNativeMount.js b/src/renderers/native/ReactNativeMount.js index c44372d1dc..e1f2487223 100644 --- a/src/renderers/native/ReactNativeMount.js +++ b/src/renderers/native/ReactNativeMount.js @@ -238,7 +238,7 @@ var ReactNativeMount = { */ unmountComponentFromNode: function( instance: ReactComponent, - containerID: string + containerID: number ) { // Call back into native to remove all of the subviews from this container ReactReconciler.unmountComponent(instance); From f14d0ef339280136834c8397ad7efb723f1585e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Tue, 3 May 2016 14:39:11 -0700 Subject: [PATCH 008/101] grunt jest tasks shouldn't use watchman (#6675) (cherry picked from commit f25a88e96582663819fc14e8824dd051fe7142cf) --- grunt/tasks/jest.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/grunt/tasks/jest.js b/grunt/tasks/jest.js index fddabd1a3d..679e26c3d0 100644 --- a/grunt/tasks/jest.js +++ b/grunt/tasks/jest.js @@ -49,7 +49,6 @@ function getJestConfig(callback) { name: 'react', collectCoverage: true, collectCoverageOnlyFrom: data, - watchman: false, })); }); } @@ -73,7 +72,11 @@ function writeTempConfig(callback) { function run(done, configPath) { grunt.log.writeln('running jest'); - var args = [path.join('node_modules', 'jest-cli', 'bin', 'jest'), '--runInBand']; + var args = [ + path.join('node_modules', 'jest-cli', 'bin', 'jest'), + '--runInBand', + '--no-watchman', + ]; if (configPath) { args.push('--config', configPath); } From 4725941c7445b02276d97fb523a0fe7b6c364459 Mon Sep 17 00:00:00 2001 From: Troy DeMonbreun Date: Tue, 3 May 2016 17:51:07 -0500 Subject: [PATCH 009/101] Fix for #6062 : Show source line number on unknown property warning (#6398) * New approach for 6062 fix : Show source line number on unknown property warning * WIP: ReactDebugToolEventForwarderDevTool * Update event signature to debugID * Trigger events in ReactDOMComponent * Renamed to onMountDOMComponent; passing in element directly * Added debugID; updated simple test * Added test for multi-div JSX to ref exact line * Added test for composite component (cherry picked from commit 7cf61db257707c49b26c94cd32d5a5d1a5d784ae) --- .babelrc | 3 +- src/renderers/dom/shared/ReactDOMComponent.js | 9 ++ src/renderers/dom/shared/ReactDOMDebugTool.js | 6 ++ .../__tests__/ReactDOMComponent-test.js | 97 +++++++++++++++++++ .../ReactDOMUnknownPropertyDevtool.js | 22 ++++- 5 files changed, 132 insertions(+), 5 deletions(-) diff --git a/.babelrc b/.babelrc index 2ff815b425..a4b2aee589 100644 --- a/.babelrc +++ b/.babelrc @@ -22,6 +22,7 @@ "transform-es2015-modules-commonjs", "transform-es3-member-expression-literals", "transform-es3-property-literals", - "./scripts/babel/transform-object-assign-require" + "./scripts/babel/transform-object-assign-require", + "babel-preset-react/node_modules/babel-plugin-transform-react-jsx-source" ] } diff --git a/src/renderers/dom/shared/ReactDOMComponent.js b/src/renderers/dom/shared/ReactDOMComponent.js index de393515b3..67efd54c84 100644 --- a/src/renderers/dom/shared/ReactDOMComponent.js +++ b/src/renderers/dom/shared/ReactDOMComponent.js @@ -29,6 +29,7 @@ var ReactDOMButton = require('ReactDOMButton'); var ReactDOMComponentFlags = require('ReactDOMComponentFlags'); var ReactDOMComponentTree = require('ReactDOMComponentTree'); var ReactDOMInput = require('ReactDOMInput'); +var ReactDOMInstrumentation = require('ReactDOMInstrumentation'); var ReactDOMOption = require('ReactDOMOption'); var ReactDOMSelect = require('ReactDOMSelect'); var ReactDOMTextarea = require('ReactDOMTextarea'); @@ -571,6 +572,10 @@ ReactDOMComponent.Mixin = { validateDOMNesting.updatedAncestorInfo(parentInfo, this._tag, this); } + if (__DEV__) { + ReactDOMInstrumentation.debugTool.onMountDOMComponent(this._debugID, this._currentElement); + } + var mountImage; if (transaction.useCreateElement) { var ownerDocument = nativeContainerInfo._ownerDocument; @@ -846,6 +851,10 @@ ReactDOMComponent.Mixin = { context ); + if (__DEV__) { + ReactDOMInstrumentation.debugTool.onUpdateDOMComponent(this._debugID, this._currentElement); + } + if (this._tag === 'select') { // ); + expect(console.error.argsForCall.length).toBe(2); + expect(console.error.argsForCall[0][0]).toMatch(/.*className.*\(.*:\d+\)/); + expect(console.error.argsForCall[1][0]).toMatch(/.*onClick.*\(.*:\d+\)/); + }); + + it('gives source code refs for unknown prop warning for update render', function() { + spyOn(console, 'error'); + var container = document.createElement('div'); + + ReactDOMServer.renderToString(
, container); + expect(console.error.argsForCall.length).toBe(0); + + ReactDOMServer.renderToString(
, container); + expect(console.error.argsForCall.length).toBe(1); + expect(console.error.argsForCall[0][0]).toMatch(/.*className.*\(.*:\d+\)/); + }); + + it('gives source code refs for unknown prop warning for exact elements ', function() { + spyOn(console, 'error'); + + ReactDOMServer.renderToString( +
+
+
+
+
+
+
+ ); + + expect(console.error.argsForCall.length).toBe(2); + + var matches = console.error.argsForCall[0][0].match(/.*className.*\(.*:(\d+)\)/); + var previousLine = matches[1]; + + matches = console.error.argsForCall[1][0].match(/.*onClick.*\(.*:(\d+)\)/); + var currentLine = matches[1]; + + //verify line number has a proper relative difference, + //since hard coding the line number would make test too brittle + expect(parseInt(previousLine, 10) + 2).toBe(parseInt(currentLine, 10)); + }); + + it('gives source code refs for unknown prop warning for exact elements in composition ', function() { + spyOn(console, 'error'); + var container = document.createElement('div'); + + var Parent = React.createClass({ + render: function() { + return
; + }, + }); + + var Child1 = React.createClass({ + render: function() { + return
Child1
; + }, + }); + + var Child2 = React.createClass({ + render: function() { + return
Child2
; + }, + }); + + var Child3 = React.createClass({ + render: function() { + return
Child3
; + }, + }); + + var Child4 = React.createClass({ + render: function() { + return
Child4
; + }, + }); + + ReactDOMServer.renderToString(, container); + + expect(console.error.argsForCall.length).toBe(2); + + var matches = console.error.argsForCall[0][0].match(/.*className.*\(.*:(\d+)\)/); + var previousLine = matches[1]; + + matches = console.error.argsForCall[1][0].match(/.*onClick.*\(.*:(\d+)\)/); + var currentLine = matches[1]; + + //verify line number has a proper relative difference, + //since hard coding the line number would make test too brittle + expect(parseInt(previousLine, 10) + 12).toBe(parseInt(currentLine, 10)); + + }); }); }); diff --git a/src/renderers/dom/shared/devtools/ReactDOMUnknownPropertyDevtool.js b/src/renderers/dom/shared/devtools/ReactDOMUnknownPropertyDevtool.js index 5adc359063..5518b3b1ec 100644 --- a/src/renderers/dom/shared/devtools/ReactDOMUnknownPropertyDevtool.js +++ b/src/renderers/dom/shared/devtools/ReactDOMUnknownPropertyDevtool.js @@ -17,6 +17,7 @@ var EventPluginRegistry = require('EventPluginRegistry'); var warning = require('warning'); if (__DEV__) { + var cachedSource; var reactProps = { children: true, dangerouslySetInnerHTML: true, @@ -50,9 +51,10 @@ if (__DEV__) { // logging too much when using transferPropsTo. warning( standardName == null, - 'Unknown DOM property %s. Did you mean %s?', + 'Unknown DOM property %s. Did you mean %s? %s', name, - standardName + standardName, + formatSource(cachedSource) ); var registrationName = ( @@ -65,11 +67,17 @@ if (__DEV__) { warning( registrationName == null, - 'Unknown event handler property %s. Did you mean `%s`?', + 'Unknown event handler property %s. Did you mean `%s`? %s', name, - registrationName + registrationName, + formatSource(cachedSource) ); }; + + var formatSource = function(source) { + return source ? `(${source.fileName.replace(/^.*[\\\/]/, '')}:${source.lineNumber})` : ''; + }; + } var ReactDOMUnknownPropertyDevtool = { @@ -82,6 +90,12 @@ var ReactDOMUnknownPropertyDevtool = { onDeleteValueForProperty(node, name) { warnUnknownProperty(name); }, + onMountDOMComponent(debugID, element) { + cachedSource = element ? element._source : null; + }, + onUpdateDOMComponent(debugID, element) { + cachedSource = element ? element._source : null; + }, }; module.exports = ReactDOMUnknownPropertyDevtool; From 440543aa886ce0a51492bb6ed0dee20b5f8d9626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Tue, 3 May 2016 18:16:38 -0700 Subject: [PATCH 010/101] Setup grunt flow task and run on travis (#6684) (cherry picked from commit c9504d99a55d544b38ad452a776250e3ea6ee68c) --- .travis.yml | 1 + Gruntfile.js | 2 ++ grunt/tasks/flow.js | 22 ++++++++++++++++++++++ package.json | 3 ++- packages/react/package.json | 2 +- 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 grunt/tasks/flow.js diff --git a/.travis.yml b/.travis.yml index 1891081700..e31f7d4502 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,6 +83,7 @@ env: - TEST_TYPE=build - TEST_TYPE=test - TEST_TYPE=lint + - TEST_TYPE=flow - TEST_TYPE=build_website global: # SERVER diff --git a/Gruntfile.js b/Gruntfile.js index f1f3c43567..9562542441 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -56,6 +56,8 @@ module.exports = function(grunt) { grunt.registerTask('lint', ['eslint']); + grunt.registerTask('flow', require('./grunt/tasks/flow')); + grunt.registerTask('delete-build-modules', function() { // Use gulp here. spawnGulp(['react:clean'], null, this.async()); diff --git a/grunt/tasks/flow.js b/grunt/tasks/flow.js new file mode 100644 index 0000000000..767fc4eea6 --- /dev/null +++ b/grunt/tasks/flow.js @@ -0,0 +1,22 @@ +'use strict'; + +var grunt = require('grunt'); + +var extension = process.platform === 'win32' ? '.cmd': ''; + +module.exports = function() { + var done = this.async(); + grunt.util.spawn({ + cmd: 'node_modules/.bin/flow' + extension, + args: ['check', '.'], + opts: {stdio: 'inherit'}, + }, function(err, result, code) { + if (err) { + grunt.log.error('Flow failed'); + } else { + grunt.log.ok('Flow passed'); + } + + done(code === 0); + }); +}; diff --git a/package.json b/package.json index 71b5b11617..531be68455 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,9 @@ "eslint": "1.10.3", "eslint-plugin-react": "4.1.0", "eslint-plugin-react-internal": "file:eslint-rules", - "fbjs": "^0.8.0", + "fbjs": "^0.8.1", "fbjs-scripts": "^0.6.0", + "flow-bin": "0.24.0", "glob": "^6.0.1", "grunt": "^0.4.5", "grunt-cli": "^0.1.13", diff --git a/packages/react/package.json b/packages/react/package.json index c51981567d..0e137a5139 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -23,7 +23,7 @@ "node": ">=0.10.0" }, "dependencies": { - "fbjs": "^0.8.0", + "fbjs": "^0.8.1", "loose-envify": "^1.1.0", "object-assign": "^4.1.0" }, From 7dbf29a10da1e726860999d670b3fec4c761ffba Mon Sep 17 00:00:00 2001 From: Keyan Zhang Date: Wed, 4 May 2016 02:50:27 -0400 Subject: [PATCH 011/101] fixed transform-react-jsx-source devDep (#6697) (cherry picked from commit 9ce54210ea3a7d4568d306f526062c530ec3e839) --- .babelrc | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.babelrc b/.babelrc index a4b2aee589..2880552916 100644 --- a/.babelrc +++ b/.babelrc @@ -23,6 +23,6 @@ "transform-es3-member-expression-literals", "transform-es3-property-literals", "./scripts/babel/transform-object-assign-require", - "babel-preset-react/node_modules/babel-plugin-transform-react-jsx-source" + "transform-react-jsx-source" ] } diff --git a/package.json b/package.json index 531be68455..779f505d41 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "babel-plugin-transform-es3-member-expression-literals": "^6.5.0", "babel-plugin-transform-es3-property-literals": "^6.5.0", "babel-plugin-transform-object-rest-spread": "^6.6.5", + "babel-plugin-transform-react-jsx-source": "^6.8.0", "babel-preset-react": "^6.5.0", "babel-traverse": "^6.9.0", "babylon": "^6.8.0", From 20a081eb373b7cbe3b70348d4d73d1029399e3b8 Mon Sep 17 00:00:00 2001 From: Jay Phelps Date: Wed, 4 May 2016 14:44:53 -0700 Subject: [PATCH 012/101] [DOCS] ReactTextComponent was renamed ReactDOMTextComponent a while ago (#6700) (cherry picked from commit fbe900265f81ee36a07925374836b38a47fc3fb3) --- src/renderers/dom/client/ReactReconcileTransaction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderers/dom/client/ReactReconcileTransaction.js b/src/renderers/dom/client/ReactReconcileTransaction.js index fedd883bf1..403aa7f2ce 100644 --- a/src/renderers/dom/client/ReactReconcileTransaction.js +++ b/src/renderers/dom/client/ReactReconcileTransaction.js @@ -110,7 +110,7 @@ function ReactReconcileTransaction(useCreateElement) { // `ReactServerRendering`), but server-side uses // `ReactServerRenderingTransaction` instead. This option is here so that it's // accessible and defaults to false when `ReactDOMComponent` and - // `ReactTextComponent` checks it in `mountComponent`.` + // `ReactDOMTextComponent` checks it in `mountComponent`.` this.renderToStaticMarkup = false; this.reactMountReady = CallbackQueue.getPooled(null); this.useCreateElement = useCreateElement; From 61924171bfe288440b6fbfe50665cf80adadb028 Mon Sep 17 00:00:00 2001 From: Ben Alpert Date: Thu, 5 May 2016 15:07:04 -0700 Subject: [PATCH 013/101] Move dev-only flags to only exist on composites (#6709) _isOwnerNecessary was unused. (cherry picked from commit e01bf78a79b3562f2f6563b150b9c6affee5f2b9) --- src/renderers/shared/reconciler/ReactCompositeComponent.js | 4 ++++ src/renderers/shared/reconciler/instantiateReactComponent.js | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/renderers/shared/reconciler/ReactCompositeComponent.js b/src/renderers/shared/reconciler/ReactCompositeComponent.js index 120e5900a4..37d91f1be0 100644 --- a/src/renderers/shared/reconciler/ReactCompositeComponent.js +++ b/src/renderers/shared/reconciler/ReactCompositeComponent.js @@ -169,6 +169,10 @@ var ReactCompositeComponentMixin = { // ComponentWillUnmount shall only be called once this._calledComponentWillUnmount = false; + + if (__DEV__) { + this._warnedAboutRefsInRender = false; + } }, /** diff --git a/src/renderers/shared/reconciler/instantiateReactComponent.js b/src/renderers/shared/reconciler/instantiateReactComponent.js index 326e931a13..0632a3c4d5 100644 --- a/src/renderers/shared/reconciler/instantiateReactComponent.js +++ b/src/renderers/shared/reconciler/instantiateReactComponent.js @@ -135,11 +135,6 @@ function instantiateReactComponent(node) { instance._mountIndex = 0; instance._mountImage = null; - if (__DEV__) { - instance._isOwnerNecessary = false; - instance._warnedAboutRefsInRender = false; - } - if (__DEV__) { var debugID = isEmpty ? 0 : nextDebugID++; instance._debugID = debugID; From b3d3ae42ed3a76f11fc299e3b8dfb4096d5be85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Thu, 5 May 2016 16:12:17 -0700 Subject: [PATCH 014/101] Cleanup: remove @nolint (#6703) (cherry picked from commit 873369cc7c19c3ae9bd8a1ce3f68167a5875df13) --- src/test/reactComponentExpect.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/reactComponentExpect.js b/src/test/reactComponentExpect.js index 0905387025..d31b0d08aa 100644 --- a/src/test/reactComponentExpect.js +++ b/src/test/reactComponentExpect.js @@ -7,7 +7,6 @@ * of patent rights can be found in the PATENTS file in the same directory. * * @providesModule reactComponentExpect - * @nolint */ 'use strict'; From 2183e55c1241bd0e64a5139a829845ff0d671590 Mon Sep 17 00:00:00 2001 From: Ben Alpert Date: Thu, 5 May 2016 17:14:26 -0700 Subject: [PATCH 015/101] Disable coverage on Travis (#6712) (cherry picked from commit 82ab58ea03fdf2e069a65bb1bd748aa14dddcf7f) --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e31f7d4502..8ecb5b8661 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,14 @@ script: fi elif [ "$TEST_TYPE" = test ]; then set -e - ./node_modules/.bin/grunt jest:normal + # Disabling coverage because it's broken: + # https://travis-ci.org/facebook/react/jobs/128163922 + if false; then + ./node_modules/.bin/grunt jest:coverage + cat ./coverage/lcov.info | ./node_modules/.bin/coveralls + else + ./node_modules/.bin/grunt jest:normal + fi echo 'Testing in server-render (HTML generation) mode...' printf '\nmodule.exports.useCreateElement = false;\n' \ >> src/renderers/dom/shared/ReactDOMFeatureFlags.js From d77b28e90beef91a19e4ed93eaa46c1a42c197f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= Date: Fri, 6 May 2016 14:48:56 -0700 Subject: [PATCH 016/101] Get patch versions of Flow (#6716) Best practice or whatever. (cherry picked from commit 700b7148ef58ee9d84cfea03bc16ac40622a0213) --- .flowconfig | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.flowconfig b/.flowconfig index 72d5fe7925..7e631856fa 100644 --- a/.flowconfig +++ b/.flowconfig @@ -31,4 +31,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-4]\\|1[0-9]\\|[0-9 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy [version] -0.24.0 +^0.24.0 diff --git a/package.json b/package.json index 779f505d41..9802a25545 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "eslint-plugin-react-internal": "file:eslint-rules", "fbjs": "^0.8.1", "fbjs-scripts": "^0.6.0", - "flow-bin": "0.24.0", + "flow-bin": "^0.24.0", "glob": "^6.0.1", "grunt": "^0.4.5", "grunt-cli": "^0.1.13", From 818ef42d2282376e8bc74a2f9dabda6eab2d88cb Mon Sep 17 00:00:00 2001 From: yiminghe Date: Tue, 10 May 2016 00:22:50 +0800 Subject: [PATCH 017/101] allow to ignore value attribute for option (#5362) (cherry picked from commit 904ee9a6787d74fcffcbf1ceece1c69a9014604d) --- .../dom/client/wrappers/ReactDOMOption.js | 52 ++++++++++++------- .../wrappers/__tests__/ReactDOMOption-test.js | 38 +++++++++----- 2 files changed, 58 insertions(+), 32 deletions(-) diff --git a/src/renderers/dom/client/wrappers/ReactDOMOption.js b/src/renderers/dom/client/wrappers/ReactDOMOption.js index 685fd7d798..9d9b9cfa37 100644 --- a/src/renderers/dom/client/wrappers/ReactDOMOption.js +++ b/src/renderers/dom/client/wrappers/ReactDOMOption.js @@ -16,6 +16,30 @@ var ReactDOMComponentTree = require('ReactDOMComponentTree'); var ReactDOMSelect = require('ReactDOMSelect'); var warning = require('warning'); +var didWarnInvalidOptionChildren = false; + +function flattenChildren(children) { + var content = ''; + + // Flatten children and warn if they aren't strings or numbers; + // invalid types are ignored. + ReactChildren.forEach(children, function(child) { + if (child == null) { + return; + } + if (typeof child === 'string' || typeof child === 'number') { + content += child; + } else if (!didWarnInvalidOptionChildren) { + didWarnInvalidOptionChildren = true; + warning( + false, + 'Only strings and numbers are supported as