Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update dependency tough-cookie to v5 (main) (elastic#193107)
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [tough-cookie](https://togithub.com/salesforce/tough-cookie) | devDependencies | major | [`^4.1.4` -> `^5.0.0`](https://renovatebot.com/diffs/npm/tough-cookie/4.1.4/5.0.0) | --- ### Release Notes <details> <summary>salesforce/tough-cookie (tough-cookie)</summary> ### [`v5.0.0`](https://togithub.com/salesforce/tough-cookie/releases/tag/v5.0.0) [Compare Source](https://togithub.com/salesforce/tough-cookie/compare/v4.1.4...v5.0.0) #### Summary ##### Breaking Changes - We've migrated the project to TypeScript! First-party types are now available. - The minimum supported version of node is v18. - We no longer provide official support for non-node enviroments. ##### API Changes - We've standardized most of our exposed interfaces to accept both `null` and `undefined` and return only `undefined`. - `getCookie` and `getCookies` now accept a `string` or `URL` as a parameter. - We've removed the `inspect` function in favor of node's `util.inspect.custom` symbol. Cookies may appear different when logged in non-node environments. ##### Other Changes - Fixed the expiry time not updating when a cookie is updating. - Fixed validation errors not getting called in some callbacks. - [New documentation](https://togithub.com/salesforce/tough-cookie/blob/v5.0.0/api/docs/tough-cookie.md) that is always kept up to date! - Performance improvements. #### What's Changed - Typescript support by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/264](https://togithub.com/salesforce/tough-cookie/pull/264) - \[v5] Update config by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/269](https://togithub.com/salesforce/tough-cookie/pull/269) - Fix prettier in eslint config by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/274](https://togithub.com/salesforce/tough-cookie/pull/274) - Updated dev tooling by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/271](https://togithub.com/salesforce/tough-cookie/pull/271) - Port 283 fix to v5 by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/287](https://togithub.com/salesforce/tough-cookie/pull/287) - Remove some [@&elastic#8203;ts-ignore](https://togithub.com/ts-ignore) directives. by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/288](https://togithub.com/salesforce/tough-cookie/pull/288) - Clean up validate function. by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/275](https://togithub.com/salesforce/tough-cookie/pull/275) - Changes to support full eslint rule configurations by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/289](https://togithub.com/salesforce/tough-cookie/pull/289) - Split giant cookie.ts into multiple files. by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/296](https://togithub.com/salesforce/tough-cookie/pull/296) - Merge branch 'master' into v5 by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/300](https://togithub.com/salesforce/tough-cookie/pull/300) - Merge `v5` into `master` by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/303](https://togithub.com/salesforce/tough-cookie/pull/303) - Preparing for release `5.0.0-rc.0` by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/304](https://togithub.com/salesforce/tough-cookie/pull/304) - Bump [@&elastic#8203;babel/traverse](https://togithub.com/babel/traverse) from 7.21.3 to 7.23.2 by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/305](https://togithub.com/salesforce/tough-cookie/pull/305) - Configure dependabot and codeowners by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/306](https://togithub.com/salesforce/tough-cookie/pull/306) - Bump [@&elastic#8203;typescript-eslint/parser](https://togithub.com/typescript-eslint/parser) from 5.58.0 to 5.62.0 by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/310](https://togithub.com/salesforce/tough-cookie/pull/310) - Bump eslint-config-prettier from 8.8.0 to 9.0.0 by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/311](https://togithub.com/salesforce/tough-cookie/pull/311) - Bump async from 2.6.4 to 3.2.4 by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/313](https://togithub.com/salesforce/tough-cookie/pull/313) - Avoid using `arguments` by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/316](https://togithub.com/salesforce/tough-cookie/pull/316) - Configure dependabot to ignore [@&elastic#8203;types/node](https://togithub.com/types/node). by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/319](https://togithub.com/salesforce/tough-cookie/pull/319) - Bump dependencies. by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/323](https://togithub.com/salesforce/tough-cookie/pull/323) - Bump the dev-dependencies group with 6 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/342](https://togithub.com/salesforce/tough-cookie/pull/342) - Bump the dev-dependencies group with 1 update by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/344](https://togithub.com/salesforce/tough-cookie/pull/344) - Bump the dev-dependencies group with 3 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/347](https://togithub.com/salesforce/tough-cookie/pull/347) - docs: use correct memstore file link by [@&elastic#8203;alissonsleal](https://togithub.com/alissonsleal) in [https://github.com/salesforce/tough-cookie/pull/349](https://togithub.com/salesforce/tough-cookie/pull/349) - Bump the dev-dependencies group with 3 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/351](https://togithub.com/salesforce/tough-cookie/pull/351) - Bump the dev-dependencies group with 2 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/354](https://togithub.com/salesforce/tough-cookie/pull/354) - Fix expiry time not updating when cookie is updated by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/345](https://togithub.com/salesforce/tough-cookie/pull/345) - Change dependabot to monthly by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/355](https://togithub.com/salesforce/tough-cookie/pull/355) - Bump the dev-dependencies group with 5 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/358](https://togithub.com/salesforce/tough-cookie/pull/358) - Avoid `void` by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/331](https://togithub.com/salesforce/tough-cookie/pull/331) - Replace `psl` with `tldts` by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/346](https://togithub.com/salesforce/tough-cookie/pull/346) - Bump the production-dependencies group with 1 update by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/362](https://togithub.com/salesforce/tough-cookie/pull/362) - Bump the dev-dependencies group with 4 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/363](https://togithub.com/salesforce/tough-cookie/pull/363) - docs: fix JSON.serialize -> JSON.stringify by [@&elastic#8203;zavan](https://togithub.com/zavan) in [https://github.com/salesforce/tough-cookie/pull/361](https://togithub.com/salesforce/tough-cookie/pull/361) - Remove workarounds for `util` in non-node environments by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/359](https://togithub.com/salesforce/tough-cookie/pull/359) - Accept URL parameter in `getCookies` and `setCookie` by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/364](https://togithub.com/salesforce/tough-cookie/pull/364) - Remove community cookie store links by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/367](https://togithub.com/salesforce/tough-cookie/pull/367) - Handle unlikely edge case in unimportant util by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/366](https://togithub.com/salesforce/tough-cookie/pull/366) - Fix allow listed `files` for what to include in npm package by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/368](https://togithub.com/salesforce/tough-cookie/pull/368) - fix [#&elastic#8203;256](https://togithub.com/salesforce/tough-cookie/issues/256) by [@&elastic#8203;hrueger](https://togithub.com/hrueger) in [https://github.com/salesforce/tough-cookie/pull/297](https://togithub.com/salesforce/tough-cookie/pull/297) - Preparing for release 5.0.0-rc.1 by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/369](https://togithub.com/salesforce/tough-cookie/pull/369) - Bump [@&elastic#8203;typescript-eslint/eslint-plugin](https://togithub.com/typescript-eslint/eslint-plugin) from 6.20.0 to 7.0.0 by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/373](https://togithub.com/salesforce/tough-cookie/pull/373) - Bump the production-dependencies group with 1 update by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/370](https://togithub.com/salesforce/tough-cookie/pull/370) - Fixes eslint plugin dev upgrades by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/375](https://togithub.com/salesforce/tough-cookie/pull/375) - restore `parse` export that was accidentally removed by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/376](https://togithub.com/salesforce/tough-cookie/pull/376) - Clean up cookie creation by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/381](https://togithub.com/salesforce/tough-cookie/pull/381) - Enforce explicit function return type by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/383](https://togithub.com/salesforce/tough-cookie/pull/383) - patch removed util methods for vows by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/389](https://togithub.com/salesforce/tough-cookie/pull/389) - clean up usage of null/undefined by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/380](https://togithub.com/salesforce/tough-cookie/pull/380) - Bump the dev-dependencies group with 2 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/404](https://togithub.com/salesforce/tough-cookie/pull/404) - Bump the production-dependencies group with 1 update by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/403](https://togithub.com/salesforce/tough-cookie/pull/403) - Remove `@types/psl` from dev dependencies by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/406](https://togithub.com/salesforce/tough-cookie/pull/406) - Bump tldts from 6.1.16 to 6.1.18 in the production-dependencies group by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/411](https://togithub.com/salesforce/tough-cookie/pull/411) - Bump the dev-dependencies group with 2 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/412](https://togithub.com/salesforce/tough-cookie/pull/412) - Bump ejs from 3.1.9 to 3.1.10 by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/413](https://togithub.com/salesforce/tough-cookie/pull/413) - Update v5 docs by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/384](https://togithub.com/salesforce/tough-cookie/pull/384) - Enable strict type checked rules by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/392](https://togithub.com/salesforce/tough-cookie/pull/392) - Preparing for release 5.0.0-rc.2 by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/414](https://togithub.com/salesforce/tough-cookie/pull/414) - Bump the dev-dependencies group with 4 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/417](https://togithub.com/salesforce/tough-cookie/pull/417) - Bump [@&elastic#8203;eslint/js](https://togithub.com/eslint/js) from 8.57.0 to 9.4.0 by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/419](https://togithub.com/salesforce/tough-cookie/pull/419) - Bump tldts from 6.1.18 to 6.1.24 in the production-dependencies group across 1 directory by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/420](https://togithub.com/salesforce/tough-cookie/pull/420) - chore: update deps by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/421](https://togithub.com/salesforce/tough-cookie/pull/421) - Use latest TypeScript version by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/423](https://togithub.com/salesforce/tough-cookie/pull/423) - Update contributors by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/425](https://togithub.com/salesforce/tough-cookie/pull/425) - Bump tldts from 6.1.28 to 6.1.30 in the production-dependencies group by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/426](https://togithub.com/salesforce/tough-cookie/pull/426) - Bump the dev-dependencies group with 4 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/427](https://togithub.com/salesforce/tough-cookie/pull/427) - Fix validation errors not calling callbacks by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/424](https://togithub.com/salesforce/tough-cookie/pull/424) - Preparing for release 5.0.0-rc.3 by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/430](https://togithub.com/salesforce/tough-cookie/pull/430) - Remove url-parse and punycode by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/429](https://togithub.com/salesforce/tough-cookie/pull/429) - Checks structure instead of instanceof for URL test by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/431](https://togithub.com/salesforce/tough-cookie/pull/431) - pre-release cleanup by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/428](https://togithub.com/salesforce/tough-cookie/pull/428) - Preparing for release 5.0.0-rc.4 by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/432](https://togithub.com/salesforce/tough-cookie/pull/432) - use `domainToASCII(str)` instead of `new URL(str).hostName` by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/433](https://togithub.com/salesforce/tough-cookie/pull/433) - Bump tldts from 6.1.32 to 6.1.37 in the production-dependencies group by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/436](https://togithub.com/salesforce/tough-cookie/pull/436) - Bump the dev-dependencies group across 1 directory with 6 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/439](https://togithub.com/salesforce/tough-cookie/pull/439) - Bump tldts from 6.1.37 to 6.1.41 in the production-dependencies group by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/443](https://togithub.com/salesforce/tough-cookie/pull/443) - Bump the dev-dependencies group with 6 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/444](https://togithub.com/salesforce/tough-cookie/pull/444) - upgrade typescript-eslint to 8.0.1 by [@&elastic#8203;wjhsf](https://togithub.com/wjhsf) in [https://github.com/salesforce/tough-cookie/pull/440](https://togithub.com/salesforce/tough-cookie/pull/440) - Bump the dev-dependencies group with 2 updates by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/448](https://togithub.com/salesforce/tough-cookie/pull/448) - Bump eslint from 8.57.0 to 9.9.1 by [@&elastic#8203;dependabot](https://togithub.com/dependabot) in [https://github.com/salesforce/tough-cookie/pull/449](https://togithub.com/salesforce/tough-cookie/pull/449) - Prepare v5 by [@&elastic#8203;colincasey](https://togithub.com/colincasey) in [https://github.com/salesforce/tough-cookie/pull/451](https://togithub.com/salesforce/tough-cookie/pull/451) #### New Contributors - [@&elastic#8203;alissonsleal](https://togithub.com/alissonsleal) made their first contribution in [https://github.com/salesforce/tough-cookie/pull/349](https://togithub.com/salesforce/tough-cookie/pull/349) - [@&elastic#8203;zavan](https://togithub.com/zavan) made their first contribution in [https://github.com/salesforce/tough-cookie/pull/361](https://togithub.com/salesforce/tough-cookie/pull/361) - [@&elastic#8203;hrueger](https://togithub.com/hrueger) made their first contribution in [https://github.com/salesforce/tough-cookie/pull/297](https://togithub.com/salesforce/tough-cookie/pull/297) **Full Changelog**: salesforce/tough-cookie@v4.1.3...v5.0.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjUuMSIsInVwZGF0ZWRJblZlciI6IjM3LjQyNS4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJUZWFtOlNlY3VyaXR5IiwiYmFja3BvcnQ6YWxsLW9wZW4iLCJyZWxlYXNlX25vdGU6c2tpcCJdfQ==--> Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>
- Loading branch information
1 parent
2897f6d
commit f712e4a