diff --git a/package.json b/package.json index 0299ddf552368..d7e415137a5f1 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "babel-cli": "^6.6.5", "babel-core": "^6.0.0", "babel-eslint": "^7.1.0", - "babel-jest": "21.2.0", + "babel-jest": "^21.3.0-beta.4", "babel-plugin-check-es2015-constants": "^6.5.0", "babel-plugin-external-helpers": "^6.22.0", "babel-plugin-syntax-trailing-function-commas": "^6.5.0", @@ -53,6 +53,7 @@ "eslint-plugin-flowtype": "^2.25.0", "eslint-plugin-react": "^6.7.1", "eslint-plugin-react-internal": "file:./scripts/eslint-rules", + "expect": "^21.3.0-beta.4", "fbjs": "^0.8.16", "fbjs-scripts": "^0.6.0", "filesize": "^3.5.6", @@ -63,11 +64,10 @@ "gzip-js": "~0.3.2", "gzip-size": "^3.0.0", "jasmine-check": "^1.0.0-rc.0", - "jest": "21.2.1", - "jest-config": "21.2.1", - "jest-jasmine2": "21.2.1", - "jest-matchers": "20.1.0-delta.1", - "jest-runtime": "21.2.1", + "jest": "^21.3.0-beta.4", + "jest-config": "^21.3.0-beta.4", + "jest-jasmine2": "^21.3.0-beta.4", + "jest-runtime": "^21.3.0-beta.4", "merge-stream": "^1.0.0", "minimist": "^1.2.0", "ncp": "^2.0.0", @@ -115,9 +115,6 @@ "transform": { ".*": "./scripts/jest/preprocessor.js" }, - "transformIgnorePatterns": [ - "/node_modules/(?!react|shared|events)" - ], "setupFiles": [ "./scripts/jest/setup.js", "./scripts/jest/environment.js" diff --git a/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js b/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js index dd779a10bd995..7545a72ea752a 100644 --- a/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js +++ b/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js @@ -13,7 +13,7 @@ var React; var ReactNativeCS; jest.mock('shared/ReactFeatureFlags', () => - require('react-cs-renderer/src/ReactNativeCSFeatureFlags'), + require('../ReactNativeCSFeatureFlags'), ); describe('ReactNativeCS', () => { diff --git a/packages/react-dom/src/__tests__/EventPluginHub-test.js b/packages/react-dom/src/__tests__/EventPluginHub-test.js index bcf8d7f29cc8d..eaf40602ab6b6 100644 --- a/packages/react-dom/src/__tests__/EventPluginHub-test.js +++ b/packages/react-dom/src/__tests__/EventPluginHub-test.js @@ -9,7 +9,7 @@ 'use strict'; -jest.mock('react-dom/src/events/isEventSupported'); +jest.mock('../events/isEventSupported'); describe('EventPluginHub', () => { var React; diff --git a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js index ef826dd01bf8c..0a3cb2f6eef38 100644 --- a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js +++ b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js @@ -63,10 +63,10 @@ describe('ReactBrowserEventEmitter', () => { EventPluginRegistry = require('events/EventPluginRegistry'); React = require('react'); ReactDOM = require('react-dom'); - ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); - ReactBrowserEventEmitter = require('react-dom/src/events/ReactBrowserEventEmitter'); + ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); + ReactBrowserEventEmitter = require('../events/ReactBrowserEventEmitter'); ReactTestUtils = require('react-dom/test-utils'); - TapEventPlugin = require('react-dom/src/events/TapEventPlugin'); + TapEventPlugin = require('../events/TapEventPlugin'); var container = document.createElement('div'); diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js index c16c4a8fdd3ae..b0f205a148506 100644 --- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js @@ -27,7 +27,7 @@ describe('ReactDOMComponent', () => { ReactDOMServer = require('react-dom/server'); ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? - inputValueTracking = require('react-dom/src/client/inputValueTracking'); + inputValueTracking = require('../client/inputValueTracking'); }); describe('updateDOM', () => { diff --git a/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js b/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js index 1ff250f2569ec..366cedd08d3d4 100644 --- a/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js @@ -34,7 +34,7 @@ describe('ReactDOMComponentTree', () => { React = require('react'); ReactDOM = require('react-dom'); // TODO: can we express this test with only public API? - ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); + ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); ReactDOMServer = require('react-dom/server'); }); diff --git a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js index c126799b2fa3f..36e44d4a382ea 100644 --- a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js @@ -24,8 +24,8 @@ describe('ReactDOMEventListener', () => { React = require('react'); ReactDOM = require('react-dom'); // TODO: can we express this test with only public API? - ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); - ReactDOMEventListener = require('react-dom/src/events/ReactDOMEventListener'); + ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); + ReactDOMEventListener = require('../events/ReactDOMEventListener'); ReactTestUtils = require('react-dom/test-utils'); handleTopLevel = jest.fn(); diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js index f5465c1ea2e83..55010095995b3 100644 --- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js @@ -36,7 +36,7 @@ describe('ReactDOMInput', () => { ReactDOMServer = require('react-dom/server'); ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? - inputValueTracking = require('react-dom/src/client/inputValueTracking'); + inputValueTracking = require('../client/inputValueTracking'); spyOn(console, 'error'); }); diff --git a/packages/react-dom/src/__tests__/ReactDOMSelection-test.js b/packages/react-dom/src/__tests__/ReactDOMSelection-test.js index 3c80c40018ed5..74ff592b0ab75 100644 --- a/packages/react-dom/src/__tests__/ReactDOMSelection-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMSelection-test.js @@ -20,7 +20,7 @@ describe('ReactDOMSelection', () => { beforeEach(() => { React = require('react'); ReactDOM = require('react-dom'); - ReactDOMSelection = require('react-dom/src/client/ReactDOMSelection'); + ReactDOMSelection = require('../client/ReactDOMSelection'); invariant = require('fbjs/lib/invariant'); ({getModernOffsetsFromPoints} = ReactDOMSelection); diff --git a/packages/react-dom/src/__tests__/ReactMount-test.js b/packages/react-dom/src/__tests__/ReactMount-test.js index 169a121e2f6ec..b14143dba3460 100644 --- a/packages/react-dom/src/__tests__/ReactMount-test.js +++ b/packages/react-dom/src/__tests__/ReactMount-test.js @@ -9,7 +9,7 @@ 'use strict'; -const {COMMENT_NODE} = require('react-dom/src/shared/HTMLNodeType'); +const {COMMENT_NODE} = require('../shared/HTMLNodeType'); const invariant = require('invariant'); diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js index 4833f51c29ac4..ffae448c2d50e 100644 --- a/packages/react-dom/src/__tests__/ReactServerRendering-test.js +++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.js @@ -34,7 +34,8 @@ describe('ReactDOMServer', () => { ExecutionEnvironment.canUseDOM = false; ReactDOMServer = require('react-dom/server'); - var DOMProperty = require('react-dom/src/shared/DOMProperty'); + // TODO: can we express this test with only public API? + var DOMProperty = require('../shared/DOMProperty'); ROOT_ATTRIBUTE_NAME = DOMProperty.ROOT_ATTRIBUTE_NAME; }); diff --git a/packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js b/packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js index 7fdfcb6f50c6c..cd2bfedaed77c 100644 --- a/packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js +++ b/packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js @@ -11,7 +11,7 @@ describe('escapeTextContentForBrowser', () => { // TODO: can we express this test with only public API? - var escapeTextContentForBrowser = require('react-dom/src/shared/escapeTextContentForBrowser'); + var escapeTextContentForBrowser = require('../shared/escapeTextContentForBrowser'); it('should escape boolean to string', () => { expect(escapeTextContentForBrowser(true)).toBe('true'); diff --git a/packages/react-dom/src/__tests__/inputValueTracking-test.js b/packages/react-dom/src/__tests__/inputValueTracking-test.js index 7217b068be71d..c7805559838b8 100644 --- a/packages/react-dom/src/__tests__/inputValueTracking-test.js +++ b/packages/react-dom/src/__tests__/inputValueTracking-test.js @@ -13,7 +13,7 @@ var React = require('react'); var ReactDOM = require('react-dom'); var ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? -var inputValueTracking = require('react-dom/src/client/inputValueTracking'); +var inputValueTracking = require('../client/inputValueTracking'); var getTracker = inputValueTracking._getTrackerFromNode; diff --git a/packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js b/packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js index e96ca19197686..75300623f61ad 100644 --- a/packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js +++ b/packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js @@ -11,7 +11,7 @@ describe('quoteAttributeValueForBrowser', () => { // TODO: can we express this test with only public API? - var quoteAttributeValueForBrowser = require('react-dom/src/shared/quoteAttributeValueForBrowser'); + var quoteAttributeValueForBrowser = require('../shared/quoteAttributeValueForBrowser'); it('should escape boolean to string', () => { expect(quoteAttributeValueForBrowser(true)).toBe('"true"'); diff --git a/packages/react-dom/src/__tests__/validateDOMNesting-test.js b/packages/react-dom/src/__tests__/validateDOMNesting-test.js index da7b7ea60509a..f317c211582b9 100644 --- a/packages/react-dom/src/__tests__/validateDOMNesting-test.js +++ b/packages/react-dom/src/__tests__/validateDOMNesting-test.js @@ -136,7 +136,7 @@ describe('ReactContextValidator', () => { jest.resetModules(); // TODO: can we express this test with only public API? - validateDOMNesting = require('react-dom/src/client/validateDOMNesting'); + validateDOMNesting = require('../client/validateDOMNesting'); }); it('allows any tag with no context', () => { diff --git a/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js b/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js index eb625a0454431..05f07f572659f 100644 --- a/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js +++ b/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js @@ -10,7 +10,7 @@ 'use strict'; // TODO: can we express this test with only public API? -var getNodeForCharacterOffset = require('react-dom/src/client/getNodeForCharacterOffset'); +var getNodeForCharacterOffset = require('../getNodeForCharacterOffset'); // Create node from HTML string function createNode(html) { diff --git a/packages/react-dom/src/client/__tests__/setInnerHTML-test.js b/packages/react-dom/src/client/__tests__/setInnerHTML-test.js index 193a8c57a05ab..70b52f25c5c9b 100644 --- a/packages/react-dom/src/client/__tests__/setInnerHTML-test.js +++ b/packages/react-dom/src/client/__tests__/setInnerHTML-test.js @@ -10,8 +10,8 @@ 'use strict'; // TODO: can we express this test with only public API? -var setInnerHTML = require('react-dom/src/client/setInnerHTML'); -var Namespaces = require('react-dom/src/shared/DOMNamespaces').Namespaces; +var setInnerHTML = require('../setInnerHTML'); +var Namespaces = require('../../shared/DOMNamespaces').Namespaces; describe('setInnerHTML', () => { describe('when the node has innerHTML property', () => { diff --git a/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js b/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js index eb48bcd88a05d..cec87e39cb9ca 100644 --- a/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js @@ -49,10 +49,10 @@ describe('BeforeInputEventPlugin', function() { this.ReactDOM = require('react-dom'); // TODO: can we express this test with only public API? - this.ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); - this.SyntheticCompositionEvent = require('react-dom/src/events/SyntheticCompositionEvent'); - this.SyntheticInputEvent = require('react-dom/src/events/SyntheticInputEvent'); - this.BeforeInputEventPlugin = require('react-dom/src/events/BeforeInputEventPlugin'); + this.ReactDOMComponentTree = require('../../client//ReactDOMComponentTree'); + this.SyntheticCompositionEvent = require('../SyntheticCompositionEvent'); + this.SyntheticInputEvent = require('../SyntheticInputEvent'); + this.BeforeInputEventPlugin = require('../BeforeInputEventPlugin'); } function extract(node, eventType, optionalData) { diff --git a/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js b/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js index 25048fe1d7627..57e508e190c2f 100644 --- a/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js @@ -23,8 +23,8 @@ describe('EnterLeaveEventPlugin', () => { ReactDOM = require('react-dom'); ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? - ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); - EnterLeaveEventPlugin = require('react-dom/src/events/EnterLeaveEventPlugin'); + ReactDOMComponentTree = require('../../client/ReactDOMComponentTree'); + EnterLeaveEventPlugin = require('../EnterLeaveEventPlugin'); }); it('should set relatedTarget properly in iframe', () => { diff --git a/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js b/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js index 5dc540ef0f837..36fdbdad9d605 100644 --- a/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js +++ b/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js @@ -16,7 +16,7 @@ describe('FallbackCompositionState', () => { beforeEach(() => { // TODO: can we express this test with only public API? - FallbackCompositionState = require('react-dom/src/events/FallbackCompositionState'); + FallbackCompositionState = require('../FallbackCompositionState'); }); function getInput() { diff --git a/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js b/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js index deee5e767025f..b8764e5d62451 100644 --- a/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js @@ -30,8 +30,8 @@ describe('SelectEventPlugin', () => { ReactDOM = require('react-dom'); ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? - ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); - SelectEventPlugin = require('react-dom/src/events/SelectEventPlugin'); + ReactDOMComponentTree = require('../../client/ReactDOMComponentTree'); + SelectEventPlugin = require('../SelectEventPlugin'); }); it('should skip extraction if no listeners are present', () => { diff --git a/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js index aa2a008db3c6a..b0e2f63a04942 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js @@ -16,9 +16,9 @@ describe('SyntheticClipboardEvent', () => { beforeEach(() => { // TODO: can we express this test with only public API? - SyntheticClipboardEvent = require('react-dom/src/events/SyntheticClipboardEvent'); + SyntheticClipboardEvent = require('../SyntheticClipboardEvent'); createEvent = function(nativeEvent) { - var target = require('react-dom/src/events/getEventTarget')(nativeEvent); + var target = require('../getEventTarget')(nativeEvent); return SyntheticClipboardEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js index 8d057e9e32faf..0dd9f33dddcd4 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js @@ -25,7 +25,7 @@ describe('SyntheticEvent', () => { ReactTestUtils = require('react-dom/test-utils'); createEvent = function(nativeEvent) { - var target = require('react-dom/src/events/getEventTarget')(nativeEvent); + var target = require('../getEventTarget')(nativeEvent); return SyntheticEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js index 1f48e33e39378..ab3e40262079c 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js @@ -17,13 +17,13 @@ describe('SyntheticKeyboardEvent', () => { beforeEach(() => { // Mock getEventCharCode for proper unit testing - jest.mock('react-dom/src/events/getEventCharCode'); - getEventCharCode = require('react-dom/src/events/getEventCharCode'); + jest.mock('../getEventCharCode'); + getEventCharCode = require('../getEventCharCode'); // TODO: can we express this test with only public API? - SyntheticKeyboardEvent = require('react-dom/src/events/SyntheticKeyboardEvent'); + SyntheticKeyboardEvent = require('../SyntheticKeyboardEvent'); createEvent = function(nativeEvent) { - var target = require('react-dom/src/events/getEventTarget')(nativeEvent); + var target = require('../getEventTarget')(nativeEvent); return SyntheticKeyboardEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js index a60d3965be795..229a93f68fe5f 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js @@ -16,10 +16,10 @@ describe('SyntheticWheelEvent', () => { beforeEach(() => { // TODO: can we express this test with only public API? - SyntheticWheelEvent = require('react-dom/src/events/SyntheticWheelEvent'); + SyntheticWheelEvent = require('../SyntheticWheelEvent'); createEvent = function(nativeEvent) { - var target = require('react-dom/src/events/getEventTarget')(nativeEvent); + var target = require('../getEventTarget')(nativeEvent); return SyntheticWheelEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/getEventCharCode-test.js b/packages/react-dom/src/events/__tests__/getEventCharCode-test.js index d885706f8928f..3787151c47274 100644 --- a/packages/react-dom/src/events/__tests__/getEventCharCode-test.js +++ b/packages/react-dom/src/events/__tests__/getEventCharCode-test.js @@ -10,7 +10,7 @@ 'use strict'; // TODO: can we express this test with only public API? -var getEventCharCode = require('react-dom/src/events/getEventCharCode'); +var getEventCharCode = require('../getEventCharCode'); describe('getEventCharCode', () => { describe('when charCode is present in nativeEvent', () => { diff --git a/packages/react-dom/src/events/__tests__/getEventKey-test.js b/packages/react-dom/src/events/__tests__/getEventKey-test.js index 12e4a8342ab1e..4942911d4389f 100644 --- a/packages/react-dom/src/events/__tests__/getEventKey-test.js +++ b/packages/react-dom/src/events/__tests__/getEventKey-test.js @@ -10,7 +10,7 @@ 'use strict'; // TODO: can we express this test with only public API? -var getEventKey = require('react-dom/src/events/getEventKey'); +var getEventKey = require('../getEventKey'); describe('getEventKey', () => { describe('when key is implemented in a browser', () => { diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeAttributePayload-test.js b/packages/react-native-renderer/src/__tests__/ReactNativeAttributePayload-test.js index 124e26a4e1c45..99135d8b570e3 100644 --- a/packages/react-native-renderer/src/__tests__/ReactNativeAttributePayload-test.js +++ b/packages/react-native-renderer/src/__tests__/ReactNativeAttributePayload-test.js @@ -7,8 +7,8 @@ */ 'use strict'; -var ReactNativeAttributePayload = require('react-native-renderer/src/ReactNativeAttributePayload'); -var ReactNativePropRegistry = require('react-native-renderer/src/ReactNativePropRegistry'); +var ReactNativeAttributePayload = require('../ReactNativeAttributePayload'); +var ReactNativePropRegistry = require('../ReactNativePropRegistry'); var diff = ReactNativeAttributePayload.diff; diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js b/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js index 4e18e920d376c..79a29a2c3f1e3 100644 --- a/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js +++ b/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js @@ -69,10 +69,10 @@ beforeEach(() => { RCTEventEmitter = require('RCTEventEmitter'); React = require('react'); ReactNative = require('react-native-renderer'); - ReactNativeBridgeEventPlugin = require('react-native-renderer/src/ReactNativeBridgeEventPlugin'); + ReactNativeBridgeEventPlugin = require('../ReactNativeBridgeEventPlugin'); ResponderEventPlugin = require('events/ResponderEventPlugin'); UIManager = require('UIManager'); - createReactNativeComponentClass = require('react-native-renderer/src/createReactNativeComponentClass'); + createReactNativeComponentClass = require('../createReactNativeComponentClass'); }); it('fails if unknown/unsupported event types are dispatched', () => { diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.js b/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.js index 374fea72b9e22..8f6e5b63326b3 100644 --- a/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.js +++ b/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.js @@ -21,7 +21,7 @@ describe('ReactNative', () => { React = require('react'); ReactNative = require('react-native-renderer'); UIManager = require('UIManager'); - createReactNativeComponentClass = require('react-native-renderer/src/createReactNativeComponentClass'); + createReactNativeComponentClass = require('../createReactNativeComponentClass'); }); it('should be able to create and render a native component', () => { diff --git a/packages/react-native-renderer/src/__tests__/createReactNativeComponentClass-test.js b/packages/react-native-renderer/src/__tests__/createReactNativeComponentClass-test.js index 70166d57ecdee..aba3b8acc286d 100644 --- a/packages/react-native-renderer/src/__tests__/createReactNativeComponentClass-test.js +++ b/packages/react-native-renderer/src/__tests__/createReactNativeComponentClass-test.js @@ -17,7 +17,7 @@ describe('createReactNativeComponentClass', () => { beforeEach(() => { jest.resetModules(); - createReactNativeComponentClass = require('react-native-renderer/src/createReactNativeComponentClass'); + createReactNativeComponentClass = require('../createReactNativeComponentClass'); React = require('react'); ReactNative = require('react-native-renderer'); }); diff --git a/packages/react-noop-renderer/src/ReactNoop.js b/packages/react-noop-renderer/src/ReactNoop.js index 426d2e62c1bcc..6624ce9f72b70 100644 --- a/packages/react-noop-renderer/src/ReactNoop.js +++ b/packages/react-noop-renderer/src/ReactNoop.js @@ -25,7 +25,7 @@ var ReactFiberReconciler = require('react-reconciler'); var ReactFeatureFlags = require('shared/ReactFeatureFlags'); var ReactInstanceMap = require('shared/ReactInstanceMap'); var emptyObject = require('fbjs/lib/emptyObject'); -var expect = require('jest-matchers'); +var expect = require('expect'); const UPDATE_SIGNAL = {}; diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.js index 250575debd0a4..3ad02dd76f2dd 100644 --- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.js +++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.js @@ -935,11 +935,9 @@ describe('ReactIncrementalErrorHandling', () => { function initReactFiberErrorLoggerMock(mock) { jest.resetModules(); if (mock) { - // TODO: direct imports like some-package/src/* are bad. Fix me. - jest.mock('react-reconciler/src/ReactFiberErrorLogger'); + jest.mock('../ReactFiberErrorLogger'); } else { - // TODO: direct imports like some-package/src/* are bad. Fix me. - jest.unmock('react-reconciler/src/ReactFiberErrorLogger'); + jest.unmock('../ReactFiberErrorLogger'); } React = require('react'); ReactNoop = require('react-noop-renderer'); @@ -1035,8 +1033,7 @@ describe('ReactIncrementalErrorHandling', () => { const logCapturedErrorCalls = []; - // TODO: direct imports like some-package/src/* are bad. Fix me. - const ReactFiberErrorLogger = require('react-reconciler/src/ReactFiberErrorLogger'); + const ReactFiberErrorLogger = require('../ReactFiberErrorLogger'); ReactFiberErrorLogger.logCapturedError.mockImplementation( capturedError => { logCapturedErrorCalls.push(capturedError); diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js index 570dd845ee2f1..5b699c9414a5a 100644 --- a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js +++ b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js @@ -117,7 +117,7 @@ describe('ReactDebugFiberPerf', () => { ReactNoop = require('react-noop-renderer'); ReactCallReturn = require('react-call-return'); // TODO: can we express this test with only public API? - ReactPortal = require('react-reconciler/src/ReactPortal'); + ReactPortal = require('../ReactPortal'); PropTypes = require('prop-types'); }); diff --git a/packages/react-reconciler/src/__tests__/ReactPersistent-test.js b/packages/react-reconciler/src/__tests__/ReactPersistent-test.js index 163c0bc9378e3..4668765cdb0ca 100644 --- a/packages/react-reconciler/src/__tests__/ReactPersistent-test.js +++ b/packages/react-reconciler/src/__tests__/ReactPersistent-test.js @@ -24,7 +24,7 @@ describe('ReactPersistent', () => { React = require('react'); ReactNoop = require('react-noop-renderer'); - ReactPortal = require('react-reconciler/src/ReactPortal'); + ReactPortal = require('../ReactPortal'); }); const DEFAULT_ROOT_ID = 'persistent-test'; diff --git a/scripts/jest/preprocessor.js b/scripts/jest/preprocessor.js index 7602665f83490..19e77d621c66a 100644 --- a/scripts/jest/preprocessor.js +++ b/scripts/jest/preprocessor.js @@ -4,7 +4,6 @@ // are set up. So we might as well enforce it. process.env.NODE_ENV = 'test'; -var fs = require('fs'); var path = require('path'); var babel = require('babel-core'); @@ -47,19 +46,13 @@ var babelOptions = { module.exports = { process: function(src, filePath) { - // Resolve the path so we can tell our own packages from node_modules. - filePath = fs.realpathSync(filePath); - if (filePath.match(/\.coffee$/)) { return coffee.compile(src, {bare: true}); } if (filePath.match(/\.ts$/) && !filePath.match(/\.d\.ts$/)) { return tsPreprocessor.compile(src, filePath); } - if ( - !filePath.match(/\/node_modules\//) && - !filePath.match(/\/third_party\//) - ) { + if (!filePath.match(/\/third_party\//)) { // for test files, we also apply the async-await transform, but we want to // make sure we don't accidentally apply that transform to product code. var isTestFile = !!filePath.match(/\/__tests__\//); diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index 04889862a92b3..2771287723d13 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -184,7 +184,7 @@ const bundles = [ moduleType: RENDERER, entry: 'react-noop-renderer', global: 'ReactNoopRenderer', - externals: ['react', 'jest-matchers'], + externals: ['react', 'expect'], }, /******* React Reconciler *******/ diff --git a/yarn.lock b/yarn.lock index 4ce6d57113b00..457e151428bbd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -462,12 +462,12 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-jest@21.2.0, babel-jest@^21.2.0: - version "21.2.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-21.2.0.tgz#2ce059519a9374a2c46f2455b6fbef5ad75d863e" +babel-jest@21.3.0-beta.4, babel-jest@^21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-21.3.0-beta.4.tgz#43d3975be81fb029d2d675d913803c123267309d" dependencies: - babel-plugin-istanbul "^4.0.0" - babel-preset-jest "^21.2.0" + babel-plugin-istanbul "^4.1.5" + babel-preset-jest "21.3.0-beta.4" babel-messages@^6.23.0: version "6.23.0" @@ -503,17 +503,17 @@ babel-plugin-inline-environment-variables@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/babel-plugin-inline-environment-variables/-/babel-plugin-inline-environment-variables-1.0.1.tgz#1f58ce91207ad6a826a8bf645fafe68ff5fe3ffe" -babel-plugin-istanbul@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.1.tgz#c12de0fc6fe42adfb16be56f1ad11e4a9782eca9" +babel-plugin-istanbul@^4.1.5: + version "4.1.5" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e" dependencies: find-up "^2.1.0" - istanbul-lib-instrument "^1.6.2" - test-exclude "^4.0.3" + istanbul-lib-instrument "^1.7.5" + test-exclude "^4.1.1" -babel-plugin-jest-hoist@^21.2.0: - version "21.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-21.2.0.tgz#2cef637259bd4b628a6cace039de5fcd14dbb006" +babel-plugin-jest-hoist@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-21.3.0-beta.4.tgz#a1283b7e556c3cf236604c17e0f18aaa9cf3d79a" babel-plugin-jscript@^1.0.4: version "1.0.4" @@ -786,11 +786,11 @@ babel-preset-flow@^6.23.0: dependencies: babel-plugin-transform-flow-strip-types "^6.22.0" -babel-preset-jest@^21.2.0: - version "21.2.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-21.2.0.tgz#ff9d2bce08abd98e8a36d9a8a5189b9173b85638" +babel-preset-jest@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-21.3.0-beta.4.tgz#d4f797e00a23c0a027a42341684702888d90789a" dependencies: - babel-plugin-jest-hoist "^21.2.0" + babel-plugin-jest-hoist "21.3.0-beta.4" babel-plugin-syntax-object-rest-spread "^6.13.0" babel-preset-react@^6.5.0: @@ -885,13 +885,13 @@ babylon@^5.8.38: version "5.8.38" resolved "https://registry.yarnpkg.com/babylon/-/babylon-5.8.38.tgz#ec9b120b11bf6ccd4173a18bf217e60b79859ffd" -babylon@^6.13.0, babylon@^6.15.0, babylon@^6.17.0: +babylon@^6.15.0, babylon@^6.17.0: version "6.17.0" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.0.tgz#37da948878488b9c4e3c4038893fa3314b3fc932" -babylon@^6.17.4: - version "6.17.4" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a" +babylon@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" balanced-match@^0.4.1: version "0.4.2" @@ -1338,6 +1338,12 @@ debug@^2.6.3: dependencies: ms "2.0.0" +debug@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + dependencies: + ms "2.0.0" + decamelize@^1.0.0, decamelize@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1430,6 +1436,10 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" +detect-newline@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" + detective@^4.3.1: version "4.5.0" resolved "https://registry.yarnpkg.com/detective/-/detective-4.5.0.tgz#6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1" @@ -1767,15 +1777,15 @@ expand-range@^1.8.1: dependencies: fill-range "^2.1.0" -expect@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/expect/-/expect-21.2.1.tgz#003ac2ac7005c3c29e73b38a272d4afadd6d1d7b" +expect@21.3.0-beta.4, expect@^21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/expect/-/expect-21.3.0-beta.4.tgz#e1243ad493fb9dec41793ab0ffd08a3a81eb9cb4" dependencies: ansi-styles "^3.2.0" - jest-diff "^21.2.1" - jest-get-type "^21.2.0" - jest-matcher-utils "^21.2.1" - jest-message-util "^21.2.1" + jest-diff "21.3.0-beta.4" + jest-get-type "21.3.0-beta.4" + jest-matcher-utils "21.3.0-beta.4" + jest-message-util "21.3.0-beta.4" jest-regex-util "^21.2.0" extend-shallow@^2.0.1: @@ -2606,70 +2616,54 @@ isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" -istanbul-api@^1.1.1: - version "1.1.11" - resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.11.tgz#fcc0b461e2b3bda71e305155138238768257d9de" +istanbul-api@^1.1.14: + version "1.2.1" + resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.2.1.tgz#0c60a0515eb11c7d65c6b50bba2c6e999acd8620" dependencies: async "^2.1.4" fileset "^2.0.2" istanbul-lib-coverage "^1.1.1" - istanbul-lib-hook "^1.0.7" - istanbul-lib-instrument "^1.7.4" - istanbul-lib-report "^1.1.1" - istanbul-lib-source-maps "^1.2.1" - istanbul-reports "^1.1.1" + istanbul-lib-hook "^1.1.0" + istanbul-lib-instrument "^1.9.1" + istanbul-lib-report "^1.1.2" + istanbul-lib-source-maps "^1.2.2" + istanbul-reports "^1.1.3" js-yaml "^3.7.0" mkdirp "^0.5.1" once "^1.4.0" -istanbul-lib-coverage@^1.0.1, istanbul-lib-coverage@^1.1.1: +istanbul-lib-coverage@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da" -istanbul-lib-coverage@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1" - -istanbul-lib-hook@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz#dd6607f03076578fe7d6f2a630cf143b49bacddc" +istanbul-lib-hook@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b" dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.4.tgz#e9fd920e4767f3d19edc765e2d6b3f5ccbd0eea8" +istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.8.0, istanbul-lib-instrument@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e" dependencies: babel-generator "^6.18.0" babel-template "^6.16.0" babel-traverse "^6.18.0" babel-types "^6.18.0" - babylon "^6.17.4" + babylon "^6.18.0" istanbul-lib-coverage "^1.1.1" semver "^5.3.0" -istanbul-lib-instrument@^1.6.2: - version "1.7.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659" - dependencies: - babel-generator "^6.18.0" - babel-template "^6.16.0" - babel-traverse "^6.18.0" - babel-types "^6.18.0" - babylon "^6.13.0" - istanbul-lib-coverage "^1.0.2" - semver "^5.3.0" - -istanbul-lib-report@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#f0e55f56655ffa34222080b7a0cd4760e1405fc9" +istanbul-lib-report@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz#922be27c13b9511b979bd1587359f69798c1d425" dependencies: istanbul-lib-coverage "^1.1.1" mkdirp "^0.5.1" path-parse "^1.0.5" supports-color "^3.1.2" -istanbul-lib-source-maps@^1.1.0, istanbul-lib-source-maps@^1.2.1: +istanbul-lib-source-maps@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz#a6fe1acba8ce08eebc638e572e294d267008aa0c" dependencies: @@ -2679,9 +2673,19 @@ istanbul-lib-source-maps@^1.1.0, istanbul-lib-source-maps@^1.2.1: rimraf "^2.6.1" source-map "^0.5.3" -istanbul-reports@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.1.tgz#042be5c89e175bc3f86523caab29c014e77fee4e" +istanbul-lib-source-maps@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz#750578602435f28a0c04ee6d7d9e0f2960e62c1c" + dependencies: + debug "^3.1.0" + istanbul-lib-coverage "^1.1.1" + mkdirp "^0.5.1" + rimraf "^2.6.1" + source-map "^0.5.3" + +istanbul-reports@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.3.tgz#3b9e1e8defb6d18b1d425da8e8b32c5a163f2d10" dependencies: handlebars "^4.0.3" @@ -2697,33 +2701,34 @@ jest-changed-files@^21.2.0: dependencies: throat "^4.0.0" -jest-cli@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-21.2.1.tgz#9c528b6629d651911138d228bdb033c157ec8c00" +jest-cli@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-21.3.0-beta.4.tgz#50a1c2773cfeff68dbb1fe454a3f259ad5850fa6" dependencies: ansi-escapes "^3.0.0" chalk "^2.0.1" glob "^7.1.2" graceful-fs "^4.1.11" is-ci "^1.0.10" - istanbul-api "^1.1.1" - istanbul-lib-coverage "^1.0.1" - istanbul-lib-instrument "^1.4.2" - istanbul-lib-source-maps "^1.1.0" + istanbul-api "^1.1.14" + istanbul-lib-coverage "^1.1.1" + istanbul-lib-instrument "^1.8.0" + istanbul-lib-source-maps "^1.2.1" jest-changed-files "^21.2.0" - jest-config "^21.2.1" - jest-environment-jsdom "^21.2.1" - jest-haste-map "^21.2.0" - jest-message-util "^21.2.1" + jest-config "21.3.0-beta.4" + jest-environment-jsdom "21.3.0-beta.4" + jest-haste-map "21.3.0-beta.4" + jest-message-util "21.3.0-beta.4" jest-regex-util "^21.2.0" jest-resolve-dependencies "^21.2.0" - jest-runner "^21.2.1" - jest-runtime "^21.2.1" - jest-snapshot "^21.2.1" - jest-util "^21.2.1" + jest-runner "21.3.0-beta.4" + jest-runtime "21.3.0-beta.4" + jest-snapshot "21.3.0-beta.4" + jest-util "21.3.0-beta.4" micromatch "^2.3.11" - node-notifier "^5.0.2" + node-notifier "^5.1.2" pify "^3.0.0" + rimraf "^2.5.4" slash "^1.0.0" string-length "^2.0.0" strip-ansi "^4.0.0" @@ -2731,99 +2736,88 @@ jest-cli@^21.2.1: worker-farm "^1.3.1" yargs "^9.0.0" -jest-config@21.2.1, jest-config@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-21.2.1.tgz#c7586c79ead0bcc1f38c401e55f964f13bf2a480" +jest-config@21.3.0-beta.4, jest-config@^21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-21.3.0-beta.4.tgz#03c936c605c5ec11bbd42aa9d2715d4d96cb11ee" dependencies: chalk "^2.0.1" glob "^7.1.1" - jest-environment-jsdom "^21.2.1" - jest-environment-node "^21.2.1" - jest-get-type "^21.2.0" - jest-jasmine2 "^21.2.1" + jest-environment-jsdom "21.3.0-beta.4" + jest-environment-node "21.3.0-beta.4" + jest-get-type "21.3.0-beta.4" + jest-jasmine2 "21.3.0-beta.4" jest-regex-util "^21.2.0" - jest-resolve "^21.2.0" - jest-util "^21.2.1" - jest-validate "^21.2.1" - pretty-format "^21.2.1" + jest-resolve "21.3.0-beta.4" + jest-util "21.3.0-beta.4" + jest-validate "21.3.0-beta.4" + pretty-format "21.3.0-beta.4" -jest-diff@20.1.0-delta.1: - version "20.1.0-delta.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-20.1.0-delta.1.tgz#d64d9fcfff4bdfca87dd53f66e3db91ea8faa280" +jest-diff@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-21.3.0-beta.4.tgz#75e795e83f6c3368720c2ddd1f0cbed1543c4139" dependencies: chalk "^2.0.1" diff "^3.2.0" - jest-get-type "20.1.0-delta.1" - jest-matcher-utils "20.1.0-delta.1" - pretty-format "20.1.0-delta.1" + jest-get-type "21.3.0-beta.4" + pretty-format "21.3.0-beta.4" -jest-diff@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-21.2.1.tgz#46cccb6cab2d02ce98bc314011764bb95b065b4f" +jest-docblock@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.3.0-beta.4.tgz#11c3121cccc39d826d484e0951cb2faad1fe1ebd" dependencies: - chalk "^2.0.1" - diff "^3.2.0" - jest-get-type "^21.2.0" - pretty-format "^21.2.1" - -jest-docblock@^21.2.0: - version "21.2.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414" + detect-newline "^2.1.0" -jest-environment-jsdom@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-21.2.1.tgz#38d9980c8259b2a608ec232deee6289a60d9d5b4" +jest-environment-jsdom@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-21.3.0-beta.4.tgz#aa2831f1ac6b2c88a7ec965990517960d5828da1" dependencies: - jest-mock "^21.2.0" - jest-util "^21.2.1" + jest-mock "21.3.0-beta.4" + jest-util "21.3.0-beta.4" jsdom "^9.12.0" -jest-environment-node@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-21.2.1.tgz#98c67df5663c7fbe20f6e792ac2272c740d3b8c8" +jest-environment-node@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-21.3.0-beta.4.tgz#d4d620ee495d9af84edc157466ff962596e783ab" dependencies: - jest-mock "^21.2.0" - jest-util "^21.2.1" + jest-mock "21.3.0-beta.4" + jest-util "21.3.0-beta.4" -jest-get-type@20.1.0-delta.1: - version "20.1.0-delta.1" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-20.1.0-delta.1.tgz#f441f9e9b5305657dccf5e1c035b3c91bb166aec" - -jest-get-type@^21.2.0: - version "21.2.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.2.0.tgz#f6376ab9db4b60d81e39f30749c6c466f40d4a23" +jest-get-type@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.3.0-beta.4.tgz#248b16f9b8fe2887a0baa35b31905d73d66e56e0" -jest-haste-map@^21.2.0: - version "21.2.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-21.2.0.tgz#1363f0a8bb4338f24f001806571eff7a4b2ff3d8" +jest-haste-map@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-21.3.0-beta.4.tgz#dd8736c40c6db933e16f8f402a45fec859a310f5" dependencies: fb-watchman "^2.0.0" graceful-fs "^4.1.11" - jest-docblock "^21.2.0" + jest-docblock "21.3.0-beta.4" micromatch "^2.3.11" sane "^2.0.0" worker-farm "^1.3.1" -jest-jasmine2@21.2.1, jest-jasmine2@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-21.2.1.tgz#9cc6fc108accfa97efebce10c4308548a4ea7592" +jest-jasmine2@21.3.0-beta.4, jest-jasmine2@^21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-21.3.0-beta.4.tgz#da0f065ce48c8eaaec1de6c1074ad05cc5a9f96f" dependencies: chalk "^2.0.1" - expect "^21.2.1" + expect "21.3.0-beta.4" graceful-fs "^4.1.11" - jest-diff "^21.2.1" - jest-matcher-utils "^21.2.1" - jest-message-util "^21.2.1" - jest-snapshot "^21.2.1" + jest-diff "21.3.0-beta.4" + jest-matcher-utils "21.3.0-beta.4" + jest-message-util "21.3.0-beta.4" + jest-snapshot "21.3.0-beta.4" p-cancelable "^0.3.0" + source-map-support "^0.5.0" -jest-matcher-utils@20.1.0-delta.1: - version "20.1.0-delta.1" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-20.1.0-delta.1.tgz#e8c1153d5009d3df851641723b85bbfcec8fed37" +jest-matcher-utils@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-21.3.0-beta.4.tgz#a83ad12d284c4c3a4db87ba5830f84a16b9a4a91" dependencies: chalk "^2.0.1" - jest-get-type "20.1.0-delta.1" - pretty-format "20.1.0-delta.1" + jest-get-type "21.3.0-beta.4" + pretty-format "21.3.0-beta.4" jest-matcher-utils@^19.0.0: version "19.0.0" @@ -2832,47 +2826,18 @@ jest-matcher-utils@^19.0.0: chalk "^1.1.3" pretty-format "^19.0.0" -jest-matcher-utils@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-21.2.1.tgz#72c826eaba41a093ac2b4565f865eb8475de0f64" - dependencies: - chalk "^2.0.1" - jest-get-type "^21.2.0" - pretty-format "^21.2.1" - -jest-matchers@20.1.0-delta.1: - version "20.1.0-delta.1" - resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-20.1.0-delta.1.tgz#ef4d9fdd0ecd520000eae1a6e7c7df892d9d3653" - dependencies: - jest-diff "20.1.0-delta.1" - jest-get-type "20.1.0-delta.1" - jest-matcher-utils "20.1.0-delta.1" - jest-message-util "20.1.0-delta.1" - jest-regex-util "20.1.0-delta.1" - -jest-message-util@20.1.0-delta.1: - version "20.1.0-delta.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-20.1.0-delta.1.tgz#078ae8df88daf1f26cce34c718e7f37234e7e8b3" +jest-message-util@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-21.3.0-beta.4.tgz#018dd79f8d7b1a4bbbd9f5b3d59354d14ac9641f" dependencies: chalk "^2.0.1" micromatch "^2.3.11" slash "^1.0.0" + stack-utils "^1.0.1" -jest-message-util@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-21.2.1.tgz#bfe5d4692c84c827d1dcf41823795558f0a1acbe" - dependencies: - chalk "^2.0.1" - micromatch "^2.3.11" - slash "^1.0.0" - -jest-mock@^21.2.0: - version "21.2.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-21.2.0.tgz#7eb0770e7317968165f61ea2a7281131534b3c0f" - -jest-regex-util@20.1.0-delta.1: - version "20.1.0-delta.1" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-20.1.0-delta.1.tgz#0aaea967cdfc6cfe8fa828a11235679cf0eb2312" +jest-mock@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-21.3.0-beta.4.tgz#f318168c781a340c2a75fbb3cc40559670531ddd" jest-regex-util@^21.2.0: version "21.2.0" @@ -2884,44 +2849,42 @@ jest-resolve-dependencies@^21.2.0: dependencies: jest-regex-util "^21.2.0" -jest-resolve@^21.2.0: - version "21.2.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-21.2.0.tgz#068913ad2ba6a20218e5fd32471f3874005de3a6" +jest-resolve@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-21.3.0-beta.4.tgz#66771415f4be5363b846a6b00599c0e9b01dc726" dependencies: browser-resolve "^1.11.2" chalk "^2.0.1" - is-builtin-module "^1.0.0" -jest-runner@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-21.2.1.tgz#194732e3e518bfb3d7cbfc0fd5871246c7e1a467" - dependencies: - jest-config "^21.2.1" - jest-docblock "^21.2.0" - jest-haste-map "^21.2.0" - jest-jasmine2 "^21.2.1" - jest-message-util "^21.2.1" - jest-runtime "^21.2.1" - jest-util "^21.2.1" +jest-runner@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-21.3.0-beta.4.tgz#a52680a5aff6f1e160c6f520d86482224905d5fa" + dependencies: + jest-config "21.3.0-beta.4" + jest-docblock "21.3.0-beta.4" + jest-haste-map "21.3.0-beta.4" + jest-jasmine2 "21.3.0-beta.4" + jest-message-util "21.3.0-beta.4" + jest-runtime "21.3.0-beta.4" + jest-util "21.3.0-beta.4" pify "^3.0.0" throat "^4.0.0" worker-farm "^1.3.1" -jest-runtime@21.2.1, jest-runtime@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-21.2.1.tgz#99dce15309c670442eee2ebe1ff53a3cbdbbb73e" +jest-runtime@21.3.0-beta.4, jest-runtime@^21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-21.3.0-beta.4.tgz#22238a05341baf88857e44e39a881c28807e5a36" dependencies: - babel-core "^6.0.0" - babel-jest "^21.2.0" - babel-plugin-istanbul "^4.0.0" + babel-jest "21.3.0-beta.4" + babel-plugin-istanbul "^4.1.5" chalk "^2.0.1" convert-source-map "^1.4.0" graceful-fs "^4.1.11" - jest-config "^21.2.1" - jest-haste-map "^21.2.0" + jest-config "21.3.0-beta.4" + jest-haste-map "21.3.0-beta.4" jest-regex-util "^21.2.0" - jest-resolve "^21.2.0" - jest-util "^21.2.1" + jest-resolve "21.3.0-beta.4" + jest-util "21.3.0-beta.4" json-stable-stringify "^1.0.1" micromatch "^2.3.11" slash "^1.0.0" @@ -2929,27 +2892,27 @@ jest-runtime@21.2.1, jest-runtime@^21.2.1: write-file-atomic "^2.1.0" yargs "^9.0.0" -jest-snapshot@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-21.2.1.tgz#29e49f16202416e47343e757e5eff948c07fd7b0" +jest-snapshot@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-21.3.0-beta.4.tgz#0ba657b322029c2855dd6ac95a6494bf101de7dc" dependencies: chalk "^2.0.1" - jest-diff "^21.2.1" - jest-matcher-utils "^21.2.1" + jest-diff "21.3.0-beta.4" + jest-matcher-utils "21.3.0-beta.4" mkdirp "^0.5.1" natural-compare "^1.4.0" - pretty-format "^21.2.1" + pretty-format "21.3.0-beta.4" -jest-util@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-21.2.1.tgz#a274b2f726b0897494d694a6c3d6a61ab819bb78" +jest-util@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-21.3.0-beta.4.tgz#88bd0c8d1d51098336cf6696e3ae27d38b881664" dependencies: callsites "^2.0.0" chalk "^2.0.1" graceful-fs "^4.1.11" - jest-message-util "^21.2.1" - jest-mock "^21.2.0" - jest-validate "^21.2.1" + jest-message-util "21.3.0-beta.4" + jest-mock "21.3.0-beta.4" + jest-validate "21.3.0-beta.4" mkdirp "^0.5.1" jest-validate@19.0.0: @@ -2961,20 +2924,20 @@ jest-validate@19.0.0: leven "^2.0.0" pretty-format "^19.0.0" -jest-validate@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.2.1.tgz#cc0cbca653cd54937ba4f2a111796774530dd3c7" +jest-validate@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.3.0-beta.4.tgz#cfb0cdb38f7eb694f909ad041687645fd1b90452" dependencies: chalk "^2.0.1" - jest-get-type "^21.2.0" + jest-get-type "21.3.0-beta.4" leven "^2.1.0" - pretty-format "^21.2.1" + pretty-format "21.3.0-beta.4" -jest@21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/jest/-/jest-21.2.1.tgz#c964e0b47383768a1438e3ccf3c3d470327604e1" +jest@^21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/jest/-/jest-21.3.0-beta.4.tgz#068cb09b33b854c5fa7904f368a902d8c65bcace" dependencies: - jest-cli "^21.2.1" + jest-cli "21.3.0-beta.4" jodid25519@^1.0.0: version "1.0.2" @@ -3416,7 +3379,7 @@ node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" -node-notifier@^5.0.2: +node-notifier@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.1.2.tgz#2fa9e12605fa10009d44549d6fcd8a63dde0e4ff" dependencies: @@ -3749,12 +3712,12 @@ prettier@1.2.2: jest-validate "19.0.0" minimist "1.2.0" -pretty-format@20.1.0-delta.1: - version "20.1.0-delta.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-20.1.0-delta.1.tgz#f1d31d80b5bd8724b33f3065acb1457710213d0d" +pretty-format@21.3.0-beta.4: + version "21.3.0-beta.4" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.3.0-beta.4.tgz#6b3b8aba0b7097f821156e5fd1e3bc0fa923b17f" dependencies: ansi-regex "^3.0.0" - ansi-styles "^3.0.0" + ansi-styles "^3.2.0" pretty-format@^19.0.0: version "19.0.0" @@ -3762,13 +3725,6 @@ pretty-format@^19.0.0: dependencies: ansi-styles "^3.0.0" -pretty-format@^21.2.1: - version "21.2.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.2.1.tgz#ae5407f3cf21066cd011aa1ba5fce7b6a2eddb36" - dependencies: - ansi-regex "^3.0.0" - ansi-styles "^3.2.0" - private@^0.1.6, private@~0.1.5: version "0.1.7" resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1" @@ -4131,6 +4087,12 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1: dependencies: glob "^7.0.5" +rimraf@^2.5.4: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + rollup-plugin-alias@^1.2.1: version "1.3.1" resolved "https://registry.yarnpkg.com/rollup-plugin-alias/-/rollup-plugin-alias-1.3.1.tgz#a9152fec4b6a6510dae93989517ca7853c32a6fa" @@ -4332,6 +4294,12 @@ source-map-support@^0.4.0, source-map-support@^0.4.2: dependencies: source-map "^0.5.6" +source-map-support@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.0.tgz#2018a7ad2bdf8faf2691e5fddab26bed5a2bacab" + dependencies: + source-map "^0.6.0" + source-map@0.1.32: version "0.1.32" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266" @@ -4348,6 +4316,10 @@ source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, sour version "0.5.6" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + source-map@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" @@ -4402,6 +4374,10 @@ stable@~0.1.3: version "0.1.6" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.6.tgz#910f5d2aed7b520c6e777499c1f32e139fdecb10" +stack-utils@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620" + stream-shift@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" @@ -4532,9 +4508,9 @@ tar@^2.2.1: fstream "^1.0.2" inherits "2" -test-exclude@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.3.tgz#86a13ce3effcc60e6c90403cf31a27a60ac6c4e7" +test-exclude@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26" dependencies: arrify "^1.0.1" micromatch "^2.3.11"