From 696c2c67da8150a69fd260656cd36f12d82ab8df Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 20 Oct 2017 00:46:20 +0100
Subject: [PATCH 1/2] Move files in react package

---
 .../src/{classic => }/__tests__/ReactContextValidator-test.js     | 0
 .../{classic => }/__tests__/createReactClassIntegration-test.js   | 0
 packages/react/src/{modern => }/class/PropTypes.d.ts              | 0
 packages/react/src/{modern => }/class/React.d.ts                  | 0
 packages/react/src/{modern => }/class/ReactBaseClasses.js         | 0
 packages/react/src/{modern => }/class/ReactDOM.d.ts               | 0
 packages/react/src/{modern => }/class/ReactNoopUpdateQueue.js     | 0
 .../{modern => }/class/__tests__/ReactClassEquivalence-test.js    | 0
 .../class/__tests__/ReactCoffeeScriptClass-test.coffee            | 0
 .../react/src/{modern => }/class/__tests__/ReactES6Class-test.js  | 0
 .../src/{modern => }/class/__tests__/ReactPureComponent-test.js   | 0
 .../src/{modern => }/class/__tests__/ReactTypeScriptClass-test.ts | 0
 packages/react/src/{classic => }/element/ReactCurrentOwner.js     | 0
 .../react/src/{classic => }/element/ReactDebugCurrentFrame.js     | 0
 packages/react/src/{classic => }/element/ReactElement.js          | 0
 packages/react/src/{classic => }/element/ReactElementValidator.js | 0
 .../src/{classic => }/element/__tests__/ReactElement-test.js      | 0
 .../src/{classic => }/element/__tests__/ReactElementClone-test.js | 0
 .../{classic => }/element/__tests__/ReactElementValidator-test.js | 0
 .../src/{modern => }/element/__tests__/ReactJSXElement-test.js    | 0
 .../element/__tests__/ReactJSXElementValidator-test.js            | 0
 21 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/react/src/{classic => }/__tests__/ReactContextValidator-test.js (100%)
 rename packages/react/src/{classic => }/__tests__/createReactClassIntegration-test.js (100%)
 rename packages/react/src/{modern => }/class/PropTypes.d.ts (100%)
 rename packages/react/src/{modern => }/class/React.d.ts (100%)
 rename packages/react/src/{modern => }/class/ReactBaseClasses.js (100%)
 rename packages/react/src/{modern => }/class/ReactDOM.d.ts (100%)
 rename packages/react/src/{modern => }/class/ReactNoopUpdateQueue.js (100%)
 rename packages/react/src/{modern => }/class/__tests__/ReactClassEquivalence-test.js (100%)
 rename packages/react/src/{modern => }/class/__tests__/ReactCoffeeScriptClass-test.coffee (100%)
 rename packages/react/src/{modern => }/class/__tests__/ReactES6Class-test.js (100%)
 rename packages/react/src/{modern => }/class/__tests__/ReactPureComponent-test.js (100%)
 rename packages/react/src/{modern => }/class/__tests__/ReactTypeScriptClass-test.ts (100%)
 rename packages/react/src/{classic => }/element/ReactCurrentOwner.js (100%)
 rename packages/react/src/{classic => }/element/ReactDebugCurrentFrame.js (100%)
 rename packages/react/src/{classic => }/element/ReactElement.js (100%)
 rename packages/react/src/{classic => }/element/ReactElementValidator.js (100%)
 rename packages/react/src/{classic => }/element/__tests__/ReactElement-test.js (100%)
 rename packages/react/src/{classic => }/element/__tests__/ReactElementClone-test.js (100%)
 rename packages/react/src/{classic => }/element/__tests__/ReactElementValidator-test.js (100%)
 rename packages/react/src/{modern => }/element/__tests__/ReactJSXElement-test.js (100%)
 rename packages/react/src/{modern => }/element/__tests__/ReactJSXElementValidator-test.js (100%)

