Remove unused modules
- Remove last references to ReactInstanceHandles (still used in responder unit test) - Remove ClientReactRootIndex/ServerReactRootIndex
Ben Alpert committed
Oct 18, 2015 at 15:56 UTC
35543c63121b84933a7f9bd21c03e0a1f5227617
7 files changed
+18
-81
src/isomorphic/children/__tests__/ReactChildren-test.js
+10
-10
@@ -240,16 +240,16 @@ describe('ReactChildren', function() {
240
mappedChildren[2].key,
241
mappedChildren[3].key,
242
]).toEqual([
243
- 'giraffe/.0:$firstHalfKey/=1$keyZero',
244
- '/.0:$firstHalfKey/=1$keyTwo',
245
- 'keyFour/.0:$secondHalfKey/=1$keyFour',
246
- '/.0:$keyFive/=1$keyFiveInner',
243
+ 'giraffe/.0:$firstHalfKey/.$keyZero',
244
+ '/.0:$firstHalfKey/.$keyTwo',
245
+ 'keyFour/.0:$secondHalfKey/.$keyFour',
246
+ '/.0:$keyFive/.$keyFiveInner',
247
]);
248
249
- expect(mappedChildren[0]).toEqual(<div key="giraffe/.0:$firstHalfKey/=1$keyZero" />);
250
- expect(mappedChildren[1]).toEqual(<div key="/.0:$firstHalfKey/=1$keyTwo" />);
251
- expect(mappedChildren[2]).toEqual(<div key="keyFour/.0:$secondHalfKey/=1$keyFour" />);
252
- expect(mappedChildren[3]).toEqual(<div key="/.0:$keyFive/=1$keyFiveInner" />);
249
+ expect(mappedChildren[0]).toEqual(<div key="giraffe/.0:$firstHalfKey/.$keyZero" />);
250
+ expect(mappedChildren[1]).toEqual(<div key="/.0:$firstHalfKey/.$keyTwo" />);
251
+ expect(mappedChildren[2]).toEqual(<div key="keyFour/.0:$secondHalfKey/.$keyFour" />);
252
+ expect(mappedChildren[3]).toEqual(<div key="/.0:$keyFive/.$keyFiveInner" />);
253
});
254
255
it('should retain key across two mappings', function() {
@@ -279,8 +279,8 @@ describe('ReactChildren', function() {
279
expect(mappedForcedKeys).toEqual(expectedForcedKeys);
280
281
var expectedRemappedForcedKeys = [
282
- 'giraffe/.$giraffe/=1$keyZero',
283
- '/.$/=1$keyOne',
282
+ 'giraffe/.$giraffe/.$keyZero',
283
+ '/.$/.$keyOne',
284
];
285
var remappedChildrenForcedKeys =
286
ReactChildren.map(mappedChildrenForcedKeys, mapFn);
src/renderers/dom/ReactDOM.js
-6
@@ -13,10 +13,7 @@
13
14
'use strict';
15
16
-var ReactCurrentOwner = require('ReactCurrentOwner');
17
-var ReactDOMTextComponent = require('ReactDOMTextComponent');
16
var ReactDefaultInjection = require('ReactDefaultInjection');
19
-var ReactInstanceHandles = require('ReactInstanceHandles');
17
var ReactMount = require('ReactMount');
18
var ReactPerf = require('ReactPerf');
19
var ReactReconciler = require('ReactReconciler');
@@ -49,11 +46,8 @@ if (
46
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== 'undefined' &&
47
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject === 'function') {
48
__REACT_DEVTOOLS_GLOBAL_HOOK__.inject({
52
- CurrentOwner: ReactCurrentOwner,
53
- InstanceHandles: ReactInstanceHandles,
49
Mount: ReactMount,
50
Reconciler: ReactReconciler,
56
- TextComponent: ReactDOMTextComponent,
51
});
52
}
53
src/renderers/dom/client/ClientReactRootIndex.js
deleted
-23
@@ -1,23 +0,0 @@
1
-/**
2
- * Copyright 2013-2015, Facebook, Inc.
3
- * All rights reserved.
4
- *
5
- * This source code is licensed under the BSD-style license found in the
6
- * LICENSE file in the root directory of this source tree. An additional grant
7
- * of patent rights can be found in the PATENTS file in the same directory.
8
- *
9
- * @providesModule ClientReactRootIndex
10
- * @typechecks
11
- */
12
-
13
-'use strict';
14
-
15
-var nextReactRootIndex = 0;
16
-
17
-var ClientReactRootIndex = {
18
- createReactRootIndex: function() {
19
- return nextReactRootIndex++;
20
- },
21
-};
22
-
23
-module.exports = ClientReactRootIndex;
src/renderers/dom/client/__tests__/ReactRenderDocument-test.js
-3
@@ -11,9 +11,6 @@
11
12
'use strict';
13
14
-jest
15
- .mock('ServerReactRootIndex');
16
-
14
var React;
15
var ReactDOM;
16
var ReactDOMServer;
src/renderers/dom/server/ServerReactRootIndex.js
deleted
-29
@@ -1,29 +0,0 @@
1
-/**
2
- * Copyright 2013-2015, Facebook, Inc.
3
- * All rights reserved.
4
- *
5
- * This source code is licensed under the BSD-style license found in the
6
- * LICENSE file in the root directory of this source tree. An additional grant
7
- * of patent rights can be found in the PATENTS file in the same directory.
8
- *
9
- * @providesModule ServerReactRootIndex
10
- * @typechecks
11
- */
12
-
13
-'use strict';
14
-
15
-/**
16
- * Size of the reactRoot ID space. We generate random numbers for React root
17
- * IDs and if there's a collision the events and DOM update system will
18
- * get confused. In the future we need a way to generate GUIDs but for
19
- * now this will work on a smaller scale.
20
- */
21
-var GLOBAL_MOUNT_POINT_MAX = Math.pow(2, 53);
22
-
23
-var ServerReactRootIndex = {
24
- createReactRootIndex: function() {
25
- return Math.ceil(Math.random() * GLOBAL_MOUNT_POINT_MAX);
26
- },
27
-};
28
-
29
-module.exports = ServerReactRootIndex;
src/shared/utils/__tests__/traverseAllChildren-test.js
+6
-6
@@ -162,10 +162,10 @@ describe('traverseAllChildren', function() {
162
traverseContext, div, '.$divNode'
163
);
164
expect(traverseFn).toHaveBeenCalledWith(
165
- traverseContext, <span key="span/.$spanNode" />, '.1:0:$span/=1$spanNode'
165
+ traverseContext, <span key="span/.$spanNode" />, '.1:0:$span/.$spanNode'
166
);
167
expect(traverseFn).toHaveBeenCalledWith(
168
- traverseContext, <a key="a/.$aNode" />, '.2:$a/=1$aNode'
168
+ traverseContext, <a key="a/.$aNode" />, '.2:$a/.$aNode'
169
);
170
expect(traverseFn).toHaveBeenCalledWith(
171
traverseContext, 'string', '.3'
@@ -225,25 +225,25 @@ describe('traverseAllChildren', function() {
225
expect(traverseFn).toHaveBeenCalledWith(
226
traverseContext,
227
<div key="firstHalfKey/.$keyZero" />,
228
- '.0:$firstHalfKey/=1$keyZero'
228
+ '.0:$firstHalfKey/.$keyZero'
229
);
230
231
expect(traverseFn).toHaveBeenCalledWith(
232
traverseContext,
233
<div key="firstHalfKey/.$keyTwo" />,
234
- '.0:$firstHalfKey/=1$keyTwo'
234
+ '.0:$firstHalfKey/.$keyTwo'
235
);
236
237
expect(traverseFn).toHaveBeenCalledWith(
238
traverseContext,
239
<div key="secondHalfKey/.$keyFour" />,
240
- '.0:$secondHalfKey/=1$keyFour'
240
+ '.0:$secondHalfKey/.$keyFour'
241
);
242
243
expect(traverseFn).toHaveBeenCalledWith(
244
traverseContext,
245
<div key="keyFive/.$keyFiveInner" />,
246
- '.0:$keyFive/=1$keyFiveInner'
246
+ '.0:$keyFive/.$keyFiveInner'
247
);
248
});
249
src/shared/utils/traverseAllChildren.js
+2
-4
@@ -13,13 +13,12 @@
13
14
var ReactCurrentOwner = require('ReactCurrentOwner');
15
var ReactElement = require('ReactElement');
16
-var ReactInstanceHandles = require('ReactInstanceHandles');
16
17
var getIteratorFn = require('getIteratorFn');
18
var invariant = require('invariant');
19
var warning = require('warning');
20
22
-var SEPARATOR = ReactInstanceHandles.SEPARATOR;
21
+var SEPARATOR = '.';
22
var SUBSEPARATOR = ':';
23
24
/**
@@ -29,11 +28,10 @@ var SUBSEPARATOR = ':';
28
29
var userProvidedKeyEscaperLookup = {
30
'=': '=0',
32
- '.': '=1',
31
':': '=2',
32
};
33
36
-var userProvidedKeyEscapeRegex = /[=.:]/g;
34
+var userProvidedKeyEscapeRegex = /[=:]/g;
35
36
var didWarnAboutMaps = false;
37