Merge pull request #2 from facebook/master

Merge master into branch

.babelrc

@@ -4,6 +4,7 @@
     "transform-flow-strip-types",
     "transform-es2015-destructuring",
     "transform-es2015-parameters",
+    "transform-es2015-spread",
     "transform-async-to-generator",
     "transform-strict-mode",
     ["transform-es2015-modules-commonjs", {"allowTopLevelThis": true}]

.circleci/config.yml

@@ -23,23 +23,23 @@ aliases:
 
   - &deploy
     command: |
-      # Deploy Jest website
-      git config --global user.email "jest[email protected]"
+      # Deploy Jest website using Docusaurus bot
+      git config --global user.email "docusaurus[email protected]"
       git config --global user.name "Website Deployment Script"
-      echo "machine github.com login jest-bot password $GITHUB_TOKEN" > ~/.netrc
+      echo "machine github.com login docusaurus-bot password $DOCUSAURUS_PUBLISH_TOKEN" > ~/.netrc
       # install Docusaurus and generate file of English strings
-      cd website && yarn && yarn run write-translations
+      yarn && cd website && yarn run write-translations
       # crowdin install
       sudo apt-get update
-      sudo apt-get install default-jre
+      sudo apt-get install default-jre rsync
       wget https://artifacts.crowdin.com/repo/deb/crowdin.deb -O crowdin.deb
       sudo dpkg -i crowdin.deb
       sleep 5
       # translations upload/download
       yarn run crowdin-upload
       yarn run crowdin-download
       # build and publish website
-      GIT_USER=jest-bot yarn run publish-gh-pages
+      GIT_USER=docusaurus-bot USE_SSH=false yarn run publish-gh-pages
 
 version: 2
 jobs:
@@ -96,9 +96,7 @@ jobs:
     steps:
       - checkout
       - restore-cache: *restore-cache
-      - run: |
-          cd website
-          yarn --no-progress
+      - run: yarn --no-progress
       - save-cache: *save-cache
       - deploy: *deploy
 

.eslintrc.js

@@ -6,7 +6,7 @@
  */
 
 const path = require('path');
-const customImportResolver = path.resolve('./eslint_import_resolver');
+const customImportResolver = path.resolve('./eslintImportResolver');
 
 module.exports = {
   extends: [
@@ -46,7 +46,7 @@ module.exports = {
       },
     },
     {
-      files: ['scripts/**/*', 'integration_tests/**/*'],
+      files: ['scripts/**/*', 'integration-tests/**/*'],
       rules: {
         'babel/func-params-comma-dangle': 0,
         'unicorn/filename-case': 0,
@@ -83,13 +83,13 @@ module.exports = {
       },
     },
     {
-      excludedFiles: 'integration_tests/__tests__/**/*',
+      excludedFiles: 'integration-tests/__tests__/**/*',
       files: [
         'examples/**/*',
         'scripts/**/*',
-        'integration_tests/*/**/*',
+        'integration-tests/*/**/*',
         'website/*/**/*',
-        'eslint_import_resolver.js',
+        'eslintImportResolver.js',
       ],
       rules: {
         'prettier/prettier': [
@@ -105,7 +105,7 @@ module.exports = {
     },
     {
       files: [
-        'integration_tests/__tests__/**/*',
+        'integration-tests/__tests__/**/*',
         'packages/babel-jest/**/*.test.js',
         'packages/babel-plugin-jest-hoist/**/*.test.js',
         'packages/babel-preset-jest/**/*.test.js',
@@ -127,7 +127,7 @@ module.exports = {
       files: [
         'website/**',
         '**/__tests__/**',
-        'integration_tests/**',
+        'integration-tests/**',
         '**/pretty-format/perf/**',
       ],
       rules: {
@@ -150,8 +150,8 @@ module.exports = {
           '**/__mocks__/**',
           '**/?(*.)(spec|test).js?(x)',
           'scripts/**',
-          'eslint_import_resolver.js',
-          'test_setup_file.js',
+          'eslintImportResolver.js',
+          'testSetupFile.js',
         ],
       },
     ],
@@ -168,7 +168,7 @@ module.exports = {
         trailingComma: 'all',
       },
     ],
-    'unicorn/filename-case': [2, {case: 'snakeCase'}],
+    'unicorn/filename-case': [1, {case: 'snakeCase'}],
   },
   settings: {
     'import/resolver': {

.flowconfig

@@ -1,5 +1,6 @@
 [ignore]
 .*/examples/.*
+.*/node_modules/metro-bundler/.*
 
 [options]
 module.name_mapper='^pretty-format$' -> '<PROJECT_ROOT>/packages/pretty-format/src/index.js'
@@ -9,4 +10,4 @@ include_warnings=true
 emoji=true
 
 [version]
-^0.61.0
+^0.64.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,10 +2,10 @@
 
 <!-- Please remember to update CHANGELOG.md in the root of the project if you have not done so. -->
 
-**Summary**
+## Summary
 
 <!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
 
-**Test plan**
+## Test plan
 
 <!-- Demonstrate the code is solid. Example: The exact commands you ran and their output, screenshots / videos if the pull request changes UI. -->

.gitignore

@@ -4,9 +4,9 @@
 *~
 /examples/*/node_modules/
 
-/integration_tests/*/node_modules
-/integration_tests/transform/*/coverage
-/integration_tests/transform/*/node_modules
+/integration-tests/*/node_modules
+/integration-tests/transform/*/coverage
+/integration-tests/transform/*/node_modules
 
 /node_modules