-
Notifications
You must be signed in to change notification settings - Fork 45
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
build(deps): bump tough-cookie and jsdom in /shell-ui #4085
base: development/127.0
Are you sure you want to change the base?
build(deps): bump tough-cookie and jsdom in /shell-ui #4085
Conversation
Hello dependabot[bot],My role is to assist you with the merge of this Status report is not available. The following options are set: bypass_author_approval, bypass_jira_check |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list: The following options are set: bypass_author_approval, bypass_jira_check |
ConflictThere is a conflict between your branch Please resolve the conflict on the feature branch ( git fetch && \
git checkout origin/dependabot/npm_and_yarn/shell-ui/tough-cookie-and-jsdom-4.1.3 && \
git merge origin/development/126.0 Resolve merge conflicts and commit git push origin HEAD:dependabot/npm_and_yarn/shell-ui/tough-cookie-and-jsdom-4.1.3 The following options are set: bypass_author_approval, bypass_jira_check |
Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) and [jsdom](https://github.com/jsdom/jsdom). These dependencies needed to be updated together. Updates `tough-cookie` from 2.5.0 to 4.1.3 - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](salesforce/tough-cookie@v2.5.0...v4.1.3) Updates `jsdom` from 16.4.0 to 16.7.0 - [Release notes](https://github.com/jsdom/jsdom/releases) - [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md) - [Commits](jsdom/jsdom@16.4.0...16.7.0) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect - dependency-name: jsdom dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
4b92e9c
to
88bac0b
Compare
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list: The following options are set: bypass_author_approval, bypass_jira_check |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list: The following options are set: bypass_author_approval, bypass_jira_check |
Branches have divergedThis pull request's source branch To avoid any integration risks, please re-synchronize them using one of the
Note: If you choose to rebase, you may have to ask me to rebuild The following options are set: bypass_author_approval, bypass_jira_check |
Bumps tough-cookie and jsdom. These dependencies needed to be updated together.
Updates
tough-cookie
from 2.5.0 to 4.1.3Release notes
Sourced from tough-cookie's releases.
... (truncated)
Commits
4ff4d29
4.1.3 release preparation, update the package and lib/version to 4.1.3. (#284)12d4747
Prevent prototype pollution in cookie memstore (#283)f06b72d
Fix documentation for store.findCookies, missing allowSpecialUseDomain proper...b1a8898
fix: allow set cookies with localhost (#253)ec70796
4.1.1 Patch -- allow special use domains by default (#250)d4ac580
fix: allow special use domains by default (#249)79c2f7d
4.1.0 release to NPM (#245)4fafc17
Prepare tough-cookie 4.1 for publishing (updated GitHub actions, move Dockerf...aa4396d
fix: distinguish between no samesite and samesite=none (#240)b8d7511
Modernize README (#234)Maintainer changes
This version was pushed to npm by awaterma, a new releaser for tough-cookie since your current version.
Updates
jsdom
from 16.4.0 to 16.7.0Release notes
Sourced from jsdom's releases.
... (truncated)
Changelog
Sourced from jsdom's changelog.
... (truncated)
Commits
1aa3cbc
Version 16.7.0df1f551
Don't run WebSocketStream testseb105b2
Fix browser tests by enabling SharedArrayBuffer0dedfc0
Fix some bad cascade computation in getComputedStyle()8021a56
Fix "configuation" typo (#3213)a7febe3
Fix typo in level2/html.js (#3222)c9896c0
Return x, y properties from Element.getBoundingClientRect (#3187)346ea98
Update web-platform tests (#3203)364c77d
Bump to ws 7.4.693ba6a0
We are now on Matrix (#3207)You can trigger a rebase of this PR by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)You can disable automated security fix PRs for this repo from the Security Alerts page.