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

Fix TypeScript errors in the next_major branch #1621

Merged
merged 1 commit into from
Nov 18, 2021

Conversation

jfuchs
Copy link
Contributor

@jfuchs jfuchs commented Nov 17, 2021

Maybe this will work better?

Merge checklist

  • Added/updated tests
  • Added/updated documentation
  • Tested in Chrome
  • Tested in Firefox
  • Tested in Safari
  • Tested in Edge

Take a look at the What we look for in reviews section of the contributing guidelines for more information on how we review PRs.

@jfuchs jfuchs requested review from jonrohan, colebemis and a team November 17, 2021 20:55
@changeset-bot
Copy link

changeset-bot bot commented Nov 17, 2021

⚠️ No Changeset found

Latest commit: 507529c

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

@@ -4,6 +4,7 @@ on:
branches-ignore:
- 'main'
- 'next_major'
- '**-next_major'
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- '**-next_major'

Copy link
Contributor

@colebemis colebemis left a comment

Choose a reason for hiding this comment

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

😈

@jfuchs
Copy link
Contributor Author

jfuchs commented Nov 18, 2021

Chatted with @colebemis about this and we decided (or I convinced him?) that it's okay to merge this with broken — there are a few problems that aren't worth making work in this PR when the merge result will still be what we want:

  • the size workflow is failing because typechecking in next_major is broken
  • the release_canary workflow is failing because this branch, which needs to be based off next_major to fix type issues in next_major, includes a pre.json (and changesets won't let you do a canary release from a prerelease branch)

@jfuchs jfuchs merged commit 22483b9 into next_major Nov 18, 2021
@jfuchs jfuchs deleted the jfuchs/ts-fixes-next_major branch November 18, 2021 00:00
jfuchs added a commit that referenced this pull request Nov 22, 2021
* Set up a next_major branch

* Breadcrumbs no longer accepts styled system props (#1469)

* CircleBadge no longer accepts styled system props (#1555)

* FilteredSearch no longer accepts styled system props (#1559)

* FilterList no longer accepts styled system props (#1560)

* FormGroup no longer accepts styled system props (#1562)

* LabelGroup no longer accepts styled system props (#1565)

* Pagination no longer accepts styled system props (#1569)

* Popover no longer accepts styled system props (#1570)

* SideNav no longer accepts styled system props (#1572)

* TabNav no longer accepts styled system props (#1575)

* Timeline no longer accepts styled system props (#1576)

* Truncate no longer accepts styled system props (#1578)

* StateLabel no longer accepts styled system props (#1573)

* Buttons no longer accept styled system props (#1475)

* CounterLabel no longer accepts styled system props (#1557)

* Dropdown no longer accepts styled system props (#1558)

* Flash no longer accepts styled system props (#1561)

* Header no longer accepts styled system props (#1563)

* Label no longer accepts styled system props (#1564)

* Link no longer accepts styled system props (#1566)

* Overlay no longer accepts styled system props (#1567)

* Pagehead no longer accepts styled system props (#1568)

* SelectMenu no longer accepts styled system props (#1571)

* SubNav no longer accepts styled system props (#1574)

* Tooltip no longer accepts styled system props (#1577)

* UnderlineNav no longer accepts styled system props (#1579)

* Fixes some TypeScript errors in the next_major branch (#1621)

* Dialog no longer accepts styled system props (#1615)

* StyledOcticon no longer accepts styled system props (#1616)

* Dialog2 no longer accepts styled system props (#1614)

* Dialog2 no longer accepts styled system props

* Update docs/content/Dialog2.mdx

Co-authored-by: Mike Perrotti <mperrotti@github.com>

Co-authored-by: Mike Perrotti <mperrotti@github.com>

* Version Packages (next) (#1612)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Revert "Version Packages (next) (#1612)" (#1637)

This reverts commit 53f37a4.

* Remove pre.json

Co-authored-by: Mike Perrotti <mperrotti@github.com>
Co-authored-by: GitHub Design Systems Bot <30705008+primer-css@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip changeset This change does not need a changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants