{"patch":"diff --git a\/package.json b\/package.json\nindex b1c3b55c2a..e042615c02 100644\n--- a\/package.json\n+++ b\/package.json\n@@ -108,9 +108,40 @@\n \"version-check\": \"node .\/scripts\/tasks\/version-check.js\"\n },\n \"jest\": {\n- \"projects\": [\n- \"\/scripts\/jest\/stack.config.json\",\n- \"\/scripts\/jest\/fiber.config.json\"\n- ]\n+ \"modulePathIgnorePatterns\": [\n+ \"\/.module-cache\/\",\n+ \"\/build\/\",\n+ \"\/scripts\/rollup\/shims\/\",\n+ \"\/scripts\/bench\/\"\n+ ],\n+ \"transform\": {\n+ \".*\": \".\/scripts\/jest\/preprocessor.js\"\n+ },\n+ \"setupFiles\": [\n+ \".\/scripts\/jest\/setup.js\",\n+ \".\/scripts\/jest\/environment.js\"\n+ ],\n+ \"setupTestFrameworkScriptFile\": \".\/scripts\/jest\/test-framework-setup.js\",\n+ \"testRegex\": \"\/__tests__\/.*(\\\\.js|coffee|ts)$\",\n+ \"moduleFileExtensions\": [\n+ \"js\",\n+ \"json\",\n+ \"node\",\n+ \"coffee\",\n+ \"ts\"\n+ ],\n+ \"roots\": [\n+ \"\/eslint-rules\",\n+ \"\/mocks\",\n+ \"\/scripts\",\n+ \"\/src\",\n+ \"node_modules\/fbjs\"\n+ ],\n+ \"collectCoverageFrom\": [\n+ \"src\/**\/*.js\",\n+ \"!src\/__mocks__\/vendor\/third_party\/*.js\",\n+ \"!src\/test\/*.js\"\n+ ],\n+ \"timers\": \"fake\"\n }\n }\ndiff --git a\/scripts\/jest\/fiber.config.json b\/scripts\/jest\/fiber.config.json\ndeleted file mode 100644\nindex c6f47bf86c..0000000000\n--- a\/scripts\/jest\/fiber.config.json\n+++ \/dev\/null\n@@ -1,38 +0,0 @@\n-{\n- \"modulePathIgnorePatterns\": [\n- \"\/.module-cache\/\",\n- \"\/build\/\",\n- \"\/scripts\/rollup\/shims\/\",\n- \"\/scripts\/bench\/\"\n- ],\n- \"rootDir\": \"..\/..\/\",\n- \"transform\": {\n- \".*\": \".\/scripts\/jest\/preprocessor.js\"\n- },\n- \"setupFiles\": [\n- \".\/scripts\/jest\/fiber.setup.js\",\n- \".\/scripts\/jest\/environment.js\"\n- ],\n- \"setupTestFrameworkScriptFile\": \".\/scripts\/jest\/test-framework-setup.js\",\n- \"testRegex\": \"\/__tests__\/.*(\\\\.js|coffee|ts)$\",\n- \"moduleFileExtensions\": [\n- \"js\",\n- \"json\",\n- \"node\",\n- \"coffee\",\n- \"ts\"\n- ],\n- \"roots\": [\n- \"\/eslint-rules\",\n- \"\/mocks\",\n- \"\/scripts\",\n- \"\/src\",\n- \"node_modules\/fbjs\"\n- ],\n- \"collectCoverageFrom\": [\n- \"src\/**\/*.js\",\n- \"!src\/__mocks__\/vendor\/third_party\/*.js\",\n- \"!src\/test\/*.js\"\n- ],\n- \"timers\": \"fake\"\n-}\ndiff --git a\/scripts\/jest\/fiber.setup.js b\/scripts\/jest\/setup.js\nsimilarity index 74%\nrename from scripts\/jest\/fiber.setup.js\nrename to scripts\/jest\/setup.js\nindex 9972f16fff..a0fbd78530 100644\n--- a\/scripts\/jest\/fiber.setup.js\n+++ b\/scripts\/jest\/setup.js\n@@ -2,12 +2,6 @@\n \n \/\/ We want to globally mock this but jest doesn't let us do that by default\n \/\/ for a file that already exists. So we have to explicitly mock it.\n-jest.mock('ReactDOMFeatureFlags', () => {\n- const flags = require.requireActual('ReactDOMFeatureFlags');\n- return Object.assign({}, flags, {\n- useFiber: true,\n- });\n-});\n jest.mock('ReactFeatureFlags', () => {\n const flags = require.requireActual('ReactFeatureFlags');\n return Object.assign({}, flags, {\ndiff --git a\/scripts\/jest\/stack.config.json b\/scripts\/jest\/stack.config.json\ndeleted file mode 100644\nindex 77972ca00c..0000000000\n--- a\/scripts\/jest\/stack.config.json\n+++ \/dev\/null\n@@ -1,38 +0,0 @@\n-{\n- \"modulePathIgnorePatterns\": [\n- \"\/.module-cache\/\",\n- \"\/build\/\",\n- \"\/scripts\/rollup\/shims\/\",\n- \"\/scripts\/bench\/\"\n- ],\n- \"rootDir\": \"..\/..\/\",\n- \"transform\": {\n- \".*\": \".\/scripts\/jest\/preprocessor.js\"\n- },\n- \"setupFiles\": [\n- \".\/scripts\/jest\/stack.setup.js\",\n- \".\/scripts\/jest\/environment.js\"\n- ],\n- \"setupTestFrameworkScriptFile\": \".\/scripts\/jest\/test-framework-setup.js\",\n- \"testRegex\": \"\/__tests__\/.*(\\\\.js|coffee|ts)$\",\n- \"moduleFileExtensions\": [\n- \"js\",\n- \"json\",\n- \"node\",\n- \"coffee\",\n- \"ts\"\n- ],\n- \"roots\": [\n- \"\/eslint-rules\",\n- \"\/mocks\",\n- \"\/scripts\",\n- \"\/src\",\n- \"node_modules\/fbjs\"\n- ],\n- \"collectCoverageFrom\": [\n- \"src\/**\/*.js\",\n- \"!src\/__mocks__\/vendor\/third_party\/*.js\",\n- \"!src\/test\/*.js\"\n- ],\n- \"timers\": \"fake\"\n-}\ndiff --git a\/scripts\/jest\/stack.setup.js b\/scripts\/jest\/stack.setup.js\ndeleted file mode 100644\nindex 820ad8c5c0..0000000000\n--- a\/scripts\/jest\/stack.setup.js\n+++ \/dev\/null\n@@ -1,14 +0,0 @@\n-'use strict';\n-\n-\/\/ We want to globally mock this but jest doesn't let us do that by default\n-\/\/ for a file that already exists. So we have to explicitly mock it.\n-jest.mock('ReactDOMFeatureFlags', () => {\n- const flags = require.requireActual('ReactDOMFeatureFlags');\n- return Object.assign({}, flags, {\n- useFiber: false,\n- });\n-});\n-\n-\/\/ Error logging varies between Fiber and Stack;\n-\/\/ Rather than fork dozens of tests, mock the error-logging file by default.\n-jest.mock('ReactFiberErrorLogger');\ndiff --git a\/scripts\/rollup\/packaging.js b\/scripts\/rollup\/packaging.js\nindex 1eca01e04b..0786579162 100644\n--- a\/scripts\/rollup\/packaging.js\n+++ b\/scripts\/rollup\/packaging.js\n@@ -25,7 +25,7 @@ const facebookWWWSrcDependencies = [\n \/\/ these files need to be copied to the react-native build\n const reactNativeSrcDependencies = [\n \/\/ TODO: copy this to RN repository and delete from React\n- 'src\/renderers\/shared\/stack\/PooledClass.js',\n+ 'src\/renderers\/native\/PooledClass.js',\n 'src\/renderers\/shared\/fiber\/isomorphic\/ReactTypes.js',\n 'src\/renderers\/native\/ReactNativeTypes.js',\n ];\ndiff --git a\/src\/node_modules\/react-dom\/index.js b\/src\/node_modules\/react-dom\/index.js\nindex 9e3e32c735..509750de3b 100644\n--- a\/src\/node_modules\/react-dom\/index.js\n+++ b\/src\/node_modules\/react-dom\/index.js\n@@ -6,9 +6,4 @@\n \n 'use strict';\n \n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n-var useFiber = ReactDOMFeatureFlags.useFiber;\n-\n-module.exports = useFiber\n- ? require('ReactDOMFiberEntry')\n- : require('ReactDOMStackEntry');\n+module.exports = require('ReactDOMFiberEntry');\ndiff --git a\/src\/node_modules\/react-dom\/server.browser.js b\/src\/node_modules\/react-dom\/server.browser.js\nindex 8c08b1d676..bc35743097 100644\n--- a\/src\/node_modules\/react-dom\/server.browser.js\n+++ b\/src\/node_modules\/react-dom\/server.browser.js\n@@ -6,9 +6,4 @@\n \n 'use strict';\n \n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n-var useFiber = ReactDOMFeatureFlags.useFiber;\n-\n-module.exports = useFiber\n- ? require('ReactDOMServerBrowserEntry')\n- : require('ReactDOMServerStackEntry');\n+module.exports = require('ReactDOMServerBrowserEntry');\ndiff --git a\/src\/node_modules\/react-dom\/server.js b\/src\/node_modules\/react-dom\/server.js\nindex fa6285bfef..f19a4b36a9 100644\n--- a\/src\/node_modules\/react-dom\/server.js\n+++ b\/src\/node_modules\/react-dom\/server.js\n@@ -6,9 +6,4 @@\n \n 'use strict';\n \n-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n-var useFiber = ReactDOMFeatureFlags.useFiber;\n-\n-module.exports = useFiber\n- ? require('ReactDOMServerNodeEntry')\n- : require('ReactDOMServerStackEntry');\n+module.exports = require('ReactDOMServerNodeEntry');\ndiff --git a\/src\/renderers\/__tests__\/refs-test.js b\/src\/renderers\/__tests__\/refs-test.js\nindex 72bec0d07b..424b9667e8 100644\n--- a\/src\/renderers\/__tests__\/refs-test.js\n+++ b\/src\/renderers\/__tests__\/refs-test.js\n@@ -306,91 +306,6 @@ describe('ref swapping', () => {\n });\n });\n \n-describe('string refs between fiber and stack', () => {\n- beforeEach(() => {\n- jest.resetModules();\n- React = require('react');\n- ReactTestUtils = require('react-dom\/test-utils');\n- });\n-\n- it('attaches, detaches from fiber component with stack layer', () => {\n- const ReactCurrentOwner = require('ReactCurrentOwner');\n-\n- const ReactDOMStack = require('ReactDOMStackEntry');\n- const ReactDOMFiber = require('ReactDOMFiberEntry');\n- const ReactInstanceMap = require('ReactInstanceMap');\n- let layerMounted = false;\n- class A extends React.Component {\n- render() {\n- return

' +\n '' +\n (ReactDOMFeatureFlags.useFiber\n ? 'My name is child'\n@@ -210,9 +168,6 @@ describe('ReactDOMServer', () => {\n (ReactDOMFeatureFlags.useFiber\n ? ''\n : ' ' + ID_ATTRIBUTE_NAME + '=\"[^\"]*\"') +\n- (ReactDOMFeatureFlags.useFiber\n- ? ''\n- : ' ' + ReactMarkupChecksum.CHECKSUM_ATTR_NAME + '=\"[^\"]+\"') +\n '>' +\n (ReactDOMFeatureFlags.useFiber\n ? 'Component name: TestComponent'\n@@ -576,11 +531,6 @@ describe('ReactDOMServer', () => {\n return

{this.state.text}<\/div>;\n }\n }\n-\n- ReactReconcileTransaction.prototype.perform = function() {\n- \/\/ We shouldn't ever be calling this on the server\n- throw new Error('Browser reconcile transaction should not be used');\n- };\n var markup = ReactDOMServer.renderToString();\n expect(markup).toContain('hello, world');\n });\ndiff --git a\/src\/renderers\/dom\/stack\/client\/DOMChildrenOperations.js b\/src\/renderers\/dom\/stack\/client\/DOMChildrenOperations.js\ndeleted file mode 100644\nindex 2ad287b599..0000000000\n--- a\/src\/renderers\/dom\/stack\/client\/DOMChildrenOperations.js\n+++ \/dev\/null\n@@ -1,248 +0,0 @@\n-\/**\n- * Copyright (c) 2013-present, Facebook, Inc.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @providesModule DOMChildrenOperations\n- *\/\n-\n-'use strict';\n-\n-var DOMLazyTree = require('DOMLazyTree');\n-var Danger = require('Danger');\n-var ReactDOMComponentTree = require('ReactDOMComponentTree');\n-var ReactInstrumentation = require('ReactInstrumentation');\n-\n-var createMicrosoftUnsafeLocalFunction = require('createMicrosoftUnsafeLocalFunction');\n-var setInnerHTML = require('setInnerHTML');\n-var setTextContent = require('setTextContent');\n-\n-function getNodeAfter(parentNode, node) {\n- \/\/ Special case for text components, which return [open, close] comments\n- \/\/ from getHostNode.\n- if (Array.isArray(node)) {\n- node = node[1];\n- }\n- return node ? node.nextSibling : parentNode.firstChild;\n-}\n-\n-\/**\n- * Inserts `childNode` as a child of `parentNode` at the `index`.\n- *\n- * @param {DOMElement} parentNode Parent node in which to insert.\n- * @param {DOMElement} childNode Child node to insert.\n- * @param {number} index Index at which to insert the child.\n- * @internal\n- *\/\n-var insertChildAt = createMicrosoftUnsafeLocalFunction(function(\n- parentNode,\n- childNode,\n- referenceNode,\n-) {\n- \/\/ We rely exclusively on `insertBefore(node, null)` instead of also using\n- \/\/ `appendChild(node)`. (Using `undefined` is not allowed by all browsers so\n- \/\/ we are careful to use `null`.)\n- parentNode.insertBefore(childNode, referenceNode);\n-});\n-\n-function insertLazyTreeChildAt(parentNode, childTree, referenceNode) {\n- DOMLazyTree.insertTreeBefore(parentNode, childTree, referenceNode);\n-}\n-\n-function moveChild(parentNode, childNode, referenceNode) {\n- if (Array.isArray(childNode)) {\n- moveDelimitedText(parentNode, childNode[0], childNode[1], referenceNode);\n- } else {\n- insertChildAt(parentNode, childNode, referenceNode);\n- }\n-}\n-\n-function removeChild(parentNode, childNode) {\n- if (Array.isArray(childNode)) {\n- var closingComment = childNode[1];\n- childNode = childNode[0];\n- removeDelimitedText(parentNode, childNode, closingComment);\n- parentNode.removeChild(closingComment);\n- }\n- parentNode.removeChild(childNode);\n-}\n-\n-function moveDelimitedText(\n- parentNode,\n- openingComment,\n- closingComment,\n- referenceNode,\n-) {\n- var node = openingComment;\n- while (true) {\n- var nextNode = node.nextSibling;\n- insertChildAt(parentNode, node, referenceNode);\n- if (node === closingComment) {\n- break;\n- }\n- node = nextNode;\n- }\n-}\n-\n-function removeDelimitedText(parentNode, startNode, closingComment) {\n- while (true) {\n- var node = startNode.nextSibling;\n- if (node === closingComment) {\n- \/\/ The closing comment is removed by ReactMultiChild.\n- break;\n- } else {\n- parentNode.removeChild(node);\n- }\n- }\n-}\n-\n-function replaceDelimitedText(openingComment, closingComment, stringText) {\n- var parentNode = openingComment.parentNode;\n- var nodeAfterComment = openingComment.nextSibling;\n- if (nodeAfterComment === closingComment) {\n- \/\/ There are no text nodes between the opening and closing comments; insert\n- \/\/ a new one if stringText isn't empty.\n- if (stringText) {\n- insertChildAt(\n- parentNode,\n- document.createTextNode(stringText),\n- nodeAfterComment,\n- );\n- }\n- } else {\n- if (stringText) {\n- \/\/ Set the text content of the first node after the opening comment, and\n- \/\/ remove all following nodes up until the closing comment.\n- setTextContent(nodeAfterComment, stringText);\n- removeDelimitedText(parentNode, nodeAfterComment, closingComment);\n- } else {\n- removeDelimitedText(parentNode, openingComment, closingComment);\n- }\n- }\n-\n- if (__DEV__) {\n- ReactInstrumentation.debugTool.onHostOperation({\n- instanceID: ReactDOMComponentTree.getInstanceFromNode(openingComment)\n- ._debugID,\n- type: 'replace text',\n- payload: stringText,\n- });\n- }\n-}\n-\n-var dangerouslyReplaceNodeWithMarkup = Danger.dangerouslyReplaceNodeWithMarkup;\n-if (__DEV__) {\n- dangerouslyReplaceNodeWithMarkup = function(oldChild, markup, prevInstance) {\n- Danger.dangerouslyReplaceNodeWithMarkup(oldChild, markup);\n- if (prevInstance._debugID !== 0) {\n- ReactInstrumentation.debugTool.onHostOperation({\n- instanceID: prevInstance._debugID,\n- type: 'replace with',\n- payload: markup.toString(),\n- });\n- } else {\n- var nextInstance = ReactDOMComponentTree.getInstanceFromNode(markup.node);\n- if (nextInstance._debugID !== 0) {\n- ReactInstrumentation.debugTool.onHostOperation({\n- instanceID: nextInstance._debugID,\n- type: 'mount',\n- payload: markup.toString(),\n- });\n- }\n- }\n- };\n-}\n-\n-\/**\n- * Operations for updating with DOM children.\n- *\/\n-var DOMChildrenOperations = {\n- dangerouslyReplaceNodeWithMarkup: dangerouslyReplaceNodeWithMarkup,\n-\n- replaceDelimitedText: replaceDelimitedText,\n-\n- \/**\n- * Updates a component's children by processing a series of updates. The\n- * update configurations are each expected to have a `parentNode` property.\n- *\n- * @param {array

dillon1000/react

Files changed