diff --git a/packages/react/src/classic/__tests__/ReactContextValidator-test.js b/packages/react/src/__tests__/ReactContextValidator-test.js
similarity index 100%
rename from packages/react/src/classic/__tests__/ReactContextValidator-test.js
rename to packages/react/src/__tests__/ReactContextValidator-test.js
diff --git a/packages/react/src/classic/__tests__/createReactClassIntegration-test.js b/packages/react/src/__tests__/createReactClassIntegration-test.js
similarity index 100%
rename from packages/react/src/classic/__tests__/createReactClassIntegration-test.js
rename to packages/react/src/__tests__/createReactClassIntegration-test.js
diff --git a/packages/react/src/modern/class/PropTypes.d.ts b/packages/react/src/class/PropTypes.d.ts
similarity index 100%
rename from packages/react/src/modern/class/PropTypes.d.ts
rename to packages/react/src/class/PropTypes.d.ts
diff --git a/packages/react/src/modern/class/React.d.ts b/packages/react/src/class/React.d.ts
similarity index 100%
rename from packages/react/src/modern/class/React.d.ts
rename to packages/react/src/class/React.d.ts
diff --git a/packages/react/src/modern/class/ReactBaseClasses.js b/packages/react/src/class/ReactBaseClasses.js
similarity index 100%
rename from packages/react/src/modern/class/ReactBaseClasses.js
rename to packages/react/src/class/ReactBaseClasses.js
diff --git a/packages/react/src/modern/class/ReactDOM.d.ts b/packages/react/src/class/ReactDOM.d.ts
similarity index 100%
rename from packages/react/src/modern/class/ReactDOM.d.ts
rename to packages/react/src/class/ReactDOM.d.ts
diff --git a/packages/react/src/modern/class/ReactNoopUpdateQueue.js b/packages/react/src/class/ReactNoopUpdateQueue.js
similarity index 100%
rename from packages/react/src/modern/class/ReactNoopUpdateQueue.js
rename to packages/react/src/class/ReactNoopUpdateQueue.js
diff --git a/packages/react/src/modern/class/__tests__/ReactClassEquivalence-test.js b/packages/react/src/class/__tests__/ReactClassEquivalence-test.js
similarity index 100%
rename from packages/react/src/modern/class/__tests__/ReactClassEquivalence-test.js
rename to packages/react/src/class/__tests__/ReactClassEquivalence-test.js
diff --git a/packages/react/src/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee b/packages/react/src/class/__tests__/ReactCoffeeScriptClass-test.coffee
similarity index 100%
rename from packages/react/src/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee
rename to packages/react/src/class/__tests__/ReactCoffeeScriptClass-test.coffee
diff --git a/packages/react/src/modern/class/__tests__/ReactES6Class-test.js b/packages/react/src/class/__tests__/ReactES6Class-test.js
similarity index 100%
rename from packages/react/src/modern/class/__tests__/ReactES6Class-test.js
rename to packages/react/src/class/__tests__/ReactES6Class-test.js
diff --git a/packages/react/src/modern/class/__tests__/ReactPureComponent-test.js b/packages/react/src/class/__tests__/ReactPureComponent-test.js
similarity index 100%
rename from packages/react/src/modern/class/__tests__/ReactPureComponent-test.js
rename to packages/react/src/class/__tests__/ReactPureComponent-test.js
diff --git a/packages/react/src/modern/class/__tests__/ReactTypeScriptClass-test.ts b/packages/react/src/class/__tests__/ReactTypeScriptClass-test.ts
similarity index 100%
rename from packages/react/src/modern/class/__tests__/ReactTypeScriptClass-test.ts
rename to packages/react/src/class/__tests__/ReactTypeScriptClass-test.ts
diff --git a/packages/react/src/classic/element/ReactCurrentOwner.js b/packages/react/src/element/ReactCurrentOwner.js
similarity index 100%
rename from packages/react/src/classic/element/ReactCurrentOwner.js
rename to packages/react/src/element/ReactCurrentOwner.js
diff --git a/packages/react/src/classic/element/ReactDebugCurrentFrame.js b/packages/react/src/element/ReactDebugCurrentFrame.js
similarity index 100%
rename from packages/react/src/classic/element/ReactDebugCurrentFrame.js
rename to packages/react/src/element/ReactDebugCurrentFrame.js
diff --git a/packages/react/src/classic/element/ReactElement.js b/packages/react/src/element/ReactElement.js
similarity index 100%
rename from packages/react/src/classic/element/ReactElement.js
rename to packages/react/src/element/ReactElement.js
diff --git a/packages/react/src/classic/element/ReactElementValidator.js b/packages/react/src/element/ReactElementValidator.js
similarity index 100%
rename from packages/react/src/classic/element/ReactElementValidator.js
rename to packages/react/src/element/ReactElementValidator.js
diff --git a/packages/react/src/classic/element/__tests__/ReactElement-test.js b/packages/react/src/element/__tests__/ReactElement-test.js
similarity index 100%
rename from packages/react/src/classic/element/__tests__/ReactElement-test.js
rename to packages/react/src/element/__tests__/ReactElement-test.js
diff --git a/packages/react/src/classic/element/__tests__/ReactElementClone-test.js b/packages/react/src/element/__tests__/ReactElementClone-test.js
similarity index 100%
rename from packages/react/src/classic/element/__tests__/ReactElementClone-test.js
rename to packages/react/src/element/__tests__/ReactElementClone-test.js
diff --git a/packages/react/src/classic/element/__tests__/ReactElementValidator-test.js b/packages/react/src/element/__tests__/ReactElementValidator-test.js
similarity index 100%
rename from packages/react/src/classic/element/__tests__/ReactElementValidator-test.js
rename to packages/react/src/element/__tests__/ReactElementValidator-test.js
diff --git a/packages/react/src/modern/element/__tests__/ReactJSXElement-test.js b/packages/react/src/element/__tests__/ReactJSXElement-test.js
similarity index 100%
rename from packages/react/src/modern/element/__tests__/ReactJSXElement-test.js
rename to packages/react/src/element/__tests__/ReactJSXElement-test.js
diff --git a/packages/react/src/modern/element/__tests__/ReactJSXElementValidator-test.js b/packages/react/src/element/__tests__/ReactJSXElementValidator-test.js
similarity index 100%
rename from packages/react/src/modern/element/__tests__/ReactJSXElementValidator-test.js
rename to packages/react/src/element/__tests__/ReactJSXElementValidator-test.js

