Skip to content
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

Bump luxon and @types/luxon #530

Open
wants to merge 1 commit into
base: development/1.6
Choose a base branch
from

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jan 9, 2023

Bumps luxon and @types/luxon. These dependencies needed to be updated together.
Updates luxon from 2.4.0 to 3.2.1

Changelog

Sourced from luxon's changelog.

Changelog

3.2.0 (2022-12-29)

  • Allow timeZone to be specified as an intl option
  • Fix for diff's handling of end-of-month when crossing leap years (#1340)
  • Add Interval.toLocaleString() (#1320)

3.1.1 (2022-11-28)

  • Add Settings.twoDigitCutoffYear

3.1.0 (2022-10-31)

  • Add Duration.rescale

3.0.4 (2022-09-24)

  • Fix quarters in diffs (#1279)
  • Export package.json in package (#1239)

3.0.2 (2022-08-28)

  • Lots of doc changes
  • Added DateTime.expandFormat
  • Added support for custom conversion matrices in Durations

3.0.1 (2022-07-09)

  • Add DateTime.parseFormatForOpts

3.0.0 (2022-07-09)

  • Add "default" as an option for specifying a zone, and change "system" to really mean the system zone (breaking change)

2.5.0 (2022-07-09)

  • Support for ESM-style node imports
  • Fix Wednesday parsing for RFC 850 strings
  • Increase number of digits allowed in ISO durations
Commits

Updates @types/luxon from 2.3.2 to 3.2.0

Commits

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)
> **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days.

Bumps [luxon](https://github.com/moment/luxon) and [@types/luxon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/luxon). These dependencies needed to be updated together.

Updates `luxon` from 2.4.0 to 3.2.1
- [Release notes](https://github.com/moment/luxon/releases)
- [Changelog](https://github.com/moment/luxon/blob/master/CHANGELOG.md)
- [Commits](moment/luxon@2.4.0...3.2.1)

Updates `@types/luxon` from 2.3.2 to 3.2.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/luxon)

---
updated-dependencies:
- dependency-name: luxon
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: "@types/luxon"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file javascript Pull requests that update Javascript code labels Jan 9, 2023
@bert-e
Copy link
Contributor

bert-e commented Jan 9, 2023

Hello dependabot[bot],

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

The following options are set: bypass_author_approval, bypass_jira_check

@bert-e
Copy link
Contributor

bert-e commented Jan 9, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: bypass_author_approval, bypass_jira_check

@bert-e
Copy link
Contributor

bert-e commented Apr 18, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/2.0/dependabot/npm_and_yarn/luxon-and-types/luxon-3.2.1 with contents from dependabot/npm_and_yarn/luxon-and-types/luxon-3.2.1
and development/2.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.0/dependabot/npm_and_yarn/luxon-and-types/luxon-3.2.1 origin/development/2.0
 $ git merge origin/dependabot/npm_and_yarn/luxon-and-types/luxon-3.2.1
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.0/dependabot/npm_and_yarn/luxon-and-types/luxon-3.2.1

The following options are set: bypass_author_approval, bypass_jira_check

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file javascript Pull requests that update Javascript code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant