Update to pnpm 9, use new catalogs feature, tweak and update deps

.changeset/few-kangaroos-check.md

@@ -0,0 +1,12 @@
+---
+"@definitelytyped/definitions-parser": patch
+"@definitelytyped/dtslint-runner": patch
+"@definitelytyped/eslint-plugin": patch
+"@definitelytyped/header-parser": patch
+"@definitelytyped/dts-critic": patch
+"dts-gen": patch
+"@definitelytyped/dtslint": patch
+"@definitelytyped/utils": patch
+---
+
+Update to pnpm 9 and catalogs

.eslintrc.json

@@ -11,7 +11,7 @@
         "es6": true
     },
     "plugins": [
-        "@typescript-eslint", "jsdoc", "import"
+        "@typescript-eslint", "jsdoc"
     ],
     "rules": {
         "@typescript-eslint/adjacent-overload-signatures": "error",
@@ -57,9 +57,6 @@
         "@typescript-eslint/triple-slash-reference": "error",
         "@typescript-eslint/unified-signatures": "error",
 
-        // eslint-plugin-import
-        "import/no-extraneous-dependencies": ["error", { "optionalDependencies": false }],
-
         // eslint-plugin-jsdoc
         "jsdoc/check-alignment": "error",
 

.knip.jsonc

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://unpkg.com/knip@2/schema.json",
+  "$schema": "https://unpkg.com/knip@5/schema.json",
   "workspaces": {
     ".": {
       "ignoreBinaries": ["only-allow"]
@@ -24,13 +24,15 @@
         "@typescript-eslint/eslint-plugin",
         "@typescript-eslint/parser",
         "@typescript-eslint/types",
-        "@typescript-eslint/utils",
-        "eslint-plugin-import"
+        "@typescript-eslint/utils"
       ]
     },
     "packages/dtslint-runner": {
       "entry": ["src/index.ts", "src/post-results.ts"],
-      "project": "**/*.ts"
+      "project": "**/*.ts",
+      "ignoreDependencies": [
+        "@definitelytyped/dtslint"
+      ]
     },
     "packages/eslint-plugin": {
       "entry": "src/index.ts",

package.json

@@ -14,37 +14,36 @@
     "ci:publish": "pnpm changeset tag && pnpm publish -r"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.27.5",
-    "@types/jest": "^29.5.11",
-    "@types/node": "^18.19.7",
-    "@types/yargs": "^17.0.32",
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
-    "@typescript-eslint/parser": "^7.14.1",
-    "eslint": "^8.57.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^48.0.2",
+    "@changesets/cli": "^2.27.9",
+    "@types/jest": "^29.5.13",
+    "@types/node": "catalog:",
+    "@types/yargs": "catalog:",
+    "@typescript-eslint/eslint-plugin": "catalog:",
+    "@typescript-eslint/parser": "catalog:",
+    "eslint": "catalog:",
+    "eslint-plugin-jsdoc": "catalog:",
     "jest": "^29.7.0",
-    "knip": "^4.0.2",
-    "prettier": "^3.2.2",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.5.2"
+    "jest-file-snapshot": "^0.7.0",
+    "knip": "^5.33.3",
+    "prettier": "^3.3.3",
+    "ts-jest": "^29.2.5",
+    "typescript": "catalog:"
   },
   "pnpm": {
     "overrides": {
       "tough-cookie@<4.1.3": ">=4.1.3",
       "semver@<5.7.2": ">=5.7.2",
-      "semver@>=6.0.0 <6.3.1": ">=6.3.1"
+      "semver@>=6.0.0 <6.3.1": ">=6.3.1",
+      "apollo>graphql": "15.8.0",
+      "apollo-language-server>graphql": "15.8.0"
     },
     "updateConfig": {
       "ignoreDependencies": [
         "@types/strip-json-comments",
         "strip-json-comments",
         "typescript-*.*"
       ]
-    },
-    "patchedDependencies": {
-      "[email protected]": "patches/[email protected]"
     }
   },
-  "packageManager": "pnpm@8.10.4"
+  "packageManager": "pnpm@9.12.1+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4"
 }

