From e8c2a4a1b93533375d7a49ebcef606ac84577e43 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 07:43:54 +0200 Subject: [PATCH 01/17] update fastify deps --- package-lock.json | 416 +++++++++++++++++++++++++++++++++- packages/fastify/package.json | 11 +- 2 files changed, 417 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index f98b0b9f26b..1450b893696 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4725,6 +4725,7 @@ }, "node_modules/@fastify/ajv-compiler": { "version": "3.5.0", + "dev": true, "license": "MIT", "dependencies": { "ajv": "^8.11.0", @@ -4734,6 +4735,7 @@ }, "node_modules/@fastify/ajv-compiler/node_modules/ajv": { "version": "8.12.0", + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -4748,6 +4750,7 @@ }, "node_modules/@fastify/ajv-compiler/node_modules/json-schema-traverse": { "version": "1.0.0", + "dev": true, "license": "MIT" }, "node_modules/@fastify/busboy": { @@ -4760,19 +4763,31 @@ }, "node_modules/@fastify/deepmerge": { "version": "1.3.0", + "dev": true, "license": "MIT" }, "node_modules/@fastify/error": { "version": "3.2.1", + "dev": true, "license": "MIT" }, "node_modules/@fastify/fast-json-stringify-compiler": { "version": "4.3.0", + "dev": true, "license": "MIT", "dependencies": { "fast-json-stringify": "^5.7.0" } }, + "node_modules/@fastify/merge-json-schemas": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@fastify/merge-json-schemas/-/merge-json-schemas-0.1.1.tgz", + "integrity": "sha512-fERDVz7topgNjtXsJTTW1JKLy0rhuLRcquYqNR9rF7OcVpCa2OVW49ZPDIhaRRCaUuvVxI+N416xUoF76HNSXA==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3" + } + }, "node_modules/@floating-ui/core": { "version": "1.4.1", "license": "MIT", @@ -13641,6 +13656,7 @@ }, "node_modules/abort-controller": { "version": "3.0.0", + "dev": true, "license": "MIT", "dependencies": { "event-target-shim": "^5.0.0" @@ -13651,6 +13667,7 @@ }, "node_modules/abstract-logging": { "version": "2.0.1", + "dev": true, "license": "MIT" }, "node_modules/accepts": { @@ -13791,6 +13808,7 @@ }, "node_modules/ajv-formats": { "version": "2.1.1", + "dev": true, "license": "MIT", "dependencies": { "ajv": "^8.0.0" @@ -13806,6 +13824,7 @@ }, "node_modules/ajv-formats/node_modules/ajv": { "version": "8.12.0", + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -13820,6 +13839,7 @@ }, "node_modules/ajv-formats/node_modules/json-schema-traverse": { "version": "1.0.0", + "dev": true, "license": "MIT" }, "node_modules/ajv-keywords": { @@ -14215,6 +14235,7 @@ }, "node_modules/archy": { "version": "1.0.0", + "dev": true, "license": "MIT" }, "node_modules/are-we-there-yet": { @@ -15230,6 +15251,7 @@ }, "node_modules/atomic-sleep": { "version": "1.0.0", + "dev": true, "license": "MIT", "engines": { "node": ">=8.0.0" @@ -15250,6 +15272,7 @@ }, "node_modules/avvio": { "version": "8.2.1", + "dev": true, "license": "MIT", "dependencies": { "archy": "^1.0.0", @@ -21346,6 +21369,7 @@ }, "node_modules/event-target-shim": { "version": "5.0.1", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -21363,6 +21387,7 @@ }, "node_modules/events": { "version": "3.3.0", + "dev": true, "license": "MIT", "engines": { "node": ">=0.8.x" @@ -21703,10 +21728,12 @@ }, "node_modules/fast-content-type-parse": { "version": "1.0.0", + "dev": true, "license": "MIT" }, "node_modules/fast-decode-uri-component": { "version": "1.0.1", + "dev": true, "license": "MIT" }, "node_modules/fast-deep-equal": { @@ -21748,6 +21775,7 @@ }, "node_modules/fast-json-stringify": { "version": "5.7.0", + "dev": true, "license": "MIT", "dependencies": { "@fastify/deepmerge": "^1.0.0", @@ -21760,6 +21788,7 @@ }, "node_modules/fast-json-stringify/node_modules/ajv": { "version": "8.12.0", + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -21774,6 +21803,7 @@ }, "node_modules/fast-json-stringify/node_modules/json-schema-traverse": { "version": "1.0.0", + "dev": true, "license": "MIT" }, "node_modules/fast-levenshtein": { @@ -21782,6 +21812,7 @@ }, "node_modules/fast-querystring": { "version": "1.1.2", + "dev": true, "license": "MIT", "dependencies": { "fast-decode-uri-component": "^1.0.1" @@ -21789,6 +21820,7 @@ }, "node_modules/fast-redact": { "version": "3.2.0", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -21801,6 +21833,7 @@ }, "node_modules/fast-uri": { "version": "2.2.0", + "dev": true, "license": "MIT" }, "node_modules/fast-xml-parser": { @@ -21833,6 +21866,7 @@ }, "node_modules/fastify": { "version": "4.12.0", + "dev": true, "license": "MIT", "dependencies": { "@fastify/ajv-compiler": "^3.3.1", @@ -21854,6 +21888,7 @@ }, "node_modules/fastify-plugin": { "version": "4.5.0", + "dev": true, "license": "MIT" }, "node_modules/fastq": { @@ -22068,6 +22103,7 @@ }, "node_modules/find-my-way": { "version": "7.6.2", + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", @@ -22270,6 +22306,7 @@ }, "node_modules/forwarded": { "version": "0.2.0", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -24093,6 +24130,7 @@ }, "node_modules/ipaddr.js": { "version": "1.9.1", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.10" @@ -26753,6 +26791,15 @@ "dev": true, "license": "(AFL-2.1 OR BSD-3-Clause)" }, + "node_modules/json-schema-ref-resolver": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-schema-ref-resolver/-/json-schema-ref-resolver-1.0.1.tgz", + "integrity": "sha512-EJAj1pgHc1hxF6vo2Z3s69fMjO1INq6eGHXZ8Z6wCQeldCuwxGK9Sxf4/cScGn3FZubCVUehfWtcDM/PLteCQw==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3" + } + }, "node_modules/json-schema-traverse": { "version": "0.4.1", "license": "MIT" @@ -27010,6 +27057,7 @@ }, "node_modules/light-my-request": { "version": "5.9.2", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "cookie": "^0.5.0", @@ -30889,6 +30937,7 @@ }, "node_modules/on-exit-leak-free": { "version": "2.1.0", + "dev": true, "license": "MIT" }, "node_modules/on-finished": { @@ -31580,6 +31629,7 @@ }, "node_modules/pino": { "version": "8.17.2", + "dev": true, "license": "MIT", "dependencies": { "atomic-sleep": "^1.0.0", @@ -31600,6 +31650,7 @@ }, "node_modules/pino-abstract-transport": { "version": "1.1.0", + "dev": true, "license": "MIT", "dependencies": { "readable-stream": "^4.0.0", @@ -31608,6 +31659,7 @@ }, "node_modules/pino-abstract-transport/node_modules/buffer": { "version": "6.0.3", + "dev": true, "funding": [ { "type": "github", @@ -31630,6 +31682,7 @@ }, "node_modules/pino-abstract-transport/node_modules/readable-stream": { "version": "4.5.2", + "dev": true, "license": "MIT", "dependencies": { "abort-controller": "^3.0.0", @@ -31644,6 +31697,7 @@ }, "node_modules/pino-abstract-transport/node_modules/string_decoder": { "version": "1.3.0", + "dev": true, "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" @@ -31651,10 +31705,12 @@ }, "node_modules/pino-std-serializers": { "version": "6.2.1", + "dev": true, "license": "MIT" }, "node_modules/pino/node_modules/process-warning": { "version": "3.0.0", + "dev": true, "license": "MIT" }, "node_modules/pirates": { @@ -32208,6 +32264,7 @@ }, "node_modules/process": { "version": "0.11.10", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6.0" @@ -32220,6 +32277,7 @@ }, "node_modules/process-warning": { "version": "2.2.0", + "dev": true, "license": "MIT" }, "node_modules/prompts": { @@ -32273,6 +32331,7 @@ }, "node_modules/proxy-addr": { "version": "2.0.7", + "dev": true, "license": "MIT", "dependencies": { "forwarded": "0.2.0", @@ -32448,6 +32507,7 @@ }, "node_modules/quick-format-unescaped": { "version": "4.0.4", + "dev": true, "license": "MIT" }, "node_modules/quick-lru": { @@ -33057,6 +33117,7 @@ }, "node_modules/real-require": { "version": "0.2.0", + "dev": true, "license": "MIT", "engines": { "node": ">= 12.13.0" @@ -33393,6 +33454,7 @@ }, "node_modules/require-from-string": { "version": "2.0.2", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -33488,6 +33550,7 @@ }, "node_modules/ret": { "version": "0.2.2", + "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -33560,6 +33623,7 @@ }, "node_modules/rfdc": { "version": "1.3.0", + "dev": true, "license": "MIT" }, "node_modules/rimraf": { @@ -33806,6 +33870,7 @@ }, "node_modules/safe-regex2": { "version": "2.0.0", + "dev": true, "license": "MIT", "dependencies": { "ret": "~0.2.0" @@ -33813,6 +33878,7 @@ }, "node_modules/safe-stable-stringify": { "version": "2.4.3", + "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -33886,6 +33952,7 @@ }, "node_modules/secure-json-parse": { "version": "2.7.0", + "dev": true, "license": "BSD-3-Clause" }, "node_modules/select-hose": { @@ -34121,6 +34188,7 @@ }, "node_modules/set-cookie-parser": { "version": "2.6.0", + "dev": true, "license": "MIT" }, "node_modules/set-function-length": { @@ -34655,6 +34723,7 @@ }, "node_modules/sonic-boom": { "version": "3.8.0", + "dev": true, "license": "MIT", "dependencies": { "atomic-sleep": "^1.0.0" @@ -34916,6 +34985,7 @@ }, "node_modules/split2": { "version": "4.2.0", + "dev": true, "license": "ISC", "engines": { "node": ">= 10.x" @@ -35984,6 +36054,7 @@ }, "node_modules/thread-stream": { "version": "2.7.0", + "dev": true, "license": "MIT", "dependencies": { "real-require": "^0.2.0" @@ -36050,6 +36121,7 @@ }, "node_modules/tiny-lru": { "version": "10.4.1", + "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=12" @@ -36136,6 +36208,15 @@ "node": ">=8.0" } }, + "node_modules/toad-cache": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/toad-cache/-/toad-cache-3.7.0.tgz", + "integrity": "sha512-/m8M+2BJUpoJdgAHoG+baCwBT+tf2VraSfkBgl0Y00qIWt41DJ8R5B8nsEw0I58YwF5IZH6z24/2TobDKnqSWw==", + "dev": true, + "engines": { + "node": ">=12" + } + }, "node_modules/toggle-selection": { "version": "1.0.6", "license": "MIT" @@ -43087,22 +43168,347 @@ "@clerk/backend": "1.13.6", "@clerk/shared": "2.8.4", "@clerk/types": "4.23.0", - "cookies": "0.8.0" + "cookies": "0.8.0", + "fastify-plugin": "^5.0.1" }, "devDependencies": { "@clerk/eslint-config-custom": "*", - "@types/node": "^18.19.33", + "@types/node": "^20.14.8", + "fastify": "^5.0.0", "tsup": "*", "typescript": "*" }, "engines": { - "node": ">=18.17.0" + "node": ">=20" + }, + "peerDependencies": { + "fastify": ">=5" + } + }, + "packages/fastify/node_modules/@fastify/ajv-compiler": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@fastify/ajv-compiler/-/ajv-compiler-4.0.1.tgz", + "integrity": "sha512-DxrBdgsjNLP0YM6W5Hd6/Fmj43S8zMKiFJYgi+Ri3htTGAowPVG/tG1wpnWLMjufEnehRivUCKZ1pLDIoZdTuw==", + "dev": true, + "dependencies": { + "ajv": "^8.12.0", + "ajv-formats": "^3.0.1", + "fast-uri": "^3.0.0" + } + }, + "packages/fastify/node_modules/@fastify/error": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@fastify/error/-/error-4.0.0.tgz", + "integrity": "sha512-OO/SA8As24JtT1usTUTKgGH7uLvhfwZPwlptRi2Dp5P4KKmJI3gvsZ8MIHnNwDs4sLf/aai5LzTyl66xr7qMxA==", + "dev": true + }, + "packages/fastify/node_modules/@fastify/fast-json-stringify-compiler": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-5.0.1.tgz", + "integrity": "sha512-f2d3JExJgFE3UbdFcpPwqNUEoHWmt8pAKf8f+9YuLESdefA0WgqxeT6DrGL4Yrf/9ihXNSKOqpjEmurV405meA==", + "dev": true, + "dependencies": { + "fast-json-stringify": "^6.0.0" + } + }, + "packages/fastify/node_modules/@types/node": { + "version": "20.16.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.10.tgz", + "integrity": "sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==", + "dev": true, + "dependencies": { + "undici-types": "~6.19.2" + } + }, + "packages/fastify/node_modules/ajv": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "packages/fastify/node_modules/ajv-formats": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", + "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", + "dev": true, + "dependencies": { + "ajv": "^8.0.0" }, "peerDependencies": { - "fastify": ">=4", - "fastify-plugin": "^4.5.0" + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "packages/fastify/node_modules/avvio": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/avvio/-/avvio-9.0.0.tgz", + "integrity": "sha512-UbYrOXgE/I+knFG+3kJr9AgC7uNo8DG+FGGODpH9Bj1O1kL/QDjBXnTem9leD3VdQKtaHjV3O85DQ7hHh4IIHw==", + "dev": true, + "dependencies": { + "@fastify/error": "^4.0.0", + "fastq": "^1.17.1" + } + }, + "packages/fastify/node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, + "packages/fastify/node_modules/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "dev": true, + "engines": { + "node": ">= 0.6" } }, + "packages/fastify/node_modules/fast-json-stringify": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-6.0.0.tgz", + "integrity": "sha512-FGMKZwniMTgZh7zQp9b6XnBVxUmKVahQLQeRQHqwYmPDqDhcEKZ3BaQsxelFFI5PY7nN71OEeiL47/zUWcYe1A==", + "dev": true, + "dependencies": { + "@fastify/merge-json-schemas": "^0.1.1", + "ajv": "^8.12.0", + "ajv-formats": "^3.0.1", + "fast-deep-equal": "^3.1.3", + "fast-uri": "^2.3.0", + "json-schema-ref-resolver": "^1.0.1", + "rfdc": "^1.2.0" + } + }, + "packages/fastify/node_modules/fast-json-stringify/node_modules/fast-uri": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-2.4.0.tgz", + "integrity": "sha512-ypuAmmMKInk5q7XcepxlnUWDLWv4GFtaJqAzWKqn62IpQ3pejtr5dTVbt3vwqVaMKmkNR55sTT+CqUKIaT21BA==", + "dev": true + }, + "packages/fastify/node_modules/fast-uri": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz", + "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==", + "dev": true + }, + "packages/fastify/node_modules/fastify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/fastify/-/fastify-5.0.0.tgz", + "integrity": "sha512-Qe4dU+zGOzg7vXjw4EvcuyIbNnMwTmcuOhlOrOJsgwzvjEZmsM/IeHulgJk+r46STjdJS/ZJbxO8N70ODXDMEQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "dependencies": { + "@fastify/ajv-compiler": "^4.0.0", + "@fastify/error": "^4.0.0", + "@fastify/fast-json-stringify-compiler": "^5.0.0", + "abstract-logging": "^2.0.1", + "avvio": "^9.0.0", + "fast-json-stringify": "^6.0.0", + "find-my-way": "^9.0.0", + "light-my-request": "^6.0.0", + "pino": "^9.0.0", + "process-warning": "^4.0.0", + "proxy-addr": "^2.0.7", + "rfdc": "^1.3.1", + "secure-json-parse": "^2.7.0", + "semver": "^7.6.0", + "toad-cache": "^3.7.0" + } + }, + "packages/fastify/node_modules/fastify-plugin": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-5.0.1.tgz", + "integrity": "sha512-HCxs+YnRaWzCl+cWRYFnHmeRFyR5GVnJTAaCJQiYzQSDwK9MgJdyAsuL3nh0EWRCYMgQ5MeziymvmAhUHYHDUQ==" + }, + "packages/fastify/node_modules/find-my-way": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-9.1.0.tgz", + "integrity": "sha512-Y5jIsuYR4BwWDYYQ2A/RWWE6gD8a0FMgtU+HOq1WKku+Cwdz8M1v8wcAmRXXM1/iqtoqg06v+LjAxMYbCjViMw==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-querystring": "^1.0.0", + "safe-regex2": "^4.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "packages/fastify/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "packages/fastify/node_modules/light-my-request": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/light-my-request/-/light-my-request-6.0.0.tgz", + "integrity": "sha512-kFkFXrmKCL0EEeOmJybMH5amWFd+AFvlvMlvFTRxCUwbhfapZqDmeLMPoWihntnYY6JpoQDE9k+vOzObF1fDqg==", + "dev": true, + "dependencies": { + "cookie": "^0.6.0", + "process-warning": "^4.0.0", + "set-cookie-parser": "^2.6.0" + } + }, + "packages/fastify/node_modules/pino": { + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/pino/-/pino-9.4.0.tgz", + "integrity": "sha512-nbkQb5+9YPhQRz/BeQmrWpEknAaqjpAqRK8NwJpmrX/JHu7JuZC5G1CeAwJDJfGes4h+YihC6in3Q2nGb+Y09w==", + "dev": true, + "dependencies": { + "atomic-sleep": "^1.0.0", + "fast-redact": "^3.1.1", + "on-exit-leak-free": "^2.1.0", + "pino-abstract-transport": "^1.2.0", + "pino-std-serializers": "^7.0.0", + "process-warning": "^4.0.0", + "quick-format-unescaped": "^4.0.3", + "real-require": "^0.2.0", + "safe-stable-stringify": "^2.3.1", + "sonic-boom": "^4.0.1", + "thread-stream": "^3.0.0" + }, + "bin": { + "pino": "bin.js" + } + }, + "packages/fastify/node_modules/pino-abstract-transport": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz", + "integrity": "sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q==", + "dev": true, + "dependencies": { + "readable-stream": "^4.0.0", + "split2": "^4.0.0" + } + }, + "packages/fastify/node_modules/pino-std-serializers": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz", + "integrity": "sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==", + "dev": true + }, + "packages/fastify/node_modules/process-warning": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-4.0.0.tgz", + "integrity": "sha512-/MyYDxttz7DfGMMHiysAsFE4qF+pQYAA8ziO/3NcRVrQ5fSk+Mns4QZA/oRPFzvcqNoVJXQNWNAsdwBXLUkQKw==", + "dev": true + }, + "packages/fastify/node_modules/readable-stream": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz", + "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==", + "dev": true, + "dependencies": { + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "packages/fastify/node_modules/ret": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.5.0.tgz", + "integrity": "sha512-I1XxrZSQ+oErkRR4jYbAyEEu2I0avBvvMM5JN+6EBprOGRCs63ENqZ3vjavq8fBw2+62G5LF5XelKwuJpcvcxw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "packages/fastify/node_modules/rfdc": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", + "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", + "dev": true + }, + "packages/fastify/node_modules/safe-regex2": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/safe-regex2/-/safe-regex2-4.0.0.tgz", + "integrity": "sha512-Hvjfv25jPDVr3U+4LDzBuZPPOymELG3PYcSk5hcevooo1yxxamQL/bHs/GrEPGmMoMEwRrHVGiCA1pXi97B8Ew==", + "dev": true, + "dependencies": { + "ret": "~0.5.0" + } + }, + "packages/fastify/node_modules/sonic-boom": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.1.0.tgz", + "integrity": "sha512-NGipjjRicyJJ03rPiZCJYjwlsuP2d1/5QUviozRXC7S3WdVWNK5e3Ojieb9CCyfhq2UC+3+SRd9nG3I2lPRvUw==", + "dev": true, + "dependencies": { + "atomic-sleep": "^1.0.0" + } + }, + "packages/fastify/node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "packages/fastify/node_modules/thread-stream": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-3.1.0.tgz", + "integrity": "sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==", + "dev": true, + "dependencies": { + "real-require": "^0.2.0" + } + }, + "packages/fastify/node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "dev": true + }, "packages/localizations": { "name": "@clerk/localizations", "version": "3.1.0", diff --git a/packages/fastify/package.json b/packages/fastify/package.json index 3d1797120b9..b4082f3a1b9 100644 --- a/packages/fastify/package.json +++ b/packages/fastify/package.json @@ -43,20 +43,21 @@ "@clerk/backend": "1.13.6", "@clerk/shared": "2.8.4", "@clerk/types": "4.23.0", - "cookies": "0.8.0" + "cookies": "0.8.0", + "fastify-plugin": "^5.0.1" }, "devDependencies": { "@clerk/eslint-config-custom": "*", - "@types/node": "^18.19.33", + "@types/node": "^20.14.8", + "fastify": "^5.0.0", "tsup": "*", "typescript": "*" }, "peerDependencies": { - "fastify": ">=4", - "fastify-plugin": "^4.5.0" + "fastify": ">=5" }, "engines": { - "node": ">=18.17.0" + "node": ">=20" }, "publishConfig": { "access": "public" From f02e87d52bf144d54f4b2c753f400542b9e35b9b Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 07:44:03 +0200 Subject: [PATCH 02/17] update readme with new requirements --- packages/fastify/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fastify/README.md b/packages/fastify/README.md index 7d00d42d09f..0be40bc6a89 100644 --- a/packages/fastify/README.md +++ b/packages/fastify/README.md @@ -31,8 +31,8 @@ ### Prerequisites -- Fastify `^4.0.0` or later -- Node.js `>=18.17.0` or later +- Fastify `^5.0.0` or later +- Node.js `>=20.0.0` or later - An existing Clerk application. [Create your account for free](https://dashboard.clerk.com/sign-up?utm_source=github&utm_medium=clerk_fastify). ### Installation From 5a29f3ff3844abefb48ed81baab594167f4f4d21 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 07:44:11 +0200 Subject: [PATCH 03/17] update plugin --- packages/fastify/src/clerkPlugin.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/fastify/src/clerkPlugin.ts b/packages/fastify/src/clerkPlugin.ts index b6c3debc4b3..477894881a2 100644 --- a/packages/fastify/src/clerkPlugin.ts +++ b/packages/fastify/src/clerkPlugin.ts @@ -17,7 +17,6 @@ const plugin: FastifyPluginCallback = ( throw new Error(`Unsupported hookName: ${hookName}`); } - // @ts-expect-error unions don't play well with TS overload signatures instance.addHook(hookName, withClerkMiddleware(opts)); done(); @@ -25,5 +24,5 @@ const plugin: FastifyPluginCallback = ( export const clerkPlugin = fp(plugin, { name: '@clerk/fastify', - fastify: '4.x', + fastify: '5.x', }); From d591449886b75312502bde2dbee7fdd1fbc7eb01 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 07:44:26 +0200 Subject: [PATCH 04/17] update playground deps --- playground/fastify/package.json | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/playground/fastify/package.json b/playground/fastify/package.json index b4d475b81b5..f7e6193e587 100644 --- a/playground/fastify/package.json +++ b/playground/fastify/package.json @@ -10,17 +10,16 @@ "@clerk/fastify": "file:.yalc/@clerk/fastify", "@clerk/shared": "file:.yalc/@clerk/shared", "@clerk/types": "file:.yalc/@clerk/types", - "@fastify/view": "^8.0.0", - "dotenv": "^16.0.3", - "ejs": "^3.1.9", - "fastify": "^4.12.0", - "ts-node": "^10.9.1" + "@fastify/view": "^10.0.1", + "dotenv": "^16.4.5", + "ejs": "^3.1.10", + "fastify": "^5.0.0", + "ts-node": "^10.9.2" }, "devDependencies": { - "@types/ejs": "^3.1.2", - "@types/node": "^18.11.18", - "eslint": "8.24.0", - "tslib": "^2.5.0", - "typescript": "4.8.4" + "@types/ejs": "^3.1.5", + "@types/node": "^20.14.8", + "tslib": "^2.7.0", + "typescript": "5.0.4" } } From c2add47e38281acde1aa06c541c93a6e87ae129f Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 09:15:06 +0200 Subject: [PATCH 05/17] update playground --- playground/fastify/.env.sample | 5 ++- playground/fastify/README.md | 33 +++++++++----------- playground/fastify/src/loadEnv.ts | 2 +- playground/fastify/src/routes/public.ts | 13 ++++---- playground/fastify/src/templates/home.ejs | 18 ----------- playground/fastify/src/templates/sign-in.ejs | 24 ++++++++++++++ 6 files changed, 49 insertions(+), 46 deletions(-) delete mode 100644 playground/fastify/src/templates/home.ejs create mode 100644 playground/fastify/src/templates/sign-in.ejs diff --git a/playground/fastify/.env.sample b/playground/fastify/.env.sample index e193a5111d8..1886a694541 100644 --- a/playground/fastify/.env.sample +++ b/playground/fastify/.env.sample @@ -1 +1,4 @@ -CLERK_API_KEY= +CLERK_PUBLISHABLE_KEY= +CLERK_SECRET_KEY= +PUBLIC_CLERK_SIGN_IN_URL=/sign-in +FRONTEND_API_URL= diff --git a/playground/fastify/README.md b/playground/fastify/README.md index 208651bb54a..e6d1696dad8 100644 --- a/playground/fastify/README.md +++ b/playground/fastify/README.md @@ -1,31 +1,26 @@ -## Setup development +# playground-fastify -Execute in root folder: +Use this example app to test `@clerk/fastify`. -```bash -npm i -npm run build && npm run yalc:all -``` +## Usage -Execute in current folder: +1. Install dependencies -```bash -touch .env # set PUBLISHABLE_KEY and SECRET_KEY from Clerk Dashboard API keys -npm i -rm -rf node_modules/@clerk -yalc add @clerk/fastify @clerk/backend @clerk/types --pure +```shell +npm install ``` -## Getting Started +1. Use [`@clerk/dev-cli`](https://github.com/clerk/javascript/tree/main/packages/dev-cli) to build all repository packages and install the local version into this playground. -First, run the development server: +1. Start the server: -```bash +```shell npm run start ``` -Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. - -## Reload changes from packages/\* package +You can visit these routes: -Apply change in packages/\* project folder and run `npm run build`. Then restart Fastify server by killing the current and executing `npm start` and the change should be visible. +- `/` +- `/sign-in` +- `/me` (requires sign-in) +- `/private` (requires sign-in) \ No newline at end of file diff --git a/playground/fastify/src/loadEnv.ts b/playground/fastify/src/loadEnv.ts index 5b5d1facc93..a4e52bbebb9 100644 --- a/playground/fastify/src/loadEnv.ts +++ b/playground/fastify/src/loadEnv.ts @@ -1,2 +1,2 @@ import * as dotenv from 'dotenv'; -dotenv.config(); +dotenv.config({ path: ['.env.local', '.env.production', '.env'] }); diff --git a/playground/fastify/src/routes/public.ts b/playground/fastify/src/routes/public.ts index 04d84ec8509..cfefc2246e8 100644 --- a/playground/fastify/src/routes/public.ts +++ b/playground/fastify/src/routes/public.ts @@ -1,16 +1,15 @@ import type { FastifyInstance } from 'fastify'; export const publicRoutes = async (fastify: FastifyInstance, _opts: any) => { - fastify.get('/public', async (_req, _reply) => { + fastify.get('/', async (_req, _reply) => { return { hello: 'world' }; }); - fastify.get('/home', async (_req, reply) => { - return reply.view('/src/templates/home.ejs', { - publishableKey: process.env.CLERK_PUBLISHABLE_KEY, - domain: process.env.CLERK_DOMAIN, - isSatellite: process.env.CLERK_IS_SATELLITE, - signInUrl: process.env.CLERK_SIGN_IN_URL, + fastify.get('/sign-in', async (_req, reply) => { + return reply.viewAsync('/src/templates/sign-in.ejs', { + CLERK_PUBLISHABLE_KEY: process.env.CLERK_PUBLISHABLE_KEY, + PUBLIC_CLERK_SIGN_IN_URL: process.env.PUBLIC_CLERK_SIGN_IN_URL, + FRONTEND_API_URL: process.env.FRONTEND_API_URL, }); }); }; diff --git a/playground/fastify/src/templates/home.ejs b/playground/fastify/src/templates/home.ejs deleted file mode 100644 index 7fe10c1bcc7..00000000000 --- a/playground/fastify/src/templates/home.ejs +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - diff --git a/playground/fastify/src/templates/sign-in.ejs b/playground/fastify/src/templates/sign-in.ejs new file mode 100644 index 00000000000..f1e1be4eb30 --- /dev/null +++ b/playground/fastify/src/templates/sign-in.ejs @@ -0,0 +1,24 @@ + + + + + + + + + + From 9cba7881f1bce267dc29f0104848b5d7073b2193 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 09:15:27 +0200 Subject: [PATCH 06/17] update playground deps --- playground/fastify/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/playground/fastify/package.json b/playground/fastify/package.json index f7e6193e587..aceb099c961 100644 --- a/playground/fastify/package.json +++ b/playground/fastify/package.json @@ -6,10 +6,10 @@ "start": "ts-node ./src/server.ts" }, "dependencies": { - "@clerk/backend": "file:.yalc/@clerk/backend", - "@clerk/fastify": "file:.yalc/@clerk/fastify", - "@clerk/shared": "file:.yalc/@clerk/shared", - "@clerk/types": "file:.yalc/@clerk/types", + "@clerk/backend": "^1.13.6", + "@clerk/fastify": "^1.0.49", + "@clerk/shared": "^2.8.4", + "@clerk/types": "^4.23.0", "@fastify/view": "^10.0.1", "dotenv": "^16.4.5", "ejs": "^3.1.10", From 0c321f593991a293369ae7518b833b0484b01bab Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 09:41:37 +0200 Subject: [PATCH 07/17] add changeset --- .changeset/wise-onions-double.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .changeset/wise-onions-double.md diff --git a/.changeset/wise-onions-double.md b/.changeset/wise-onions-double.md new file mode 100644 index 00000000000..0392dddbabf --- /dev/null +++ b/.changeset/wise-onions-double.md @@ -0,0 +1,9 @@ +--- +"@clerk/fastify": major +--- + +Recently Fastify released its v5 and along with it came some breaking changes. Read their [migration guide](https://fastify.dev/docs/latest/Guides/Migration-Guide-V5/) to learn more. + +In order to support Fastify v5 a new major version of `@clerk/fastify` is required as Fastify's Node.js requirement is now `>=20`. Previoulsy `@clerk/fastify` allowed `>=18.17.0`. + +`@clerk/fastify@2.0.0` only supports Fastify v5 or later, if you want/need to continue using Fastify v4, please stick with your current version. The `@clerk/fastify@2.0.0` upgrade itself doesn't have any required code changes as only internal dependencies and requirements were updated. From 02d9c45f197faed3526d635cfa1d9a87c353a36f Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 16:10:14 +0200 Subject: [PATCH 08/17] use node20 in linting step --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47bc23d43e4..a85b381fcfa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,6 +36,7 @@ jobs: turbo-summarize: ${{ env.TURBO_SUMMARIZE }} turbo-team: ${{ vars.TURBO_TEAM }} turbo-token: ${{ secrets.TURBO_TOKEN }} + node-version: 20 - name: Require Changeset if: ${{ !(github.event_name == 'merge_group') }} From e6d27b68a75ecfbc74babc997abd643831feb249 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 16:33:04 +0200 Subject: [PATCH 09/17] fix ci? --- package-lock.json | 214 ++++++++++++++++++++------------------- packages/ui/package.json | 1 + 2 files changed, 113 insertions(+), 102 deletions(-) diff --git a/package-lock.json b/package-lock.json index cd92bbda6ad..4e317c6f477 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16037,6 +16037,117 @@ "semver": "^7.0.0" } }, + "node_modules/bundlewatch": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/bundlewatch/-/bundlewatch-0.4.0.tgz", + "integrity": "sha512-w8w4K8RdrsHMZD9Ss4Ailfsrax/0zSIgh25GCaiudNHg45xXuh/u/xezzjbu+WCQJGjL9O1Fg9k9TEdS/XkZFA==", + "dev": true, + "dependencies": { + "axios": "^0.28.0", + "bytes": "^3.1.1", + "chalk": "^4.0.0", + "ci-env": "^1.17.0", + "commander": "^5.0.0", + "glob": "^7.1.2", + "gzip-size": "^6.0.0", + "jsonpack": "^1.1.5", + "lodash.merge": "^4.6.1", + "read-pkg-up": "^7.0.1" + }, + "bin": { + "bundlewatch": "lib/bin/index.js" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/bundlewatch/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/bundlewatch/node_modules/axios": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.1.tgz", + "integrity": "sha512-iUcGA5a7p0mVb4Gm/sy+FSECNkPFT4y7wt6OM/CDpO/OnNCvSs3PoMG8ibrC9jRoGYU0gUK5pXVC4NPXq6lHRQ==", + "dev": true, + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/bundlewatch/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/bundlewatch/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/bundlewatch/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/bundlewatch/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/bundlewatch/node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true + }, "node_modules/busboy": { "version": "1.6.0", "dev": true, @@ -41009,30 +41120,6 @@ "ajv": "^8.8.2" } }, - "packages/clerk-js/node_modules/ansi-styles": { - "version": "4.3.0", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "packages/clerk-js/node_modules/axios": { - "version": "0.28.1", - "dev": true, - "license": "MIT", - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "packages/clerk-js/node_modules/babel-loader": { "version": "9.1.2", "dev": true, @@ -41049,60 +41136,6 @@ "webpack": ">=5" } }, - "packages/clerk-js/node_modules/bundlewatch": { - "version": "0.4.0", - "dev": true, - "license": "MIT", - "dependencies": { - "axios": "^0.28.0", - "bytes": "^3.1.1", - "chalk": "^4.0.0", - "ci-env": "^1.17.0", - "commander": "^5.0.0", - "glob": "^7.1.2", - "gzip-size": "^6.0.0", - "jsonpack": "^1.1.5", - "lodash.merge": "^4.6.1", - "read-pkg-up": "^7.0.1" - }, - "bin": { - "bundlewatch": "lib/bin/index.js" - }, - "engines": { - "node": ">=16" - } - }, - "packages/clerk-js/node_modules/chalk": { - "version": "4.1.2", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "packages/clerk-js/node_modules/color-convert": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "packages/clerk-js/node_modules/color-name": { - "version": "1.1.4", - "dev": true, - "license": "MIT" - }, "packages/clerk-js/node_modules/enhanced-resolve": { "version": "5.16.0", "dev": true, @@ -41135,35 +41168,11 @@ "node": ">=4.0" } }, - "packages/clerk-js/node_modules/glob": { - "version": "7.2.3", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "packages/clerk-js/node_modules/json-schema-traverse": { "version": "1.0.0", "dev": true, "license": "MIT" }, - "packages/clerk-js/node_modules/proxy-from-env": { - "version": "1.1.0", - "dev": true, - "license": "MIT" - }, "packages/clerk-js/node_modules/schema-utils": { "version": "4.0.1", "dev": true, @@ -45479,6 +45488,7 @@ "@clerk/tailwindcss-transformer": "*", "@testing-library/react": "^16.0.0", "@vitejs/plugin-react": "^4.3.1", + "bundlewatch": "^0.4.0", "concurrently": "^8.2.2", "jsdom": "^24.1.1", "vitest": "^2.0.5" diff --git a/packages/ui/package.json b/packages/ui/package.json index cc292d6f8e8..aada6836b40 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -62,6 +62,7 @@ "@clerk/tailwindcss-transformer": "*", "@testing-library/react": "^16.0.0", "@vitejs/plugin-react": "^4.3.1", + "bundlewatch": "^0.4.0", "concurrently": "^8.2.2", "jsdom": "^24.1.1", "vitest": "^2.0.5" From 578d7b94d98ac016d7ed82b78bae1b7f52a29e32 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 16:48:10 +0200 Subject: [PATCH 10/17] update attw --- package-lock.json | 162 +++++++++++++++++++++++++++++++++++----------- package.json | 2 +- 2 files changed, 124 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e317c6f477..66ce4ad58d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "devDependencies": { "@actions/core": "^1.10.1", - "@arethetypeswrong/cli": "^0.15.3", + "@arethetypeswrong/cli": "^0.16.4", "@changesets/cli": "^2.26.2", "@changesets/get-github-info": "^0.5.2", "@commitlint/cli": "^19.3.0", @@ -151,19 +151,22 @@ }, "node_modules/@andrewbranch/untar.js": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@andrewbranch/untar.js/-/untar.js-1.0.3.tgz", + "integrity": "sha512-Jh15/qVmrLGhkKJBdXlK1+9tY4lZruYjsgkDFj08ZmDiWVBLJcqkok7Z0/R0In+i1rScBpJlSvrTS2Lm41Pbnw==", "dev": true }, "node_modules/@arethetypeswrong/cli": { - "version": "0.15.3", + "version": "0.16.4", + "resolved": "https://registry.npmjs.org/@arethetypeswrong/cli/-/cli-0.16.4.tgz", + "integrity": "sha512-qMmdVlJon5FtA+ahn0c1oAVNxiq4xW5lqFiTZ21XHIeVwAVIQ+uRz4UEivqRMsjVV1grzRgJSKqaOrq1MvlVyQ==", "dev": true, - "license": "MIT", "dependencies": { - "@arethetypeswrong/core": "0.15.1", + "@arethetypeswrong/core": "0.16.4", "chalk": "^4.1.2", "cli-table3": "^0.6.3", "commander": "^10.0.1", "marked": "^9.1.2", - "marked-terminal": "^6.0.0", + "marked-terminal": "^7.1.0", "semver": "^7.5.4" }, "bin": { @@ -227,25 +230,34 @@ } }, "node_modules/@arethetypeswrong/core": { - "version": "0.15.1", + "version": "0.16.4", + "resolved": "https://registry.npmjs.org/@arethetypeswrong/core/-/core-0.16.4.tgz", + "integrity": "sha512-RI3HXgSuKTfcBf1hSEg1P9/cOvmI0flsMm6/QL3L3wju4AlHDqd55JFPfXs4pzgEAgy5L9pul4/HPPz99x2GvA==", "dev": true, - "license": "MIT", "dependencies": { "@andrewbranch/untar.js": "^1.0.3", + "cjs-module-lexer": "^1.2.3", "fflate": "^0.8.2", + "lru-cache": "^10.4.3", "semver": "^7.5.4", - "ts-expose-internals-conditionally": "1.0.0-empty.0", - "typescript": "5.3.3", + "typescript": "5.6.1-rc", "validate-npm-package-name": "^5.0.0" }, "engines": { "node": ">=18" } }, + "node_modules/@arethetypeswrong/core/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true + }, "node_modules/@arethetypeswrong/core/node_modules/typescript": { - "version": "5.3.3", + "version": "5.6.1-rc", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.1-rc.tgz", + "integrity": "sha512-E3b2+1zEFu84jB0YQi9BORDjz9+jGbwwy1Zi3G0LUNw7a7cePUrHMRNy8aPh53nXpkFGVHSxIZo5vKTfYaFiBQ==", "dev": true, - "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -5238,6 +5250,28 @@ "react": ">=16.8.0" } }, + "node_modules/@jescalan/ink-markdown/node_modules/ansi-escapes": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz", + "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@jescalan/ink-markdown/node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, "node_modules/@jescalan/ink-markdown/node_modules/marked": { "version": "11.2.0", "license": "MIT", @@ -5248,6 +5282,25 @@ "node": ">= 18" } }, + "node_modules/@jescalan/ink-markdown/node_modules/marked-terminal": { + "version": "6.2.0", + "resolved": "git+ssh://git@github.com/jescalan/marked-terminal.git#44f5ab42076e16937f56d645d3d7264675558ea1", + "license": "MIT", + "dependencies": { + "ansi-escapes": "^6.2.0", + "chalk": "^5.3.0", + "cli-highlight": "^2.1.11", + "cli-table3": "^0.6.3", + "node-emoji": "^2.1.3", + "supports-hyperlinks": "^3.0.0" + }, + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "marked": ">=1 <12" + } + }, "node_modules/@jest/console": { "version": "29.7.0", "devOptional": true, @@ -11165,7 +11218,8 @@ }, "node_modules/@sindresorhus/is": { "version": "4.6.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", + "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", "engines": { "node": ">=10" }, @@ -16809,8 +16863,9 @@ } }, "node_modules/cli-table3": { - "version": "0.6.3", - "license": "MIT", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz", + "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==", "dependencies": { "string-width": "^4.2.0" }, @@ -19670,7 +19725,8 @@ }, "node_modules/emojilib": { "version": "2.4.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/emojilib/-/emojilib-2.4.0.tgz", + "integrity": "sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==" }, "node_modules/emojis-list": { "version": "3.0.0", @@ -19783,6 +19839,18 @@ "node": ">=4" } }, + "node_modules/environment": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz", + "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/error-ex": { "version": "1.3.2", "license": "MIT", @@ -22048,8 +22116,9 @@ }, "node_modules/fflate": { "version": "0.8.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz", + "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==", + "dev": true }, "node_modules/figures": { "version": "3.2.0", @@ -28225,7 +28294,9 @@ }, "node_modules/marked": { "version": "9.1.6", - "license": "MIT", + "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.6.tgz", + "integrity": "sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==", + "dev": true, "bin": { "marked": "bin/marked.js" }, @@ -28234,13 +28305,15 @@ } }, "node_modules/marked-terminal": { - "version": "6.2.0", - "license": "MIT", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-7.1.0.tgz", + "integrity": "sha512-+pvwa14KZL74MVXjYdPR3nSInhGhNvPce/3mqLVZT2oUvt654sL1XImFuLZ1pkA866IYZ3ikDTOFUIC7XzpZZg==", + "dev": true, "dependencies": { - "ansi-escapes": "^6.2.0", + "ansi-escapes": "^7.0.0", "chalk": "^5.3.0", "cli-highlight": "^2.1.11", - "cli-table3": "^0.6.3", + "cli-table3": "^0.6.5", "node-emoji": "^2.1.3", "supports-hyperlinks": "^3.0.0" }, @@ -28248,14 +28321,19 @@ "node": ">=16.0.0" }, "peerDependencies": { - "marked": ">=1 <12" + "marked": ">=1 <14" } }, "node_modules/marked-terminal/node_modules/ansi-escapes": { - "version": "6.2.1", - "license": "MIT", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz", + "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==", + "dev": true, + "dependencies": { + "environment": "^1.0.0" + }, "engines": { - "node": ">=14.16" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -28263,7 +28341,9 @@ }, "node_modules/marked-terminal/node_modules/chalk": { "version": "5.3.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" }, @@ -30361,7 +30441,8 @@ }, "node_modules/node-emoji": { "version": "2.1.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.1.3.tgz", + "integrity": "sha512-E2WEOVsgs7O16zsURJ/eH8BqhF029wGpEOnv7Urwdo2wmQanOACwJQh0devF9D9RhoZru0+9JXIS0dBXIAz+lA==", "dependencies": { "@sindresorhus/is": "^4.6.0", "char-regex": "^1.0.2", @@ -34556,7 +34637,8 @@ }, "node_modules/skin-tone": { "version": "2.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/skin-tone/-/skin-tone-2.0.0.tgz", + "integrity": "sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==", "dependencies": { "unicode-emoji-modifier-base": "^1.0.0" }, @@ -35701,19 +35783,24 @@ } }, "node_modules/supports-hyperlinks": { - "version": "3.0.0", - "license": "MIT", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz", + "integrity": "sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==", "dependencies": { "has-flag": "^4.0.0", "supports-color": "^7.0.0" }, "engines": { "node": ">=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/supports-hyperlinks/node_modules/has-flag": { "version": "4.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "engines": { "node": ">=8" } @@ -36414,11 +36501,6 @@ "typescript": ">=4.2.0" } }, - "node_modules/ts-expose-internals-conditionally": { - "version": "1.0.0-empty.0", - "dev": true, - "license": "MIT" - }, "node_modules/ts-interface-checker": { "version": "0.1.13", "license": "Apache-2.0" @@ -37477,7 +37559,8 @@ }, "node_modules/unicode-emoji-modifier-base": { "version": "1.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/unicode-emoji-modifier-base/-/unicode-emoji-modifier-base-1.0.0.tgz", + "integrity": "sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==", "engines": { "node": ">=4" } @@ -38061,8 +38144,9 @@ }, "node_modules/validate-npm-package-name": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", + "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", "dev": true, - "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } diff --git a/package.json b/package.json index 5d86e1126b7..39686ad1f32 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ }, "devDependencies": { "@actions/core": "^1.10.1", - "@arethetypeswrong/cli": "^0.15.3", + "@arethetypeswrong/cli": "^0.16.4", "@changesets/cli": "^2.26.2", "@changesets/get-github-info": "^0.5.2", "@commitlint/cli": "^19.3.0", From 47b3fe158061645d62fdd4e69cf1bb87495cbae0 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 17:00:11 +0200 Subject: [PATCH 11/17] attw --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a85b381fcfa..b8c4926e827 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,10 +66,10 @@ jobs: run: npx turbo lint:publint $TURBO_ARGS --only - name: Lint types using attw - run: npx turbo lint:attw $TURBO_ARGS --filter=!@clerk/nextjs --filter=!@clerk/tanstack-start --filter=!@clerk/elements --filter=!@clerk/backend --filter=!@clerk/astro --only + run: npx turbo lint:attw $TURBO_ARGS --filter=!@clerk/nextjs --filter=!@clerk/tanstack-start --filter=!@clerk/elements --filter=!@clerk/backend --filter=!@clerk/astro --filter=!@clerk/clerk-js --only - name: Lint types using attw [Errors Allowed] - run: npx turbo lint:attw $TURBO_ARGS --filter=@clerk/nextjs --filter=@clerk/tanstack-start --filter=@clerk/backend --filter=@clerk/elements --filter=@clerk/astro --continue --only + run: npx turbo lint:attw $TURBO_ARGS --filter=@clerk/nextjs --filter=@clerk/tanstack-start --filter=@clerk/backend --filter=@clerk/elements --filter=@clerk/astro --filter=@clerk/clerk-js --continue --only continue-on-error: true # TODO: Remove this when all related errors are fixed - name: Run lint From 28763a648690926c108076a61e733d02c45577e5 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 17:23:19 +0200 Subject: [PATCH 12/17] revert --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8c4926e827..c7b021ce692 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,10 +66,10 @@ jobs: run: npx turbo lint:publint $TURBO_ARGS --only - name: Lint types using attw - run: npx turbo lint:attw $TURBO_ARGS --filter=!@clerk/nextjs --filter=!@clerk/tanstack-start --filter=!@clerk/elements --filter=!@clerk/backend --filter=!@clerk/astro --filter=!@clerk/clerk-js --only + run: npx turbo lint:attw $TURBO_ARGS --filter=!@clerk/nextjs --filter=!@clerk/tanstack-start --filter=!@clerk/elements --filter=!@clerk/backend --filter=!@clerk/astro --only - name: Lint types using attw [Errors Allowed] - run: npx turbo lint:attw $TURBO_ARGS --filter=@clerk/nextjs --filter=@clerk/tanstack-start --filter=@clerk/backend --filter=@clerk/elements --filter=@clerk/astro --filter=@clerk/clerk-js --continue --only + run: npx turbo lint:attw $TURBO_ARGS --filter=@clerk/nextjs --filter=@clerk/tanstack-start --filter=@clerk/backend --filter=@clerk/elements --filter=@clerk/astro --continue --only continue-on-error: true # TODO: Remove this when all related errors are fixed - name: Run lint @@ -119,7 +119,7 @@ jobs: run: | if [ "${{ matrix.node-version }}" == "18" ]; then echo "Running tests on Node 18 only for packages with LTS support." - npx turbo test $TURBO_ARGS --filter="@clerk/astro" --filter="@clerk/backend" --filter="@clerk/express" --filter="@clerk/nextjs" --filter="@clerk/clerk-react" --filter="@clerk/fastify" --filter="@clerk/clerk-sdk-node" --filter="@clerk/shared" --filter="@clerk/remix" --filter="@clerk/tanstack-start" --filter="@clerk/elements" + npx turbo test $TURBO_ARGS --filter="@clerk/astro" --filter="@clerk/backend" --filter="@clerk/express" --filter="@clerk/nextjs" --filter="@clerk/clerk-react" --filter="@clerk/clerk-sdk-node" --filter="@clerk/shared" --filter="@clerk/remix" --filter="@clerk/tanstack-start" --filter="@clerk/elements" else echo "Running tests for all packages on Node 20." npx turbo test $TURBO_ARGS From d928938e82a4ec741f9f511389b19241ccb1144e Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 17:41:06 +0200 Subject: [PATCH 13/17] ignore rule in attw --- packages/clerk-js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json index e7d3cc1a449..3d2116d9d3c 100644 --- a/packages/clerk-js/package.json +++ b/packages/clerk-js/package.json @@ -40,7 +40,7 @@ "dev": "webpack serve --config webpack.config.js", "dev:headless": "webpack serve --config webpack.config.js --env variant=\"clerk.headless.browser\"", "lint": "eslint src/", - "lint:attw": "attw --pack .", + "lint:attw": "attw --pack . --ignore-rules named-exports", "lint:publint": "publint || true", "test": "jest", "test:cache:clear": "jest --clearCache --useStderr", From 61a1cd53572b84cab54c287bf78a21efa6e268f5 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 2 Oct 2024 17:41:33 +0200 Subject: [PATCH 14/17] typo fix --- .changeset/wise-onions-double.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/wise-onions-double.md b/.changeset/wise-onions-double.md index 0392dddbabf..46179c41246 100644 --- a/.changeset/wise-onions-double.md +++ b/.changeset/wise-onions-double.md @@ -4,6 +4,6 @@ Recently Fastify released its v5 and along with it came some breaking changes. Read their [migration guide](https://fastify.dev/docs/latest/Guides/Migration-Guide-V5/) to learn more. -In order to support Fastify v5 a new major version of `@clerk/fastify` is required as Fastify's Node.js requirement is now `>=20`. Previoulsy `@clerk/fastify` allowed `>=18.17.0`. +In order to support Fastify v5 a new major version of `@clerk/fastify` is required as Fastify's Node.js requirement is now `>=20`. Previously `@clerk/fastify` allowed `>=18.17.0`. `@clerk/fastify@2.0.0` only supports Fastify v5 or later, if you want/need to continue using Fastify v4, please stick with your current version. The `@clerk/fastify@2.0.0` upgrade itself doesn't have any required code changes as only internal dependencies and requirements were updated. From b185f1226b436fcd869bfe94178e0ee49c78e42e Mon Sep 17 00:00:00 2001 From: LekoArts Date: Fri, 4 Oct 2024 10:48:55 +0200 Subject: [PATCH 15/17] downgrade attw, change ci --- .github/workflows/ci.yml | 6 +---- package-lock.json | 39 ++++++++++++++-------------- package.json | 2 +- packages/astro/package.json | 2 +- packages/backend/package.json | 2 +- packages/clerk-js/package.json | 2 +- packages/elements/package.json | 2 +- packages/nextjs/package.json | 2 +- packages/tanstack-start/package.json | 2 +- 9 files changed, 27 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7b021ce692..a195c029923 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,11 +66,7 @@ jobs: run: npx turbo lint:publint $TURBO_ARGS --only - name: Lint types using attw - run: npx turbo lint:attw $TURBO_ARGS --filter=!@clerk/nextjs --filter=!@clerk/tanstack-start --filter=!@clerk/elements --filter=!@clerk/backend --filter=!@clerk/astro --only - - - name: Lint types using attw [Errors Allowed] - run: npx turbo lint:attw $TURBO_ARGS --filter=@clerk/nextjs --filter=@clerk/tanstack-start --filter=@clerk/backend --filter=@clerk/elements --filter=@clerk/astro --continue --only - continue-on-error: true # TODO: Remove this when all related errors are fixed + run: npx turbo lint:attw $TURBO_ARGS --only - name: Run lint run: npx turbo lint $TURBO_ARGS --only -- --quiet diff --git a/package-lock.json b/package-lock.json index 66ce4ad58d2..f15e9dde33b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "devDependencies": { "@actions/core": "^1.10.1", - "@arethetypeswrong/cli": "^0.16.4", + "@arethetypeswrong/cli": "0.15.4", "@changesets/cli": "^2.26.2", "@changesets/get-github-info": "^0.5.2", "@commitlint/cli": "^19.3.0", @@ -156,12 +156,12 @@ "dev": true }, "node_modules/@arethetypeswrong/cli": { - "version": "0.16.4", - "resolved": "https://registry.npmjs.org/@arethetypeswrong/cli/-/cli-0.16.4.tgz", - "integrity": "sha512-qMmdVlJon5FtA+ahn0c1oAVNxiq4xW5lqFiTZ21XHIeVwAVIQ+uRz4UEivqRMsjVV1grzRgJSKqaOrq1MvlVyQ==", + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/@arethetypeswrong/cli/-/cli-0.15.4.tgz", + "integrity": "sha512-YDbImAi1MGkouT7f2yAECpUMFhhA1J0EaXzIqoC5GGtK0xDgauLtcsZezm8tNq7d3wOFXH7OnY+IORYcG212rw==", "dev": true, "dependencies": { - "@arethetypeswrong/core": "0.16.4", + "@arethetypeswrong/core": "0.15.1", "chalk": "^4.1.2", "cli-table3": "^0.6.3", "commander": "^10.0.1", @@ -230,33 +230,26 @@ } }, "node_modules/@arethetypeswrong/core": { - "version": "0.16.4", - "resolved": "https://registry.npmjs.org/@arethetypeswrong/core/-/core-0.16.4.tgz", - "integrity": "sha512-RI3HXgSuKTfcBf1hSEg1P9/cOvmI0flsMm6/QL3L3wju4AlHDqd55JFPfXs4pzgEAgy5L9pul4/HPPz99x2GvA==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@arethetypeswrong/core/-/core-0.15.1.tgz", + "integrity": "sha512-FYp6GBAgsNz81BkfItRz8RLZO03w5+BaeiPma1uCfmxTnxbtuMrI/dbzGiOk8VghO108uFI0oJo0OkewdSHw7g==", "dev": true, "dependencies": { "@andrewbranch/untar.js": "^1.0.3", - "cjs-module-lexer": "^1.2.3", "fflate": "^0.8.2", - "lru-cache": "^10.4.3", "semver": "^7.5.4", - "typescript": "5.6.1-rc", + "ts-expose-internals-conditionally": "1.0.0-empty.0", + "typescript": "5.3.3", "validate-npm-package-name": "^5.0.0" }, "engines": { "node": ">=18" } }, - "node_modules/@arethetypeswrong/core/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true - }, "node_modules/@arethetypeswrong/core/node_modules/typescript": { - "version": "5.6.1-rc", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.1-rc.tgz", - "integrity": "sha512-E3b2+1zEFu84jB0YQi9BORDjz9+jGbwwy1Zi3G0LUNw7a7cePUrHMRNy8aPh53nXpkFGVHSxIZo5vKTfYaFiBQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -36501,6 +36494,12 @@ "typescript": ">=4.2.0" } }, + "node_modules/ts-expose-internals-conditionally": { + "version": "1.0.0-empty.0", + "resolved": "https://registry.npmjs.org/ts-expose-internals-conditionally/-/ts-expose-internals-conditionally-1.0.0-empty.0.tgz", + "integrity": "sha512-F8m9NOF6ZhdOClDVdlM8gj3fDCav4ZIFSs/EI3ksQbAAXVSCN/Jh5OCJDDZWBuBy9psFc6jULGDlPwjMYMhJDw==", + "dev": true + }, "node_modules/ts-interface-checker": { "version": "0.1.13", "license": "Apache-2.0" diff --git a/package.json b/package.json index 39686ad1f32..968ee33ce95 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ }, "devDependencies": { "@actions/core": "^1.10.1", - "@arethetypeswrong/cli": "^0.16.4", + "@arethetypeswrong/cli": "0.15.4", "@changesets/cli": "^2.26.2", "@changesets/get-github-info": "^0.5.2", "@commitlint/cli": "^19.3.0", diff --git a/packages/astro/package.json b/packages/astro/package.json index fabc9fb343b..c5c90fc216b 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -34,7 +34,7 @@ "build:dts": "tsc --emitDeclarationOnly --declaration", "copy:components": "rm -rf ./components && mkdir -p ./components/ && cp -r ./src/astro-components/* ./components/ && cp ./src/types.ts ./", "lint": "eslint src/", - "lint:attw": "attw --pack .", + "lint:attw": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm internal-resolution-error", "lint:publint": "npm run copy:components && publint", "publish:local": "npx yalc push --replace --sig" }, diff --git a/packages/backend/package.json b/packages/backend/package.json index d55242664ff..f2ac8a262d7 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -87,7 +87,7 @@ "clean:tests": "rimraf ./tests/dist", "lint": "eslint src/", "lint:publint": "publint", - "lint:attw": "attw --pack .", + "lint:attw": "attw --pack . --ignore-rules false-cjs", "test": "run-s clean:tests build:runtime build:tests test:node test:edge-runtime test:cloudflare-miniflare", "test:node": "./tests/node/run.sh", "test:edge-runtime": "./tests/edge-runtime/run.sh", diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json index 3d2116d9d3c..e7d3cc1a449 100644 --- a/packages/clerk-js/package.json +++ b/packages/clerk-js/package.json @@ -40,7 +40,7 @@ "dev": "webpack serve --config webpack.config.js", "dev:headless": "webpack serve --config webpack.config.js --env variant=\"clerk.headless.browser\"", "lint": "eslint src/", - "lint:attw": "attw --pack . --ignore-rules named-exports", + "lint:attw": "attw --pack .", "lint:publint": "publint || true", "test": "jest", "test:cache:clear": "jest --clearCache --useStderr", diff --git a/packages/elements/package.json b/packages/elements/package.json index 70c07d70848..af98919a733 100644 --- a/packages/elements/package.json +++ b/packages/elements/package.json @@ -65,7 +65,7 @@ "dev:example": "concurrently \"npm run dev\" \"npm run app:dev\"", "dev:theme-builder": "TURBO_UI=0 concurrently --prefix-colors auto --names \"elements,ui,theme-builder\" \"turbo dev --filter=@clerk/elements\" \"npm run dev -w @clerk/ui\" \"cd ../ui/theme-builder && npm run dev\"", "lint": "eslint src/", - "lint:attw": "attw --pack .", + "lint:attw": "attw --pack . --ignore-rules no-resolution", "lint:publint": "publint", "test": "jest", "test:cache:clear": "jest --clearCache --useStderr" diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index 717b714e905..18732202029 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -59,7 +59,7 @@ "dev": "tsup --watch", "dev:publish": "npm run dev -- --env.publish", "lint": "eslint src/", - "lint:attw": "attw --pack .", + "lint:attw": "attw --pack . --ignore-rules no-resolution unexpected-module-syntax", "lint:publint": "publint", "publish:local": "npx yalc push --replace --sig", "test": "jest", diff --git a/packages/tanstack-start/package.json b/packages/tanstack-start/package.json index 113ffc6d6a3..174565e537e 100644 --- a/packages/tanstack-start/package.json +++ b/packages/tanstack-start/package.json @@ -49,7 +49,7 @@ "dev": "tsup --watch", "dev:publish": "npm run dev -- --env.publish", "lint": "eslint src/", - "lint:attw": "attw --pack .", + "lint:attw": "attw --pack . --ignore-rules cjs-resolves-to-esm", "lint:publint": "publint", "publish:local": "npx yalc push --replace --sig" }, From e72dc9327975a4f7ad23256d536a5feda3b668c7 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Fri, 4 Oct 2024 11:01:47 +0200 Subject: [PATCH 16/17] engine strict --- .github/actions/init/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/init/action.yml b/.github/actions/init/action.yml index c05326f31c3..a3485991e09 100644 --- a/.github/actions/init/action.yml +++ b/.github/actions/init/action.yml @@ -112,7 +112,7 @@ runs: registry-url: ${{ inputs.registry-url }} - name: Install NPM Dependencies - run: npm ci --audit=false --fund=false + run: npm ci --audit=false --fund=false --engine-strict=false shell: bash - name: Get Playwright Version From d2c348cbd7706600e3f5484b44bc0e849b5a0ab1 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 7 Oct 2024 11:31:24 +0200 Subject: [PATCH 17/17] remove deps from root pkg.json --- package-lock.json | 187 ---------------------------------------------- package.json | 2 - 2 files changed, 189 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6175f8ca513..f4a2125dbd3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,8 +36,6 @@ "eslint": "^8.49.0", "execa": "^5.1.1", "expect-type": "^0.16.0", - "fastify": "4.12.0", - "fastify-plugin": "^4.5.0", "fs-extra": "^11.1.1", "get-port": "^5.1.1", "globby": "^13.2.2", @@ -7019,36 +7017,6 @@ "npm": ">=6.14.13" } }, - "node_modules/@fastify/ajv-compiler": { - "version": "3.5.0", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^8.11.0", - "ajv-formats": "^2.1.1", - "fast-uri": "^2.0.0" - } - }, - "node_modules/@fastify/ajv-compiler/node_modules/ajv": { - "version": "8.12.0", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/@fastify/ajv-compiler/node_modules/json-schema-traverse": { - "version": "1.0.0", - "dev": true, - "license": "MIT" - }, "node_modules/@fastify/busboy": { "version": "2.0.0", "dev": true, @@ -7057,24 +7025,6 @@ "node": ">=14" } }, - "node_modules/@fastify/deepmerge": { - "version": "1.3.0", - "dev": true, - "license": "MIT" - }, - "node_modules/@fastify/error": { - "version": "3.2.1", - "dev": true, - "license": "MIT" - }, - "node_modules/@fastify/fast-json-stringify-compiler": { - "version": "4.3.0", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-json-stringify": "^5.7.0" - } - }, "node_modules/@fastify/merge-json-schemas": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/@fastify/merge-json-schemas/-/merge-json-schemas-0.1.1.tgz", @@ -16183,11 +16133,6 @@ "safe-buffer": "~5.2.0" } }, - "node_modules/archy": { - "version": "1.0.0", - "dev": true, - "license": "MIT" - }, "node_modules/are-we-there-yet": { "version": "2.0.0", "dev": true, @@ -17397,16 +17342,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/avvio": { - "version": "8.2.1", - "dev": true, - "license": "MIT", - "dependencies": { - "archy": "^1.0.0", - "debug": "^4.0.0", - "fastq": "^1.6.1" - } - }, "node_modules/aws-sign2": { "version": "0.7.0", "dev": true, @@ -25081,11 +25016,6 @@ ], "license": "MIT" }, - "node_modules/fast-content-type-parse": { - "version": "1.0.0", - "dev": true, - "license": "MIT" - }, "node_modules/fast-decode-uri-component": { "version": "1.0.1", "dev": true, @@ -25128,39 +25058,6 @@ "version": "2.1.0", "license": "MIT" }, - "node_modules/fast-json-stringify": { - "version": "5.7.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@fastify/deepmerge": "^1.0.0", - "ajv": "^8.10.0", - "ajv-formats": "^2.1.1", - "fast-deep-equal": "^3.1.3", - "fast-uri": "^2.1.0", - "rfdc": "^1.2.0" - } - }, - "node_modules/fast-json-stringify/node_modules/ajv": { - "version": "8.12.0", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/fast-json-stringify/node_modules/json-schema-traverse": { - "version": "1.0.0", - "dev": true, - "license": "MIT" - }, "node_modules/fast-levenshtein": { "version": "2.0.6", "license": "MIT" @@ -25186,11 +25083,6 @@ "dev": true, "license": "MIT" }, - "node_modules/fast-uri": { - "version": "2.2.0", - "dev": true, - "license": "MIT" - }, "node_modules/fast-xml-parser": { "version": "4.4.0", "dev": true, @@ -25219,33 +25111,6 @@ "node": ">= 4.9.1" } }, - "node_modules/fastify": { - "version": "4.12.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@fastify/ajv-compiler": "^3.3.1", - "@fastify/error": "^3.0.0", - "@fastify/fast-json-stringify-compiler": "^4.1.0", - "abstract-logging": "^2.0.1", - "avvio": "^8.2.0", - "fast-content-type-parse": "^1.0.0", - "find-my-way": "^7.3.0", - "light-my-request": "^5.6.1", - "pino": "^8.5.0", - "process-warning": "^2.0.0", - "proxy-addr": "^2.0.7", - "rfdc": "^1.3.0", - "secure-json-parse": "^2.5.0", - "semver": "^7.3.7", - "tiny-lru": "^10.0.0" - } - }, - "node_modules/fastify-plugin": { - "version": "4.5.0", - "dev": true, - "license": "MIT" - }, "node_modules/fastq": { "version": "1.17.1", "license": "ISC", @@ -25491,19 +25356,6 @@ "url": "https://github.com/avajs/find-cache-dir?sponsor=1" } }, - "node_modules/find-my-way": { - "version": "7.6.2", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-querystring": "^1.0.0", - "safe-regex2": "^2.0.0" - }, - "engines": { - "node": ">=14" - } - }, "node_modules/find-root": { "version": "1.1.0", "license": "MIT" @@ -30645,16 +30497,6 @@ "node": ">= 0.8.0" } }, - "node_modules/light-my-request": { - "version": "5.9.2", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "cookie": "^0.5.0", - "process-warning": "^2.0.0", - "set-cookie-parser": "^2.4.1" - } - }, "node_modules/lighthouse-logger": { "version": "1.4.2", "dev": true, @@ -36151,11 +35993,6 @@ "dev": true, "license": "MIT" }, - "node_modules/process-warning": { - "version": "2.2.0", - "dev": true, - "license": "MIT" - }, "node_modules/progress": { "version": "2.0.3", "dev": true, @@ -37503,14 +37340,6 @@ "dev": true, "license": "ISC" }, - "node_modules/ret": { - "version": "0.2.2", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/retext": { "version": "9.0.0", "license": "MIT", @@ -37819,14 +37648,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/safe-regex2": { - "version": "2.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "ret": "~0.2.0" - } - }, "node_modules/safe-stable-stringify": { "version": "2.4.3", "dev": true, @@ -40144,14 +39965,6 @@ "version": "1.3.3", "license": "MIT" }, - "node_modules/tiny-lru": { - "version": "10.4.1", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=12" - } - }, "node_modules/tiny-warning": { "version": "1.0.3", "dev": true, diff --git a/package.json b/package.json index 1f44355e66b..84f5c046d48 100644 --- a/package.json +++ b/package.json @@ -80,8 +80,6 @@ "eslint": "^8.49.0", "execa": "^5.1.1", "expect-type": "^0.16.0", - "fastify": "4.12.0", - "fastify-plugin": "^4.5.0", "fs-extra": "^11.1.1", "get-port": "^5.1.1", "globby": "^13.2.2",