Merge branch 'master' into crawl-symlinks

.azure-pipelines-steps.yml

@@ -6,11 +6,11 @@ steps:
   - checkout: self
     path: jest
 
-  # Ensure Node.js 12 is active
+  # Ensure Node.js 14 is active
   - task: NodeTool@0
     inputs:
-      versionSpec: '12.x'
-    displayName: 'Use Node.js 12'
+      versionSpec: '14.x'
+    displayName: 'Use Node.js 14'
 
   # Ensure Python 2.7 is active
   - task: UsePythonVersion@0
@@ -27,7 +27,7 @@ steps:
       path: $(yarnCache.folder)
     displayName: Cache Yarn packages
 
-  - script: yarn install
+  - script: yarn install --immutable
     displayName: 'Install dependencies'
 
   - script: yarn build:js

.circleci/config.yml

@@ -4,7 +4,7 @@ aliases:
       ignore: gh-pages
   - &install
     pkg-manager: yarn
-    override-ci-command: yarn install && yarn build:js
+    override-ci-command: yarn install --immutable && yarn build:js
     cache-path: ~/.yarn/berry/cache
     include-branch-in-cache-key: false
     app-dir: ~/jest
@@ -27,7 +27,7 @@ jobs:
       - store_test_results:
           path: reports/junit
 
-  test-jest-circus:
+  test-jest-jasmine:
     working_directory: ~/jest
     executor: node/default
     steps:
@@ -37,7 +37,7 @@ jobs:
           install-npm: false
       - node/install-packages: *install
       - run:
-          command: JEST_CIRCUS=1 yarn test-ci-partial && JEST_CIRCUS=1 yarn test-leak
+          command: JEST_JASMINE=1 yarn test-ci-partial && JEST_JASMINE=1 yarn test-leak
       - store_test_results:
           path: reports/junit
 
@@ -50,20 +50,6 @@ jobs:
           node-version: '12'
           install-npm: false
       - node/install-packages: *install
-      - run:
-          command: yarn test-ci
-      - store_test_results:
-          path: reports/junit
-
-  test-node-13:
-    working_directory: ~/jest
-    executor: node/default
-    steps:
-      - checkout
-      - node/install:
-          node-version: '13'
-          install-npm: false
-      - node/install-packages: *install
       - run:
           command: yarn test-ci-partial
       - store_test_results:
@@ -79,7 +65,7 @@ jobs:
           install-npm: false
       - node/install-packages: *install
       - run:
-          command: yarn test-ci-partial
+          command: yarn test-ci
       - store_test_results:
           path: reports/junit
 
@@ -97,30 +83,13 @@ jobs:
       - 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-13
       - test-node-14
       - test-node-15 # current
-      - test-jest-circus
-      - test-or-deploy-website:
-          filters: *filter-ignore-gh-pages
+      - test-jest-jasmine

.eslintignore

@@ -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