Merge branch 'main' into patch

Author: SimenB

.circleci/config.yml

@@ -12,7 +12,7 @@ aliases:
     app-dir: ~/jest
 
 orbs:
-  node: circleci/[email protected].0
+  node: circleci/[email protected].1
 
 jobs:
   test-node:
@@ -58,6 +58,5 @@ workflows:
           name: test-node-partial-<< matrix.node-version >>
           matrix:
             parameters:
-              # For some reason, v20 fails to run yarn install…
-              node-version: ['16', '18']
+              node-version: ['16', '18', '20', '21']
       - test-jest-jasmine

.eslintignore

@@ -12,6 +12,7 @@ website/static
 
 # Third-party script
 packages/jest-diff/src/cleanupSemantic.ts
+e2e/native-esm/wasm-bindgen/index_bg.js
 
 **/.yarn
 **/.pnp.*

.eslintrc.cjs

@@ -33,26 +33,39 @@ module.exports = {
     'plugin:markdown/recommended',
     'plugin:import/errors',
     'plugin:eslint-comments/recommended',
+    'plugin:unicorn/recommended',
+    'plugin:promise/recommended',
     'plugin:prettier/recommended',
   ],
   globals: {
     console: 'readonly',
   },
   overrides: [
     {
-      extends: ['plugin:@typescript-eslint/strict', 'plugin:import/typescript'],
+      extends: [
+        'plugin:@typescript-eslint/eslint-recommended',
+        'plugin:@typescript-eslint/strict',
+        'plugin:@typescript-eslint/stylistic',
+        'plugin:import/typescript',
+      ],
       files: ['*.ts', '*.tsx'],
       plugins: ['@typescript-eslint/eslint-plugin', 'local'],
       rules: {
         '@typescript-eslint/array-type': ['error', {default: 'generic'}],
         '@typescript-eslint/ban-types': 'error',
+        '@typescript-eslint/consistent-type-imports': [
+          'error',
+          {fixStyle: 'inline-type-imports', disallowTypeAnnotations: false},
+        ],
+        '@typescript-eslint/no-import-type-side-effects': 'error',
         '@typescript-eslint/no-inferrable-types': 'error',
         '@typescript-eslint/no-unused-vars': [
           'error',
           {argsIgnorePattern: '^_'},
         ],
         '@typescript-eslint/prefer-ts-expect-error': 'error',
         '@typescript-eslint/no-var-requires': 'off',
+        '@typescript-eslint/consistent-indexed-object-style': 'off',
         // TS verifies these
         'consistent-return': 'off',
         'no-dupe-class-members': 'off',
@@ -62,24 +75,14 @@ module.exports = {
         '@typescript-eslint/no-explicit-any': 'off',
         '@typescript-eslint/no-non-null-assertion': 'off',
         '@typescript-eslint/no-invalid-void-type': 'off',
-
-        // TODO: part of "stylistic" rules, remove explicit activation when that lands
-        '@typescript-eslint/no-empty-function': 'error',
-        '@typescript-eslint/no-empty-interface': 'error',
+        '@typescript-eslint/consistent-type-definitions': 'off',
 
         // not needed to be enforced for TS
         'import/namespace': 'off',
       },
     },
     {
       files: [
-        'packages/jest-jasmine2/src/jasmine/Env.ts',
-        'packages/jest-jasmine2/src/jasmine/ReportDispatcher.ts',
-        'packages/jest-jasmine2/src/jasmine/Spec.ts',
-        'packages/jest-jasmine2/src/jasmine/SpyStrategy.ts',
-        'packages/jest-jasmine2/src/jasmine/Suite.ts',
-        'packages/jest-jasmine2/src/jasmine/createSpy.ts',
-        'packages/jest-jasmine2/src/jasmine/jasmineLight.ts',
         'packages/jest-mock/src/__tests__/index.test.ts',
         'packages/jest-mock/src/index.ts',
         'packages/pretty-format/src/__tests__/Immutable.test.ts',
@@ -94,13 +97,7 @@ module.exports = {
       files: [
         'packages/expect/src/index.ts',
         'packages/jest-fake-timers/src/legacyFakeTimers.ts',
-        'packages/jest-jasmine2/src/jasmine/Env.ts',
-        'packages/jest-jasmine2/src/jasmine/ReportDispatcher.ts',
-        'packages/jest-jasmine2/src/jasmine/Spec.ts',
-        'packages/jest-jasmine2/src/jasmine/Suite.ts',
-        'packages/jest-jasmine2/src/jasmine/jasmineLight.ts',
         'packages/jest-jasmine2/src/jestExpect.ts',
-        'packages/jest-resolve/src/resolver.ts',
       ],
       rules: {
         'local/prefer-spread-eventually': 'warn',
@@ -117,8 +114,6 @@ module.exports = {
         'packages/expect-utils/src/utils.ts',
         'packages/jest-core/src/collectHandles.ts',
         'packages/jest-core/src/plugins/UpdateSnapshotsInteractive.ts',
-        'packages/jest-jasmine2/src/jasmine/SpyStrategy.ts',
-        'packages/jest-jasmine2/src/jasmine/Suite.ts',
         'packages/jest-leak-detector/src/index.ts',
         'packages/jest-matcher-utils/src/index.ts',
         'packages/jest-mock/src/__tests__/index.test.ts',
@@ -151,6 +146,13 @@ module.exports = {
         ],
       },
     },
+    {
+      files: 'e2e/coverage-remapping/covered.ts',
+      rules: {
+        'no-constant-binary-expression': 'off',
+        'no-constant-condition': 'off',
+      },
+    },
 
     // 'eslint-plugin-jest' rules for test and test related files
     {
@@ -213,9 +215,15 @@ module.exports = {
         'jest/no-focused-tests': 'off',
         'jest/require-to-throw-message': 'off',
         'no-console': 'off',
+        'no-constant-condition': 'off',
         'no-undef': 'off',
         'no-unused-vars': 'off',
         'sort-keys': 'off',
+        'unicorn/consistent-function-scoping': 'off',
+        'unicorn/error-message': 'off',
+        'unicorn/no-await-expression-member': 'off',
+        'unicorn/no-static-only-class': 'off',
+        'unicorn/prefer-number-properties': 'off',
       },
     },
     // demonstration of matchers usage
@@ -278,6 +286,16 @@ module.exports = {
         'no-restricted-imports': 'off',
       },
     },
+    {
+      files: ['examples/angular/**/*'],
+      rules: {
+        // Angular DI for some reason doesn't work with type imports
+        '@typescript-eslint/consistent-type-imports': [
+          'error',
+          {prefer: 'no-type-imports', disallowTypeAnnotations: false},
+        ],
+      },
+    },
     {
       files: 'packages/**/*.ts',
       rules: {
@@ -301,6 +319,7 @@ module.exports = {
       rules: {
         '@typescript-eslint/ban-ts-comment': 'off',
         '@typescript-eslint/no-empty-function': 'off',
+        '@typescript-eslint/class-literal-property-style': 'off',
       },
     },
     {
@@ -313,6 +332,9 @@ module.exports = {
       ],
       rules: {
         '@typescript-eslint/explicit-module-boundary-types': 'off',
+        'unicorn/consistent-function-scoping': 'off',
+        'unicorn/no-await-expression-member': 'off',
+        'unicorn/prefer-spread': 'off',
       },
     },
     {
@@ -321,8 +343,12 @@ module.exports = {
         'packages/expect-utils/src/jasmineUtils.ts',
       ],
       rules: {
+        '@typescript-eslint/ban-types': 'off',
         'eslint-comments/disable-enable-pair': 'off',
         'eslint-comments/no-unlimited-disable': 'off',
+        'prefer-rest-params': 'off',
+        'prefer-spread': 'off',
+        'sort-keys ': 'off',
       },
     },
     {
@@ -342,11 +368,13 @@ module.exports = {
         'website/**',
         '**/__benchmarks__/**',
         '**/__tests__/**',
-        'packages/jest-types/**/*',
+        '**/__typetests__/**',
         '.eslintplugin/**',
       ],
       rules: {
         'import/no-extraneous-dependencies': 'off',
+        'unicorn/consistent-function-scoping': 'off',
+        'unicorn/error-message': 'off',
       },
     },
     {
@@ -389,12 +417,43 @@ module.exports = {
         'no-unused-vars': 'off',
       },
     },
+    {
+      files: 'packages/jest-mock/src/__tests__/**/*',
+      rules: {
+        'unicorn/no-static-only-class': 'off',
+      },
+    },
+    {
+      files: '**/*.mjs',
+      rules: {
+        'unicorn/prefer-top-level-await': 'error',
+      },
+    },
+    {
+      files: [
+        'e2e/coverage-report/__mocks__/sumDependency.js',
+        'e2e/require-main-after-create-require/empty.js',
+        'packages/create-jest/src/__tests__/__fixtures__/**/*',
+        'packages/jest-core/src/__tests__/**/*',
+        'packages/jest-haste-map/src/__tests__/test_dotfiles_root/**/*',
+        'packages/jest-resolve/src/__mocks__/**/*',
+      ],
+      rules: {
+        'unicorn/no-empty-file': 'off',
+      },
+    },
+    {
+      files: 'packages/expect/src/__tests__/*.test.js',
+      rules: {
+        'unicorn/prefer-number-properties': 'off',
+      },
+    },
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
     sourceType: 'module',
   },
-  plugins: ['import', 'jsdoc', 'unicorn'],
+  plugins: ['import', 'jsdoc'],
   rules: {
     'accessor-pairs': ['warn', {setWithoutGet: true}],
     'block-scoped-var': 'off',
@@ -416,6 +475,7 @@ module.exports = {
     'handle-callback-err': 'off',
     'id-length': 'off',
     'id-match': 'off',
+    'import/no-duplicates': 'error',
     'import/no-extraneous-dependencies': [
       'error',
       {
@@ -473,7 +533,8 @@ module.exports = {
       {allow: ['warn', 'error', 'time', 'timeEnd', 'timeStamp']},
     ],
     'no-const-assign': 'error',
-    'no-constant-condition': 'off',
+    'no-constant-condition': 'error',
+    'no-constant-binary-expression': 'error',
     'no-continue': 'off',
     'no-control-regex': 'off',
     'no-debugger': 'error',
@@ -515,9 +576,7 @@ module.exports = {
     'no-multi-str': 'error',
     'no-multiple-empty-lines': 'off',
     'no-native-reassign': ['error', {exceptions: ['Map', 'Set']}],
-    'no-negated-condition': 'off',
     'no-negated-in-lhs': 'error',
-    'no-nested-ternary': 'off',
     'no-new': 'warn',
     'no-new-func': 'error',
     'no-new-object': 'warn',
@@ -579,6 +638,11 @@ module.exports = {
     'prefer-arrow-callback': ['error', {allowNamedFunctions: true}],
     'prefer-const': 'error',
     'prefer-template': 'error',
+
+    'promise/always-return': 'off',
+    'promise/catch-or-return': 'off',
+    'promise/no-callback-in-promise': 'off',
+
     quotes: [
       'error',
       'single',
@@ -600,13 +664,43 @@ module.exports = {
     'wrap-regex': 'off',
     yoda: 'off',
 
-    'unicorn/explicit-length-check': 'error',
-    'unicorn/no-array-for-each': 'error',
-    'unicorn/no-negated-condition': 'error',
-    'unicorn/numeric-separators-style': 'error',
-    'unicorn/prefer-default-parameters': 'error',
-    'unicorn/prefer-includes': 'error',
-    'unicorn/template-indent': 'error',
+    // doesn't work without ESModuleInterop
+    'unicorn/import-style': 'off',
+    // we're a CJS project
+    'unicorn/prefer-module': 'off',
+
+    // enforced by `@typescript-eslint/no-this-alias` already
+    'unicorn/no-this-assignment': 'off',
+
+    // Not an issue with TypeScript
+    'unicorn/no-array-callback-reference': 'off',
+
+    // reduce is fine
+    'unicorn/no-array-reduce': 'off',
+
+    // this is very aggressive (600+ files changed). might make sense to apply bit by bit over time?
+    'unicorn/prevent-abbreviations': 'off',
+
+    // nah
+    'unicorn/consistent-destructuring': 'off',
+    'unicorn/no-lonely-if': 'off',
+    'unicorn/no-null': 'off',
+    'unicorn/no-process-exit': 'off',
+    'unicorn/no-useless-undefined': 'off',
+    'unicorn/prefer-event-target': 'off',
+    'unicorn/prefer-switch': 'off',
+    'unicorn/prefer-ternary': 'off',
+    'unicorn/prefer-top-level-await': 'off',
+    'unicorn/switch-case-braces': 'off',
+
+    // TODO: decide whether or not we want these
+    'unicorn/filename-case': 'off',
+    'unicorn/prefer-reflect-apply': 'off',
+
+    // enabling this is blocked by https://github.com/microsoft/rushstack/issues/2780
+    'unicorn/prefer-export-from': 'off',
+    // enabling this is blocked by https://github.com/jestjs/jest/pull/14297
+    'unicorn/prefer-node-protocol': 'off',
   },
   settings: {
     'import/ignore': ['react-native'],

.github/renovate.json

@@ -12,6 +12,10 @@
     {
       "matchPackageNames": ["jest-runner-tsd", "tsd-lite"],
       "groupName": "tsd"
+    },
+    {
+      "matchPackageNames": ["@lerna-lite/cli", "@lerna-lite/publish"],
+      "groupName": "lerna-lite"
     }
   ]
 }

.github/workflows/close-stale.yml

@@ -12,7 +12,7 @@ jobs:
     name: 'Close month old issues and PRs'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           start-date: '2022-01-01T00:00:00Z'
           stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
@@ -32,7 +32,7 @@ jobs:
     name: 'Close year old issues and PRs'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           stale-issue-message: 'This issue is stale because it has been open for 1 year with no activity. Remove stale label or comment or this will be closed in 30 days.'
           stale-pr-message: 'This PR is stale because it has been open 1 year with no activity. Remove stale label or comment or this will be closed in 30 days.'

.github/workflows/lock.yml

@@ -4,18 +4,23 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+concurrency:
+  group: lock-threads
+
 permissions: {}
 jobs:
   lock:
     permissions:
       issues: write # to lock issues (dessant/lock-threads)
       pull-requests: write # to lock PRs (dessant/lock-threads)
+      discussions: write # to lock discussions (dessant/lock-threads)
 
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v5
         with:
           github-token: ${{ github.token }}
+          process-only: 'issues, prs'
           issue-inactive-days: '30'
           exclude-any-issue-labels: 'Discussion'
           issue-comment: >