Merge branch 'master' into outputFile_use_stream

.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:
@@ -50,10 +50,23 @@ jobs:
     steps:
       - checkout
       - restore-cache: *restore-cache
+      - run: |
+          apt-get update && apt-get install make g++ -y
       - *yarn-install-no-sudo
       - save-cache: *save-cache
       - run: yarn run test-ci-es5-build-in-browser
 
+  test-node-9:
+    working_directory: ~/jest
+    docker:
+      - image: circleci/node:9
+    steps:
+      - checkout
+      - restore-cache: *restore-cache
+      - run: yarn --no-progress
+      - save-cache: *save-cache
+      - run: yarn run test-ci-partial
+
   test-node-8:
     working_directory: ~/jest
     docker:
@@ -63,7 +76,7 @@ jobs:
       - restore-cache: *restore-cache
       - run: yarn --no-progress
       - save-cache: *save-cache
-      - run: yarn run test-ci-partial
+      - run: yarn run test-ci
 
   test-node-6:
     working_directory: ~/jest
@@ -74,7 +87,7 @@ jobs:
       - restore-cache: *restore-cache
       - *yarn-install
       - save-cache: *save-cache
-      - run: yarn run test-ci
+      - run: yarn run test-ci-partial
 
   test-and-deploy-website:
     working_directory: ~/jest
@@ -83,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
 
@@ -96,5 +107,6 @@ workflows:
     jobs:
       - test-node-8
       - test-node-6
+      - test-node-9
       - test-browser
       - test-and-deploy-website

.eslintrc.js

@@ -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,11 +83,11 @@ module.exports = {
       },
     },
     {
-      excludedFiles: 'integration_tests/__tests__/**/*',
+      excludedFiles: 'integration-tests/__tests__/**/*',
       files: [
         'examples/**/*',
         'scripts/**/*',
-        'integration_tests/*/**/*',
+        'integration-tests/*/**/*',
         'website/*/**/*',
         'eslint_import_resolver.js',
       ],
@@ -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: {

.flowconfig

@@ -1,12 +1,6 @@
 [ignore]
-.*/node_modules/conventional-changelog-core/.*
-.*/node_modules/fbjs/.*
-.*/node_modules/jest-validate/.*
-.*/node_modules/react-native/.*
-.*/node_modules/graphql/.*
-.*/vendor/jsonlint/.*
 .*/examples/.*
-.*/website/.*
+.*/node_modules/metro-bundler/.*
 
 [options]
 module.name_mapper='^pretty-format$' -> '<PROJECT_ROOT>/packages/pretty-format/src/index.js'
@@ -16,4 +10,4 @@ include_warnings=true
 emoji=true
 
 [version]
-^0.58.0
+^0.64.0

.github/ISSUE_TEMPLATE.md

@@ -3,19 +3,23 @@ THIS IS NOT A HELP FORUM.
 If you are experiencing problems with setting up Jest, please make sure to visit our Help page: 
 https://facebook.github.io/jest/help.html
 -->
+
 <!-- 
 Before creating an issue please check the following:
 * you are using the latest version of Jest
 * try re-installing your node_modules folder 
 * run Jest once with `--no-cache` to see if that fixes the problem you are experiencing. 
 -->
 
-**Do you want to request a *feature* or report a *bug*?**
+**Do you want to request a _feature_ or report a _bug_?**
 
 **What is the current behavior?**
 
-**If the current behavior is a bug, please provide the steps to reproduce and either a repl.it demo through https://repl.it/languages/jest or a minimal repository on GitHub that we can `yarn install` and `yarn test`.**
+**If the current behavior is a bug, please provide the steps to reproduce and
+either a repl.it demo through https://repl.it/languages/jest or a minimal
+repository on GitHub that we can `yarn install` and `yarn test`.**
 
 **What is the expected behavior?**
 
-**Please provide your exact Jest configuration and mention your Jest, node, yarn/npm version and operating system.**
+**Please provide your exact Jest configuration and mention your Jest, node,
+yarn/npm version and operating system.**

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,11 @@
 <!-- Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. The two fields below are mandatory. -->
+
 <!-- 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. -->

.github/SUPPORT.md

@@ -0,0 +1,3 @@
+Please note this issue tracker is not a help forum. We recommend using
+[StackOverflow](https://stackoverflow.com/questions/tagged/jest) or our
+[discord channel](http://facebook.github.io/jest/en/help.html) for questions.

.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
 

.vscode/settings.json

@@ -9,10 +9,5 @@
   "flow.useNPMPackagedFlow": true,
   "javascript.validate.enable": false,
   "jest.pathToJest": "yarn jest --",
-  "prettier.eslintIntegration": true,
-  "prettier.parser": "flow",
-  "prettier.printWidth": 80,
-  "prettier.semi": true,
-  "prettier.singleQuote": true,
-  "prettier.trailingComma": "all"
+  "prettier.eslintIntegration": true
 }