From 8336da666da1d527f072dd7a72ccbe49bfef2dd3 Mon Sep 17 00:00:00 2001
From: Phips Peter <pspeter333@gmail.com>
Date: Fri, 17 Oct 2014 12:14:42 -0700
Subject: [PATCH] Renaming the legacy module for tests

Apparently they conflict otherwise which is unfortunate.
---
 react-addons/legacy/react-addons-0.11-tests.ts | 2 +-
 react-addons/legacy/react-addons-0.11.d.ts     | 2 +-
 react/legacy/react-0.11-tests.ts               | 3 ++-
 react/legacy/react-0.11.d.ts                   | 2 +-
 react/react.d.ts                               | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/react-addons/legacy/react-addons-0.11-tests.ts b/react-addons/legacy/react-addons-0.11-tests.ts
index 2c5c781d73..e34e42fbcc 100644
--- a/react-addons/legacy/react-addons-0.11-tests.ts
+++ b/react-addons/legacy/react-addons-0.11-tests.ts
@@ -1,5 +1,5 @@
 /// <reference path="react-addons-0.11.d.ts" />
-import React = require("react/addons");
+import React = require("react/addons-0.11");
 
 var PropTypesSpecification: React.Specification<any, any> = {
     propTypes: {
diff --git a/react-addons/legacy/react-addons-0.11.d.ts b/react-addons/legacy/react-addons-0.11.d.ts
index a741d545fb..3e2f22a513 100644
--- a/react-addons/legacy/react-addons-0.11.d.ts
+++ b/react-addons/legacy/react-addons-0.11.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference path="../../react/legacy/react-0.11.d.ts" />
 
-declare module "react/addons" {
+declare module "react/addons-0.11" {
     export = React;
 }
 
diff --git a/react/legacy/react-0.11-tests.ts b/react/legacy/react-0.11-tests.ts
index 497f4e86f3..83029993b4 100644
--- a/react/legacy/react-0.11-tests.ts
+++ b/react/legacy/react-0.11-tests.ts
@@ -1,5 +1,5 @@
 /// <reference path="react-0.11.d.ts" />
-import React = require("react");
+import React = require("react-0.11");
 
 var PropTypesSpecification: React.Specification<any, any> = {
     propTypes: {
@@ -63,6 +63,7 @@ var PropTypesSpecification: React.Specification<any, any> = {
             return null;
         }
     },
+
     render: (): React.Descriptor<any> => {
         return null;
     }
diff --git a/react/legacy/react-0.11.d.ts b/react/legacy/react-0.11.d.ts
index 0b0350473d..468dabe8ba 100644
--- a/react/legacy/react-0.11.d.ts
+++ b/react/legacy/react-0.11.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module "react" {
+declare module "react-0.11" {
     export = React;
 }
 
diff --git a/react/react.d.ts b/react/react.d.ts
index 0b0350473d..f3547a95c5 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React 0.11.2
+// Type definitions for React 0.12.RC
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped