Skip to content

chore: merge latest from main#3671

Merged
castastrophe merged 3 commits into
spectrum-twofrom
chore-merge-latest-main
Apr 16, 2025
Merged

chore: merge latest from main#3671
castastrophe merged 3 commits into
spectrum-twofrom
chore-merge-latest-main

Conversation

@castastrophe
Copy link
Copy Markdown
Contributor

Description

Pull in the latest updates from the main branch to benefit the spectrum 2 development.

Testing and validation

Expect no regressions.

@castastrophe castastrophe added size-2 S ~6-18hrs; not hard or time consuming, one or two work days to complete. skip_vrt Add to a PR to skip running VRT (but still pass the action) ready-for-review S2 Spectrum 2 labels Apr 15, 2025
@castastrophe castastrophe self-assigned this Apr 15, 2025
@changeset-bot
Copy link
Copy Markdown

changeset-bot Bot commented Apr 15, 2025

⚠️ No Changeset found

Latest commit: 81d8313

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 15, 2025

🚀 Deployed on https://pr-3671--spectrum-css.netlify.app

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 15, 2025

File metrics

Summary

Total size: 1.37 MB*

🎉 No changes detected in any packages

* Size is the sum of all main files for packages in the library.
* An ASCII character in UTF-8 is 8 bits or 1 byte.

jawinn
jawinn previously approved these changes Apr 16, 2025
Copy link
Copy Markdown
Collaborator

@jawinn jawinn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've lost a couple things in the MDX docs removal for story and icon on main, that we can update in a follow-up PR:

  1. Button "Docs" page is missing; I think this just needs "!autodocs" removed from the story default export.
  2. Icon docs lost a few additions from its MDX in spectrum-two, “For a full list of all icons within this set...” text/links

We'll also need to reorganize and exclude new stories as necessary on the Docs page for Icon in that follow-up, as there are new stories that should be hidden and a few stories need a title change to organize them better.

Edit: as discussed, I'll add a commit to update that on this PR.

@jawinn jawinn dismissed their stale review April 16, 2025 13:32

Adding Docs tweaks to this PR and someone else will need to review.

@rise-erpelding rise-erpelding self-requested a review April 16, 2025 14:00
Copy link
Copy Markdown
Collaborator

@rise-erpelding rise-erpelding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great! I did check over the button and icon docs pages and they incorporate the needed info from main and maintain any new icons documentation that's more specific to S2.

castastrophe and others added 3 commits April 16, 2025 12:24
In the switch back to autodocs from a custom MDX, some newly added
stories for S2 needed to be hidden for the Docs page, and some story
titles needing renaming to keep related stories in order.
@castastrophe castastrophe force-pushed the chore-merge-latest-main branch from a3cd891 to 81d8313 Compare April 16, 2025 16:24
@castastrophe castastrophe enabled auto-merge (squash) April 16, 2025 16:25
@castastrophe castastrophe merged commit 71ae67a into spectrum-two Apr 16, 2025
18 of 24 checks passed
@castastrophe castastrophe deleted the chore-merge-latest-main branch April 16, 2025 16:31
@castastrophe castastrophe mentioned this pull request Aug 6, 2025
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-for-review S2 Spectrum 2 size-2 S ~6-18hrs; not hard or time consuming, one or two work days to complete. skip_vrt Add to a PR to skip running VRT (but still pass the action)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants