Skip to content

Commit a6156c1

Browse files
authored
Merge branch 'main' into failing-test-not-yet-fulfilled
2 parents e1fa70b + b522b03 commit a6156c1

File tree

2,900 files changed

+141984
-73604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,900 files changed

+141984
-73604
lines changed

.azure-pipelines-steps.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.azure-pipelines.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

.circleci/config.yml

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,63 +12,52 @@ aliases:
1212
app-dir: ~/jest
1313

1414
orbs:
15-
node: circleci/node@4.0.0
15+
node: circleci/node@5.1.0
1616

1717
jobs:
1818
test-node:
1919
parameters:
2020
node-version:
2121
type: string
22-
partial:
23-
type: boolean
24-
default: false
2522
working_directory: ~/jest
2623
executor: node/default
24+
parallelism: 4
2725
steps:
2826
- checkout
2927
- node/install:
3028
node-version: << parameters.node-version >>
31-
install-npm: false
3229
- node/install-packages: *install
33-
- when:
34-
condition: << parameters.partial >>
35-
steps:
36-
- run:
37-
command: yarn test-ci-partial
38-
- unless:
39-
condition: << parameters.partial >>
40-
steps:
41-
- run:
42-
command: yarn test-ci
30+
- run:
31+
command: yarn test-ci-partial --shard=$(expr $CIRCLE_NODE_INDEX + 1)/$CIRCLE_NODE_TOTAL
4332
- store_test_results:
4433
path: reports/junit
4534

4635
test-jest-jasmine:
4736
working_directory: ~/jest
4837
executor: node/default
38+
parallelism: 4
4939
steps:
5040
- checkout
5141
- node/install:
52-
lts: true
53-
install-npm: false
42+
node-version: lts/*
5443
- node/install-packages: *install
5544
- run:
56-
command: JEST_JASMINE=1 yarn test-ci-partial && JEST_JASMINE=1 yarn test-leak
45+
name: Test
46+
command: JEST_JASMINE=1 yarn test-ci-partial --shard=$(expr $CIRCLE_NODE_INDEX + 1)/$CIRCLE_NODE_TOTAL
47+
- run:
48+
name: Leak test
49+
command: JEST_JASMINE=1 yarn test-leak
5750
- store_test_results:
5851
path: reports/junit
5952

6053
# Workflows enables us to run multiple jobs in parallel
6154
workflows:
6255
build-and-deploy:
6356
jobs:
64-
- test-node:
65-
matrix:
66-
parameters:
67-
node-version: ['14']
6857
- test-node:
6958
name: test-node-partial-<< matrix.node-version >>
70-
partial: true
7159
matrix:
7260
parameters:
73-
node-version: ['10', '12', '15', '16']
61+
# For some reason, v20 fails to run yarn install…
62+
node-version: ['14', '16', '18', '19']
7463
- test-jest-jasmine

.codecov.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
codecov:
2+
require_ci_to_pass: false
3+
4+
comment: false
5+
6+
coverage:
7+
status:
8+
patch:
9+
default:
10+
target: auto
11+
project:
12+
default:
13+
target: auto

.eslintignore

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1+
!.*
12
**/coverage/**
23
**/node_modules/**
34
bin/
4-
flow-typed/**
55
packages/*/build/**
6-
packages/jest-diff/src/cleanupSemantic.ts
6+
packages/*/dist/**
77
website/.docusaurus
8-
website/blog
98
website/build
109
website/node_modules
1110
website/i18n/*.js
1211
website/static
13-
!.eslintrc.js
12+
13+
# Third-party script
14+
packages/jest-diff/src/cleanupSemantic.ts
15+
16+
**/.yarn
17+
**/.pnp.*
18+

.eslintplugin/index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
33
*
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
@@ -9,6 +9,10 @@ exports.rules = {
99
'ban-types-eventually': require('@typescript-eslint/eslint-plugin').rules[
1010
'ban-types'
1111
],
12-
'prefer-rest-params-eventually': require('eslint/lib/rules/prefer-rest-params'),
13-
'prefer-spread-eventually': require('eslint/lib/rules/prefer-spread'),
12+
'prefer-rest-params-eventually':
13+
require('eslint/use-at-your-own-risk').builtinRules.get(
14+
'prefer-rest-params',
15+
),
16+
'prefer-spread-eventually':
17+
require('eslint/use-at-your-own-risk').builtinRules.get('prefer-spread'),
1418
};

0 commit comments

Comments
 (0)