From edfdd78aab699fbefc96798d4e26c36ffedfdaa9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 May 2025 14:44:15 +0000
Subject: [PATCH 1/4] deps: bump @electron/get from 3.1.0 to 4.0.0

Bumps [@electron/get](https://github.com/electron/get) from 3.1.0 to 4.0.0.
- [Release notes](https://github.com/electron/get/releases)
- [Changelog](https://github.com/electron/get/blob/main/.releaserc.json)
- [Commits](https://github.com/electron/get/compare/v3.1.0...v4.0.0)

---
updated-dependencies:
- dependency-name: "@electron/get"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index edddbfb5f..bd5845127 100644
--- a/package.json
+++ b/package.json
@@ -219,7 +219,7 @@
     "release": "node src/index.js release --no-bundle"
   },
   "dependencies": {
-    "@electron/get": "^3.0.0",
+    "@electron/get": "^4.0.0",
     "@polka/send-type": "^0.5.2",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/commit-analyzer": "^13.0.0",

From 69d5e9923df77a70d938a120b851402506cd207b Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Mon, 19 May 2025 18:17:46 +0100
Subject: [PATCH 2/4] chore: fix module

---
 eslint.config.js                              | 186 ++++--------------
 package.json                                  |   7 +-
 src/check-project/check-build-files.js        |   4 +-
 src/check-project/manifests/typed-cjs.js      |   3 -
 src/check-project/manifests/untyped-cjs.js    |   3 -
 src/check-project/manifests/untyped-esm.js    |   3 -
 src/config/tsconfig.aegir.json                |   4 +-
 src/docs/readme-updater-plugin.js             |   1 -
 src/docs/type-indexer-plugin.js               |   3 +-
 src/document-check.js                         |   2 -
 .../dependency-check/esm-fail/src/index.js    |   1 +
 .../dependency-check/esm-pass/src/index.js    |   1 +
 .../dependency-check/fail-prod/index.js       |   1 +
 .../dependency-check/fail-unused/index.js     |   2 +
 test/fixtures/dependency-check/fail/index.js  |   1 +
 .../pass-certain-files/derp/foo.js            |   1 +
 .../pass-certain-files/index.js               |   1 +
 test/fixtures/dependency-check/pass/index.js  |   4 +-
 .../dependency-check/ts-fail/src/index.ts     |   3 +-
 .../dependency-check/ts-fail/src/other.ts     |   4 +-
 .../dependency-check/ts-pass/src/index.ts     |   3 +-
 .../dependency-check/ts-pass/src/other.ts     |   4 +-
 .../with-aegir-config/index.js                |   1 +
 .../projects/a-ts-project/src/index.ts        |   1 +
 .../projects/an-esm-project/src/index.js      |   1 +
 .../tests/unhandled-promise-rejection.js      |   1 +
 test/ts-features.spec.js                      |   1 -
 27 files changed, 73 insertions(+), 174 deletions(-)

diff --git a/eslint.config.js b/eslint.config.js
index dbfce338f..6d95fe91e 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,83 +1,53 @@
-import typescriptEslint from '@typescript-eslint/eslint-plugin'
-// @ts-expect-error no types
-import typescriptParser from '@typescript-eslint/parser'
-import love from 'eslint-config-love'
 // @ts-expect-error no types
 import importPlugin from 'eslint-plugin-import'
-import jsdoc from 'eslint-plugin-jsdoc'
 // @ts-expect-error no types
 import noOnlyTests from 'eslint-plugin-no-only-tests'
+import neostandard from 'neostandard'
+
+const standard = neostandard({
+  env: ['node', 'browser', 'worker', 'serviceworker', 'webextensions', 'mocha', 'es2024'],
+})
 
-const MAX_NESTED_CALLBACKS = 4
-const MAX_DEPTH = 4
-const TAG_START_LINES = 1
+/**
+ * @param {string} name
+ * @returns {import('eslint').Linter.Config}
+ */
+function findRuleset (name) {
+  const ruleset = standard.find(r => r.name === name)
 
-/** @type {import('eslint').Linter.RulesRecord} */
-const jsRules = {
-  strict: ['error', 'safe'],
-  curly: 'error',
-  'block-scoped-var': 'error',
-  complexity: 'warn',
-  'default-case': 'error',
-  'guard-for-in': 'warn',
-  'linebreak-style': ['warn', 'unix'],
-  'no-alert': 'error',
-  'no-console': 'error',
-  'no-div-regex': 'error',
-  'no-empty': 'warn',
-  'no-extra-semi': 'error',
-  'no-implicit-coercion': 'error',
-  'no-loop-func': 'error',
-  'no-nested-ternary': 'warn',
-  'no-script-url': 'error',
-  'no-warning-comments': 'warn',
-  'max-nested-callbacks': ['error', MAX_NESTED_CALLBACKS],
-  'max-depth': ['error', MAX_DEPTH],
-  'require-yield': 'error',
-  'eslint-comments/require-description': 'off',
-  'arrow-body-style': 'off',
+  if (ruleset == null) {
+    throw new Error(`Could not find ruleset "${name}`)
+  }
+
+  return ruleset
+}
 
-  // plugins
-  'no-only-tests/no-only-tests': 'error',
+/**
+ *
+ * @param {import('eslint').Linter.StringSeverity} severity
+ * @param {any[]} config
+ *
+ * @returns {import('eslint').Linter.RuleSeverity | import('eslint').Linter.RuleSeverityAndOptions<any>}
+ */
+function rule (severity, ...config) {
+  if (config == null || config.length === 0) {
+    return severity
+  }
 
-  'jsdoc/check-alignment': 'error',
-  'jsdoc/check-examples': 'off',
-  'jsdoc/check-indentation': 'error',
-  'jsdoc/check-param-names': 'error',
-  'jsdoc/check-syntax': 'error',
-  'jsdoc/check-tag-names': ['error', { definedTags: ['internal', 'packageDocumentation'] }],
-  'jsdoc/check-types': 'error',
-  'jsdoc/implements-on-classes': 'error',
-  'jsdoc/match-description': 'off',
-  'jsdoc/tag-lines': ['error', 'any', { startLines: TAG_START_LINES }],
-  'jsdoc/no-types': 'off',
-  // Note: no-undefined-types rule causes to many false positives:
-  // https://github.com/gajus/eslint-plugin-jsdoc/issues/559
-  // And it is also unaware of many built in types
-  // https://github.com/gajus/eslint-plugin-jsdoc/issues/280
-  'jsdoc/no-undefined-types': 'off',
-  'jsdoc/require-returns-type': 'off',
-  'jsdoc/require-description': 'off',
-  'jsdoc/require-description-complete-sentence': 'off',
-  'jsdoc/require-example': 'off',
-  'jsdoc/require-hyphen-before-param-description': 'error',
-  'jsdoc/require-jsdoc': 'off',
-  'jsdoc/require-param': 'error',
-  'jsdoc/require-param-description': 'off',
-  'jsdoc/require-param-name': 'error',
-  'jsdoc/require-param-type': 'error',
-  // Note: Do not require @returns because TS often can infer return types and
-  // in many such cases it's not worth it.
-  'jsdoc/require-returns': 'off',
-  'jsdoc/require-returns-check': 'error',
-  'jsdoc/require-returns-description': 'off',
-  // Note: At the moment type parser used by eslint-plugin-jsdoc does not
-  // parse various forms correctly. For now warn on invalid type from,
-  // should revisit once following issue is fixed:
-  // https://github.com/jsdoctypeparser/jsdoctypeparser/issues/50
-  'jsdoc/valid-types': 'off',
+  return [severity, ...config]
+}
 
-  'import/order': [
+const base = findRuleset('neostandard/base')
+base.plugins = {
+  ...base.plugins,
+  'no-only-tests': noOnlyTests,
+  import: importPlugin,
+}
+base.rules = {
+  ...base.rules,
+  'no-console': rule('error'),
+  'no-only-tests/no-only-tests': rule('error'),
+  'import/order': rule(
     'error',
     {
       alphabetize: {
@@ -88,77 +58,7 @@ const jsRules = {
       // the overall order of imports - anything not in this list is grouped together at the end
       groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index', 'object', 'type']
     }
-  ]
-}
-
-/** @type {import('eslint').Linter.RulesRecord} */
-const tsRules = {
-  ...love.rules,
-  ...jsRules,
-
-  'no-use-before-define': 'off', // Types often are recursive & no use before define is too restrictive
-  'no-return-await': 'off', // disable this rule to use @typescript-eslint/return-await instead
-  'no-unused-vars': 'off', // disable this rule to use @typescript-eslint/no-unused-vars instead
-  'no-undef': 'off', // typescript already checks for undefined variables so this is redundant - https://typescript-eslint.io/troubleshooting/#i-get-errors-from-the-no-undef-rule-about-global-variables-not-being-defined-even-though-there-are-no-typescript-errors
-
-  // 'etc/prefer-interface': 'error', // https://ncjamieson.com/prefer-interfaces/
-  '@typescript-eslint/prefer-function-type': 'off', // conflicts with 'etc/prefer-interface'
-  '@typescript-eslint/explicit-function-return-type': 'error', // functions require return types
-  '@typescript-eslint/no-this-alias': 'off', // allow 'const self = this'
-  '@typescript-eslint/await-thenable': 'error', // disallows awaiting a value that is not a "Thenable"
-  '@typescript-eslint/restrict-template-expressions': 'off', // allow values with `any` type in template literals
-  '@typescript-eslint/method-signature-style': ['error', 'method'], // enforce method signature style
-  '@typescript-eslint/no-unsafe-argument': 'off', // allow passing args with `any` type to functions
-  '@typescript-eslint/unbound-method': 'off', // allow invoking functions that may be unbound (e.g. passed as part of an options object)
-  '@typescript-eslint/no-unused-vars': 'error', // disallow unused variables
-  '@typescript-eslint/return-await': ['error', 'in-try-catch'], // require awaiting thenables returned from try/catch
-  '@typescript-eslint/no-unsafe-assignment': 'off',
-  '@typescript-eslint/no-unsafe-member-access': 'off',
-  'jsdoc/require-param': 'off', // do not require jsdoc for params
-  'jsdoc/require-param-type': 'off' // allow compiler to derive param type
-}
-
-/**
- * @type {import('eslint').Linter.Config['plugins']}
- */
-const plugins = {
-  ...love.plugins,
-  jsdoc,
-  'no-only-tests': noOnlyTests,
-  'import': importPlugin,
-  '@typescript-eslint': typescriptEslint
+  )
 }
 
-/**
- * @typedef {import('eslint').Linter.Config} EslintConfig
- */
-
-/** @type {EslintConfig[]} */
-const config = [{
-  ...love,
-  languageOptions: {
-  sourceType: 'module',
-  parserOptions: {
-    project: true
-  }
-},
-  files: ['**/*.js', '**/*.jsx'],
-  plugins,
-  rules: jsRules
-}, {
-  ...love,
-  languageOptions: {
-  sourceType: 'module',
-  parser: typescriptParser,
-  parserOptions: {
-    project: './tsconfig.json', // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/README.md#parseroptionsproject
-    projectService: true,
-    tsconfigRootDir: import.meta.dirname,
-  }
-},
-  files: ['**/*.ts', '**/*.tsx'],
-  plugins,
-  rules: tsRules
-}]
-
-export default config
+export default standard
diff --git a/package.json b/package.json
index bd5845127..7513450b5 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,7 @@
   },
   "keywords": [
     "build",
-    "lint",
-    "standard"
+    "lint"
   ],
   "bin": {
     "aegir": "src/index.js"
@@ -66,6 +65,7 @@
   },
   "files": [
     "cspell.json",
+    "eslint.config.js",
     "src",
     "dictionaries",
     "dist",
@@ -253,10 +253,8 @@
     "env-paths": "^3.0.0",
     "esbuild": "^0.25.0",
     "eslint": "^9.27.0",
-    "eslint-config-love": "^120.0.0",
     "eslint-formatter-unix": "^8.40.0",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jsdoc": "^50.6.17",
     "eslint-plugin-no-only-tests": "^3.3.0",
     "execa": "^8.0.1",
     "extract-zip": "^2.0.1",
@@ -282,6 +280,7 @@
     "micromark-extension-gfm-table": "^2.0.0",
     "micromark-extension-gfm-task-list-item": "^2.0.1",
     "mocha": "^11.0.1",
+    "neostandard": "^0.12.1",
     "npm-package-json-lint": "^8.0.0",
     "nyc": "^17.0.0",
     "p-map": "^7.0.1",
diff --git a/src/check-project/check-build-files.js b/src/check-project/check-build-files.js
index 3c9c9f785..74ce5e2f2 100644
--- a/src/check-project/check-build-files.js
+++ b/src/check-project/check-build-files.js
@@ -44,8 +44,8 @@ export async function checkBuildFiles (projectDir, branchName, repoUrl) {
   await ensureFileHasContents(projectDir, '.github/workflows/stale.yml')
 
   let defaultCiContent = await download(ciFileUrl)
-  defaultCiContent = defaultCiContent.replaceAll('${{{ github.default_branch }}}', branchName)
-  defaultCiContent = defaultCiContent.replaceAll('${{{ .config.versions.uci // (.source.tag | sub("\\\\.[^.\\\\-\\\\+]+(?=\\\\-|\\\\+|$)"; "")) }}}', 'v0.0')
+  defaultCiContent = defaultCiContent.replaceAll('${{{ github.default_branch }}}', branchName) // eslint-disable-line no-template-curly-in-string
+  defaultCiContent = defaultCiContent.replaceAll('${{{ .config.versions.uci // (.source.tag | sub("\\\\.[^.\\\\-\\\\+]+(?=\\\\-|\\\\+|$)"; "")) }}}', 'v0.0') // eslint-disable-line no-template-curly-in-string
 
   await ensureFileHasContents(projectDir, '.github/workflows/js-test-and-release.yml', defaultCiContent)
 }
diff --git a/src/check-project/manifests/typed-cjs.js b/src/check-project/manifests/typed-cjs.js
index 288a7f5b5..d36e2220d 100644
--- a/src/check-project/manifests/typed-cjs.js
+++ b/src/check-project/manifests/typed-cjs.js
@@ -1,12 +1,9 @@
-import mergeOptions from '../../utils/merge-options.js'
 import { semanticReleaseConfig } from '../semantic-release-config.js'
 import {
   sortFields,
   constructManifest
 } from '../utils.js'
 
-const merge = mergeOptions.bind({ ignoreUndefined: true })
-
 /**
  * @param {import('../index.js').ProcessManifestContext} context
  */
diff --git a/src/check-project/manifests/untyped-cjs.js b/src/check-project/manifests/untyped-cjs.js
index 39d6c2b7a..1be1a20a5 100644
--- a/src/check-project/manifests/untyped-cjs.js
+++ b/src/check-project/manifests/untyped-cjs.js
@@ -1,12 +1,9 @@
-import mergeOptions from '../../utils/merge-options.js'
 import { semanticReleaseConfig } from '../semantic-release-config.js'
 import {
   sortFields,
   constructManifest
 } from '../utils.js'
 
-const merge = mergeOptions.bind({ ignoreUndefined: true })
-
 /**
  * @param {import('../index.js').ProcessManifestContext} context
  */
diff --git a/src/check-project/manifests/untyped-esm.js b/src/check-project/manifests/untyped-esm.js
index cadaf3a4f..b56963783 100644
--- a/src/check-project/manifests/untyped-esm.js
+++ b/src/check-project/manifests/untyped-esm.js
@@ -1,12 +1,9 @@
-import mergeOptions from '../../utils/merge-options.js'
 import { semanticReleaseConfig } from '../semantic-release-config.js'
 import {
   sortFields,
   constructManifest
 } from '../utils.js'
 
-const merge = mergeOptions.bind({ ignoreUndefined: true })
-
 /**
  * @param {import('../index.js').ProcessManifestContext} context
  */
diff --git a/src/config/tsconfig.aegir.json b/src/config/tsconfig.aegir.json
index 8a5e62e6a..2157528f8 100644
--- a/src/config/tsconfig.aegir.json
+++ b/src/config/tsconfig.aegir.json
@@ -6,7 +6,7 @@
         "allowJs": true,
         "checkJs": true,
         "target": "ES2024",
-        "module": "ES2022",
+        "module": "Node16",
         "lib": ["DOM", "DOM.Iterable", "WebWorker", "ES2024"],
         "noEmit": false,
         "noEmitOnError": true,
@@ -20,7 +20,7 @@
         "sourceMap": true,
         // module resolution
         "esModuleInterop": true,
-        "moduleResolution": "node",
+        "moduleResolution": "Node16",
         // advanced
         "verbatimModuleSyntax": true,
         "forceConsistentCasingInFileNames": true,
diff --git a/src/docs/readme-updater-plugin.js b/src/docs/readme-updater-plugin.js
index e90cda8ec..ef05f8e8c 100644
--- a/src/docs/readme-updater-plugin.js
+++ b/src/docs/readme-updater-plugin.js
@@ -101,7 +101,6 @@ export function load (app) {
     }
   }
 
-  // @ts-expect-error https://github.com/TypeStrong/typedoc/issues/2903#issuecomment-2733243351
   app.renderer.on(td.RendererEvent.END, onRendererEnd)
 }
 
diff --git a/src/docs/type-indexer-plugin.js b/src/docs/type-indexer-plugin.js
index 1c7b84323..38fff5068 100644
--- a/src/docs/type-indexer-plugin.js
+++ b/src/docs/type-indexer-plugin.js
@@ -159,7 +159,6 @@ export function load (app) {
     }
   }
 
-  // @ts-expect-error https://github.com/TypeStrong/typedoc/issues/2903#issuecomment-2733243351
   app.converter.on(td.Converter.EVENT_RESOLVE, onResolve)
 
   app.serializer.addSerializer({
@@ -181,6 +180,7 @@ export function load (app) {
     },
     fromObject (_model, obj) {
       app.deserializer.defer((project) => {
+        // @ts-expect-error not properties of these types
         project.reflectionSources = project.reflectionSources ?? {}
 
         // @ts-expect-error obj is unknown type
@@ -192,7 +192,6 @@ export function load (app) {
     }
   })
 
-  // @ts-expect-error https://github.com/TypeStrong/typedoc/issues/2903#issuecomment-2733243351
   app.renderer.on(td.RendererEvent.BEGIN, onRendererBegin)
 }
 
diff --git a/src/document-check.js b/src/document-check.js
index 61cdb1542..6df17fb60 100644
--- a/src/document-check.js
+++ b/src/document-check.js
@@ -59,8 +59,6 @@ const tasks = new Listr(
                 userTSConfig,
                 {
                   compilerOptions: {
-                    target: 'esnext',
-                    module: 'esnext',
                     noImplicitAny: true,
                     noEmit: true,
                     skipLibCheck: true
diff --git a/test/fixtures/dependency-check/esm-fail/src/index.js b/test/fixtures/dependency-check/esm-fail/src/index.js
index 40cfe7747..057d2bd9a 100644
--- a/test/fixtures/dependency-check/esm-fail/src/index.js
+++ b/test/fixtures/dependency-check/esm-fail/src/index.js
@@ -1,2 +1,3 @@
 // @ts-nocheck
+/* eslint-disable */
 import { execa } from 'execa'
diff --git a/test/fixtures/dependency-check/esm-pass/src/index.js b/test/fixtures/dependency-check/esm-pass/src/index.js
index 40cfe7747..057d2bd9a 100644
--- a/test/fixtures/dependency-check/esm-pass/src/index.js
+++ b/test/fixtures/dependency-check/esm-pass/src/index.js
@@ -1,2 +1,3 @@
 // @ts-nocheck
+/* eslint-disable */
 import { execa } from 'execa'
diff --git a/test/fixtures/dependency-check/fail-prod/index.js b/test/fixtures/dependency-check/fail-prod/index.js
index 40cfe7747..057d2bd9a 100644
--- a/test/fixtures/dependency-check/fail-prod/index.js
+++ b/test/fixtures/dependency-check/fail-prod/index.js
@@ -1,2 +1,3 @@
 // @ts-nocheck
+/* eslint-disable */
 import { execa } from 'execa'
diff --git a/test/fixtures/dependency-check/fail-unused/index.js b/test/fixtures/dependency-check/fail-unused/index.js
index d4a9c8584..057d2bd9a 100644
--- a/test/fixtures/dependency-check/fail-unused/index.js
+++ b/test/fixtures/dependency-check/fail-unused/index.js
@@ -1 +1,3 @@
+// @ts-nocheck
+/* eslint-disable */
 import { execa } from 'execa'
diff --git a/test/fixtures/dependency-check/fail/index.js b/test/fixtures/dependency-check/fail/index.js
index 40cfe7747..057d2bd9a 100644
--- a/test/fixtures/dependency-check/fail/index.js
+++ b/test/fixtures/dependency-check/fail/index.js
@@ -1,2 +1,3 @@
 // @ts-nocheck
+/* eslint-disable */
 import { execa } from 'execa'
diff --git a/test/fixtures/dependency-check/pass-certain-files/derp/foo.js b/test/fixtures/dependency-check/pass-certain-files/derp/foo.js
index 40cfe7747..057d2bd9a 100644
--- a/test/fixtures/dependency-check/pass-certain-files/derp/foo.js
+++ b/test/fixtures/dependency-check/pass-certain-files/derp/foo.js
@@ -1,2 +1,3 @@
 // @ts-nocheck
+/* eslint-disable */
 import { execa } from 'execa'
diff --git a/test/fixtures/dependency-check/pass-certain-files/index.js b/test/fixtures/dependency-check/pass-certain-files/index.js
index c253d8a2d..cd6f94173 100644
--- a/test/fixtures/dependency-check/pass-certain-files/index.js
+++ b/test/fixtures/dependency-check/pass-certain-files/index.js
@@ -1,2 +1,3 @@
 // @ts-nocheck
+/* eslint-disable */
 const pico = require('pico')
diff --git a/test/fixtures/dependency-check/pass/index.js b/test/fixtures/dependency-check/pass/index.js
index 7c1b9291c..51468b0bb 100644
--- a/test/fixtures/dependency-check/pass/index.js
+++ b/test/fixtures/dependency-check/pass/index.js
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-nocheck
+/* eslint-disable */
 import { execa } from 'execa'
-// @ts-ignore
 import pico from 'pico'
diff --git a/test/fixtures/dependency-check/ts-fail/src/index.ts b/test/fixtures/dependency-check/ts-fail/src/index.ts
index 0a6f23f99..47e9fba87 100644
--- a/test/fixtures/dependency-check/ts-fail/src/index.ts
+++ b/test/fixtures/dependency-check/ts-fail/src/index.ts
@@ -1,3 +1,4 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
+// @ts-nocheck
+/* eslint-disable */
 import { execa } from 'execa'
 import './other.js'
diff --git a/test/fixtures/dependency-check/ts-fail/src/other.ts b/test/fixtures/dependency-check/ts-fail/src/other.ts
index 290395624..6f1b30108 100644
--- a/test/fixtures/dependency-check/ts-fail/src/other.ts
+++ b/test/fixtures/dependency-check/ts-fail/src/other.ts
@@ -1,3 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-// @ts-expect-error unused
+// @ts-nocheck
+/* eslint-disable */
 import * as pico from 'pico'
diff --git a/test/fixtures/dependency-check/ts-pass/src/index.ts b/test/fixtures/dependency-check/ts-pass/src/index.ts
index e8afcb68d..057d2bd9a 100644
--- a/test/fixtures/dependency-check/ts-pass/src/index.ts
+++ b/test/fixtures/dependency-check/ts-pass/src/index.ts
@@ -1,2 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
+// @ts-nocheck
+/* eslint-disable */
 import { execa } from 'execa'
diff --git a/test/fixtures/dependency-check/ts-pass/src/other.ts b/test/fixtures/dependency-check/ts-pass/src/other.ts
index 69b5dfea1..4a7e586cd 100644
--- a/test/fixtures/dependency-check/ts-pass/src/other.ts
+++ b/test/fixtures/dependency-check/ts-pass/src/other.ts
@@ -1,3 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-// @ts-expect-error unused
+// @ts-nocheck
+/* eslint-disable */
 import pico from 'pico'
diff --git a/test/fixtures/dependency-check/with-aegir-config/index.js b/test/fixtures/dependency-check/with-aegir-config/index.js
index 85321b514..4a7e586cd 100644
--- a/test/fixtures/dependency-check/with-aegir-config/index.js
+++ b/test/fixtures/dependency-check/with-aegir-config/index.js
@@ -1,2 +1,3 @@
 // @ts-nocheck
+/* eslint-disable */
 import pico from 'pico'
diff --git a/test/fixtures/projects/a-ts-project/src/index.ts b/test/fixtures/projects/a-ts-project/src/index.ts
index f43b9a90c..76ef3cd80 100644
--- a/test/fixtures/projects/a-ts-project/src/index.ts
+++ b/test/fixtures/projects/a-ts-project/src/index.ts
@@ -6,6 +6,7 @@ import type { EventEmitter } from 'events'
 export { garply } from './dir/index.js'
 
 export const useHerp = (): void => {
+  // @ts-ignore this is a function
   herp()
 }
 
diff --git a/test/fixtures/projects/an-esm-project/src/index.js b/test/fixtures/projects/an-esm-project/src/index.js
index a0536765d..b651490b1 100644
--- a/test/fixtures/projects/an-esm-project/src/index.js
+++ b/test/fixtures/projects/an-esm-project/src/index.js
@@ -13,6 +13,7 @@ export { garply } from './dir/index.js'
  */
 
 export const useHerp = () => {
+  // @ts-ignore this is a function
   herp()
 }
 
diff --git a/test/fixtures/tests/unhandled-promise-rejection.js b/test/fixtures/tests/unhandled-promise-rejection.js
index e612114eb..385ac1165 100644
--- a/test/fixtures/tests/unhandled-promise-rejection.js
+++ b/test/fixtures/tests/unhandled-promise-rejection.js
@@ -2,6 +2,7 @@
 
 describe('should fail', () => {
   it('unhandled promise rejection', (done) => {
+    // eslint-disable-next-line no-new
     new Promise((resolve, reject) => {
       reject(new Error('Nope!'))
     })
diff --git a/test/ts-features.spec.js b/test/ts-features.spec.js
index ac4341ac5..d564bbc0e 100644
--- a/test/ts-features.spec.js
+++ b/test/ts-features.spec.js
@@ -13,7 +13,6 @@ describe('ts features', () => {
   it('should support Array.toSorted', async () => {
     const arr1 = [3, 2, 1]
     const arr2 = arr1.toSorted()
-    const foo = 'bar'
 
     expect(arr1).to.not.equal(arr2)
     expect(arr2).to.deep.equal([1, 2, 3])

From 8e16f6ef8e3ca88632cce5062704807469bbba7f Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Mon, 19 May 2025 18:21:16 +0100
Subject: [PATCH 3/4] chore: deps

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 7513450b5..4286437f2 100644
--- a/package.json
+++ b/package.json
@@ -234,7 +234,6 @@
     "@types/mocha": "^10.0.0",
     "@types/node": "^22.10.7",
     "@typescript-eslint/eslint-plugin": "^8.32.1",
-    "@typescript-eslint/parser": "^8.32.1",
     "buffer": "^6.0.3",
     "bytes": "^3.1.0",
     "c8": "^10.1.2",

From 1904b2720760dcee1bdf59bd930cbf2a24cce635 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Mon, 19 May 2025 18:24:27 +0100
Subject: [PATCH 4/4] chore: fix spelling

---
 dictionaries/ipfs.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dictionaries/ipfs.txt b/dictionaries/ipfs.txt
index 32bd9388e..c15ed8bcd 100644
--- a/dictionaries/ipfs.txt
+++ b/dictionaries/ipfs.txt
@@ -208,6 +208,7 @@ runtimes
 sdp
 secio
 secp
+serviceworker
 semver
 seqno
 sha