Merge branch 'master' into docs/dontThrow

Author: eps1lon

.circleci/config.yml

@@ -1,3 +1,5 @@
+version: 2.1
+
 aliases:
   - &filter-ignore-gh-pages
     branches:
@@ -11,19 +13,33 @@ aliases:
 
 orbs:
   node: circleci/node@4.0.0
-version: 2.1
+
 jobs:
-  test-node-10:
+  test-node:
+    parameters:
+      node-version:
+        type: string
+      partial:
+        type: boolean
+        default: false
     working_directory: ~/jest
     executor: node/default
     steps:
       - checkout
       - node/install:
-          node-version: '10'
+          node-version: << parameters.node-version >>
           install-npm: false
       - node/install-packages: *install
-      - run:
-          command: yarn test-ci-partial
+      - when:
+          condition: << parameters.partial >>
+          steps:
+            - run:
+                command: yarn test-ci-partial
+      - unless:
+          condition: << parameters.partial >>
+          steps:
+            - run:
+                command: yarn test-ci
       - store_test_results:
           path: reports/junit
 
@@ -41,71 +57,18 @@ jobs:
       - store_test_results:
           path: reports/junit
 
-  test-node-12:
-    working_directory: ~/jest
-    executor: node/default
-    steps:
-      - checkout
-      - node/install:
-          node-version: '12'
-          install-npm: false
-      - node/install-packages: *install
-      - run:
-          command: yarn test-ci-partial
-      - store_test_results:
-          path: reports/junit
-
-  test-node-14:
-    working_directory: ~/jest
-    executor: node/default
-    steps:
-      - checkout
-      - node/install:
-          node-version: '14'
-          install-npm: false
-      - node/install-packages: *install
-      - run:
-          command: yarn test-ci
-      - store_test_results:
-          path: reports/junit
-
-  test-node-15:
-    working_directory: ~/jest
-    executor: node/default
-    steps:
-      - checkout
-      - node/install:
-          node-version: '15'
-          install-npm: false
-      - node/install-packages: *install
-      - run:
-          command: yarn test-ci-partial
-      - store_test_results:
-          path: reports/junit
-
-  test-or-deploy-website:
-    working_directory: ~/jest
-    executor: node/default
-    resource_class: large
-    steps:
-      - checkout
-      - node/install:
-          lts: true
-          install-npm: false
-      - node/install-packages: *install
-      - run:
-          name: Test or Deploy Jest Website
-          command: ./.circleci/website.sh
-
 # Workflows enables us to run multiple jobs in parallel
 workflows:
-  version: 2
   build-and-deploy:
     jobs:
-      - test-node-10
-      - test-node-12
-      - test-node-14
-      - test-node-15 # current
+      - test-node:
+          matrix:
+            parameters:
+              node-version: ['14']
+      - test-node:
+          name: test-node-partial-<< matrix.node-version >>
+          partial: true
+          matrix:
+            parameters:
+              node-version: ['10', '12', '15', '16']
       - test-jest-jasmine
-      - test-or-deploy-website:
-          filters: *filter-ignore-gh-pages

.circleci/website.sh

@@ -4,10 +4,10 @@ bin/
 flow-typed/**
 packages/*/build/**
 packages/jest-diff/src/cleanupSemantic.ts
+website/.docusaurus
 website/blog
 website/build
 website/node_modules
 website/i18n/*.js
-website/translated_docs
 website/static
 !.eslintrc.js

.eslintignore

@@ -23,15 +23,14 @@ module.exports = {
   },
   extends: [
     'plugin:import/errors',
-    'prettier',
     'plugin:eslint-comments/recommended',
+    'plugin:prettier/recommended',
   ],
   overrides: [
     {
       extends: [
         'plugin:@typescript-eslint/eslint-recommended',
         'plugin:import/typescript',
-        'prettier/@typescript-eslint',
       ],
       files: ['*.ts', '*.tsx'],
       plugins: ['@typescript-eslint/eslint-plugin', 'local'],
@@ -153,6 +152,14 @@ module.exports = {
         'sort-keys': 'off',
       },
     },
+    {
+      files: ['website/**/*'],
+      rules: {
+        'import/order': 'off',
+        'import/sort-keys': 'off',
+        'sort-keys': 'off',
+      },
+    },
     {
       files: ['examples/**/*'],
       rules: {
@@ -258,7 +265,7 @@ module.exports = {
   parserOptions: {
     sourceType: 'module',
   },
-  plugins: ['markdown', 'import', 'jest', 'prettier'],
+  plugins: ['markdown', 'import', 'jest'],
   rules: {
     'accessor-pairs': ['warn', {setWithoutGet: true}],
     'block-scoped-var': 'off',
@@ -442,7 +449,6 @@ module.exports = {
     'prefer-arrow-callback': ['error', {allowNamedFunctions: true}],
     'prefer-const': 'error',
     'prefer-template': 'off',
-    'prettier/prettier': 'error',
     quotes: [
       'error',
       'single',

.eslintrc.js

@@ -12,6 +12,6 @@ about: If you have questions, please check Reactiflux or StackOverflow
 
 For questions or help please see:
 
-- [The Jest help page](https://jestjs.io/en/help.html)
+- [The Jest help page](https://jestjs.io/help)
 - [Our `#testing` channel in Reactiflux](https://discord.gg/j6FKKQQrW9)
 - The [jestjs](https://stackoverflow.com/questions/tagged/jestjs) tag on [StackOverflow](https://stackoverflow.com/questions/ask)

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,27 @@
+name: 'Lock Threads'
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2.0.3
+        with:
+          github-token: ${{ github.token }}
+          issue-lock-inactive-days: '30'
+          issue-exclude-labels: 'Discussion'
+          issue-lock-comment: >
+            This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.
+            
+            Please note this issue tracker is not a help forum. We recommend using [StackOverflow](https://stackoverflow.com/questions/tagged/jestjs) or our [discord channel](https://discord.gg/j6FKKQQrW9) for questions.
+
+
+          pr-lock-inactive-days: '30'
+          pr-lock-comment: >
+            This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.
+            
+            Please note this issue tracker is not a help forum. We recommend using [StackOverflow](https://stackoverflow.com/questions/tagged/jestjs) or our [discord channel](https://discord.gg/j6FKKQQrW9) for questions.
+

.github/workflows/lock.yml

@@ -22,17 +22,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
-      - uses: actions/setup-node@v2.1.4
+      - uses: actions/setup-node@v2.1.5
         with:
           node-version: 14.x
 
       - name: Get yarn cache
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v2.1.5
         with:
           path: ${{ steps.yarn-cache.outputs.dir }}
           key: yarn2-${{ hashFiles('yarn.lock') }}
@@ -53,14 +53,14 @@ jobs:
     needs: prepare-yarn-cache
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2.1.4
+      - uses: actions/checkout@v2.3.4
+      - uses: actions/setup-node@v2.1.5
         with:
           node-version: 12.x
       - name: Get yarn cache
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v2.1.5
         with:
           path: ${{ steps.yarn-cache.outputs.dir }}
           key: yarn2-${{ hashFiles('yarn.lock') }}
@@ -85,7 +85,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [10.x, 12.x, 14.x, 15.x]
+        node-version: [10.x, 12.x, 14.x, 15.x, 16.x]
         os: [ubuntu-latest, macOS-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     needs: prepare-yarn-cache
@@ -97,15 +97,15 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.symlinks true
         if: runner.os == 'Windows'
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2.1.4
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: ${{ matrix.node-version }}
       - name: Get yarn cache
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v2.1.5
         with:
           path: ${{ steps.yarn-cache.outputs.dir }}
           key: yarn2-${{ hashFiles('yarn.lock') }}
@@ -137,15 +137,15 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.symlinks true
         if: runner.os == 'Windows'
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.1.4
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: 14.x
       - name: Get yarn cache
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v2.1.5
         with:
           path: ${{ steps.yarn-cache.outputs.dir }}
           key: yarn2-${{ hashFiles('yarn.lock') }}

.github/workflows/nodejs.yml

@@ -20,13 +20,15 @@
 /packages/*/coverage/
 /packages/*/node_modules/
 
+/website/.docusaurus
 /website/build
 /website/backers.json
 /website/node_modules
 /website/yarn.lock
-/website/translated_docs
 /website/i18n/*
 
+/benchmarks/*/node_modules/
+
 /reports/*
 
 coverage
@@ -46,3 +48,5 @@ package-lock.json
 !**/.yarn/sdks
 !**/.yarn/versions
 **/.pnp.*
+
+crowdin-cli.jar

.gitignore

@@ -6,4 +6,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-2.4.0.cjs
+yarnPath: .yarn/releases/yarn-2.4.1.cjs