Reorganize Src Files for Isomorphic React Package
The new folder structure is organized around major packages that are expected to ship separately in some form. `/isomorphic` I moved classic/modern and children utils into a directory called "isomorphic" with the main export being ReactIsomorphic. This will eventually become the "react" package. This includes all the dependencies that you might need to create a component without dependencies on the renderer/reconciler. The rest moves into decoupled renderers. `/renderers/dom/client` - This is the main renderer for DOM. `/renderers/dom/server` - This is the server-side renderer for HTML strings. `/addons` and `/test` - Same as before for now. You're not supposed to take on a dependency inside another package. Shared code is organized into a "shared" directory which is intended to support all the packages in that subdirectory. Meaning that once we swap to CommonJS modules, the only time you should use `..` is to target `../shared/` or `../../shared`. E.g. `/shared/` is common utils that are used by everything. `/renderers/shared/` is code that is shared by all renderers, such as the main reconciliation algorithm. Shared code will likely be copied into each package rather than referenced. This allow us to have separate state and allow inlining and deadcode elimination.
Sebastian Markbage committed
May 15, 2015 at 18:35 UTC
0b063f8a09dae4b6b1de400ff2d9aba9108647de
261 files changed
+138
-51
.eslintignore
+1
-1
@@ -1,5 +1,5 @@
1
# We can probably lint these later but not important at this point
2
-src/vendor
2
+src/shared/vendor
3
# eslint uses JSX* node types to determine if using JSX. esprima-fb still uses
4
# XJS* nodes. When we fix that (https://github.com/facebook/esprima/pull/85) we
5
# can enable linting the tests and fix those errors.
grunt/config/jsx.js
+1
-1
@@ -1,6 +1,6 @@
1
'use strict';
2
3
-var assign = require('../../src/stubs/Object.assign');
3
+var assign = require('../../src/shared/stubs/Object.assign');
4
var grunt = require('grunt');
5
6
var rootIDs = [
grunt/tasks/version-check.js
+1
-1
@@ -10,7 +10,7 @@ var reactVersionExp = /\bReact\.version\s*=\s*['"]([^'"]+)['"];/;
10
11
module.exports = function() {
12
var reactVersion = reactVersionExp.exec(
13
- grunt.file.read('./src/browser/ui/React.js')
13
+ grunt.file.read('./src/React.js')
14
)[1];
15
var npmReactVersion = grunt.file.readJSON('./npm-react/package.json').version;
16
var reactToolsVersion = grunt.config.data.pkg.version;
jest/preprocessor.js
+1
-1
@@ -7,7 +7,7 @@ var tsPreprocessor = require('./ts-preprocessor');
7
8
var defaultLibraries = [
9
require.resolve('./jest.d.ts'),
10
- require.resolve('../src/modern/class/React.d.ts')
10
+ require.resolve('../src/isomorphic/modern/class/React.d.ts')
11
];
12
13
var ts = tsPreprocessor(defaultLibraries);
src/React.js
new
+28
@@ -0,0 +1,28 @@
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 React
10
+ */
11
+
12
+'use strict';
13
+
14
+var ReactDOMClient = require('ReactDOMClient');
15
+var ReactDOMServer = require('ReactDOMServer');
16
+var ReactIsomorphic = require('ReactIsomorphic');
17
+
18
+var assign = require('Object.assign');
19
+
20
+var React = {};
21
+
22
+assign(React, ReactIsomorphic);
23
+assign(React, ReactDOMClient);
24
+assign(React, ReactDOMServer);
25
+
26
+React.version = '0.14.0-alpha1';
27
+
28
+module.exports = React;
src/addons/ReactWithAddons.js
renamed
src/isomorphic/ReactIsomorphic.js
new
+70
@@ -0,0 +1,70 @@
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 ReactIsomorphic
10
+ */
11
+
12
+'use strict';
13
+
14
+var ReactChildren = require('ReactChildren');
15
+var ReactComponent = require('ReactComponent');
16
+var ReactClass = require('ReactClass');
17
+var ReactDOM = require('ReactDOM');
18
+var ReactElement = require('ReactElement');
19
+var ReactElementValidator = require('ReactElementValidator');
20
+var ReactPropTypes = require('ReactPropTypes');
21
+
22
+var assign = require('Object.assign');
23
+var onlyChild = require('onlyChild');
24
+
25
+var createElement = ReactElement.createElement;
26
+var createFactory = ReactElement.createFactory;
27
+var cloneElement = ReactElement.cloneElement;
28
+
29
+if (__DEV__) {
30
+ createElement = ReactElementValidator.createElement;
31
+ createFactory = ReactElementValidator.createFactory;
32
+ cloneElement = ReactElementValidator.cloneElement;
33
+}
34
+
35
+var React = {
36
+
37
+ // Modern
38
+
39
+ Children: {
40
+ map: ReactChildren.map,
41
+ forEach: ReactChildren.forEach,
42
+ count: ReactChildren.count,
43
+ only: onlyChild
44
+ },
45
+
46
+ Component: ReactComponent,
47
+
48
+ createElement: createElement,
49
+ cloneElement: cloneElement,
50
+ isValidElement: ReactElement.isValidElement,
51
+
52
+ // Classic
53
+
54
+ PropTypes: ReactPropTypes,
55
+ createClass: ReactClass.createClass,
56
+ createFactory: createFactory,
57
+ createMixin: function(mixin) {
58
+ // Currently a noop. Will be used to validate and trace mixins.
59
+ return mixin;
60
+ },
61
+
62
+ // This looks DOM specific but these are actually isomorphic helpers
63
+ // since they are just generating DOM strings.
64
+ DOM: ReactDOM,
65
+
66
+ // Hook for JSX spread, don't use this for anything else.
67
+ __spread: assign
68
+};
69
+
70
+module.exports = React;
src/isomorphic/children/ReactChildren.js
renamed
src/isomorphic/children/__tests__/ReactChildren-test.js
renamed
src/isomorphic/children/__tests__/onlyChild-test.js
renamed
src/isomorphic/children/__tests__/sliceChildren-test.js
renamed
src/isomorphic/children/onlyChild.js
renamed
src/isomorphic/children/sliceChildren.js
renamed
src/isomorphic/classic/__tests__/ReactContextValidator-test.js
renamed
src/isomorphic/classic/class/ReactClass.js
renamed
src/isomorphic/classic/class/__tests__/ReactBind-test.js
renamed
src/isomorphic/classic/class/__tests__/ReactClass-test.js
renamed
src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js
renamed
src/isomorphic/classic/element/ReactDOM.js
renamed
src/isomorphic/classic/element/ReactElement.js
renamed
src/isomorphic/classic/element/ReactElementValidator.js
renamed
src/isomorphic/classic/element/__tests__/ReactElement-test.js
renamed
src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
renamed
src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
renamed
src/isomorphic/classic/types/ReactPropTypeLocationNames.js
renamed
src/isomorphic/classic/types/ReactPropTypeLocations.js
renamed
src/isomorphic/classic/types/ReactPropTypes.js
renamed
src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
renamed
src/isomorphic/deprecated/OrderedMap.js
renamed
src/isomorphic/deprecated/ReactPropTransferer.js
renamed
src/isomorphic/deprecated/__tests__/cloneWithProps-test.js
renamed
src/isomorphic/deprecated/__tests__/joinClasses-test.js
renamed
src/isomorphic/deprecated/cloneWithProps.js
renamed
src/isomorphic/deprecated/joinClasses.js
renamed
src/isomorphic/modern/class/React.d.ts
renamed
src/isomorphic/modern/class/ReactComponent.js
renamed
src/isomorphic/modern/class/__tests__/ReactClassEquivalence-test.js
renamed
src/isomorphic/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee
renamed
src/isomorphic/modern/class/__tests__/ReactES6Class-test.js
renamed
src/isomorphic/modern/class/__tests__/ReactTypeScriptClass-test.ts
renamed
src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
renamed
src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js
renamed
src/isomorphic/modern/types/__tests__/ReactFlowPropTypes-test.js
renamed
src/isomorphic/modern/types/__tests__/ReactTypeScriptPropTypes-test.js
renamed
src/renderers/dom/ReactDOMClient.js
renamed
+2
-47
@@ -6,77 +6,34 @@
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 React
9
+ * @providesModule ReactDOMClient
10
*/
11
12
/* globals __REACT_DEVTOOLS_GLOBAL_HOOK__*/
13
14
'use strict';
15
16
-var ReactChildren = require('ReactChildren');
17
-var ReactComponent = require('ReactComponent');
18
-var ReactClass = require('ReactClass');
16
var ReactCurrentOwner = require('ReactCurrentOwner');
20
-var ReactElement = require('ReactElement');
21
-var ReactElementValidator = require('ReactElementValidator');
22
-var ReactDOM = require('ReactDOM');
17
var ReactDOMTextComponent = require('ReactDOMTextComponent');
18
var ReactDefaultInjection = require('ReactDefaultInjection');
19
var ReactInstanceHandles = require('ReactInstanceHandles');
20
var ReactMount = require('ReactMount');
21
var ReactPerf = require('ReactPerf');
28
-var ReactPropTypes = require('ReactPropTypes');
22
var ReactReconciler = require('ReactReconciler');
30
-var ReactServerRendering = require('ReactServerRendering');
23
32
-var assign = require('Object.assign');
24
var findDOMNode = require('findDOMNode');
34
-var onlyChild = require('onlyChild');
25
var warning = require('warning');
26
27
ReactDefaultInjection.inject();
28
39
-var createElement = ReactElement.createElement;
40
-var createFactory = ReactElement.createFactory;
41
-var cloneElement = ReactElement.cloneElement;
42
-
43
-if (__DEV__) {
44
- createElement = ReactElementValidator.createElement;
45
- createFactory = ReactElementValidator.createFactory;
46
- cloneElement = ReactElementValidator.cloneElement;
47
-}
48
-
29
var render = ReactPerf.measure('React', 'render', ReactMount.render);
30
31
var React = {
52
- Children: {
53
- map: ReactChildren.map,
54
- forEach: ReactChildren.forEach,
55
- count: ReactChildren.count,
56
- only: onlyChild
57
- },
58
- Component: ReactComponent,
59
- DOM: ReactDOM,
60
- PropTypes: ReactPropTypes,
61
- createClass: ReactClass.createClass,
62
- createElement: createElement,
63
- cloneElement: cloneElement,
64
- createFactory: createFactory,
65
- createMixin: function(mixin) {
66
- // Currently a noop. Will be used to validate and trace mixins.
67
- return mixin;
68
- },
32
constructAndRenderComponent: ReactMount.constructAndRenderComponent,
33
constructAndRenderComponentByID: ReactMount.constructAndRenderComponentByID,
34
findDOMNode: findDOMNode,
35
render: render,
73
- renderToString: ReactServerRendering.renderToString,
74
- renderToStaticMarkup: ReactServerRendering.renderToStaticMarkup,
75
- unmountComponentAtNode: ReactMount.unmountComponentAtNode,
76
- isValidElement: ReactElement.isValidElement,
77
-
78
- // Hook for JSX spread, don't use this for anything else.
79
- __spread: assign
36
+ unmountComponentAtNode: ReactMount.unmountComponentAtNode
37
};
38
39
// Inject the runtime into a devtools global hook regardless of browser.
@@ -150,6 +107,4 @@ if (__DEV__) {
107
}
108
}
109
153
-React.version = '0.14.0-alpha1';
154
-
110
module.exports = React;
src/renderers/dom/ReactDOMServer.js
new
+24
@@ -0,0 +1,24 @@
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 ReactDOMServer
10
+ */
11
+
12
+'use strict';
13
+
14
+var ReactDefaultInjection = require('ReactDefaultInjection');
15
+var ReactServerRendering = require('ReactServerRendering');
16
+
17
+ReactDefaultInjection.inject();
18
+
19
+var ReactDOMServer = {
20
+ renderToString: ReactServerRendering.renderToString,
21
+ renderToStaticMarkup: ReactServerRendering.renderToStaticMarkup
22
+};
23
+
24
+module.exports = ReactDOMServer;
src/renderers/dom/client/ClientReactRootIndex.js
renamed
src/renderers/dom/client/ReactBrowserEventEmitter.js
renamed
src/renderers/dom/client/ReactDOMIDOperations.js
renamed
src/renderers/dom/client/ReactDOMSelection.js
renamed
src/renderers/dom/client/ReactEventListener.js
renamed
src/renderers/dom/client/ReactInputSelection.js
renamed
src/renderers/dom/client/ReactMount.js
renamed
src/renderers/dom/client/ReactReconcileTransaction.js
renamed
src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js
renamed
src/renderers/dom/client/__tests__/ReactDOM-test.js
renamed
src/renderers/dom/client/__tests__/ReactDOMIDOperations-test.js
renamed
src/renderers/dom/client/__tests__/ReactDOMSVG-test.js
renamed
src/renderers/dom/client/__tests__/ReactEventListener-test.js
renamed
src/renderers/dom/client/__tests__/ReactMount-test.js
renamed
src/renderers/dom/client/__tests__/ReactMountDestruction-test.js
renamed
src/renderers/dom/client/__tests__/ReactRenderDocument-test.js
renamed
src/renderers/dom/client/__tests__/ReactWebWorker-test.js
renamed
src/renderers/dom/client/__tests__/findDOMNode-test.js
renamed
src/renderers/dom/client/__tests__/validateDOMNesting-test.js
renamed
src/renderers/dom/client/eventPlugins/AnalyticsEventPluginFactory.js
renamed
src/renderers/dom/client/eventPlugins/BeforeInputEventPlugin.js
renamed
src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js
renamed
src/renderers/dom/client/eventPlugins/DefaultEventPluginOrder.js
renamed
src/renderers/dom/client/eventPlugins/EnterLeaveEventPlugin.js
renamed
src/renderers/dom/client/eventPlugins/FallbackCompositionState.js
renamed
src/renderers/dom/client/eventPlugins/SelectEventPlugin.js
renamed
src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js
renamed
src/renderers/dom/client/eventPlugins/TapEventPlugin.js
renamed
src/renderers/dom/client/eventPlugins/__tests__/AnalyticsEventPlugin-test.js
renamed
src/renderers/dom/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
renamed
src/renderers/dom/client/eventPlugins/__tests__/FallbackCompositionState-test.js
renamed
src/renderers/dom/client/eventPlugins/__tests__/SelectEventPlugin-test.js
renamed
src/renderers/dom/client/findDOMNode.js
renamed
src/renderers/dom/client/syntheticEvents/SyntheticClipboardEvent.js
renamed
src/renderers/dom/client/syntheticEvents/SyntheticCompositionEvent.js
renamed
src/renderers/dom/client/syntheticEvents/SyntheticDragEvent.js
renamed
src/renderers/dom/client/syntheticEvents/SyntheticEvent.js
renamed
src/renderers/dom/client/syntheticEvents/SyntheticFocusEvent.js
renamed
src/renderers/dom/client/syntheticEvents/SyntheticInputEvent.js
renamed
src/renderers/dom/client/syntheticEvents/SyntheticKeyboardEvent.js
renamed
src/renderers/dom/client/syntheticEvents/SyntheticMouseEvent.js
renamed
src/renderers/dom/client/syntheticEvents/SyntheticTouchEvent.js
renamed
src/renderers/dom/client/syntheticEvents/SyntheticUIEvent.js
renamed
src/renderers/dom/client/syntheticEvents/SyntheticWheelEvent.js
renamed
src/renderers/dom/client/syntheticEvents/__tests__/SyntheticEvent-test.js
renamed
src/renderers/dom/client/syntheticEvents/__tests__/SyntheticWheelEvent-test.js
renamed
src/renderers/dom/client/utils/DOMChildrenOperations.js
renamed
src/renderers/dom/client/utils/ViewportMetrics.js
renamed
src/renderers/dom/client/utils/__tests__/getNodeForCharacterOffset-test.js
renamed
src/renderers/dom/client/utils/getEventCharCode.js
renamed
src/renderers/dom/client/utils/getEventKey.js
renamed
src/renderers/dom/client/utils/getEventModifierState.js
renamed
src/renderers/dom/client/utils/getEventTarget.js
renamed
src/renderers/dom/client/utils/getNodeForCharacterOffset.js
renamed
src/renderers/dom/client/utils/getTextContentAccessor.js
renamed
src/renderers/dom/client/utils/isEventSupported.js
renamed
src/renderers/dom/client/utils/setInnerHTML.js
renamed
src/renderers/dom/client/utils/setTextContent.js
renamed
src/renderers/dom/client/validateDOMNesting.js
renamed
src/renderers/dom/client/wrappers/AutoFocusMixin.js
renamed
src/renderers/dom/client/wrappers/LinkedValueUtils.js
renamed
src/renderers/dom/client/wrappers/LocalEventTrapMixin.js
renamed
src/renderers/dom/client/wrappers/ReactDOMButton.js
renamed
src/renderers/dom/client/wrappers/ReactDOMForm.js
renamed
src/renderers/dom/client/wrappers/ReactDOMIframe.js
renamed
src/renderers/dom/client/wrappers/ReactDOMImg.js
renamed
src/renderers/dom/client/wrappers/ReactDOMInput.js
renamed
src/renderers/dom/client/wrappers/ReactDOMOption.js
renamed
src/renderers/dom/client/wrappers/ReactDOMSelect.js
renamed
src/renderers/dom/client/wrappers/ReactDOMTextarea.js
renamed
src/renderers/dom/client/wrappers/__tests__/LocalEventTrapMixin-test.js
renamed
src/renderers/dom/client/wrappers/__tests__/ReactDOMButton-test.js
renamed
src/renderers/dom/client/wrappers/__tests__/ReactDOMIframe-test.js
renamed
src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js
renamed
src/renderers/dom/client/wrappers/__tests__/ReactDOMOption-test.js
renamed
src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js
renamed
src/renderers/dom/client/wrappers/__tests__/ReactDOMTextarea-test.js
renamed
src/renderers/dom/client/wrappers/createFullPageComponent.js
renamed
src/renderers/dom/server/ReactMarkupChecksum.js
renamed
src/renderers/dom/server/ReactServerRendering.js
renamed
src/renderers/dom/server/ReactServerRenderingTransaction.js
renamed
src/renderers/dom/server/ServerReactRootIndex.js
renamed
src/renderers/dom/server/__tests__/ReactServerRendering-test.js
renamed
src/renderers/dom/shared/CSSProperty.js
renamed
src/renderers/dom/shared/CSSPropertyOperations.js
renamed
src/renderers/dom/shared/DOMProperty.js
renamed
src/renderers/dom/shared/DOMPropertyOperations.js
renamed
src/renderers/dom/shared/Danger.js
renamed
src/renderers/dom/shared/HTMLDOMPropertyConfig.js
renamed
src/renderers/dom/shared/ReactBrowserComponentMixin.js
renamed
src/renderers/dom/shared/ReactComponentBrowserEnvironment.js
renamed
src/renderers/dom/shared/ReactDOMComponent.js
renamed
src/renderers/dom/shared/ReactDOMTextComponent.js
renamed
src/renderers/dom/shared/ReactDefaultInjection.js
renamed
+10
@@ -66,7 +66,17 @@ function autoGenerateWrapperClass(type) {
66
});
67
}
68
69
+var alreadyInjected = false;
70
+
71
function inject() {
72
+ if (alreadyInjected) {
73
+ // TODO: This is currently true because these injections are shared between
74
+ // the client and the server package. They should be built independently
75
+ // and not share any injection state. Then this problem will be solved.
76
+ return;
77
+ }
78
+ alreadyInjected = true;
79
+
80
ReactInjection.EventEmitter.injectReactEventListener(
81
ReactEventListener
82
);