From d012ab6e77918cd4e94f5cf084fcc206f2d21bb6 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 20 Oct 2017 00:58:37 +0100
Subject: [PATCH 2/2] Move test-only TypeScript definitions into tests
 subfolder

---
 package.json                                                | 2 +-
 .../react/src/class/__tests__/ReactTypeScriptClass-test.ts  | 6 +++---
 .../class/{ => __tests__/testDefinitions}/PropTypes.d.ts    | 0
 .../src/class/{ => __tests__/testDefinitions}/React.d.ts    | 0
 .../src/class/{ => __tests__/testDefinitions}/ReactDOM.d.ts | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/react/src/class/{ => __tests__/testDefinitions}/PropTypes.d.ts (100%)
 rename packages/react/src/class/{ => __tests__/testDefinitions}/React.d.ts (100%)
 rename packages/react/src/class/{ => __tests__/testDefinitions}/ReactDOM.d.ts (100%)

diff --git a/package.json b/package.json
index 1eac640c001ef..6e7318e4f746b 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
       "./scripts/jest/environment.js"
     ],
     "setupTestFrameworkScriptFile": "./scripts/jest/test-framework-setup.js",
-    "testRegex": "/__tests__/.*(\\.js|coffee|ts)$",
+    "testRegex": "/__tests__/.*(\\.js|\\.coffee|[^d]\\.ts)$",
     "moduleFileExtensions": [
       "js",
       "json",
diff --git a/packages/react/src/class/__tests__/ReactTypeScriptClass-test.ts b/packages/react/src/class/__tests__/ReactTypeScriptClass-test.ts
index ee6b163a7a0e0..b568214bd5540 100644
--- a/packages/react/src/class/__tests__/ReactTypeScriptClass-test.ts
+++ b/packages/react/src/class/__tests__/ReactTypeScriptClass-test.ts
@@ -1,6 +1,6 @@
-/// <reference path="../PropTypes.d.ts" />
-/// <reference path="../React.d.ts" />
-/// <reference path="../ReactDOM.d.ts" />
+/// <reference path="./testDefinitions/PropTypes.d.ts" />
+/// <reference path="./testDefinitions/React.d.ts" />
+/// <reference path="./testDefinitions/ReactDOM.d.ts" />
 
 /*!
  * Copyright (c) 2015-present, Facebook, Inc.
diff --git a/packages/react/src/class/PropTypes.d.ts b/packages/react/src/class/__tests__/testDefinitions/PropTypes.d.ts
similarity index 100%
rename from packages/react/src/class/PropTypes.d.ts
rename to packages/react/src/class/__tests__/testDefinitions/PropTypes.d.ts
diff --git a/packages/react/src/class/React.d.ts b/packages/react/src/class/__tests__/testDefinitions/React.d.ts
similarity index 100%
rename from packages/react/src/class/React.d.ts
rename to packages/react/src/class/__tests__/testDefinitions/React.d.ts
diff --git a/packages/react/src/class/ReactDOM.d.ts b/packages/react/src/class/__tests__/testDefinitions/ReactDOM.d.ts
similarity index 100%
rename from packages/react/src/class/ReactDOM.d.ts
rename to packages/react/src/class/__tests__/testDefinitions/ReactDOM.d.ts