build(deps): fix package-lock merge conflicts #8120
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/yargs](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/yargs) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped)) | [`17.0.24` -> `17.0.29`](https://renovatebot.com/diffs/npm/@types%2fyargs/17.0.24/17.0.29) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - "before 5am every weekday" in timezone America/Los_Angeles, 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 [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/Esri/calcite-design-system). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMS41IiwidXBkYXRlZEluVmVyIjoiMzcuMzEuNSIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [ng-packagr](https://togithub.com/ng-packagr/ng-packagr) | [`16.2.0` -> `16.2.3`](https://renovatebot.com/diffs/npm/ng-packagr/16.2.3/16.2.3) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - "before 5am every weekday" in timezone America/Los_Angeles, 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 [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/Esri/calcite-design-system). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMS41IiwidXBkYXRlZEluVmVyIjoiMzcuMzEuNSIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [tailwindcss](https://tailwindcss.com) ([source](https://togithub.com/tailwindlabs/tailwindcss)) | [`3.3.3` -> `3.3.5`](https://renovatebot.com/diffs/npm/tailwindcss/3.3.3/3.3.5) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>tailwindlabs/tailwindcss (tailwindcss)</summary> ### [`v3.3.5`](https://togithub.com/tailwindlabs/tailwindcss/blob/HEAD/CHANGELOG.md#335---2023-10-25) [Compare Source](https://togithub.com/tailwindlabs/tailwindcss/compare/v3.3.4...v3.3.5) ##### Fixed - Fix incorrect spaces around `-` in `calc()` expression ([#​12283](https://togithub.com/tailwindlabs/tailwindcss/pull/12283)) ### [`v3.3.4`](https://togithub.com/tailwindlabs/tailwindcss/blob/HEAD/CHANGELOG.md#334---2023-10-24) [Compare Source](https://togithub.com/tailwindlabs/tailwindcss/compare/v3.3.3...v3.3.4) ##### Fixed - Improve normalisation of `calc()`-like functions ([#​11686](https://togithub.com/tailwindlabs/tailwindcss/pull/11686)) - Skip `calc()` normalisation in nested `theme()` calls ([#​11705](https://togithub.com/tailwindlabs/tailwindcss/pull/11705)) - Fix incorrectly generated CSS when using square brackets inside arbitrary properties ([#​11709](https://togithub.com/tailwindlabs/tailwindcss/pull/11709)) - Make `content` optional for presets in TypeScript types ([#​11730](https://togithub.com/tailwindlabs/tailwindcss/pull/11730)) - Handle variable colors that have variable fallback values ([#​12049](https://togithub.com/tailwindlabs/tailwindcss/pull/12049)) - Batch reading content files to prevent `too many open files` error ([#​12079](https://togithub.com/tailwindlabs/tailwindcss/pull/12079)) - Skip over classes inside `:not(…)` when nested in an at-rule ([#​12105](https://togithub.com/tailwindlabs/tailwindcss/pull/12105)) - Update types to work with `Node16` module resolution ([#​12097](https://togithub.com/tailwindlabs/tailwindcss/pull/12097)) - Don’t crash when important and parent selectors are equal in `@apply` ([#​12112](https://togithub.com/tailwindlabs/tailwindcss/pull/12112)) - Eliminate irrelevant rules when applying variants ([#​12113](https://togithub.com/tailwindlabs/tailwindcss/pull/12113)) - Improve RegEx parser, reduce possibilities as the key for arbitrary properties ([#​12121](https://togithub.com/tailwindlabs/tailwindcss/pull/12121)) - Fix sorting of utilities that share multiple candidates ([#​12173](https://togithub.com/tailwindlabs/tailwindcss/pull/12173)) - Ensure variants with arbitrary values and a modifier are correctly matched in the RegEx based parser ([#​12179](https://togithub.com/tailwindlabs/tailwindcss/pull/12179)) - Fix crash when watching renamed files on FreeBSD ([#​12193](https://togithub.com/tailwindlabs/tailwindcss/pull/12193)) - Allow plugins from a parent document to be used in an iframe ([#​12208](https://togithub.com/tailwindlabs/tailwindcss/pull/12208)) - Add types for `tailwindcss/nesting` ([#​12269](https://togithub.com/tailwindlabs/tailwindcss/pull/12269)) - Bump `jiti`, `fast-glob`, and `browserlist` dependencies ([#​11550](https://togithub.com/tailwindlabs/tailwindcss/pull/11550)) - Improve automatic `var` injection for properties that accept a `<dashed-ident>` ([#​12236](https://togithub.com/tailwindlabs/tailwindcss/pull/12236)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 5am every weekday" in timezone America/Los_Angeles, 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 [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/Esri/calcite-design-system). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMS41IiwidXBkYXRlZEluVmVyIjoiMzcuMzEuNSIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…pkgs * origin/main: build(deps): update dependency tailwindcss to v3.3.5 (#8118)
benelan
requested review from
jcfranco,
driskull,
geospatialem and
a team
as code owners
…ular-pkgs * jcfranco/7861-bump-stencil-to-v4: build(deps): bump angular packages to fix build errors (#8119)
](https://renovatebot.com){kind=link}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Fixed a couple more package-lock merge conflicts that popped up from syncing with main after installing the renovate tailwind pr