chore(deps): update eslint to v10, unicorn to v68, switch to eslint-plugin-import-x

The eslint 9->10 and unicorn 65->68 bumps turn on a large set of new recommended
rules. The newly-firing ones are deactivated in the config with per-rule counts,
grouped by intent (autofixable follow-up, needs-audit, never-activate), so this
bump stays free of production source churn; enabling them is left to follow-ups.

Some deactivated rules may surface real bugs (unicorn/no-duplicate-logical-operands,
no-duplicate-if-branches, no-loop-iterable-mutation, and the core no-unassigned-vars);
their config comments flag them for a focused audit.

Changes the bump requires directly:

1. Port the repo's custom eslint rules to the v10 context API; context.getSourceCode()
   was removed in favour of context.sourceCode.
2. eslint 10 drops Node.js 18, so .nvmrc moves to 22.
3. Rename getRunInChildContextSubtype and drop an unnecessary String.raw to satisfy
   the two rules kept on (consistent-compound-words, prefer-string-raw).
4. Remove stale unicorn/no-array-for-each disable directives; the rule was renamed to
   no-for-each, which is deactivated here.

Author: BridgeAR

.nvmrc

@@ -1 +1 @@
-18
+22

eslint-rules/eslint-prefer-assert-match.mjs

@@ -47,7 +47,7 @@ export default {
   },
 
   create (context) {
-    const sourceCode = context.getSourceCode()
+    const sourceCode = context.sourceCode
 
     return {
       CallExpression (node) {

eslint-rules/eslint-require-boolean-assert-message.mjs

@@ -106,7 +106,7 @@ export default {
 
         if (isTrivialExpression(firstArg)) return
 
-        const sourceCode = context.getSourceCode()
+        const sourceCode = context.sourceCode
         const fixMessage = buildAutofixMessage(firstArg, sourceCode)
 
         context.report({

eslint-rules/eslint-safe-typeof-object.mjs

@@ -23,7 +23,7 @@ export default {
         ) {
           // Get the expression being checked (x or x.y)
           const targetNode = node.left.argument
-          const targetExpression = context.getSourceCode().getText(targetNode)
+          const targetExpression = context.sourceCode.getText(targetNode)
 
           const hasNullCheck = isGuardedInLogicalExpression(node, targetNode) ||
             isGuardedInConditionalExpression(node, targetNode) ||
@@ -384,7 +384,7 @@ function isGuardedByIfStatement (node, targetNode) {
 }
 
 function walkAst (context, node, visitor) {
-  const visitorKeys = context.getSourceCode().visitorKeys
+  const visitorKeys = context.sourceCode.visitorKeys
 
   /** @type {unknown[]} */
   const stack = [node]

eslint.config.mjs

@@ -6,7 +6,7 @@ import { readFileSync } from 'fs'
 import eslintPluginJs from '@eslint/js'
 import eslintPluginStylistic from '@stylistic/eslint-plugin'
 import eslintPluginCypress from 'eslint-plugin-cypress'
-import eslintPluginImport from 'eslint-plugin-import'
+import eslintPluginImport from 'eslint-plugin-import-x'
 import eslintPluginJSDoc from 'eslint-plugin-jsdoc'
 import eslintPluginMocha from 'eslint-plugin-mocha'
 import eslintPluginN from 'eslint-plugin-n'
@@ -265,7 +265,7 @@ export default [
       'import/no-self-import': 'error',
       'import/order': ['error', {
         // `dd-trace` must be allowed first (and is often intentionally required before any other module).
-        // eslint-plugin-import defaults can exclude some import types (notably `builtin`) from `pathGroups`,
+        // eslint-plugin-import-x defaults can exclude some import types (notably `builtin`) from `pathGroups`,
         // which would make the `dd-trace` exception below a no-op. Make this explicit.
         pathGroupsExcludedImportTypes: [],
         pathGroups: [
@@ -324,6 +324,9 @@ export default [
       'no-sequences': 'error',
       'no-template-curly-in-string': 'error',
       'no-throw-literal': 'error',
+      // Surfaces pre-existing latent bugs (always-undefined vars in tests/intake helpers)
+      // unrelated to this tooling bump; worth a focused follow-up.
+      'no-unassigned-vars': 'off',
       'no-undef-init': 'error',
       'no-unmodified-loop-condition': 'error',
       'no-unneeded-ternary': ['error', { defaultAssignment: false }],
@@ -353,6 +356,8 @@ export default [
       'prefer-const': ['error', { destructuring: 'all' }],
       'prefer-promise-reject-errors': 'error',
       'prefer-regex-literals': ['error', { disallowRedundantWrapping: true }],
+      // Newly enabled by the ESLint 10 bump; deferred with no-unassigned-vars above.
+      'preserve-caught-error': 'off',
       'promise/param-names': 'error',
       'symbol-description': 'error',
       'unicode-bom': ['error', 'never'],
@@ -580,42 +585,120 @@ export default [
 
       ...eslintPluginUnicorn.configs.recommended.rules,
 
-      // Overriding recommended unicorn rules
+      // Overriding recommended unicorn rules.
+      // Rules not listed here are left at the `recommended` default. The v65→v68 bump
+      // turned ~130 rules on in `recommended`; the entries below are the ones that fire
+      // on our source and are intentionally kept off (counts are from the v68 run).
       'unicorn/catch-error-name': ['off', { name: 'err' }], // Many errors
       'unicorn/expiring-todo-comments': 'off',
-      'unicorn/filename-case': ['off', { case: 'kebabCase' }], // // Many errors
+      'unicorn/filename-case': ['off', { case: 'kebabCase' }], // Many errors
+      'unicorn/name-replacements': 'off', // Many errors | naming churn (split out of prevent-abbreviations)
       'unicorn/prevent-abbreviations': 'off', // Many errors
 
       // These rules require a newer Node.js version than we support
       'unicorn/no-array-reverse': 'off', // Node.js 20
       'unicorn/no-array-sort': 'off', // Node.js 20
+      'unicorn/prefer-dispose': 'off', // Explicit resource management (newer Node.js)
+      'unicorn/prefer-iterator-to-array': 'off', // Iterator helpers (Node.js 22)
+      'unicorn/prefer-iterator-to-array-at-end': 'off', // Iterator helpers (Node.js 22)
+      'unicorn/prefer-promise-with-resolvers': 'off', // 6 errors | Promise.withResolvers (Node.js 22)
+      'unicorn/prefer-temporal': 'off', // Temporal is not stable on supported Node.js
+      'unicorn/prefer-uint8array-base64': 'off', // Uint8Array base64 (Node.js 22)
 
-      // These rules could potentially evaluated again at a much later point
+      // These rules could potentially be evaluated again at a much later point
+      'unicorn/class-reference-in-static-methods': 'off', // 6 errors
+      'unicorn/consistent-class-member-order': 'off', // 55 errors | ordering churn
+      'unicorn/consistent-conditional-object-spread': 'off', // 3 errors
+      'unicorn/consistent-optional-chaining': 'off', // 3 errors
       'unicorn/explicit-length-check': 'off', // Not a big advantage
+      'unicorn/explicit-timer-delay': 'off', // Covered by our own timer lint rules
       'unicorn/no-array-callback-reference': 'off',
+      'unicorn/no-computed-property-existence-check': 'off', // 160 errors | needs an audit
+      'unicorn/no-declarations-before-early-exit': 'off', // 62 errors
+      'unicorn/no-duplicate-if-branches': 'off', // 1 error | may surface real bugs
+      'unicorn/no-duplicate-logical-operands': 'off', // 2 errors | may surface real bugs
+      'unicorn/no-error-property-assignment': 'off', // 6 errors
       'unicorn/no-for-loop': 'off', // Activate if this is resolved https://github.com/sindresorhus/eslint-plugin-unicorn/issues/2664
+      'unicorn/no-incorrect-template-string-interpolation': 'off', // 3 errors | audit for real bugs first
+      'unicorn/no-invalid-argument-count': 'off', // 98 errors | high false-positive risk, worth a focused pass
+      'unicorn/no-loop-iterable-mutation': 'off', // 2 errors | may surface real bugs
+      'unicorn/no-nonstandard-builtin-properties': 'off', // 34 errors | needs an audit
       'unicorn/no-this-assignment': 'off', // This would need some further refactoring and the benefit is small
+      'unicorn/no-undeclared-class-members': 'off', // 272 errors | requires declaring every field
+      'unicorn/no-unreadable-array-destructuring': 'off', // 4 errors | not autofixable, needs manual rewrite
+      'unicorn/no-unreadable-for-of-expression': 'off', // 32 errors
+      'unicorn/no-unreadable-object-destructuring': 'off', // 57 errors
+      'unicorn/no-unsafe-string-replacement': 'off', // 6 errors
+      'unicorn/no-useless-recursion': 'off', // 2 errors
       'unicorn/prefer-code-point': 'off', // Should be activated, but needs a refactor of some code
-      'unicorn/prefer-queue-microtask': 'off', // No advantage for us
+      'unicorn/prefer-early-return': 'off', // 67 errors | tension with our positive-`if` style
+      'unicorn/prefer-hoisting-branch-code': 'off', // 2 errors | reshapes branch bodies
+      'unicorn/prefer-minimal-ternary': 'off', // 24 errors
+      'unicorn/prefer-number-is-safe-integer': 'off', // 17 errors
+      'unicorn/prefer-object-iterable-methods': 'off', // 56 errors
+      'unicorn/prefer-queue-microtask': 'off', // process.nextTick semantics differ
+      'unicorn/prefer-smaller-scope': 'off', // 3 errors
+      'unicorn/prefer-split-limit': 'off', // 23 errors
+      'unicorn/require-array-sort-compare': 'off', // 8 errors | may surface real default-sort bugs
 
       // The following rules should not be activated!
+      'unicorn/consistent-boolean-name': 'off', // Would rename public API and config booleans
       'unicorn/import-style': 'off', // Questionable benefit
+      'unicorn/max-nested-calls': 'off', // Questionable benefit
       'unicorn/no-array-reduce': 'off', // Questionable benefit
-      'unicorn/no-hex-escape': 'off', // Questionable benefit
+      'unicorn/no-array-splice': 'off', // toSpliced copies the whole array (perf)
+      'unicorn/no-break-in-nested-loop': 'off', // Conflicts with our performance-oriented loops
+      'unicorn/no-global-object-property-assignment': 'off', // We use globalThis[Symbol.for('dd-trace')]
       'unicorn/no-nested-ternary': 'off', // Not really an issue in the code and the benefit is small
       'unicorn/no-new-array': 'off', // new Array is often used for performance reasons
       'unicorn/no-null': 'off', // We do not control external APIs and it is hard to differentiate these
+      'unicorn/no-return-array-push': 'off', // Questionable benefit
       'unicorn/no-this-outside-of-class': 'off', // This will not work for us
+      'unicorn/no-top-level-assignment-in-function': 'off', // Module-level singletons are assigned from functions
+      'unicorn/no-useless-else': 'off', // Covered by core no-else-return
+      'unicorn/operator-assignment': 'off', // Covered by core operator-assignment
+      'unicorn/prefer-array-last-methods': 'off', // Questionable benefit
+      'unicorn/prefer-await': 'off', // We avoid async/await in production hot paths
       'unicorn/prefer-event-target': 'off', // Benefit only outside of Node.js
       'unicorn/prefer-global-this': 'off', // Questionable benefit in Node.js alone
       'unicorn/prefer-includes-over-repeated-comparisons': 'off', // Bad for performance
       'unicorn/prefer-math-trunc': 'off', // Math.trunc is not a 1-to-1 replacement for most of our usage
       'unicorn/prefer-module': 'off', // We use CJS
       'unicorn/prefer-node-protocol': 'off', // May not be used due to guardrails
+      'unicorn/prefer-number-coercion': 'off', // Number() is not a 1-to-1 replacement for parseInt/parseFloat
+      'unicorn/prefer-private-class-fields': 'off', // Many `_underscore` fields cross module boundaries
       'unicorn/prefer-reflect-apply': 'off', // Questionable benefit and more than 500 matches
+      'unicorn/prefer-short-arrow-method': 'off', // Method shorthand is intentional; arrow properties change `this`
       'unicorn/prefer-switch': 'off', // Questionable benefit
       'unicorn/prefer-top-level-await': 'off', // Only useful when using ESM
+      'unicorn/prefer-unicode-code-point-escapes': 'off', // Replaces the dropped no-hex-escape; questionable benefit
       'unicorn/switch-case-braces': 'off', // Questionable benefit
+
+      // Safe to enable in a follow-up: autofixable and aligned with our style. Kept off
+      // here only to keep this version bump free of source churn (counts from the v68 run).
+      'unicorn/logical-assignment-operators': 'off', // 42 errors | matches our ??=/||= usage
+      'unicorn/no-for-each': 'off', // 10 errors | we already prefer for-of in production
+      'unicorn/no-negated-array-predicate': 'off', // 2 errors
+      'unicorn/no-negated-comparison': 'off', // 1 error
+      'unicorn/no-subtraction-comparison': 'off', // 2 errors
+      'unicorn/no-unnecessary-boolean-comparison': 'off', // 6 errors
+      'unicorn/no-unnecessary-global-this': 'off', // 4 errors
+      'unicorn/no-unnecessary-splice': 'off', // 2 errors
+      'unicorn/no-useless-concat': 'off', // 4 errors
+      'unicorn/no-useless-continue': 'off', // 1 error
+      'unicorn/no-useless-delete-check': 'off', // 1 error
+      'unicorn/no-useless-fallback-in-spread': 'off', // 5 errors
+      'unicorn/no-useless-override': 'off', // 1 error
+      'unicorn/no-useless-template-literals': 'off', // 13 errors
+      'unicorn/prefer-array-from-map': 'off', // 6 errors
+      'unicorn/prefer-boolean-return': 'off', // 1 error
+      'unicorn/prefer-continue': 'off', // 52 errors
+      'unicorn/prefer-direct-iteration': 'off', // 5 errors
+      'unicorn/prefer-else-if': 'off', // 6 errors
+      'unicorn/prefer-global-number-constants': 'off', // 3 errors
+      'unicorn/prefer-logical-operator-over-ternary': 'off', // 3 errors
+      'unicorn/prefer-ternary': 'off', // 16 errors
+      'unicorn/prefer-unary-minus': 'off', // 1 error
     },
   },
   {

package.json

@@ -182,7 +182,7 @@
     "@actions/github": "^9.1.1",
     "@babel/helpers": "^8.0.0",
     "@eslint/eslintrc": "^3.3.5",
-    "@eslint/js": "^9.39.2",
+    "@eslint/js": "^10.0.1",
     "@msgpack/msgpack": "^3.1.3",
     "@openfeature/core": "^1.11.0",
     "@openfeature/server-sdk": "~1.22.0",
@@ -196,15 +196,15 @@
     "bun": "1.3.14",
     "codeowners-audit": "^2.9.0",
     "editorconfig-checker": "^6.1.1",
-    "eslint": "^9.39.2",
+    "eslint": "^10.5.0",
     "eslint-plugin-cypress": "^6.4.1",
-    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-import-x": "^4.16.2",
     "eslint-plugin-jsdoc": "^63.0.5",
     "eslint-plugin-mocha": "^11.3.0",
     "eslint-plugin-n": "^18.1.0",
     "eslint-plugin-promise": "^7.3.0",
     "eslint-plugin-sonarjs": "^4.0.3",
-    "eslint-plugin-unicorn": "^65.0.1",
+    "eslint-plugin-unicorn": "^68.0.0",
     "express": "^5.1.0",
     "glob": "^10.4.5",
     "globals": "^17.2.0",

packages/datadog-instrumentations/src/mocha/main.js

@@ -546,7 +546,6 @@ addHook({
 
     const runner = run.apply(this, args)
 
-    // eslint-disable-next-line unicorn/no-array-for-each
     this.files.forEach((path) => {
       const isUnskippable = isMarkedAsUnskippable({ path })
       if (isUnskippable) {
@@ -899,7 +898,6 @@ addHook({
         status = 'skip'
       } else {
         // has to check every test in the test file
-        // eslint-disable-next-line unicorn/no-array-for-each
         suitesInTestFile.forEach(suite => {
           suite.eachTest(test => {
             if (test.state === 'failed' || test.timedOut) {

packages/datadog-instrumentations/src/mocha/utils.js

@@ -226,7 +226,6 @@ function getSuitesByTestFile (root) {
         suitesByTestFile[suite.file] = [suite]
       }
     }
-    // eslint-disable-next-line unicorn/no-array-for-each
     suite.suites.forEach(suite => {
       getSuites(suite)
     })
@@ -817,7 +816,6 @@ function getOnPendingHandler () {
 function getRunTestsWrapper (runTests, config) {
   return function (suite) {
     if (config.isTestManagementTestsEnabled) {
-      // eslint-disable-next-line unicorn/no-array-for-each
       suite.tests.forEach((test) => {
         const { isAttemptToFix, isDisabled, isQuarantined } = getTestProperties(test, config.testManagementTests)
         if (isAttemptToFix && !test.isPending()) {
@@ -841,7 +839,6 @@ function getRunTestsWrapper (runTests, config) {
     }
 
     if (config.isImpactedTestsEnabled) {
-      // eslint-disable-next-line unicorn/no-array-for-each
       suite.tests.forEach((test) => {
         isModifiedCh.publish({
           modifiedFiles: config.modifiedFiles,
@@ -865,7 +862,6 @@ function getRunTestsWrapper (runTests, config) {
 
     if (config.isKnownTestsEnabled) {
       // by the time we reach `this.on('test')`, it is too late. We need to add retries here
-      // eslint-disable-next-line unicorn/no-array-for-each
       suite.tests.forEach((test) => {
         if (!test.isPending() && isNewTest(test, config.knownTests)) {
           test._ddIsNew = true

packages/datadog-instrumentations/src/vitest.js

@@ -770,10 +770,8 @@ function threadHandler (thread) {
 function wrapTinyPoolRun (TinyPool) {
   shimmer.wrap(TinyPool.prototype, 'run', run => async function () {
     // We have to do this before and after because the threads list gets recycled, that is, the processes are re-created
-    // eslint-disable-next-line unicorn/no-array-for-each
     this.threads.forEach(threadHandler)
     const runResult = await run.apply(this, arguments)
-    // eslint-disable-next-line unicorn/no-array-for-each
     this.threads.forEach(threadHandler)
     return runResult
   })

packages/datadog-plugin-aws-durable-execution-sdk-js/src/context.js

@@ -85,7 +85,7 @@ class RunInChildContextPlugin extends BaseContextPlugin {
   static spanName = 'aws.durable.child_context'
 
   bindStart (ctx) {
-    if (SUPPRESSED_CHILD_CONTEXT_SUBTYPES.has(getRunInChildContextSubType(ctx))) {
+    if (SUPPRESSED_CHILD_CONTEXT_SUBTYPES.has(getRunInChildContextSubtype(ctx))) {
       // Pass the active store through unchanged so any nested spans
       // remain parented to the surrounding map/parallel span
       ctx.suppressed = true
@@ -96,7 +96,7 @@ class RunInChildContextPlugin extends BaseContextPlugin {
 }
 
 // runInChildContext has two overloads: `(name, fn, options)` and `(fn, options)`.
-function getRunInChildContextSubType (ctx) {
+function getRunInChildContextSubtype (ctx) {
   const args = ctx.arguments || []
   const opts = typeof args[0] === 'function' ? args[1] : args[2]
   return opts?.subType