packages/definitions-parser/package.json

@@ -22,14 +22,14 @@
     "@definitelytyped/header-parser": "workspace:*",
     "@definitelytyped/typescript-versions": "workspace:*",
     "@definitelytyped/utils": "workspace:*",
-    "@types/node": "^18.19.7",
-    "@types/semver": "^7.5.6",
-    "pacote": "^17.0.5",
-    "semver": "^7.5.4"
+    "@types/node": "catalog:",
+    "@types/semver": "catalog:",
+    "pacote": "catalog:",
+    "semver": "catalog:"
   },
   "devDependencies": {
-    "@types/pacote": "^11.1.8",
-    "typescript": "^5.5.2"
+    "@types/pacote": "catalog:",
+    "typescript": "catalog:"
   },
   "peerDependencies": {
     "typescript": "*"

packages/dts-critic/package.json

@@ -8,8 +8,8 @@
   },
   "dependencies": {
     "@definitelytyped/header-parser": "workspace:*",
-    "typescript": "^5.5.2",
-    "yargs": "^17.7.2"
+    "typescript": "catalog:",
+    "yargs": "catalog:"
   },
   "peerDependencies": {
     "typescript": "*"

packages/dts-gen/package.json

@@ -26,13 +26,13 @@
   "dependencies": {
     "dts-dom": "^3.7.0",
     "parse-git-config": "^3.0.0",
-    "typescript": "^5.5.2",
-    "yargs": "^17.7.2"
+    "typescript": "catalog:",
+    "yargs": "catalog:"
   },
   "devDependencies": {
-    "@types/node": "^18.19.7",
+    "@types/node": "catalog:",
     "@types/parse-git-config": "^3.0.4",
-    "@types/yargs": "^17.0.32",
+    "@types/yargs": "catalog:",
     "ecurve": "1.0.6",
     "jquery": "3.7.1",
     "lodash": "4.17.21"

packages/dtslint-runner/package.json

@@ -26,11 +26,11 @@
     "@definitelytyped/definitions-parser": "workspace:*",
     "@definitelytyped/dtslint": "workspace:*",
     "@definitelytyped/utils": "workspace:*",
-    "@octokit/rest": "^20.0.2",
-    "yargs": "^17.7.2"
+    "@octokit/rest": "^20.1.1",
+    "yargs": "catalog:"
   },
   "devDependencies": {
-    "glob": "^10.3.10"
+    "glob": "catalog:"
   },
   "engines": {
     "node": ">=18.18.0"

packages/dtslint/package.json

@@ -28,24 +28,22 @@
     "@definitelytyped/typescript-packages": "workspace:*",
     "@definitelytyped/typescript-versions": "workspace:*",
     "@definitelytyped/utils": "workspace:*",
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
-    "@typescript-eslint/parser": "^7.14.1",
-    "@typescript-eslint/types": "^7.14.1",
-    "@typescript-eslint/typescript-estree": "^7.14.1",
-    "@typescript-eslint/utils": "^7.14.1",
-    "eslint": "^8.57.0",
-    "eslint-plugin-import": "^2.29.1",
-    "semver": "^7.5.4",
+    "@typescript-eslint/eslint-plugin": "catalog:",
+    "@typescript-eslint/parser": "catalog:",
+    "@typescript-eslint/types": "catalog:",
+    "@typescript-eslint/typescript-estree": "catalog:",
+    "@typescript-eslint/utils": "catalog:",
+    "eslint": "catalog:",
+    "semver": "catalog:",
     "strip-json-comments": "^3.1.1"
   },
   "peerDependencies": {
     "typescript": ">= 3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.7.0-dev || >= 3.8.0-dev || >= 3.9.0-dev || >= 4.0.0-dev || >=5.0.0-dev"
   },
   "devDependencies": {
-    "@types/eslint": "^8.56.2",
-    "@types/semver": "^7.5.5",
-    "@types/strip-json-comments": "^3.0.0",
-    "typescript": "^5.5.2"
+    "@types/eslint": "catalog:",
+    "@types/semver": "catalog:",
+    "typescript": "catalog:"
   },
   "engines": {
     "node": ">=18.18.0"

packages/eslint-plugin/package.json

@@ -23,25 +23,24 @@
   },
   "dependencies": {
     "@definitelytyped/utils": "workspace:*",
-    "@typescript-eslint/types": "^7.14.1",
-    "@typescript-eslint/utils": "^7.14.1",
-    "semver": "^7.5.4"
+    "@typescript-eslint/types": "catalog:",
+    "@typescript-eslint/utils": "catalog:",
+    "semver": "catalog:"
   },
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
-    "@typescript-eslint/parser": "^7.14.1",
-    "eslint": "^8.40.0",
-    "eslint-plugin-jsdoc": "^44.0.0",
+    "@typescript-eslint/eslint-plugin": "catalog:",
+    "@typescript-eslint/parser": "catalog:",
+    "eslint": "catalog:",
+    "eslint-plugin-jsdoc": "catalog:",
     "typescript": ">= 3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.7.0-dev || >= 3.8.0-dev || >= 3.9.0-dev || >= 4.0.0-dev || >=5.0.0-dev"
   },
   "devDependencies": {
     "@definitelytyped/eslint-plugin": "link:",
-    "@types/eslint": "^8.56.2",
-    "@types/semver": "^7.5.6",
-    "glob": "^10.3.10",
-    "jest-file-snapshot": "^0.5.0",
+    "@types/eslint": "catalog:",
+    "@types/semver": "catalog:",
+    "glob": "catalog:",
     "strip-ansi": "^6.0.1",
-    "typescript": "^5.5.2",
+    "typescript": "catalog:",
     "typescript-5.4": "npm:typescript@~5.4.0-0",
     "typescript-5.5": "npm:typescript@~5.5.0-0"
   },

