15-next

.babelrc

@@ -2,7 +2,6 @@
   "presets": ["react"],
   "ignore": ["third_party"],
   "plugins": [
-    "fbjs-scripts/babel-6/dev-expression",
     "syntax-trailing-function-commas",
     "babel-plugin-transform-object-rest-spread",
     "transform-es2015-template-literals",
@@ -22,6 +21,7 @@
     "transform-es2015-modules-commonjs",
     "transform-es3-member-expression-literals",
     "transform-es3-property-literals",
-    "./scripts/babel/transform-object-assign-require"
+    "./scripts/babel/transform-object-assign-require",
+    "transform-react-jsx-source"
   ]
 }

.eslintignore

@@ -1,4 +1,5 @@
 # We can probably lint these later but not important at this point
+src/renderers/art
 src/shared/vendor
 # But not in docs/_js/examples/*
 docs/_js/*.js

.eslintrc.js

@@ -30,6 +30,7 @@ module.exports = {
     'indent': [ERROR, 2, {SwitchCase: 1}],
     'jsx-quotes': [ERROR, 'prefer-double'],
     'no-bitwise': OFF,
+    'no-inner-declarations': [ERROR, 'functions'],
     'no-multi-spaces': ERROR,
     'no-restricted-syntax': [ERROR, 'WithStatement'],
     'no-shadow': ERROR,

.flowconfig

@@ -0,0 +1,37 @@
+[ignore]
+
+.*/examples/.*
+.*/build/.*
+.*/node_modules/y18n/.*
+.*/__mocks__/.*
+.*/__tests__/.*
+
+# Ignore Docs
+.*/docs/.*
+
+[include]
+
+[libs]
+./node_modules/fbjs/flow/lib
+./flow
+
+[options]
+module.system=haste
+
+esproposal.class_static_fields=enable
+esproposal.class_instance_fields=enable
+
+experimental.strict_type_args=true
+
+munge_underscores=false
+
+suppress_type=$FlowIssue
+suppress_type=$FlowFixMe
+suppress_type=$FixMe
+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-4]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-4]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*\\)?)\\)? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
+
+[version]
+^0.26.0

.travis.yml

@@ -68,7 +68,14 @@ script:
       fi
     elif [ "$TEST_TYPE" = test ]; then
       set -e
-      ./node_modules/.bin/grunt jest:normal
+      # Disabling coverage because it's broken:
+      # https://travis-ci.org/facebook/react/jobs/128163922
+      if false; then
+        ./node_modules/.bin/grunt jest:coverage
+        cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
+      else
+        ./node_modules/.bin/grunt jest:normal
+      fi
       echo 'Testing in server-render (HTML generation) mode...'
       printf '\nmodule.exports.useCreateElement = false;\n' \
         >> src/renderers/dom/shared/ReactDOMFeatureFlags.js
@@ -83,6 +90,7 @@ env:
   - TEST_TYPE=build
   - TEST_TYPE=test
   - TEST_TYPE=lint
+  - TEST_TYPE=flow
   - TEST_TYPE=build_website
   global:
   # SERVER

CHANGELOG.md

@@ -874,14 +874,14 @@ Each of these changes will continue to work as before with a new warning until t
 
 * Upgrade Commoner so `require` statements are no longer relativized when passing through the transformer. This was a feature needed when building React, but doesn't translate well for other consumers of `bin/jsx`.
 * Upgraded our dependencies on Commoner and Recast so they use a different directory for their cache.
-* Freeze our esprima dependency.
+* Freeze our Esprima dependency.
 
 
 ## 0.3.2 (May 31, 2013)
 
 ### JSX
 
-* Improved compatability with other coding styles (specifically, multiple assignments with a single `var`).
+* Improved compatibility with other coding styles (specifically, multiple assignments with a single `var`).
 
 ### react-tools
 

Gruntfile.js

@@ -56,6 +56,8 @@ module.exports = function(grunt) {
 
   grunt.registerTask('lint', ['eslint']);
 
+  grunt.registerTask('flow', require('./grunt/tasks/flow'));
+
   grunt.registerTask('delete-build-modules', function() {
     // Use gulp here.
     spawnGulp(['react:clean'], null, this.async());

flow/environment.js

@@ -0,0 +1,20 @@
+/**
+ * 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.
+ *
+ * @flow
+ */
+
+/* eslint-disable */
+
+declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: any; /*?{
+  inject: ?((stuff: Object) => void)
+};*/
+
+// temporary patches for React.Component and React.Element
+declare var ReactComponent: typeof React$Component;
+declare var ReactElement: typeof React$Element;

flow/react-native-host-hooks.js

@@ -0,0 +1,44 @@
+/**
+ * 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.
+ *
+ * @flow
+ */
+
+/* eslint-disable */
+
+declare module 'deepDiffer' {
+  declare function exports(one: any, two: any): bool;
+}
+declare module 'deepFreezeAndThrowOnMutationInDev' {
+  declare function exports<T>(obj : T) : T;
+}
+declare module 'flattenStyle' { }
+declare module 'InitializeJavaScriptAppEngine' { }
+declare module 'RCTEventEmitter' {
+  declare function register() : void;
+}
+declare module 'TextInputState' {
+  declare function blurTextInput(object : any) : void;
+  declare function focusTextInput(object : any) : void;
+}
+declare module 'UIManager' {
+  declare var customBubblingEventTypes : Object;
+  declare var customDirectEventTypes : Object;
+  declare function createView() : void;
+  declare function manageChildren() : void;
+  declare function measure() : void;
+  declare function measureInWindow() : void;
+  declare function measureLayout() : void;
+  declare function removeRootView() : void;
+  declare function removeSubviewsFromContainerWithID() : void;
+  declare function replaceExistingNonRootView() : void;
+  declare function setChildren() : void;
+  declare function setChildren() : void;
+  declare function updateView() : void;
+}
+declare module 'View' { }

grunt/tasks/flow.js

@@ -0,0 +1,22 @@
+'use strict';
+
+var grunt = require('grunt');
+
+var extension = process.platform === 'win32' ? '.cmd': '';
+
+module.exports = function() {
+  var done = this.async();
+  grunt.util.spawn({
+    cmd: 'node_modules/.bin/flow' + extension,
+    args: ['check', '.'],
+    opts: {stdio: 'inherit'},
+  }, function(err, result, code) {
+    if (err) {
+      grunt.log.error('Flow failed');
+    } else {
+      grunt.log.ok('Flow passed');
+    }
+
+    done(code === 0);
+  });
+};

grunt/tasks/jest.js

@@ -1,9 +1,3 @@
-// We run our own grunt task instead of using grunt-jest so that we can have
-// more control. Specifically we want to set NODE_ENV and make sure stdio is
-// inherited. We also run with --harmony directly so that we don't have to
-// respawn immediately. We should be able to reduce some of this complexity
-// when jest 0.5 is run on top of iojs.
-
 'use strict';
 
 var async = require('async');
@@ -52,6 +46,7 @@ function getJestConfig(callback) {
   getCollectCoverageOnlyFrom(function(err, data) {
     callback(err, Object.assign({}, config, {
       rootDir: rootDir,
+      name: 'react',
       collectCoverage: true,
       collectCoverageOnlyFrom: data,
     }));
@@ -75,16 +70,25 @@ function writeTempConfig(callback) {
 }
 
 function run(done, configPath) {
-  grunt.log.writeln('running jest (this may take a while)');
+  grunt.log.writeln('running jest');
 
-  var args = ['--harmony', path.join('node_modules', 'jest-cli', 'bin', 'jest'), '--runInBand'];
+  var args = [
+    path.join('node_modules', 'jest', 'bin', 'jest'),
+    '--runInBand',
+    '--no-watchman',
+  ];
   if (configPath) {
     args.push('--config', configPath);
   }
   grunt.util.spawn({
     cmd: 'node',
     args: args,
-    opts: { stdio: 'inherit', env: { NODE_ENV: 'test' } },
+    opts: {
+      stdio: 'inherit',
+      env: Object.assign({}, process.env, {
+        NODE_ENV: 'test',
+      }),
+    },
   }, function(spawnErr, result, code) {
     if (spawnErr) {
       onError(spawnErr);

gulpfile.js

@@ -16,6 +16,7 @@ var del = require('del');
 
 var babelPluginModules = require('fbjs-scripts/babel-6/rewrite-modules');
 var extractErrors = require('./scripts/error-codes/gulp-extract-errors');
+var devExpressionWithCodes = require('./scripts/error-codes/dev-expression-with-codes');
 
 var paths = {
   react: {
@@ -24,40 +25,36 @@ var paths = {
       '!src/**/__benchmarks__/**/*.js',
       '!src/**/__tests__/**/*.js',
       '!src/**/__mocks__/**/*.js',
+      '!src/renderers/art/**/*.js',
       '!src/shared/vendor/**/*.js',
     ],
     lib: 'build/modules',
   },
 };
 
-var fbjsModuleMap = require('fbjs/module-map');
-var moduleMap = {};
-for (var key in fbjsModuleMap) {
-  moduleMap[key] = fbjsModuleMap[key];
-}
-var whiteListNames = [
-  'deepDiffer',
-  'deepFreezeAndThrowOnMutationInDev',
-  'flattenStyle',
-  'InitializeJavaScriptAppEngine',
-  'RCTEventEmitter',
-  'TextInputState',
-  'UIManager',
-  'View',
-];
-
-whiteListNames.forEach(function(name) {
-  moduleMap[name] = name;
-});
-
-moduleMap['object-assign'] = 'object-assign';
+var moduleMap = Object.assign(
+  {'object-assign': 'object-assign'},
+  require('fbjs/module-map'),
+  {
+    deepDiffer: 'react-native/lib/deepDiffer',
+    deepFreezeAndThrowOnMutationInDev: 'react-native/lib/deepFreezeAndThrowOnMutationInDev',
+    flattenStyle: 'react-native/lib/flattenStyle',
+    InitializeJavaScriptAppEngine: 'react-native/lib/InitializeJavaScriptAppEngine',
+    RCTEventEmitter: 'react-native/lib/RCTEventEmitter',
+    TextInputState: 'react-native/lib/TextInputState',
+    UIManager: 'react-native/lib/UIManager',
+    UIManagerStatTracker: 'react-native/lib/UIManagerStatTracker',
+    View: 'react-native/lib/View',
+  }
+);
 
 var errorCodeOpts = {
   errorMapFilePath: 'scripts/error-codes/codes.json',
 };
 
 var babelOpts = {
   plugins: [
+    devExpressionWithCodes, // this pass has to run before `rewrite-modules`
     [babelPluginModules, {map: moduleMap}],
   ],
 };

package.json

@@ -3,6 +3,7 @@
   "private": true,
   "version": "15.1.0",
   "devDependencies": {
+    "art": "^0.10.1",
     "async": "^1.5.0",
     "babel-cli": "^6.6.5",
     "babel-core": "^6.0.0",
@@ -26,20 +27,23 @@
     "babel-plugin-transform-es3-member-expression-literals": "^6.5.0",
     "babel-plugin-transform-es3-property-literals": "^6.5.0",
     "babel-plugin-transform-object-rest-spread": "^6.6.5",
+    "babel-plugin-transform-react-jsx-source": "^6.8.0",
     "babel-preset-react": "^6.5.0",
     "babel-traverse": "^6.9.0",
     "babylon": "^6.8.0",
     "browserify": "^13.0.0",
     "bundle-collapser": "^1.1.1",
     "coffee-script": "^1.8.0",
+    "core-js": "^2.2.1",
     "coveralls": "^2.11.6",
     "del": "^2.0.2",
     "derequire": "^2.0.3",
     "eslint": "1.10.3",
     "eslint-plugin-react": "4.1.0",
     "eslint-plugin-react-internal": "file:eslint-rules",
-    "fbjs": "^0.8.0",
+    "fbjs": "^0.8.1",
     "fbjs-scripts": "^0.6.0",
+    "flow-bin": "^0.26.0",
     "glob": "^6.0.1",
     "grunt": "^0.4.5",
     "grunt-cli": "^0.1.13",
@@ -51,19 +55,19 @@
     "gulp-flatten": "^0.2.0",
     "gulp-util": "^3.0.7",
     "gzip-js": "~0.3.2",
-    "jest-cli": "^12.0.2",
+    "jest": "^12.1.1",
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.0",
     "platform": "^1.1.0",
     "run-sequence": "^1.1.4",
     "through2": "^2.0.0",
     "tmp": "~0.0.28",
-    "typescript": "~1.4.0",
+    "typescript": "~1.8.10",
     "uglify-js": "^2.5.0",
     "uglifyify": "^3.0.1"
   },
   "devEngines": {
-    "node": "4.x || 5.x",
+    "node": "4.x || 5.x || 6.x",
     "npm": "2.x || 3.x"
   },
   "commonerConfig": {
@@ -86,7 +90,6 @@
     "scriptPreprocessor": "scripts/jest/preprocessor.js",
     "setupEnvScriptFile": "scripts/jest/environment.js",
     "setupTestFrameworkScriptFile": "scripts/jest/test-framework-setup.js",
-    "testRunner": "jasmine1",
     "testFileExtensions": [
       "coffee",
       "js",

packages/react/package.json

@@ -23,7 +23,7 @@
     "node": ">=0.10.0"
   },
   "dependencies": {
-    "fbjs": "^0.8.0",
+    "fbjs": "^0.8.1",
     "loose-envify": "^1.1.0",
     "object-assign": "^4.1.0"
   },