From 4025f9a929fad2bf291845238f51f8f736257df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= <mateuszburzynski@gmail.com>
Date: Sat, 31 Mar 2018 13:08:59 +0200
Subject: [PATCH] Prefix _context property on returned ReactContext from
 createContext - it's private

---
 packages/react-dom/src/server/ReactPartialRenderer.js | 4 ++--
 packages/react-reconciler/src/ReactFiberBeginWork.js  | 2 +-
 packages/react-reconciler/src/ReactFiberNewContext.js | 4 ++--
 packages/react/src/ReactContext.js                    | 2 +-
 packages/shared/ReactTypes.js                         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js
index 1cede6e41178..cdb8ff192358 100644
--- a/packages/react-dom/src/server/ReactPartialRenderer.js
+++ b/packages/react-dom/src/server/ReactPartialRenderer.js
@@ -675,7 +675,7 @@ class ReactDOMServerRenderer {
   pushProvider<T>(provider: ReactProvider<T>): void {
     this.providerIndex += 1;
     this.providerStack[this.providerIndex] = provider;
-    const context: ReactContext<any> = provider.type.context;
+    const context: ReactContext<any> = provider.type._context;
     context._currentValue = provider.props.value;
   }
 
@@ -689,7 +689,7 @@ class ReactDOMServerRenderer {
     }
     this.providerStack[this.providerIndex] = null;
     this.providerIndex -= 1;
-    const context: ReactContext<any> = provider.type.context;
+    const context: ReactContext<any> = provider.type._context;
     if (this.providerIndex < 0) {
       context._currentValue = context._defaultValue;
     } else {
diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js
index 7ca1aa6f2557..e8d69502062d 100644
--- a/packages/react-reconciler/src/ReactFiberBeginWork.js
+++ b/packages/react-reconciler/src/ReactFiberBeginWork.js
@@ -868,7 +868,7 @@ export default function<T, P, I, TI, HI, PI, C, CC, CX, PL>(
     renderExpirationTime,
   ) {
     const providerType: ReactProviderType<any> = workInProgress.type;
-    const context: ReactContext<any> = providerType.context;
+    const context: ReactContext<any> = providerType._context;
 
     const newProps = workInProgress.pendingProps;
     const oldProps = workInProgress.memoizedProps;
diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js
index 5f64352438ef..ab9c27e88aa5 100644
--- a/packages/react-reconciler/src/ReactFiberNewContext.js
+++ b/packages/react-reconciler/src/ReactFiberNewContext.js
@@ -32,7 +32,7 @@ export default function(stack: Stack) {
   }
 
   function pushProvider(providerFiber: Fiber): void {
-    const context: ReactContext<any> = providerFiber.type.context;
+    const context: ReactContext<any> = providerFiber.type._context;
 
     push(changedBitsCursor, context._changedBits, providerFiber);
     push(valueCursor, context._currentValue, providerFiber);
@@ -60,7 +60,7 @@ export default function(stack: Stack) {
     pop(valueCursor, providerFiber);
     pop(changedBitsCursor, providerFiber);
 
-    const context: ReactContext<any> = providerFiber.type.context;
+    const context: ReactContext<any> = providerFiber.type._context;
     context._currentValue = currentValue;
     context._changedBits = changedBits;
   }
diff --git a/packages/react/src/ReactContext.js b/packages/react/src/ReactContext.js
index 7d63e3d2bccc..10190accc4e9 100644
--- a/packages/react/src/ReactContext.js
+++ b/packages/react/src/ReactContext.js
@@ -44,7 +44,7 @@ export function createContext<T>(
 
   context.Provider = {
     $$typeof: REACT_PROVIDER_TYPE,
-    context,
+    _context: context,
   };
   context.Consumer = context;
 
diff --git a/packages/shared/ReactTypes.js b/packages/shared/ReactTypes.js
index a42336b6baf8..689ed18bf952 100644
--- a/packages/shared/ReactTypes.js
+++ b/packages/shared/ReactTypes.js
@@ -62,7 +62,7 @@ export type ReactProvider<T> = {
 
 export type ReactProviderType<T> = {
   $$typeof: Symbol | number,
-  context: ReactContext<T>,
+  _context: ReactContext<T>,
 };
 
 export type ReactConsumer<T> = {