15.6.1 source read

.babelrc

@@ -2,8 +2,9 @@
   "presets": ["react"],
   "ignore": ["third_party"],
   "plugins": [
-    "fbjs-scripts/babel-6/dev-expression",
+    "transform-class-properties",
     "syntax-trailing-function-commas",
+    "transform-object-rest-spread",
     "transform-es2015-template-literals",
     "transform-es2015-literals",
     "transform-es2015-arrow-functions",
@@ -21,6 +22,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,6 @@
 # We can probably lint these later but not important at this point
+addons/**/node_modules/
+src/renderers/art
 src/shared/vendor
 # But not in docs/_js/examples/*
 docs/_js/*.js
@@ -9,6 +11,7 @@ docs/vendor/bundle/
 # This should be more like examples/**/thirdparty/** but
 # we should fix https://github.com/facebook/esprima/pull/85 first
 examples/
+fixtures/
 # Ignore built files.
 build/
 coverage/

.eslintrc.js

@@ -3,67 +3,50 @@ const WARNING = 1;
 const ERROR = 2;
 
 module.exports = {
-  parser: 'babel-eslint',
-
-  extends: './node_modules/fbjs-scripts/eslint/.eslintrc.js',
+  extends: 'fbjs',
 
   plugins: [
     'react',
     'react-internal',
   ],
 
-  ecmaFeatures: {
-    modules: false
-  },
-
   // We're stricter than the default config, mostly. We'll override a few rules
   // and then enable some React specific ones.
   rules: {
     'accessor-pairs': OFF,
     'brace-style': [ERROR, '1tbs'],
     'comma-dangle': [ERROR, 'always-multiline'],
-    'consistent-return': ERROR,
+    'consistent-return': OFF,
     'dot-location': [ERROR, 'property'],
     'dot-notation': ERROR,
     'eol-last': ERROR,
     'eqeqeq': [ERROR, 'allow-null'],
-    'indent': [ERROR, 2, {SwitchCase: 1}],
+    'indent': OFF, // We use Prettier now
     'jsx-quotes': [ERROR, 'prefer-double'],
+    'keyword-spacing': [ERROR, {after: true, before: true}],
     'no-bitwise': OFF,
+    'no-inner-declarations': [ERROR, 'functions'],
     'no-multi-spaces': ERROR,
     'no-restricted-syntax': [ERROR, 'WithStatement'],
     'no-shadow': ERROR,
     'no-unused-expressions': ERROR,
     'no-unused-vars': [ERROR, {args: 'none'}],
-    'quotes': [ERROR, 'single', 'avoid-escape'],
-    'space-after-keywords': ERROR,
+    'quotes': [ERROR, 'single', {avoidEscape: true, allowTemplateLiterals: true }],
     'space-before-blocks': ERROR,
     'space-before-function-paren': [ERROR, {anonymous: 'never', named: 'never'}],
-    'space-before-keywords': ERROR,
-    'strict': [ERROR, 'global'],
 
     // React & JSX
     // Our transforms set this automatically
-    'react/display-name': OFF,
     'react/jsx-boolean-value': [ERROR, 'always'],
     'react/jsx-no-undef': ERROR,
     // We don't care to do this
     'react/jsx-sort-prop-types': OFF,
-    'react/jsx-sort-props': OFF,
     'react/jsx-uses-react': ERROR,
-    'react/jsx-uses-vars': ERROR,
-    // It's easier to test some things this way
-    'react/no-did-mount-set-state': OFF,
-    'react/no-did-update-set-state': OFF,
-    // We define multiple components in test files
-    'react/no-multi-comp': OFF,
-    'react/no-unknown-property': OFF,
+    'react/no-is-mounted': OFF,
     // This isn't useful in our test code
-    'react/prop-types': OFF,
     'react/react-in-jsx-scope': ERROR,
     'react/self-closing-comp': ERROR,
     // We don't care to do this
-    'react/sort-comp': OFF,
     'react/wrap-multilines': [ERROR, {declaration: false, assignment: false}],
 
     // CUSTOM RULES

.flowconfig

@@ -0,0 +1,43 @@
+[ignore]
+
+<PROJECT_ROOT>/examples/.*
+<PROJECT_ROOT>/fixtures/.*
+<PROJECT_ROOT>/build/.*
+<PROJECT_ROOT>/node_modules/chrome-devtools-frontend/.*
+<PROJECT_ROOT>/.*/node_modules/chrome-devtools-frontend/.*
+<PROJECT_ROOT>/.*/node_modules/y18n/.*
+<PROJECT_ROOT>/.*/__mocks__/.*
+<PROJECT_ROOT>/.*/__tests__/.*
+<PROJECT_ROOT>/addons/.*
+
+# Ignore Docs
+<PROJECT_ROOT>/docs/.*
+<PROJECT_ROOT>/.*/docs/.*
+
+[include]
+
+[libs]
+./node_modules/fbjs/flow/lib/dev.js
+./flow
+
+[options]
+module.system=haste
+
+esproposal.class_static_fields=enable
+esproposal.class_instance_fields=enable
+
+munge_underscores=false
+
+suppress_type=$FlowIssue
+suppress_type=$FlowFixMe
+suppress_type=$FixMe
+suppress_type=$FlowExpectedError
+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-3]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*www[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-3]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*www[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
+suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
+
+[version]
+^0.37.0
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+**Before submitting a pull request,** please make sure the following is done:
+
+1. Fork [the repository](https://github.com/facebook/react) and create your branch from `master`.
+2. If you've added code that should be tested, add tests!
+3. If you've changed APIs, update the documentation.
+4. Ensure the test suite passes (`npm test`).
+5. Make sure your code lints (`npm run lint`).
+6. Format your code with [prettier](https://github.com/prettier/prettier) (`npm run prettier`).
+7. Run the [Flow](https://flowtype.org/) typechecks (`npm run flow`).
+8. If you added or removed any tests, run `./scripts/fiber/record-tests` before submitting the pull request, and commit the resulting changes.
+9. If you haven't already, complete the CLA.

.gitignore

@@ -15,9 +15,15 @@ docs/code
 docs/_site
 docs/.sass-cache
 docs/js/*
-docs/downloads
+docs/downloads/*.zip
 docs/vendor/bundle
+<<<<<<< HEAD
 examples/shared/*.js
+examples/**/bundle.js
+=======
+fixtures/dom/public/react-dom.js
+fixtures/dom/public/react.js
+>>>>>>> 4a37718... Remove examples/ folder (#9323)
 test/the-files-to-test.generated.js
 *.log*
 chrome-user-data

.travis.yml

@@ -1,8 +1,11 @@
 ---
+sudo: required
+dist: trusty
 language: node_js
 node_js:
 - 4
-sudo: false
+rvm:
+- 2.2.3
 cache:
   directories:
   - docs/vendor/bundle
@@ -25,8 +28,8 @@ script:
 
         GH_PAGES_DIR="$TRAVIS_BUILD_DIR"/../react-gh-pages
         echo "machine github.com login reactjs-bot password $GITHUB_TOKEN" >~/.netrc
-        git config --global user.name "Travis CI"
-        git config --global user.email "travis@reactjs.org"
+        git config --global user.name "$GITHUB_USER_NAME"
+        git config --global user.email "$GITHUB_USER_EMAIL"
 
         git clone --branch gh-pages --depth=50 \
           https://reactjs-bot@github.com/facebook/react.git \
@@ -36,7 +39,7 @@ script:
         bundle exec rake release
         cd $GH_PAGES_DIR
         git status
-        if ! git diff-index --quiet HEAD --; then
+        if test -n "$(git status --porcelain)"; then
           git add -A .
           git commit -m "Rebuild website"
           git push origin gh-pages
@@ -58,6 +61,7 @@ script:
           -F "react-dom-server.min=@build/react-dom-server.min.js" \
           -F "npm-react=@build/packages/react.tgz" \
           -F "npm-react-dom=@build/packages/react-dom.tgz" \
+          -F "npm-react-native=@build/packages/react-native-renderer.tgz" \
           -F "commit=$TRAVIS_COMMIT" \
           -F "date=`git log --format='%ct' -1`" \
           -F "pull_request=$TRAVIS_PULL_REQUEST" \
@@ -67,12 +71,40 @@ script:
       fi
     elif [ "$TEST_TYPE" = test ]; then
       set -e
-      ./node_modules/.bin/grunt jest:normal
+      ./node_modules/.bin/grunt jest:coverage
+      cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
+
       echo 'Testing in server-render (HTML generation) mode...'
       printf '\nmodule.exports.useCreateElement = false;\n' \
         >> src/renderers/dom/shared/ReactDOMFeatureFlags.js
       ./node_modules/.bin/grunt jest:normal
       git checkout -- src/renderers/dom/shared/ReactDOMFeatureFlags.js
+
+      echo 'Testing in fiber mode...'
+      printf '\nmodule.exports.useFiber = true;\n' \
+        >> src/renderers/dom/shared/ReactDOMFeatureFlags.js
+      FIBER_TESTS=`\
+        NODE_ENV=test node node_modules/jest/bin/jest --json | \
+        node -e "\
+          var data = JSON.parse(require('fs').readFileSync('/dev/stdin', 'utf8')); \
+          console.log(data.numPassedTests + '/' + data.numTotalTests)\
+        "\
+      `
+      git checkout -- src/renderers/dom/shared/ReactDOMFeatureFlags.js
+      node scripts/facts-tracker/index.js \
+        "fiber-tests" "$FIBER_TESTS"
+
+      ./node_modules/.bin/gulp react:extract-errors
+    elif [ "$TEST_TYPE" = flow ]; then
+      set -e
+      ./node_modules/.bin/grunt flow
+
+      ALL_FILES=`find src -name '*.js' | grep -v umd/ | grep -v __tests__ | grep -v __mocks__`
+      COUNT_ALL_FILES=`echo "$ALL_FILES" | wc -l`
+      COUNT_WITH_FLOW=`grep '@flow' $ALL_FILES | perl -pe 's/:.+//' | wc -l`
+      node scripts/facts-tracker/index.js \
+        "flow-files" "$COUNT_WITH_FLOW/$COUNT_ALL_FILES"
+
     else
       ./node_modules/.bin/grunt $TEST_TYPE
     fi
@@ -81,6 +113,7 @@ env:
   - TEST_TYPE=build
   - TEST_TYPE=test
   - TEST_TYPE=lint
+  - TEST_TYPE=flow
   - TEST_TYPE=build_website
   global:
   # SERVER