File tree Expand file tree Collapse file tree 6 files changed +23
-8
lines changed
Expand file tree Collapse file tree 6 files changed +23
-8
lines changed Original file line number Diff line number Diff line change 22
33var grunt = require ( 'grunt' ) ;
44
5- // Check that the version we're exporting is the same one we expect in the
6- // package. This is not an ideal way to do this, but makes sure that we keep
7- // them in sync.
8- var reactVersionExp = / \b R e a c t \. v e r s i o n \s * = \s * [ ' " ] ( [ ^ ' " ] + ) [ ' " ] ; / ;
9-
105module . exports = function ( ) {
116 var pkgVersion = grunt . config . data . pkg . version ;
127
@@ -19,7 +14,7 @@ module.exports = function() {
1914 'packages/react-addons/package.json (version)' : addonsData . version ,
2015 // Get the "version" without the range bit
2116 'packages/react-addons/package.json (react dependency)' : addonsData . peerDependencies . react . slice ( 1 ) ,
22- 'src/React .js' : reactVersionExp . exec ( grunt . file . read ( '. /src/React.js' ) ) [ 1 ] ,
17+ 'src/ReactVersion .js' : require ( '../.. /src/ReactVersion' ) ,
2318 } ;
2419
2520 // Return true (ok) or false (failed)
Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ var ReactIsomorphic = require('ReactIsomorphic');
1818var assign = require ( 'Object.assign' ) ;
1919var deprecated = require ( 'deprecated' ) ;
2020
21+ // `version` will be added here by ReactIsomorphic.
2122var React = { } ;
2223
2324assign ( React , ReactIsomorphic ) ;
@@ -63,6 +64,4 @@ assign(React, {
6364 ) ,
6465} ) ;
6566
66- React . version = '0.14.0-beta3' ;
67-
6867module . exports = React ;
Original file line number Diff line number Diff line change 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 ReactVersion
10+ */
11+
12+ 'use strict' ;
13+
14+ module . exports = '0.14.0-beta3' ;
Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ var ReactDOMFactories = require('ReactDOMFactories');
1818var ReactElement = require ( 'ReactElement' ) ;
1919var ReactElementValidator = require ( 'ReactElementValidator' ) ;
2020var ReactPropTypes = require ( 'ReactPropTypes' ) ;
21+ var ReactVersion = require ( 'ReactVersion' ) ;
2122
2223var assign = require ( 'Object.assign' ) ;
2324var onlyChild = require ( 'onlyChild' ) ;
@@ -64,6 +65,8 @@ var React = {
6465 // since they are just generating DOM strings.
6566 DOM : ReactDOMFactories ,
6667
68+ version : ReactVersion ,
69+
6770 // Hook for JSX spread, don't use this for anything else.
6871 __spread : assign ,
6972} ;
Original file line number Diff line number Diff line change @@ -21,6 +21,7 @@ var ReactMount = require('ReactMount');
2121var ReactPerf = require ( 'ReactPerf' ) ;
2222var ReactReconciler = require ( 'ReactReconciler' ) ;
2323var ReactUpdates = require ( 'ReactUpdates' ) ;
24+ var ReactVersion = require ( 'ReactVersion' ) ;
2425
2526var findDOMNode = require ( 'findDOMNode' ) ;
2627var renderSubtreeIntoContainer = require ( 'renderSubtreeIntoContainer' ) ;
@@ -34,6 +35,7 @@ var React = {
3435 findDOMNode : findDOMNode ,
3536 render : render ,
3637 unmountComponentAtNode : ReactMount . unmountComponentAtNode ,
38+ version : ReactVersion ,
3739
3840 /* eslint-disable camelcase */
3941 unstable_batchedUpdates : ReactUpdates . batchedUpdates ,
Original file line number Diff line number Diff line change 1313
1414var ReactDefaultInjection = require ( 'ReactDefaultInjection' ) ;
1515var ReactServerRendering = require ( 'ReactServerRendering' ) ;
16+ var ReactVersion = require ( 'ReactVersion' ) ;
1617
1718ReactDefaultInjection . inject ( ) ;
1819
1920var ReactDOMServer = {
2021 renderToString : ReactServerRendering . renderToString ,
2122 renderToStaticMarkup : ReactServerRendering . renderToStaticMarkup ,
23+ version : ReactVersion ,
2224} ;
2325
2426module . exports = ReactDOMServer ;
You can’t perform that action at this time.
0 commit comments