From 77bec99f7afae5d8a3128aa73698f1d2b6fe2715 Mon Sep 17 00:00:00 2001 From: Nathan Rajlich Date: Tue, 22 Aug 2023 01:12:13 -0700 Subject: [PATCH 1/5] Remove `tsconfig` package and update TypeScript to v5.1.6 --- packages/agent-base/package.json | 3 +- packages/agent-base/tsconfig.json | 12 +- packages/data-uri-to-buffer/package.json | 3 +- packages/data-uri-to-buffer/tsconfig.json | 12 +- packages/degenerator/package.json | 1 - packages/degenerator/tsconfig.json | 12 +- packages/get-uri/package.json | 3 +- packages/get-uri/tsconfig.json | 13 +- packages/http-proxy-agent/package.json | 3 +- packages/http-proxy-agent/tsconfig.json | 12 +- packages/https-proxy-agent/package.json | 3 +- packages/https-proxy-agent/tsconfig.json | 12 +- packages/pac-proxy-agent/package.json | 3 +- packages/pac-proxy-agent/tsconfig.json | 12 +- packages/pac-resolver/package.json | 1 - packages/pac-resolver/tsconfig.json | 12 +- packages/proxy-agent/package.json | 3 +- packages/proxy-agent/tsconfig.json | 12 +- packages/proxy/package.json | 3 +- packages/proxy/tsconfig.json | 12 +- packages/socks-proxy-agent/package.json | 3 +- packages/socks-proxy-agent/tsconfig.json | 12 +- packages/tsconfig/base.json | 22 ---- packages/tsconfig/package.json | 6 - pnpm-lock.yaml | 150 +++++++++------------- 25 files changed, 157 insertions(+), 183 deletions(-) delete mode 100644 packages/tsconfig/base.json delete mode 100644 packages/tsconfig/package.json diff --git a/packages/agent-base/package.json b/packages/agent-base/package.json index e24792be..da38eab3 100644 --- a/packages/agent-base/package.json +++ b/packages/agent-base/package.json @@ -39,8 +39,7 @@ "async-listen": "^3.0.0", "jest": "^29.5.0", "ts-jest": "^29.1.0", - "tsconfig": "workspace:*", - "typescript": "^5.0.4", + "typescript": "^5.1.6", "ws": "^3.3.3" }, "engines": { diff --git a/packages/agent-base/tsconfig.json b/packages/agent-base/tsconfig.json index 24b6cf7e..3ea2e2a4 100644 --- a/packages/agent-base/tsconfig.json +++ b/packages/agent-base/tsconfig.json @@ -1,8 +1,12 @@ { - "extends": "tsconfig/base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "dist", + "outDir": "dist" }, - "include": ["src"], - "exclude": ["node_modules"] + "include": [ + "src" + ], + "exclude": [ + "node_modules" + ] } diff --git a/packages/data-uri-to-buffer/package.json b/packages/data-uri-to-buffer/package.json index 9fa9d442..4e6a34ce 100644 --- a/packages/data-uri-to-buffer/package.json +++ b/packages/data-uri-to-buffer/package.json @@ -38,7 +38,6 @@ "@types/node": "^14.18.45", "jest": "^29.5.0", "ts-jest": "^29.1.0", - "tsconfig": "workspace:*", - "typescript": "^5.0.4" + "typescript": "^5.1.6" } } diff --git a/packages/data-uri-to-buffer/tsconfig.json b/packages/data-uri-to-buffer/tsconfig.json index 24b6cf7e..3ea2e2a4 100644 --- a/packages/data-uri-to-buffer/tsconfig.json +++ b/packages/data-uri-to-buffer/tsconfig.json @@ -1,8 +1,12 @@ { - "extends": "tsconfig/base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "dist", + "outDir": "dist" }, - "include": ["src"], - "exclude": ["node_modules"] + "include": [ + "src" + ], + "exclude": [ + "node_modules" + ] } diff --git a/packages/degenerator/package.json b/packages/degenerator/package.json index a47c23d6..66d451f4 100644 --- a/packages/degenerator/package.json +++ b/packages/degenerator/package.json @@ -36,7 +36,6 @@ "@types/node": "^14.18.52", "jest": "^29.5.0", "ts-jest": "^29.1.0", - "tsconfig": "workspace:*", "typescript": "^5.1.6" } } diff --git a/packages/degenerator/tsconfig.json b/packages/degenerator/tsconfig.json index 24b6cf7e..3ea2e2a4 100644 --- a/packages/degenerator/tsconfig.json +++ b/packages/degenerator/tsconfig.json @@ -1,8 +1,12 @@ { - "extends": "tsconfig/base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "dist", + "outDir": "dist" }, - "include": ["src"], - "exclude": ["node_modules"] + "include": [ + "src" + ], + "exclude": [ + "node_modules" + ] } diff --git a/packages/get-uri/package.json b/packages/get-uri/package.json index 1d11ab10..9f269c7d 100644 --- a/packages/get-uri/package.json +++ b/packages/get-uri/package.json @@ -45,8 +45,7 @@ "jest": "^29.5.0", "st": "^1.2.2", "ts-jest": "^29.1.0", - "tsconfig": "workspace:*", - "typescript": "^5.0.4" + "typescript": "^5.1.6" }, "dependencies": { "basic-ftp": "^5.0.2", diff --git a/packages/get-uri/tsconfig.json b/packages/get-uri/tsconfig.json index d43bf6a4..13fb6d79 100644 --- a/packages/get-uri/tsconfig.json +++ b/packages/get-uri/tsconfig.json @@ -1,10 +1,13 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { "strict": true, "module": "CommonJS", "target": "es2020", "esModuleInterop": true, - "lib": ["esnext"], + "lib": [ + "esnext" + ], "outDir": "dist", "sourceMap": true, "declaration": true, @@ -13,6 +16,10 @@ "./node_modules/@types" ] }, - "include": ["src/**/*"], - "exclude": ["node_modules"] + "include": [ + "src/**/*" + ], + "exclude": [ + "node_modules" + ] } diff --git a/packages/http-proxy-agent/package.json b/packages/http-proxy-agent/package.json index 4cfd780b..e8e4c040 100644 --- a/packages/http-proxy-agent/package.json +++ b/packages/http-proxy-agent/package.json @@ -38,8 +38,7 @@ "jest": "^29.5.0", "proxy": "workspace:*", "ts-jest": "^29.1.0", - "tsconfig": "workspace:*", - "typescript": "^5.0.4" + "typescript": "^5.1.6" }, "engines": { "node": ">= 14" diff --git a/packages/http-proxy-agent/tsconfig.json b/packages/http-proxy-agent/tsconfig.json index 24b6cf7e..3ea2e2a4 100644 --- a/packages/http-proxy-agent/tsconfig.json +++ b/packages/http-proxy-agent/tsconfig.json @@ -1,8 +1,12 @@ { - "extends": "tsconfig/base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "dist", + "outDir": "dist" }, - "include": ["src"], - "exclude": ["node_modules"] + "include": [ + "src" + ], + "exclude": [ + "node_modules" + ] } diff --git a/packages/https-proxy-agent/package.json b/packages/https-proxy-agent/package.json index 5c5a2b27..2f8427d6 100644 --- a/packages/https-proxy-agent/package.json +++ b/packages/https-proxy-agent/package.json @@ -41,8 +41,7 @@ "jest": "^29.5.0", "proxy": "workspace:*", "ts-jest": "^29.1.0", - "tsconfig": "workspace:*", - "typescript": "^5.0.4" + "typescript": "^5.1.6" }, "engines": { "node": ">= 14" diff --git a/packages/https-proxy-agent/tsconfig.json b/packages/https-proxy-agent/tsconfig.json index 24b6cf7e..3ea2e2a4 100644 --- a/packages/https-proxy-agent/tsconfig.json +++ b/packages/https-proxy-agent/tsconfig.json @@ -1,8 +1,12 @@ { - "extends": "tsconfig/base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "dist", + "outDir": "dist" }, - "include": ["src"], - "exclude": ["node_modules"] + "include": [ + "src" + ], + "exclude": [ + "node_modules" + ] } diff --git a/packages/pac-proxy-agent/package.json b/packages/pac-proxy-agent/package.json index 762442d1..5026ceab 100644 --- a/packages/pac-proxy-agent/package.json +++ b/packages/pac-proxy-agent/package.json @@ -49,8 +49,7 @@ "proxy": "workspace:*", "socksv5": "0.0.6", "ts-jest": "^29.1.0", - "tsconfig": "workspace:*", - "typescript": "^5.0.4" + "typescript": "^5.1.6" }, "engines": { "node": ">= 14" diff --git a/packages/pac-proxy-agent/tsconfig.json b/packages/pac-proxy-agent/tsconfig.json index 24b6cf7e..3ea2e2a4 100644 --- a/packages/pac-proxy-agent/tsconfig.json +++ b/packages/pac-proxy-agent/tsconfig.json @@ -1,8 +1,12 @@ { - "extends": "tsconfig/base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "dist", + "outDir": "dist" }, - "include": ["src"], - "exclude": ["node_modules"] + "include": [ + "src" + ], + "exclude": [ + "node_modules" + ] } diff --git a/packages/pac-resolver/package.json b/packages/pac-resolver/package.json index 688383c1..69930799 100644 --- a/packages/pac-resolver/package.json +++ b/packages/pac-resolver/package.json @@ -20,7 +20,6 @@ "@types/node": "^14.18.52", "jest": "^29.5.0", "ts-jest": "^29.1.0", - "tsconfig": "workspace:*", "typescript": "^5.1.6" }, "scripts": { diff --git a/packages/pac-resolver/tsconfig.json b/packages/pac-resolver/tsconfig.json index 24b6cf7e..3ea2e2a4 100644 --- a/packages/pac-resolver/tsconfig.json +++ b/packages/pac-resolver/tsconfig.json @@ -1,8 +1,12 @@ { - "extends": "tsconfig/base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "dist", + "outDir": "dist" }, - "include": ["src"], - "exclude": ["node_modules"] + "include": [ + "src" + ], + "exclude": [ + "node_modules" + ] } diff --git a/packages/proxy-agent/package.json b/packages/proxy-agent/package.json index 99ab0361..86ceaa38 100644 --- a/packages/proxy-agent/package.json +++ b/packages/proxy-agent/package.json @@ -53,8 +53,7 @@ "proxy": "workspace:*", "socksv5": "github:TooTallNate/socksv5#fix/dstSock-close-event", "ts-jest": "^29.1.0", - "tsconfig": "workspace:*", - "typescript": "^5.0.4", + "typescript": "^5.1.6", "ws": "^8.13.0" } } diff --git a/packages/proxy-agent/tsconfig.json b/packages/proxy-agent/tsconfig.json index 24b6cf7e..3ea2e2a4 100644 --- a/packages/proxy-agent/tsconfig.json +++ b/packages/proxy-agent/tsconfig.json @@ -1,8 +1,12 @@ { - "extends": "tsconfig/base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "dist", + "outDir": "dist" }, - "include": ["src"], - "exclude": ["node_modules"] + "include": [ + "src" + ], + "exclude": [ + "node_modules" + ] } diff --git a/packages/proxy/package.json b/packages/proxy/package.json index a4ab921a..63aa9b0c 100644 --- a/packages/proxy/package.json +++ b/packages/proxy/package.json @@ -46,8 +46,7 @@ "async-listen": "^3.0.0", "jest": "^29.5.0", "ts-jest": "^29.1.0", - "tsconfig": "workspace:*", - "typescript": "^5.0.4" + "typescript": "^5.1.6" }, "engines": { "node": ">= 14" diff --git a/packages/proxy/tsconfig.json b/packages/proxy/tsconfig.json index 24b6cf7e..3ea2e2a4 100644 --- a/packages/proxy/tsconfig.json +++ b/packages/proxy/tsconfig.json @@ -1,8 +1,12 @@ { - "extends": "tsconfig/base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "dist", + "outDir": "dist" }, - "include": ["src"], - "exclude": ["node_modules"] + "include": [ + "src" + ], + "exclude": [ + "node_modules" + ] } diff --git a/packages/socks-proxy-agent/package.json b/packages/socks-proxy-agent/package.json index 76ab7c65..f4826523 100644 --- a/packages/socks-proxy-agent/package.json +++ b/packages/socks-proxy-agent/package.json @@ -125,8 +125,7 @@ "proxy": "workspace:*", "socksv5": "github:TooTallNate/socksv5#fix/dstSock-close-event", "ts-jest": "^29.1.0", - "tsconfig": "workspace:*", - "typescript": "^5.0.4" + "typescript": "^5.1.6" }, "engines": { "node": ">= 14" diff --git a/packages/socks-proxy-agent/tsconfig.json b/packages/socks-proxy-agent/tsconfig.json index 24b6cf7e..3ea2e2a4 100644 --- a/packages/socks-proxy-agent/tsconfig.json +++ b/packages/socks-proxy-agent/tsconfig.json @@ -1,8 +1,12 @@ { - "extends": "tsconfig/base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "dist", + "outDir": "dist" }, - "include": ["src"], - "exclude": ["node_modules"] + "include": [ + "src" + ], + "exclude": [ + "node_modules" + ] } diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.json deleted file mode 100644 index b28bb607..00000000 --- a/packages/tsconfig/base.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "compilerOptions": { - "composite": false, - "declaration": true, - "declarationMap": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "sourceMap": true, - "inlineSources": false, - "isolatedModules": true, - "moduleResolution": "node", - "noUnusedLocals": false, - "noUnusedParameters": false, - "preserveWatchOutput": true, - "skipLibCheck": true, - "module": "CommonJS", - "target": "ES2020", - "lib": ["ESNext"], - "strict": true - } -} \ No newline at end of file diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json deleted file mode 100644 index 70219b6f..00000000 --- a/packages/tsconfig/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "tsconfig", - "version": "0.0.0", - "private": true, - "license": "MIT" -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5eca9a6d..fa54ab0d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,10 +9,10 @@ importers: version: 2.26.2 '@typescript-eslint/eslint-plugin': specifier: ^5.59.1 - version: 5.60.1(@typescript-eslint/parser@5.60.1)(eslint@7.32.0) + version: 5.60.1(@typescript-eslint/parser@5.60.1)(eslint@7.32.0)(typescript@5.1.6) '@typescript-eslint/parser': specifier: ^5.59.1 - version: 5.60.1(eslint@7.32.0) + version: 5.60.1(eslint@7.32.0)(typescript@5.1.6) eslint: specifier: ^7.32.0 version: 7.32.0 @@ -58,13 +58,10 @@ importers: version: 29.5.0(@types/node@14.18.45) ts-jest: specifier: ^29.1.0 - version: 29.1.0(jest@29.5.0)(typescript@5.0.4) - tsconfig: - specifier: workspace:* - version: link:../tsconfig + version: 29.1.0(@babel/core@7.21.4)(jest@29.5.0)(typescript@5.1.6) typescript: - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^5.1.6 + version: 5.1.6 ws: specifier: ^3.3.3 version: 3.3.3 @@ -82,13 +79,10 @@ importers: version: 29.5.0(@types/node@14.18.45) ts-jest: specifier: ^29.1.0 - version: 29.1.0(jest@29.5.0)(typescript@5.0.4) - tsconfig: - specifier: workspace:* - version: link:../tsconfig + version: 29.1.0(@babel/core@7.22.5)(jest@29.5.0)(typescript@5.1.6) typescript: - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^5.1.6 + version: 5.1.6 packages/degenerator: dependencies: @@ -122,10 +116,7 @@ importers: version: 29.5.0(@types/node@14.18.52) ts-jest: specifier: ^29.1.0 - version: 29.1.0(jest@29.5.0)(typescript@5.1.6) - tsconfig: - specifier: workspace:* - version: link:../tsconfig + version: 29.1.0(@babel/core@7.22.5)(jest@29.5.0)(typescript@5.1.6) typescript: specifier: ^5.1.6 version: 5.1.6 @@ -174,13 +165,10 @@ importers: version: 1.2.2 ts-jest: specifier: ^29.1.0 - version: 29.1.0(jest@29.5.0)(typescript@5.0.4) - tsconfig: - specifier: workspace:* - version: link:../tsconfig + version: 29.1.0(@babel/core@7.22.5)(jest@29.5.0)(typescript@5.1.6) typescript: - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^5.1.6 + version: 5.1.6 packages/http-proxy-agent: dependencies: @@ -211,13 +199,10 @@ importers: version: link:../proxy ts-jest: specifier: ^29.1.0 - version: 29.1.0(jest@29.5.0)(typescript@5.0.4) - tsconfig: - specifier: workspace:* - version: link:../tsconfig + version: 29.1.0(@babel/core@7.22.5)(jest@29.5.0)(typescript@5.1.6) typescript: - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^5.1.6 + version: 5.1.6 packages/https-proxy-agent: dependencies: @@ -254,13 +239,10 @@ importers: version: link:../proxy ts-jest: specifier: ^29.1.0 - version: 29.1.0(jest@29.5.0)(typescript@5.0.4) - tsconfig: - specifier: workspace:* - version: link:../tsconfig + version: 29.1.0(@babel/core@7.22.5)(jest@29.5.0)(typescript@5.1.6) typescript: - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^5.1.6 + version: 5.1.6 packages/pac-proxy-agent: dependencies: @@ -312,13 +294,10 @@ importers: version: 0.0.6 ts-jest: specifier: ^29.1.0 - version: 29.1.0(jest@29.5.0)(typescript@5.0.4) - tsconfig: - specifier: workspace:* - version: link:../tsconfig + version: 29.1.0(@babel/core@7.22.5)(jest@29.5.0)(typescript@5.1.6) typescript: - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^5.1.6 + version: 5.1.6 packages/pac-resolver: dependencies: @@ -352,10 +331,7 @@ importers: version: 29.5.0(@types/node@14.18.52) ts-jest: specifier: ^29.1.0 - version: 29.1.0(jest@29.5.0)(typescript@5.1.6) - tsconfig: - specifier: workspace:* - version: link:../tsconfig + version: 29.1.0(@babel/core@7.22.5)(jest@29.5.0)(typescript@5.1.6) typescript: specifier: ^5.1.6 version: 5.1.6 @@ -392,13 +368,10 @@ importers: version: 29.5.0(@types/node@14.18.45) ts-jest: specifier: ^29.1.0 - version: 29.1.0(jest@29.5.0)(typescript@5.0.4) - tsconfig: - specifier: workspace:* - version: link:../tsconfig + version: 29.1.0(@babel/core@7.22.5)(jest@29.5.0)(typescript@5.1.6) typescript: - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^5.1.6 + version: 5.1.6 packages/proxy-agent: dependencies: @@ -459,13 +432,10 @@ importers: version: github.com/TooTallNate/socksv5/d937368b28e929396166d77a06d387a4a902bd51 ts-jest: specifier: ^29.1.0 - version: 29.1.0(jest@29.5.0)(typescript@5.0.4) - tsconfig: - specifier: workspace:* - version: link:../tsconfig + version: 29.1.0(@babel/core@7.22.5)(jest@29.5.0)(typescript@5.1.6) typescript: - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^5.1.6 + version: 5.1.6 ws: specifier: ^8.13.0 version: 8.13.0 @@ -520,15 +490,10 @@ importers: version: github.com/TooTallNate/socksv5/d937368b28e929396166d77a06d387a4a902bd51 ts-jest: specifier: ^29.1.0 - version: 29.1.0(jest@29.5.0)(typescript@5.0.4) - tsconfig: - specifier: workspace:* - version: link:../tsconfig + version: 29.1.0(@babel/core@7.22.5)(jest@29.5.0)(typescript@5.1.6) typescript: - specifier: ^5.0.4 - version: 5.0.4 - - packages/tsconfig: {} + specifier: ^5.1.6 + version: 5.1.6 packages: @@ -1995,7 +1960,7 @@ packages: '@types/yargs-parser': 21.0.0 dev: true - /@typescript-eslint/eslint-plugin@5.60.1(@typescript-eslint/parser@5.60.1)(eslint@7.32.0): + /@typescript-eslint/eslint-plugin@5.60.1(@typescript-eslint/parser@5.60.1)(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-KSWsVvsJsLJv3c4e73y/Bzt7OpqMCADUO846bHcuWYSYM19bldbAeDv7dYyV0jwkbMfJ2XdlzwjhXtuD7OY6bw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2007,22 +1972,23 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.5.1 - '@typescript-eslint/parser': 5.60.1(eslint@7.32.0) + '@typescript-eslint/parser': 5.60.1(eslint@7.32.0)(typescript@5.1.6) '@typescript-eslint/scope-manager': 5.60.1 - '@typescript-eslint/type-utils': 5.60.1(eslint@7.32.0) - '@typescript-eslint/utils': 5.60.1(eslint@7.32.0) + '@typescript-eslint/type-utils': 5.60.1(eslint@7.32.0)(typescript@5.1.6) + '@typescript-eslint/utils': 5.60.1(eslint@7.32.0)(typescript@5.1.6) debug: 4.3.4 eslint: 7.32.0 grapheme-splitter: 1.0.4 ignore: 5.2.4 natural-compare-lite: 1.4.0 semver: 7.5.3 - tsutils: 3.21.0 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@5.60.1(eslint@7.32.0): + /@typescript-eslint/parser@5.60.1(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-pHWlc3alg2oSMGwsU/Is8hbm3XFbcrb6P5wIxcQW9NsYBfnrubl/GhVVD/Jm/t8HXhA2WncoIRfBtnCgRGV96Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2034,9 +2000,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.60.1 '@typescript-eslint/types': 5.60.1 - '@typescript-eslint/typescript-estree': 5.60.1 + '@typescript-eslint/typescript-estree': 5.60.1(typescript@5.1.6) debug: 4.3.4 eslint: 7.32.0 + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true @@ -2049,7 +2016,7 @@ packages: '@typescript-eslint/visitor-keys': 5.60.1 dev: true - /@typescript-eslint/type-utils@5.60.1(eslint@7.32.0): + /@typescript-eslint/type-utils@5.60.1(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-vN6UztYqIu05nu7JqwQGzQKUJctzs3/Hg7E2Yx8rz9J+4LgtIDFWjjl1gm3pycH0P3mHAcEUBd23LVgfrsTR8A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2059,11 +2026,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.60.1 - '@typescript-eslint/utils': 5.60.1(eslint@7.32.0) + '@typescript-eslint/typescript-estree': 5.60.1(typescript@5.1.6) + '@typescript-eslint/utils': 5.60.1(eslint@7.32.0)(typescript@5.1.6) debug: 4.3.4 eslint: 7.32.0 - tsutils: 3.21.0 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true @@ -2073,7 +2041,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree@5.60.1: + /@typescript-eslint/typescript-estree@5.60.1(typescript@5.1.6): resolution: {integrity: sha512-hkX70J9+2M2ZT6fhti5Q2FoU9zb+GeZK2SLP1WZlvUDqdMbEKhexZODD1WodNRyO8eS+4nScvT0dts8IdaBzfw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2088,12 +2056,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.3 - tsutils: 3.21.0 + tsutils: 3.21.0(typescript@5.1.6) + typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.60.1(eslint@7.32.0): + /@typescript-eslint/utils@5.60.1(eslint@7.32.0)(typescript@5.1.6): resolution: {integrity: sha512-tiJ7FFdFQOWssFa3gqb94Ilexyw0JVxj6vBzaSpfN/8IhoKkDuSAenUKvsSHw2A/TMpJb26izIszTXaqygkvpQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2104,7 +2073,7 @@ packages: '@types/semver': 7.5.0 '@typescript-eslint/scope-manager': 5.60.1 '@typescript-eslint/types': 5.60.1 - '@typescript-eslint/typescript-estree': 5.60.1 + '@typescript-eslint/typescript-estree': 5.60.1(typescript@5.1.6) eslint: 7.32.0 eslint-scope: 5.1.1 semver: 7.5.3 @@ -5424,7 +5393,7 @@ packages: engines: {node: '>=8'} dev: true - /ts-jest@29.1.0(jest@29.5.0)(typescript@5.0.4): + /ts-jest@29.1.0(@babel/core@7.21.4)(jest@29.5.0)(typescript@5.1.6): resolution: {integrity: sha512-ZhNr7Z4PcYa+JjMl62ir+zPiNJfXJN6E8hSLnaUKhOgqcn8vb3e537cpkd0FuAfRK3sR1LSqM1MOhliXNgOFPA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -5445,6 +5414,7 @@ packages: esbuild: optional: true dependencies: + '@babel/core': 7.21.4 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 jest: 29.5.0(@types/node@14.18.45) @@ -5453,11 +5423,11 @@ packages: lodash.memoize: 4.1.2 make-error: 1.3.6 semver: 7.5.0 - typescript: 5.0.4 + typescript: 5.1.6 yargs-parser: 21.1.1 dev: true - /ts-jest@29.1.0(jest@29.5.0)(typescript@5.1.6): + /ts-jest@29.1.0(@babel/core@7.22.5)(jest@29.5.0)(typescript@5.1.6): resolution: {integrity: sha512-ZhNr7Z4PcYa+JjMl62ir+zPiNJfXJN6E8hSLnaUKhOgqcn8vb3e537cpkd0FuAfRK3sR1LSqM1MOhliXNgOFPA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -5478,9 +5448,10 @@ packages: esbuild: optional: true dependencies: + '@babel/core': 7.22.5 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 - jest: 29.5.0(@types/node@14.18.52) + jest: 29.5.0(@types/node@14.18.45) jest-util: 29.5.0 json5: 2.2.3 lodash.memoize: 4.1.2 @@ -5498,13 +5469,14 @@ packages: resolution: {integrity: sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==} dev: false - /tsutils@3.21.0: + /tsutils@3.21.0(typescript@5.1.6): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 + typescript: 5.1.6 dev: true /tty-table@4.2.1: @@ -5634,12 +5606,6 @@ packages: is-typed-array: 1.1.10 dev: true - /typescript@5.0.4: - resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==} - engines: {node: '>=12.20'} - hasBin: true - dev: true - /typescript@5.1.6: resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} engines: {node: '>=14.17'} From 4dd48041e8a93ad6e56a470715afbf0f202a3741 Mon Sep 17 00:00:00 2001 From: Nathan Rajlich Date: Tue, 22 Aug 2023 01:12:36 -0700 Subject: [PATCH 2/5] Add `tsconfig.base.json` --- tsconfig.base.json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 tsconfig.base.json diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 00000000..1881d1bf --- /dev/null +++ b/tsconfig.base.json @@ -0,0 +1,22 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "compilerOptions": { + "composite": false, + "declaration": true, + "declarationMap": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "sourceMap": true, + "inlineSources": false, + "isolatedModules": true, + "moduleResolution": "node", + "noUnusedLocals": false, + "noUnusedParameters": false, + "preserveWatchOutput": true, + "skipLibCheck": true, + "module": "CommonJS", + "target": "ES2020", + "lib": ["ESNext"], + "strict": true + } +} From 7b3557c7b572fc6c9288b4df15f1395be3c2dd9c Mon Sep 17 00:00:00 2001 From: Nathan Rajlich Date: Tue, 22 Aug 2023 01:28:02 -0700 Subject: [PATCH 3/5] [WIP] Generate TypeDoc docs --- package.json | 4 +- packages/agent-base/typedoc.json | 4 ++ packages/data-uri-to-buffer/typedoc.json | 4 ++ packages/degenerator/typedoc.json | 4 ++ packages/get-uri/typedoc.json | 4 ++ packages/http-proxy-agent/typedoc.json | 4 ++ packages/https-proxy-agent/typedoc.json | 4 ++ packages/pac-proxy-agent/typedoc.json | 4 ++ packages/pac-resolver/typedoc.json | 4 ++ packages/proxy-agent/typedoc.json | 4 ++ packages/socks-proxy-agent/typedoc.json | 4 ++ pnpm-lock.yaml | 52 ++++++++++++++++++++++++ typedoc.json | 7 ++++ vercel.json | 3 ++ 14 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 packages/agent-base/typedoc.json create mode 100644 packages/data-uri-to-buffer/typedoc.json create mode 100644 packages/degenerator/typedoc.json create mode 100644 packages/get-uri/typedoc.json create mode 100644 packages/http-proxy-agent/typedoc.json create mode 100644 packages/https-proxy-agent/typedoc.json create mode 100644 packages/pac-proxy-agent/typedoc.json create mode 100644 packages/pac-resolver/typedoc.json create mode 100644 packages/proxy-agent/typedoc.json create mode 100644 packages/socks-proxy-agent/typedoc.json create mode 100644 typedoc.json create mode 100644 vercel.json diff --git a/package.json b/package.json index c488e88e..4ee76054 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "private": true, "name": "proxy-agent-monorepo", "scripts": { + "docs": "typedoc", "build": "turbo run build", "lint": "turbo run lint", "test": "turbo run test", @@ -18,6 +19,7 @@ "eslint-config-prettier": "^8.8.0", "eslint-config-turbo": "^1.9.3", "prettier": "^2.8.8", - "turbo": "^1.10.8" + "turbo": "^1.10.8", + "typedoc": "^0.24.8" } } diff --git a/packages/agent-base/typedoc.json b/packages/agent-base/typedoc.json new file mode 100644 index 00000000..41a4f9e2 --- /dev/null +++ b/packages/agent-base/typedoc.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://typedoc.org/schema.json", + "entryPoints": ["src/index.ts"] +} diff --git a/packages/data-uri-to-buffer/typedoc.json b/packages/data-uri-to-buffer/typedoc.json new file mode 100644 index 00000000..41a4f9e2 --- /dev/null +++ b/packages/data-uri-to-buffer/typedoc.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://typedoc.org/schema.json", + "entryPoints": ["src/index.ts"] +} diff --git a/packages/degenerator/typedoc.json b/packages/degenerator/typedoc.json new file mode 100644 index 00000000..41a4f9e2 --- /dev/null +++ b/packages/degenerator/typedoc.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://typedoc.org/schema.json", + "entryPoints": ["src/index.ts"] +} diff --git a/packages/get-uri/typedoc.json b/packages/get-uri/typedoc.json new file mode 100644 index 00000000..41a4f9e2 --- /dev/null +++ b/packages/get-uri/typedoc.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://typedoc.org/schema.json", + "entryPoints": ["src/index.ts"] +} diff --git a/packages/http-proxy-agent/typedoc.json b/packages/http-proxy-agent/typedoc.json new file mode 100644 index 00000000..41a4f9e2 --- /dev/null +++ b/packages/http-proxy-agent/typedoc.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://typedoc.org/schema.json", + "entryPoints": ["src/index.ts"] +} diff --git a/packages/https-proxy-agent/typedoc.json b/packages/https-proxy-agent/typedoc.json new file mode 100644 index 00000000..41a4f9e2 --- /dev/null +++ b/packages/https-proxy-agent/typedoc.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://typedoc.org/schema.json", + "entryPoints": ["src/index.ts"] +} diff --git a/packages/pac-proxy-agent/typedoc.json b/packages/pac-proxy-agent/typedoc.json new file mode 100644 index 00000000..41a4f9e2 --- /dev/null +++ b/packages/pac-proxy-agent/typedoc.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://typedoc.org/schema.json", + "entryPoints": ["src/index.ts"] +} diff --git a/packages/pac-resolver/typedoc.json b/packages/pac-resolver/typedoc.json new file mode 100644 index 00000000..41a4f9e2 --- /dev/null +++ b/packages/pac-resolver/typedoc.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://typedoc.org/schema.json", + "entryPoints": ["src/index.ts"] +} diff --git a/packages/proxy-agent/typedoc.json b/packages/proxy-agent/typedoc.json new file mode 100644 index 00000000..41a4f9e2 --- /dev/null +++ b/packages/proxy-agent/typedoc.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://typedoc.org/schema.json", + "entryPoints": ["src/index.ts"] +} diff --git a/packages/socks-proxy-agent/typedoc.json b/packages/socks-proxy-agent/typedoc.json new file mode 100644 index 00000000..41a4f9e2 --- /dev/null +++ b/packages/socks-proxy-agent/typedoc.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://typedoc.org/schema.json", + "entryPoints": ["src/index.ts"] +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fa54ab0d..5d536408 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,6 +28,9 @@ importers: turbo: specifier: ^1.10.8 version: 1.10.8 + typedoc: + specifier: ^0.24.8 + version: 0.24.8(typescript@5.1.6) packages/agent-base: dependencies: @@ -2144,6 +2147,10 @@ packages: engines: {node: '>=12'} dev: true + /ansi-sequence-parser@1.1.1: + resolution: {integrity: sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg==} + dev: true + /ansi-styles@3.2.1: resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} engines: {node: '>=4'} @@ -4281,6 +4288,10 @@ packages: hasBin: true dev: true + /jsonc-parser@3.2.0: + resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==} + dev: true + /jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} optionalDependencies: @@ -4401,6 +4412,10 @@ packages: engines: {node: '>=12'} dev: false + /lunr@2.3.9: + resolution: {integrity: sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==} + dev: true + /make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} engines: {node: '>=8'} @@ -4428,6 +4443,12 @@ packages: engines: {node: '>=8'} dev: true + /marked@4.3.0: + resolution: {integrity: sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==} + engines: {node: '>= 12'} + hasBin: true + dev: true + /meow@6.1.1: resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==} engines: {node: '>=8'} @@ -5058,6 +5079,15 @@ packages: engines: {node: '>=8'} dev: true + /shiki@0.14.3: + resolution: {integrity: sha512-U3S/a+b0KS+UkTyMjoNojvTgrBHjgp7L6ovhFVZsXmBGnVdQ4K4U9oK0z63w538S91ATngv1vXigHCSWOwnr+g==} + dependencies: + ansi-sequence-parser: 1.1.1 + jsonc-parser: 3.2.0 + vscode-oniguruma: 1.7.0 + vscode-textmate: 8.0.0 + dev: true + /side-channel@1.0.4: resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} dependencies: @@ -5606,6 +5636,20 @@ packages: is-typed-array: 1.1.10 dev: true + /typedoc@0.24.8(typescript@5.1.6): + resolution: {integrity: sha512-ahJ6Cpcvxwaxfu4KtjA8qZNqS43wYt6JL27wYiIgl1vd38WW/KWX11YuAeZhuz9v+ttrutSsgK+XO1CjL1kA3w==} + engines: {node: '>= 14.14'} + hasBin: true + peerDependencies: + typescript: 4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x + dependencies: + lunr: 2.3.9 + marked: 4.3.0 + minimatch: 9.0.2 + shiki: 0.14.3 + typescript: 5.1.6 + dev: true + /typescript@5.1.6: resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} engines: {node: '>=14.17'} @@ -5681,6 +5725,14 @@ packages: spdx-expression-parse: 3.0.1 dev: true + /vscode-oniguruma@1.7.0: + resolution: {integrity: sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==} + dev: true + + /vscode-textmate@8.0.0: + resolution: {integrity: sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==} + dev: true + /walker@1.0.8: resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==} dependencies: diff --git a/typedoc.json b/typedoc.json new file mode 100644 index 00000000..a788fdae --- /dev/null +++ b/typedoc.json @@ -0,0 +1,7 @@ +{ + "$schema": "https://typedoc.org/schema.json", + "entryPointStrategy": "packages", + "entryPoints": ["./packages/*"], + "includeVersion": true, + "out": "public" +} diff --git a/vercel.json b/vercel.json new file mode 100644 index 00000000..36081427 --- /dev/null +++ b/vercel.json @@ -0,0 +1,3 @@ +{ + "buildCommand": "pnpm run docs" +} From b2c0effb97c55416446ff64afcb3695f5d768282 Mon Sep 17 00:00:00 2001 From: Nathan Rajlich Date: Tue, 22 Aug 2023 01:29:49 -0700 Subject: [PATCH 4/5] . --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 36081427..255230e9 100644 --- a/vercel.json +++ b/vercel.json @@ -1,3 +1,3 @@ { - "buildCommand": "pnpm run docs" + "buildCommand": "pnpm run pack && pnpm run docs" } From 36584fe27276c5a5c64d6afaa874778bd03fc1a6 Mon Sep 17 00:00:00 2001 From: Nathan Rajlich Date: Tue, 22 Aug 2023 01:31:30 -0700 Subject: [PATCH 5/5] . --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 255230e9..814a45e0 100644 --- a/vercel.json +++ b/vercel.json @@ -1,3 +1,3 @@ { - "buildCommand": "pnpm run pack && pnpm run docs" + "buildCommand": "turbo run pack && pnpm run docs" }