Skip to content

Commit bf5d709

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix-memory-leak
# Conflicts: # packages/jest-circus/src/state.ts
2 parents 05592c7 + 1853785 commit bf5d709

File tree

513 files changed

+17116
-16375
lines changed

Some content is hidden

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

513 files changed

+17116
-16375
lines changed

.circleci/config.yml

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

1414
orbs:
15-
node: circleci/node@5.2.0
15+
node: circleci/node@7.1.0
1616

1717
jobs:
1818
test-node:
@@ -58,5 +58,5 @@ workflows:
5858
name: test-node-partial-<< matrix.node-version >>
5959
matrix:
6060
parameters:
61-
node-version: ['16', '18', '20', '21']
61+
node-version: ['16', '18', '20', '22', '23']
6262
- test-jest-jasmine

.eslintignore

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

.eslintplugin/index.js

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

.eslintplugin/index.mjs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*/
7+
8+
import {builtinRules} from 'eslint/use-at-your-own-risk';
9+
import typescriptEslint from 'typescript-eslint';
10+
11+
const rules = {
12+
'no-restricted-types-eventually':
13+
typescriptEslint.plugin.rules['no-restricted-types'],
14+
'prefer-rest-params-eventually': builtinRules.get('prefer-rest-params'),
15+
'prefer-spread-eventually': builtinRules.get('prefer-spread'),
16+
};
17+
18+
export default {rules};

0 commit comments

Comments
 (0)