packages/header-parser/package.json

@@ -22,10 +22,10 @@
   "dependencies": {
     "@definitelytyped/typescript-versions": "workspace:*",
     "@definitelytyped/utils": "workspace:*",
-    "semver": "^7.5.4"
+    "semver": "catalog:"
   },
   "devDependencies": {
-    "@types/semver": "^7.5.6"
+    "@types/semver": "catalog:"
   },
   "publishConfig": {
     "access": "public"

packages/mergebot/apollo.config.js

@@ -6,9 +6,9 @@ module.exports = {
             url: "https://api.github.com/graphql",
             headers: {
                 authorization: `Bearer ${
-                    process.env["DT_BOT_AUTH_TOKEN"] ||
-                    process.env["BOT_AUTH_TOKEN"] ||
-                    process.env["AUTH_TOKEN"]
+                    process.env.DT_BOT_AUTH_TOKEN ||
+                    process.env.BOT_AUTH_TOKEN ||
+                    process.env.AUTH_TOKEN
                 }`,
                 accept: "application/vnd.github.starfox-preview+json, application/vnd.github.bane-preview+json",
             },

packages/mergebot/package.json

@@ -19,42 +19,29 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@apollo/client": "^3.10.3",
-    "@azure/functions": "^4.4.0",
+    "@apollo/client": "^3.11.8",
+    "@azure/functions": "^4.5.1",
     "@definitelytyped/old-header-parser": "npm:@definitelytyped/[email protected]",
     "@definitelytyped/utils": "workspace:*",
     "@octokit/webhooks-methods": "^4.1.0",
-    "dayjs": "^1.11.11",
+    "dayjs": "^1.11.13",
     "fast-json-patch": "^3.1.1",
     "graphql": "15.8.0",
     "prettyjson": "^1.2.5",
-    "yargs": "^17.7.2"
+    "yargs": "catalog:"
   },
   "devDependencies": {
     "@octokit/graphql-schema": "^14.58.0",
-    "@octokit/webhooks-types": "^7.5.1",
-    "@types/node": "^18.19.33",
+    "@octokit/webhooks-types": "^7.6.1",
+    "@types/node": "catalog:",
     "@types/prettyjson": "^0.0.33",
-    "@types/yargs": "^17.0.32",
+    "@types/yargs": "catalog:",
     "apollo": "^2.34.0",
-    "azure-functions-core-tools": "^4.0.5700",
-    "esbuild": "^0.21.5",
-    "eslint": "^8.57.0",
-    "jest": "^29.7.0",
-    "jest-file-snapshot": "^0.5.0",
-    "knip": "^5.15.1",
-    "rimraf": "^5.0.7",
-    "seroval": "^1.0.7",
-    "ts-jest": "^29.1.2",
-    "typescript": "^5.4.5"
-  },
-  "overrides": {
-    "apollo": {
-      "graphql": "15.8.0"
-    },
-    "apollo-language-server": {
-      "graphql": "15.8.0"
-    }
+    "azure-functions-core-tools": "^4.0.6280",
+    "esbuild": "^0.24.0",
+    "rimraf": "^6.0.1",
+    "seroval": "^1.1.1",
+    "typescript": "catalog:"
   },
   "scripts": {
     "prestart": "pnpm run build",
@@ -67,7 +54,6 @@
     "update-test-data": "pnpm run build && node dist/commands/update-test-data.js",
     "update-all-fixtures": "pnpm run build && node dist/commands/update-all-fixtures.js",
     "start": "func start",
-    "lint": "eslint --report-unused-disable-directives . --ext .ts",
     "test": "jest"
   },
   "jest": {

packages/publisher/README.md

@@ -277,10 +277,6 @@ If present, packages are published with the provided version tag.
 
 These are needed to access all other secrets. See `src/lib/secrets.ts`.
 
-### `LONGJOHN`
-
-Setting this variable turns on [longjohn](https://github.com/mattinsler/longjohn) stacktraces.
-
 ### `NPM_TOKEN` and `GH_API_TOKEN`
 
 These are needed for running repair scripts, which should be rare.

packages/publisher/package.json

@@ -10,16 +10,15 @@
     "@definitelytyped/header-parser": "workspace:*",
     "@definitelytyped/retag": "workspace:*",
     "@definitelytyped/utils": "workspace:*",
-    "longjohn": "^0.2.12",
-    "pacote": "^17.0.5",
-    "semver": "^7.5.4",
-    "typescript": "^5.5.2",
-    "yargs": "^17.7.2"
+    "pacote": "catalog:",
+    "semver": "catalog:",
+    "typescript": "catalog:",
+    "yargs": "catalog:"
   },
   "devDependencies": {
-    "@types/pacote": "^11.1.8",
-    "@types/semver": "^7.5.6",
-    "@types/yargs": "^17.0.32"
+    "@types/pacote": "catalog:",
+    "@types/semver": "catalog:",
+    "@types/yargs": "catalog:"
   },
   "scripts": {
     "build": "tsc -b",

packages/publisher/src/lib/common.ts

@@ -1,12 +1,6 @@
 import { ParseDefinitionsOptions } from "@definitelytyped/definitions-parser";
 import path from "path";
 
-if (process.env.LONGJOHN) {
-  console.log("=== USING LONGJOHN ===");
-  const longjohn = require("longjohn") as { async_trace_limit: number };
-  longjohn.async_trace_limit = -1; // unlimited
-}
-
 export interface TesterOptions extends ParseDefinitionsOptions {
   // Tester can only run on files stored on-disk.
   readonly definitelyTypedPath: string;