From 292cc82d0ebc437a6f1cdd2e972b3917b7ee05a4 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Tue, 11 Oct 2016 10:08:54 -0700 Subject: [PATCH] Reorganize core JS files Reviewed By: lexs Differential Revision: D3987463 fbshipit-source-id: fa8f1d1bea7ed699120b9705ddc1c83767fcf8e4 --- Libraries/{Utilities => Alert}/Alert.js | 2 +- Libraries/{Utilities => Alert}/AlertIOS.js | 0 Libraries/Alert/RCTAlertManager.android.js | 25 ++++++ .../RCTAlertManager.ios.js | 0 .../MessageQueue.js | 0 .../NativeModules.js | 0 .../__mocks__/MessageQueueTestConfig.js | 0 .../__mocks__/MessageQueueTestModule.js | 0 .../__mocks__/NativeModules.js | 0 .../__tests__/MessageQueue-test.js | 0 .../__tests__/NativeModules-test.js | 0 .../__tests__/parseErrorStack-test.js | 0 .../Devtools}/getDevServer.js | 0 .../Devtools}/openFileInEditor.js | 0 .../Devtools}/parseErrorStack.js | 0 .../{ => Core}/Devtools/setupDevtools.js | 2 +- .../Devtools}/symbolicateStackTrace.js | 3 +- Libraries/{Utilities => Core}/ErrorUtils.js | 0 .../ExceptionsManager.js | 0 .../InitializeCore.js} | 2 +- .../JSTimers => Core/Timers}/JSTimers.js | 0 .../Timers}/JSTimersExecution.js | 0 .../__mocks__/ErrorUtils.js | 9 +++ .../RCTEventEmitter.js | 0 .../Initialization/source-map-url.js | 79 ------------------- .../{Utilities => Network}/XHRInterceptor.js | 0 Libraries/{Fetch => Network}/fetch.js | 0 .../{Utilities => Performance}/CPUProfiler.js | 0 .../QuickPerformanceLogger.js | 0 .../RCTRenderingPerf.js | 2 +- .../SamplingProfiler.js | 0 .../{Utilities => Performance}/Systrace.js | 0 .../{ReactIOS => ReactNative}/AppContainer.js | 2 +- .../AppRegistry.js | 0 .../{Utilities => ReactNative}/I18nManager.js | 0 .../{Utilities => ReactNative}/UIManager.js | 0 .../{ReactIOS => ReactNative}/YellowBox.js | 0 .../queryLayoutByID.js | 0 .../renderApplication.js | 0 .../requireNativeComponent.js | 3 +- .../verifyPropTypes.js | 0 .../WebSocketInterceptor.js | 1 + docs/Troubleshooting.md | 2 +- lib/InitializeJavaScriptAppEngine.js | 2 +- lib/README | 1 + .../src/Bundler/__tests__/Bundle-test.js | 8 +- .../src/Server/__tests__/Server-test.js | 10 +-- packager/react-packager/src/Server/index.js | 2 +- 48 files changed, 56 insertions(+), 99 deletions(-) rename Libraries/{Utilities => Alert}/Alert.js (99%) rename Libraries/{Utilities => Alert}/AlertIOS.js (100%) create mode 100644 Libraries/Alert/RCTAlertManager.android.js rename Libraries/{BatchedBridge/BatchedBridgedModules => Alert}/RCTAlertManager.ios.js (100%) rename Libraries/{Utilities => BatchedBridge}/MessageQueue.js (100%) rename Libraries/BatchedBridge/{BatchedBridgedModules => }/NativeModules.js (100%) rename Libraries/BatchedBridge/{BatchedBridgedModules => }/__mocks__/MessageQueueTestConfig.js (100%) rename Libraries/{Utilities => BatchedBridge}/__mocks__/MessageQueueTestModule.js (100%) rename Libraries/BatchedBridge/{BatchedBridgedModules => }/__mocks__/NativeModules.js (100%) rename Libraries/{Utilities => BatchedBridge}/__tests__/MessageQueue-test.js (100%) rename Libraries/BatchedBridge/{BatchedBridgedModules => }/__tests__/NativeModules-test.js (100%) rename Libraries/{JavaScriptAppEngine/Initialization => Core/Devtools}/__tests__/parseErrorStack-test.js (100%) rename Libraries/{JavaScriptAppEngine/Initialization => Core/Devtools}/getDevServer.js (100%) rename Libraries/{JavaScriptAppEngine/Initialization => Core/Devtools}/openFileInEditor.js (100%) rename Libraries/{JavaScriptAppEngine/Initialization => Core/Devtools}/parseErrorStack.js (100%) rename Libraries/{ => Core}/Devtools/setupDevtools.js (100%) rename Libraries/{JavaScriptAppEngine/Initialization => Core/Devtools}/symbolicateStackTrace.js (99%) rename Libraries/{Utilities => Core}/ErrorUtils.js (100%) rename Libraries/{JavaScriptAppEngine/Initialization => Core}/ExceptionsManager.js (100%) rename Libraries/{JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js => Core/InitializeCore.js} (99%) rename Libraries/{JavaScriptAppEngine/System/JSTimers => Core/Timers}/JSTimers.js (100%) rename Libraries/{JavaScriptAppEngine/System/JSTimers => Core/Timers}/JSTimersExecution.js (100%) rename Libraries/{Utilities => Core}/__mocks__/ErrorUtils.js (68%) rename Libraries/{BatchedBridge/BatchedBridgedModules => EventEmitter}/RCTEventEmitter.js (100%) delete mode 100644 Libraries/JavaScriptAppEngine/Initialization/source-map-url.js rename Libraries/{Utilities => Network}/XHRInterceptor.js (100%) rename Libraries/{Fetch => Network}/fetch.js (100%) rename Libraries/{Utilities => Performance}/CPUProfiler.js (100%) rename Libraries/{QuickPerformanceLogger => Performance}/QuickPerformanceLogger.js (100%) rename Libraries/{Utilities => Performance}/RCTRenderingPerf.js (100%) rename Libraries/{Utilities => Performance}/SamplingProfiler.js (100%) rename Libraries/{Utilities => Performance}/Systrace.js (100%) rename Libraries/{ReactIOS => ReactNative}/AppContainer.js (100%) rename Libraries/{AppRegistry => ReactNative}/AppRegistry.js (100%) rename Libraries/{Utilities => ReactNative}/I18nManager.js (100%) rename Libraries/{Utilities => ReactNative}/UIManager.js (100%) rename Libraries/{ReactIOS => ReactNative}/YellowBox.js (100%) rename Libraries/{RKBackendNode => ReactNative}/queryLayoutByID.js (100%) rename Libraries/{ReactIOS => ReactNative}/renderApplication.js (100%) rename Libraries/{ReactIOS => ReactNative}/requireNativeComponent.js (99%) rename Libraries/{ReactIOS => ReactNative}/verifyPropTypes.js (100%) rename Libraries/{Utilities => WebSocket}/WebSocketInterceptor.js (99%) create mode 100644 lib/README diff --git a/Libraries/Utilities/Alert.js b/Libraries/Alert/Alert.js similarity index 99% rename from Libraries/Utilities/Alert.js rename to Libraries/Alert/Alert.js index 070c91b0d..940db0c7b 100644 --- a/Libraries/Utilities/Alert.js +++ b/Libraries/Alert/Alert.js @@ -24,7 +24,7 @@ type Buttons = Array<{ }>; type Options = { - cancelable?: ?boolean; + cancelable?: ?boolean, }; /** diff --git a/Libraries/Utilities/AlertIOS.js b/Libraries/Alert/AlertIOS.js similarity index 100% rename from Libraries/Utilities/AlertIOS.js rename to Libraries/Alert/AlertIOS.js diff --git a/Libraries/Alert/RCTAlertManager.android.js b/Libraries/Alert/RCTAlertManager.android.js new file mode 100644 index 000000000..a9b411338 --- /dev/null +++ b/Libraries/Alert/RCTAlertManager.android.js @@ -0,0 +1,25 @@ +/** + * Copyright (c) 2013-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @providesModule RCTAlertManager +*/ +'use strict'; + +var DialogManager = require('NativeModules').DialogManagerAndroid; + +function emptyCallback() {} + +module.exports = { + alertWithArgs: function(args, callback) { + // TODO(5998984): Polyfill it correctly with DialogManagerAndroid + DialogManager.showAlert( + args, + emptyCallback, + callback || emptyCallback); + }, +}; diff --git a/Libraries/BatchedBridge/BatchedBridgedModules/RCTAlertManager.ios.js b/Libraries/Alert/RCTAlertManager.ios.js similarity index 100% rename from Libraries/BatchedBridge/BatchedBridgedModules/RCTAlertManager.ios.js rename to Libraries/Alert/RCTAlertManager.ios.js diff --git a/Libraries/Utilities/MessageQueue.js b/Libraries/BatchedBridge/MessageQueue.js similarity index 100% rename from Libraries/Utilities/MessageQueue.js rename to Libraries/BatchedBridge/MessageQueue.js diff --git a/Libraries/BatchedBridge/BatchedBridgedModules/NativeModules.js b/Libraries/BatchedBridge/NativeModules.js similarity index 100% rename from Libraries/BatchedBridge/BatchedBridgedModules/NativeModules.js rename to Libraries/BatchedBridge/NativeModules.js diff --git a/Libraries/BatchedBridge/BatchedBridgedModules/__mocks__/MessageQueueTestConfig.js b/Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js similarity index 100% rename from Libraries/BatchedBridge/BatchedBridgedModules/__mocks__/MessageQueueTestConfig.js rename to Libraries/BatchedBridge/__mocks__/MessageQueueTestConfig.js diff --git a/Libraries/Utilities/__mocks__/MessageQueueTestModule.js b/Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js similarity index 100% rename from Libraries/Utilities/__mocks__/MessageQueueTestModule.js rename to Libraries/BatchedBridge/__mocks__/MessageQueueTestModule.js diff --git a/Libraries/BatchedBridge/BatchedBridgedModules/__mocks__/NativeModules.js b/Libraries/BatchedBridge/__mocks__/NativeModules.js similarity index 100% rename from Libraries/BatchedBridge/BatchedBridgedModules/__mocks__/NativeModules.js rename to Libraries/BatchedBridge/__mocks__/NativeModules.js diff --git a/Libraries/Utilities/__tests__/MessageQueue-test.js b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js similarity index 100% rename from Libraries/Utilities/__tests__/MessageQueue-test.js rename to Libraries/BatchedBridge/__tests__/MessageQueue-test.js diff --git a/Libraries/BatchedBridge/BatchedBridgedModules/__tests__/NativeModules-test.js b/Libraries/BatchedBridge/__tests__/NativeModules-test.js similarity index 100% rename from Libraries/BatchedBridge/BatchedBridgedModules/__tests__/NativeModules-test.js rename to Libraries/BatchedBridge/__tests__/NativeModules-test.js diff --git a/Libraries/JavaScriptAppEngine/Initialization/__tests__/parseErrorStack-test.js b/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js similarity index 100% rename from Libraries/JavaScriptAppEngine/Initialization/__tests__/parseErrorStack-test.js rename to Libraries/Core/Devtools/__tests__/parseErrorStack-test.js diff --git a/Libraries/JavaScriptAppEngine/Initialization/getDevServer.js b/Libraries/Core/Devtools/getDevServer.js similarity index 100% rename from Libraries/JavaScriptAppEngine/Initialization/getDevServer.js rename to Libraries/Core/Devtools/getDevServer.js diff --git a/Libraries/JavaScriptAppEngine/Initialization/openFileInEditor.js b/Libraries/Core/Devtools/openFileInEditor.js similarity index 100% rename from Libraries/JavaScriptAppEngine/Initialization/openFileInEditor.js rename to Libraries/Core/Devtools/openFileInEditor.js diff --git a/Libraries/JavaScriptAppEngine/Initialization/parseErrorStack.js b/Libraries/Core/Devtools/parseErrorStack.js similarity index 100% rename from Libraries/JavaScriptAppEngine/Initialization/parseErrorStack.js rename to Libraries/Core/Devtools/parseErrorStack.js diff --git a/Libraries/Devtools/setupDevtools.js b/Libraries/Core/Devtools/setupDevtools.js similarity index 100% rename from Libraries/Devtools/setupDevtools.js rename to Libraries/Core/Devtools/setupDevtools.js index e81a86299..f217fa3c4 100644 --- a/Libraries/Devtools/setupDevtools.js +++ b/Libraries/Core/Devtools/setupDevtools.js @@ -11,8 +11,8 @@ */ 'use strict'; -var Platform = require('Platform'); var NativeModules = require('NativeModules'); +var Platform = require('Platform'); function setupDevtools() { var messageListeners = []; diff --git a/Libraries/JavaScriptAppEngine/Initialization/symbolicateStackTrace.js b/Libraries/Core/Devtools/symbolicateStackTrace.js similarity index 99% rename from Libraries/JavaScriptAppEngine/Initialization/symbolicateStackTrace.js rename to Libraries/Core/Devtools/symbolicateStackTrace.js index 9f68826cf..2e544149d 100644 --- a/Libraries/JavaScriptAppEngine/Initialization/symbolicateStackTrace.js +++ b/Libraries/Core/Devtools/symbolicateStackTrace.js @@ -11,9 +11,10 @@ */ 'use strict'; -const {fetch} = require('fetch'); const getDevServer = require('getDevServer'); + const {SourceCode} = require('NativeModules'); +const {fetch} = require('fetch'); import type {StackFrame} from 'parseErrorStack'; diff --git a/Libraries/Utilities/ErrorUtils.js b/Libraries/Core/ErrorUtils.js similarity index 100% rename from Libraries/Utilities/ErrorUtils.js rename to Libraries/Core/ErrorUtils.js diff --git a/Libraries/JavaScriptAppEngine/Initialization/ExceptionsManager.js b/Libraries/Core/ExceptionsManager.js similarity index 100% rename from Libraries/JavaScriptAppEngine/Initialization/ExceptionsManager.js rename to Libraries/Core/ExceptionsManager.js diff --git a/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js b/Libraries/Core/InitializeCore.js similarity index 99% rename from Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js rename to Libraries/Core/InitializeCore.js index 912db0f9c..8e5ae36f3 100644 --- a/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js +++ b/Libraries/Core/InitializeCore.js @@ -16,7 +16,7 @@ * 1. Require system. * 2. Bridged modules. * - * @providesModule InitializeJavaScriptAppEngine + * @providesModule InitializeCore * @flow */ diff --git a/Libraries/JavaScriptAppEngine/System/JSTimers/JSTimers.js b/Libraries/Core/Timers/JSTimers.js similarity index 100% rename from Libraries/JavaScriptAppEngine/System/JSTimers/JSTimers.js rename to Libraries/Core/Timers/JSTimers.js diff --git a/Libraries/JavaScriptAppEngine/System/JSTimers/JSTimersExecution.js b/Libraries/Core/Timers/JSTimersExecution.js similarity index 100% rename from Libraries/JavaScriptAppEngine/System/JSTimers/JSTimersExecution.js rename to Libraries/Core/Timers/JSTimersExecution.js diff --git a/Libraries/Utilities/__mocks__/ErrorUtils.js b/Libraries/Core/__mocks__/ErrorUtils.js similarity index 68% rename from Libraries/Utilities/__mocks__/ErrorUtils.js rename to Libraries/Core/__mocks__/ErrorUtils.js index dc4319e1f..2c9a98f56 100644 --- a/Libraries/Utilities/__mocks__/ErrorUtils.js +++ b/Libraries/Core/__mocks__/ErrorUtils.js @@ -1,3 +1,12 @@ +/** + * Copyright (c) 2013-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + */ + // This mock only provides short-circuited methods of applyWithGuard and guard. // A lot of modules rely on these two functions. This mock relieves their tests // from depending on the real ErrorUtils module. If you need real error handling diff --git a/Libraries/BatchedBridge/BatchedBridgedModules/RCTEventEmitter.js b/Libraries/EventEmitter/RCTEventEmitter.js similarity index 100% rename from Libraries/BatchedBridge/BatchedBridgedModules/RCTEventEmitter.js rename to Libraries/EventEmitter/RCTEventEmitter.js diff --git a/Libraries/JavaScriptAppEngine/Initialization/source-map-url.js b/Libraries/JavaScriptAppEngine/Initialization/source-map-url.js deleted file mode 100644 index f44740031..000000000 --- a/Libraries/JavaScriptAppEngine/Initialization/source-map-url.js +++ /dev/null @@ -1,79 +0,0 @@ -/** - * Copyright (c) 2015-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - * - * This is a third-party micro-library grabbed from: - * https://github.com/lydell/source-map-url - * - * @nolint - */ -/* eslint-disable */ - -(function() { - var define = null; // Hack to make it work with our packager - -// Copyright 2014 Simon Lydell -// X11 ("MIT") Licensed. (See LICENSE.) - -void (function(root, factory) { - if (typeof define === "function" && define.amd) { - define(factory) - } else if (typeof exports === "object") { - module.exports = factory() - } else { - root.sourceMappingURL = factory() - } -}(this, function() { - - var innerRegex = /[#@] source(?:Mapping)?URL=([^\s'"]*)/ - - var regex = RegExp( - "(?:" + - "/\\*" + - "(?:\\s*\r?\n(?://)?)?" + - "(?:" + innerRegex.source + ")" + - "\\s*" + - "\\*/" + - "|" + - "//(?:" + innerRegex.source + ")" + - ")" + - "\\s*$" - ) - - return { - - regex: regex, - _innerRegex: innerRegex, - - getFrom: function(code) { - var match = code.match(regex) - return (match ? match[1] || match[2] || "" : null) - }, - - existsIn: function(code) { - return regex.test(code) - }, - - removeFrom: function(code) { - return code.replace(regex, "") - }, - - insertBefore: function(code, string) { - var match = code.match(regex) - if (match) { - return code.slice(0, match.index) + string + code.slice(match.index) - } else { - return code + string - } - } - } - -})); - -/** End of the third-party code */ - -})(); diff --git a/Libraries/Utilities/XHRInterceptor.js b/Libraries/Network/XHRInterceptor.js similarity index 100% rename from Libraries/Utilities/XHRInterceptor.js rename to Libraries/Network/XHRInterceptor.js diff --git a/Libraries/Fetch/fetch.js b/Libraries/Network/fetch.js similarity index 100% rename from Libraries/Fetch/fetch.js rename to Libraries/Network/fetch.js diff --git a/Libraries/Utilities/CPUProfiler.js b/Libraries/Performance/CPUProfiler.js similarity index 100% rename from Libraries/Utilities/CPUProfiler.js rename to Libraries/Performance/CPUProfiler.js diff --git a/Libraries/QuickPerformanceLogger/QuickPerformanceLogger.js b/Libraries/Performance/QuickPerformanceLogger.js similarity index 100% rename from Libraries/QuickPerformanceLogger/QuickPerformanceLogger.js rename to Libraries/Performance/QuickPerformanceLogger.js diff --git a/Libraries/Utilities/RCTRenderingPerf.js b/Libraries/Performance/RCTRenderingPerf.js similarity index 100% rename from Libraries/Utilities/RCTRenderingPerf.js rename to Libraries/Performance/RCTRenderingPerf.js index bd2154458..18e30fbe5 100644 --- a/Libraries/Utilities/RCTRenderingPerf.js +++ b/Libraries/Performance/RCTRenderingPerf.js @@ -11,8 +11,8 @@ */ 'use strict'; -var ReactPerf = require('react/lib/ReactPerf'); var ReactDebugTool = require('react/lib/ReactDebugTool'); +var ReactPerf = require('react/lib/ReactPerf'); var invariant = require('fbjs/lib/invariant'); var performanceNow = require('fbjs/lib/performanceNow'); diff --git a/Libraries/Utilities/SamplingProfiler.js b/Libraries/Performance/SamplingProfiler.js similarity index 100% rename from Libraries/Utilities/SamplingProfiler.js rename to Libraries/Performance/SamplingProfiler.js diff --git a/Libraries/Utilities/Systrace.js b/Libraries/Performance/Systrace.js similarity index 100% rename from Libraries/Utilities/Systrace.js rename to Libraries/Performance/Systrace.js diff --git a/Libraries/ReactIOS/AppContainer.js b/Libraries/ReactNative/AppContainer.js similarity index 100% rename from Libraries/ReactIOS/AppContainer.js rename to Libraries/ReactNative/AppContainer.js index 16da9c220..e5ae85b46 100644 --- a/Libraries/ReactIOS/AppContainer.js +++ b/Libraries/ReactNative/AppContainer.js @@ -15,8 +15,8 @@ var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); var React = require('React'); var ReactNative = require('react/lib/ReactNative'); -var Subscribable = require('Subscribable'); var StyleSheet = require('StyleSheet'); +var Subscribable = require('Subscribable'); var View = require('View'); var Inspector = __DEV__ ? require('Inspector') : null; diff --git a/Libraries/AppRegistry/AppRegistry.js b/Libraries/ReactNative/AppRegistry.js similarity index 100% rename from Libraries/AppRegistry/AppRegistry.js rename to Libraries/ReactNative/AppRegistry.js diff --git a/Libraries/Utilities/I18nManager.js b/Libraries/ReactNative/I18nManager.js similarity index 100% rename from Libraries/Utilities/I18nManager.js rename to Libraries/ReactNative/I18nManager.js diff --git a/Libraries/Utilities/UIManager.js b/Libraries/ReactNative/UIManager.js similarity index 100% rename from Libraries/Utilities/UIManager.js rename to Libraries/ReactNative/UIManager.js diff --git a/Libraries/ReactIOS/YellowBox.js b/Libraries/ReactNative/YellowBox.js similarity index 100% rename from Libraries/ReactIOS/YellowBox.js rename to Libraries/ReactNative/YellowBox.js diff --git a/Libraries/RKBackendNode/queryLayoutByID.js b/Libraries/ReactNative/queryLayoutByID.js similarity index 100% rename from Libraries/RKBackendNode/queryLayoutByID.js rename to Libraries/ReactNative/queryLayoutByID.js diff --git a/Libraries/ReactIOS/renderApplication.js b/Libraries/ReactNative/renderApplication.js similarity index 100% rename from Libraries/ReactIOS/renderApplication.js rename to Libraries/ReactNative/renderApplication.js diff --git a/Libraries/ReactIOS/requireNativeComponent.js b/Libraries/ReactNative/requireNativeComponent.js similarity index 99% rename from Libraries/ReactIOS/requireNativeComponent.js rename to Libraries/ReactNative/requireNativeComponent.js index 2c1987df3..8720d34cd 100644 --- a/Libraries/ReactIOS/requireNativeComponent.js +++ b/Libraries/ReactNative/requireNativeComponent.js @@ -16,10 +16,9 @@ var UIManager = require('UIManager'); var UnimplementedView = require('UnimplementedView'); var createReactNativeComponentClass = require('react/lib/createReactNativeComponentClass'); - var insetsDiffer = require('insetsDiffer'); -var pointsDiffer = require('pointsDiffer'); var matricesDiffer = require('matricesDiffer'); +var pointsDiffer = require('pointsDiffer'); var processColor = require('processColor'); var resolveAssetSource = require('resolveAssetSource'); var sizesDiffer = require('sizesDiffer'); diff --git a/Libraries/ReactIOS/verifyPropTypes.js b/Libraries/ReactNative/verifyPropTypes.js similarity index 100% rename from Libraries/ReactIOS/verifyPropTypes.js rename to Libraries/ReactNative/verifyPropTypes.js diff --git a/Libraries/Utilities/WebSocketInterceptor.js b/Libraries/WebSocket/WebSocketInterceptor.js similarity index 99% rename from Libraries/Utilities/WebSocketInterceptor.js rename to Libraries/WebSocket/WebSocketInterceptor.js index f6a329620..3ac649a16 100644 --- a/Libraries/Utilities/WebSocketInterceptor.js +++ b/Libraries/WebSocket/WebSocketInterceptor.js @@ -12,6 +12,7 @@ const RCTWebSocketModule = require('NativeModules').WebSocketModule; const NativeEventEmitter = require('NativeEventEmitter'); + const base64 = require('base64-js'); const originalRCTWebSocketConnect = RCTWebSocketModule.connect; diff --git a/docs/Troubleshooting.md b/docs/Troubleshooting.md index 2055a2c67..691216bb4 100644 --- a/docs/Troubleshooting.md +++ b/docs/Troubleshooting.md @@ -72,7 +72,7 @@ To revert the `User Search Header Paths` and `Header Search Paths` build setting ### No transports available -React Native implements a polyfill for WebSockets. These [polyfills](https://github.com/facebook/react-native/blob/master/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js) are initialized as part of the react-native module that you include in your application through `import React from 'react'`. If you load another module that requires WebSockets, such as [Firebase](https://github.com/facebook/react-native/issues/3645), be sure to load/require it after react-native: +React Native implements a polyfill for WebSockets. These [polyfills](https://github.com/facebook/react-native/blob/master/Libraries/Core/InitializeCore.js) are initialized as part of the react-native module that you include in your application through `import React from 'react'`. If you load another module that requires WebSockets, such as [Firebase](https://github.com/facebook/react-native/issues/3645), be sure to load/require it after react-native: ``` import React from 'react'; diff --git a/lib/InitializeJavaScriptAppEngine.js b/lib/InitializeJavaScriptAppEngine.js index 44fb9d3fa..c560dccac 100644 --- a/lib/InitializeJavaScriptAppEngine.js +++ b/lib/InitializeJavaScriptAppEngine.js @@ -12,4 +12,4 @@ // This is a forwarding module to allow React to require React Native internals // as node dependency -module.exports = require('InitializeJavaScriptAppEngine'); +module.exports = require('InitializeCore'); diff --git a/lib/README b/lib/README new file mode 100644 index 000000000..b5273d497 --- /dev/null +++ b/lib/README @@ -0,0 +1 @@ +JS modules in this folder are forwarding modules to allow React to require React Native internals as node dependencies. diff --git a/packager/react-packager/src/Bundler/__tests__/Bundle-test.js b/packager/react-packager/src/Bundler/__tests__/Bundle-test.js index a043c164f..9aef2b35d 100644 --- a/packager/react-packager/src/Bundler/__tests__/Bundle-test.js +++ b/packager/react-packager/src/Bundler/__tests__/Bundle-test.js @@ -212,7 +212,7 @@ describe('Bundle', () => { }).then(() => { otherBundle.setMainModuleId('foo'); otherBundle.finalize({ - runBeforeMainModule: ['InitializeJavaScriptAppEngine'], + runBeforeMainModule: ['InitializeCore'], runMainModule: true, }); @@ -243,11 +243,11 @@ describe('Bundle', () => { line: 6 }, map: { - file: 'require-InitializeJavaScriptAppEngine.js', + file: 'require-InitializeCore.js', mappings: 'AAAA;', names: [], - sources: [ 'require-InitializeJavaScriptAppEngine.js' ], - sourcesContent: [';require("InitializeJavaScriptAppEngine");'], + sources: [ 'require-InitializeCore.js' ], + sourcesContent: [';require("InitializeCore");'], version: 3, } }, diff --git a/packager/react-packager/src/Server/__tests__/Server-test.js b/packager/react-packager/src/Server/__tests__/Server-test.js index 4cb073972..2a4041169 100644 --- a/packager/react-packager/src/Server/__tests__/Server-test.js +++ b/packager/react-packager/src/Server/__tests__/Server-test.js @@ -160,7 +160,7 @@ describe('processRequest', () => { dev: true, platform: undefined, onProgress: jasmine.any(Function), - runBeforeMainModule: ['InitializeJavaScriptAppEngine'], + runBeforeMainModule: ['InitializeCore'], unbundle: false, entryModuleOnly: false, isolateModuleIDs: false, @@ -185,7 +185,7 @@ describe('processRequest', () => { dev: true, platform: 'ios', onProgress: jasmine.any(Function), - runBeforeMainModule: ['InitializeJavaScriptAppEngine'], + runBeforeMainModule: ['InitializeCore'], unbundle: false, entryModuleOnly: false, isolateModuleIDs: false, @@ -210,7 +210,7 @@ describe('processRequest', () => { dev: true, platform: undefined, onProgress: jasmine.any(Function), - runBeforeMainModule: ['InitializeJavaScriptAppEngine'], + runBeforeMainModule: ['InitializeCore'], unbundle: false, entryModuleOnly: false, isolateModuleIDs: false, @@ -440,7 +440,7 @@ describe('processRequest', () => { runModule: true, dev: true, platform: undefined, - runBeforeMainModule: ['InitializeJavaScriptAppEngine'], + runBeforeMainModule: ['InitializeCore'], unbundle: false, entryModuleOnly: false, isolateModuleIDs: false, @@ -463,7 +463,7 @@ describe('processRequest', () => { sourceMapUrl: '/path/to/foo.map?dev=false&runModule=false', dev: false, platform: undefined, - runBeforeMainModule: ['InitializeJavaScriptAppEngine'], + runBeforeMainModule: ['InitializeCore'], unbundle: false, entryModuleOnly: false, isolateModuleIDs: false, diff --git a/packager/react-packager/src/Server/index.js b/packager/react-packager/src/Server/index.js index 1b679e813..a9153d27f 100644 --- a/packager/react-packager/src/Server/index.js +++ b/packager/react-packager/src/Server/index.js @@ -130,7 +130,7 @@ const bundleOpts = declareOpts({ type: 'array', default: [ // Ensures essential globals are available and are patched correctly. - 'InitializeJavaScriptAppEngine' + 'InitializeCore' ], }, unbundle: {