From 6c885d28c51ea30af0d8a4031dedcea98ef4114c Mon Sep 17 00:00:00 2001 From: Sebastian Markbage Date: Thu, 24 Mar 2016 15:47:48 -0700 Subject: [PATCH] Remove duplicates and move files out of native/vendor Moving the event plugins into their dedicated folder Removing the ExecutionEnvironment override. I will just have to fix where needed. Probably related to the Chrome debugger? --- .../platform => NodeHandle}/NodeHandle.js | 0 .../UniversalWorkerNodeHandle.js | 0 src/renderers/native/ReactNative/React.js | 14 ----- src/renderers/native/ReactNative/ReactDOM.js | 16 ------ .../core/ExecutionEnvironment.android.js | 51 ------------------- .../vendor/core/ExecutionEnvironment.ios.js | 48 ----------------- .../event}/eventPlugins/PanResponder.js | 0 .../event}/eventPlugins/TouchHistoryMath.js | 0 8 files changed, 129 deletions(-) rename src/renderers/native/{vendor/react/platform => NodeHandle}/NodeHandle.js (100%) rename src/renderers/native/{vendor/react/platformImplementations/universal/worker => NodeHandle}/UniversalWorkerNodeHandle.js (100%) delete mode 100644 src/renderers/native/ReactNative/React.js delete mode 100644 src/renderers/native/ReactNative/ReactDOM.js delete mode 100644 src/renderers/native/vendor/react/vendor/core/ExecutionEnvironment.android.js delete mode 100644 src/renderers/native/vendor/react/vendor/core/ExecutionEnvironment.ios.js rename src/renderers/{native/vendor/react/browser => shared/event}/eventPlugins/PanResponder.js (100%) rename src/renderers/{native/vendor/react/browser => shared/event}/eventPlugins/TouchHistoryMath.js (100%) diff --git a/src/renderers/native/vendor/react/platform/NodeHandle.js b/src/renderers/native/NodeHandle/NodeHandle.js similarity index 100% rename from src/renderers/native/vendor/react/platform/NodeHandle.js rename to src/renderers/native/NodeHandle/NodeHandle.js diff --git a/src/renderers/native/vendor/react/platformImplementations/universal/worker/UniversalWorkerNodeHandle.js b/src/renderers/native/NodeHandle/UniversalWorkerNodeHandle.js similarity index 100% rename from src/renderers/native/vendor/react/platformImplementations/universal/worker/UniversalWorkerNodeHandle.js rename to src/renderers/native/NodeHandle/UniversalWorkerNodeHandle.js diff --git a/src/renderers/native/ReactNative/React.js b/src/renderers/native/ReactNative/React.js deleted file mode 100644 index 9cd4464f28..0000000000 --- a/src/renderers/native/ReactNative/React.js +++ /dev/null @@ -1,14 +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. - * - * @providesModule React - * @flow - */ -'use strict'; - -module.exports = require('ReactNative'); diff --git a/src/renderers/native/ReactNative/ReactDOM.js b/src/renderers/native/ReactNative/ReactDOM.js deleted file mode 100644 index 7ac737c132..0000000000 --- a/src/renderers/native/ReactNative/ReactDOM.js +++ /dev/null @@ -1,16 +0,0 @@ -/** - * Copyright 2004-present Facebook. All Rights Reserved. - * - * @providesModule ReactDOM - */ - -'use strict'; - -var ReactUpdates = require('ReactUpdates'); - -// Temporary shim required for ReactTestUtils and Relay. -var ReactDOM = { - unstable_batchedUpdates: ReactUpdates.batchedUpdates, -}; - -module.exports = ReactDOM; diff --git a/src/renderers/native/vendor/react/vendor/core/ExecutionEnvironment.android.js b/src/renderers/native/vendor/react/vendor/core/ExecutionEnvironment.android.js deleted file mode 100644 index 23116e61cd..0000000000 --- a/src/renderers/native/vendor/react/vendor/core/ExecutionEnvironment.android.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright 2013-2014 Facebook, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @providesModule ExecutionEnvironment - * - * NB: This is a temporary override that has not yet been merged upstream. It is NOT actually part - * of react-core (yet) - * - * Stubs SignedSource<<7afee88a05412d0c4eef54817419648e>> - */ - -/*jslint evil: true */ - -"use strict"; - -var canUseDOM = false; - -/** - * Simple, lightweight module assisting with the detection and context of - * Worker. Helps avoid circular dependencies and allows code to reason about - * whether or not they are in a Worker, even if they never include the main - * `ReactWorker` dependency. - */ -var ExecutionEnvironment = { - - canUseDOM: canUseDOM, - - canUseWorkers: typeof Worker !== 'undefined', - - canUseEventListeners: - canUseDOM && !!(window.addEventListener || window.attachEvent), - - canUseViewport: canUseDOM && !!window.screen, - - isInWorker: !canUseDOM // For now, this is true - might change in the future. - -}; - -module.exports = ExecutionEnvironment; diff --git a/src/renderers/native/vendor/react/vendor/core/ExecutionEnvironment.ios.js b/src/renderers/native/vendor/react/vendor/core/ExecutionEnvironment.ios.js deleted file mode 100644 index 3a59accdcd..0000000000 --- a/src/renderers/native/vendor/react/vendor/core/ExecutionEnvironment.ios.js +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright 2013-2014 Facebook, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @providesModule ExecutionEnvironment - * - * Stubs SignedSource<<7afee88a05412d0c4eef54817419648e>> - */ - -/*jslint evil: true */ - -"use strict"; - -var canUseDOM = false; - -/** - * Simple, lightweight module assisting with the detection and context of - * Worker. Helps avoid circular dependencies and allows code to reason about - * whether or not they are in a Worker, even if they never include the main - * `ReactWorker` dependency. - */ -var ExecutionEnvironment = { - - canUseDOM: canUseDOM, - - canUseWorkers: typeof Worker !== 'undefined', - - canUseEventListeners: - canUseDOM && !!(window.addEventListener || window.attachEvent), - - canUseViewport: canUseDOM && !!window.screen, - - isInWorker: !canUseDOM // For now, this is true - might change in the future. - -}; - -module.exports = ExecutionEnvironment; diff --git a/src/renderers/native/vendor/react/browser/eventPlugins/PanResponder.js b/src/renderers/shared/event/eventPlugins/PanResponder.js similarity index 100% rename from src/renderers/native/vendor/react/browser/eventPlugins/PanResponder.js rename to src/renderers/shared/event/eventPlugins/PanResponder.js diff --git a/src/renderers/native/vendor/react/browser/eventPlugins/TouchHistoryMath.js b/src/renderers/shared/event/eventPlugins/TouchHistoryMath.js similarity index 100% rename from src/renderers/native/vendor/react/browser/eventPlugins/TouchHistoryMath.js rename to src/renderers/shared/event/eventPlugins/TouchHistoryMath.js