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

Merge latest main into next #10861

Merged
merged 6 commits into from
Oct 5, 2023
Merged

Merge latest main into next #10861

merged 6 commits into from
Oct 5, 2023

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Oct 3, 2023

This PR was opened by a GitHub Action following a recent push to main in order to keep the next branch up to date. Please resolve any merge conflicts and ensure that your recent changes to main work as expected.

…uidance (#10816)

> [!Important]
> Do not merge until `v12.0.0-beta.2` released

### WHY are these changes introduced?

Updates content on `/new-design-language` page for the `v12.0.0-beta.2`
release. Because our migration guidance isn't published on our site yet,
I've linked to the guidance for migrations from our `next` branch.

### WHAT is this pull request doing?

Updates documentation specifically for `v12.0.0-beta.2` release.
    <details>
      <summary>What's new page update</summary>
<img
src="https://github.com/Shopify/polaris/assets/26749317/4328ab19-651a-415c-baec-e7fa694288b7"
alt="What's new page update">
    </details>
    <details>
      <summary>Timeline update</summary>
<img
src="https://github.com/Shopify/polaris/assets/26749317/9e7f6b57-11ad-4900-a788-bcfe4ae2a01b"
alt="Timeline update">
    </details>
    <details>
      <summary>Want to dive in early update</summary>
<img
src="https://github.com/Shopify/polaris/assets/26749317/79e6092c-9fae-4f5d-9095-af899540c9e2"
alt="Want to dive in early update">
    </details>

### How to 🎩

🖥 [Local development
instructions](https://github.com/Shopify/polaris/blob/main/README.md#local-development)
🗒 [General tophatting
guidelines](https://github.com/Shopify/polaris/blob/main/documentation/Tophatting.md)
📄 [Changelog
guidelines](https://github.com/Shopify/polaris/blob/main/.github/CONTRIBUTING.md#changelog)

### 🎩 checklist

- [ ] Tested on
[mobile](https://github.com/Shopify/polaris/blob/main/documentation/Tophatting.md#cross-browser-testing)
- [ ] Tested on [multiple
browsers](https://help.shopify.com/en/manual/shopify-admin/supported-browsers)
- [ ] Tested for
[accessibility](https://github.com/Shopify/polaris/blob/main/documentation/Accessibility%20testing.md)
- [ ] Updated the component's `README.md` with documentation changes
- [x] [Tophatted
documentation](https://github.com/Shopify/polaris/blob/main/documentation/Tophatting%20documentation.md)
changes in the style guide
@github-actions github-actions bot requested a review from laurkim October 3, 2023 22:49
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @shopify/[email protected]

### Minor Changes

- [#10579](#10579)
[`b5a3622ca`](b5a3622)
Thanks [@aaronccasanova](https://github.com/aaronccasanova)! - Created
migration to replace deprecated `color` custom properties in Polaris
v12.0.0


- [#10304](#10304)
[`eb93b7f1c`](eb93b7f)
Thanks [@lgriffee](https://github.com/lgriffee)! - Created migration to
replace deprecated `font` custom properties in polaris-react v12.0.0


- [#10506](#10506)
[`d901a07a3`](d901a07)
Thanks [@lgriffee](https://github.com/lgriffee)! - Created migration to
replace deprecated `border` custom properties in polaris-react v12.0.0


- [#10305](#10305)
[`1b36b9256`](1b36b92)
Thanks [@lgriffee](https://github.com/lgriffee)! - Created migration to
replace deprecated `space` custom properties in polaris-react v12.0.0


- [#10306](#10306)
[`dbae87e58`](dbae87e)
Thanks [@lgriffee](https://github.com/lgriffee)! - Created migration to
replace deprecated `shadow` custom properties in polaris-react v12.0.0

## @shopify/[email protected]

### Minor Changes

- [#10788](#10788)
[`82f10e830`](82f10e8)
Thanks [@mrcthms](https://github.com/mrcthms)! - Deprecated the
IndexFiltersManager component

## [email protected]

### Patch Changes

- Updated dependencies
\[[`82f10e830`](82f10e8)]:
    -   @shopify/[email protected]

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the cla-needed Added by a bot. Contributor needs to sign the CLA Agreement. label Oct 4, 2023
lgriffee and others added 4 commits October 4, 2023 11:39
### WHY are these changes introduced?

In order to run the `v12-react-avatar-component` migration as part of
our beta release it needs to be merged and released on `main` instead of
the `next` branch.

### WHAT is this pull request doing?
Ports over `v12-react-avatar-component` migration from [[Avatar] Remove
customer prop and experiemntal values
#10283](#10283) to main branch

---------

Co-authored-by: Lo Kim <[email protected]>
Co-authored-by: Lo Kim <[email protected]>
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @shopify/[email protected]

### Minor Changes

- [#10874](#10874)
[`471c3d5af`](471c3d5)
Thanks [@lgriffee](https://github.com/lgriffee)! - Ported
`v12-react-avatar-component` migration from [Avatar] Remove customer
prop and experimental values
[#10283](#10283) to main branch

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Fixes `hub: command not found issue`


![image](https://github.com/Shopify/polaris/assets/32409546/f869720f-e5f9-4c07-9c00-579014b79058)

We no longer need to use the `hub` command as the GitHub CLI now exposes
the same behavior via [gh pr checkout
<number>](https://cli.github.com/manual/gh_pr_checkout).
@sophschneider sophschneider merged commit 9d97815 into next Oct 5, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-needed Added by a bot. Contributor needs to sign the CLA Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants