chore: merge main and solid2 (major conflicts)#696
Open
davedbase wants to merge 10 commits into
Open
Conversation
Co-authored-by: ladybluenotes <hello@sarahgerrard.me>
Fixes issues surfaced by rebasing solid2 onto main's docs migration: - restore @testing-library/jest-dom in tsconfig types (silently dropped by the docs migration, breaking test assertion types across the board) - bump apps/docs to solid-js/@solidjs/web 2.0.0-beta.15 to match @kobalte/core's new peer deps, fixing JSX.Element mismatches - pin @internationalized/date to 3.4.0 to avoid picking up an incompatible newer release when regenerating the lockfile
❌ Deploy Preview for kobalte failed.
|
…olorFieldInput Surfaced by combining the solid2 rebase with chore/remove-turbo: switching @kobalte/core's @kobalte/utils dependency to workspace:* (instead of a semver range) changed how composeEventHandlers' generic type parameter gets inferred here, since props.onBlur keeps the polymorphic ElementOf<T> generic while context.onBlur is concretely typed to HTMLInputElement. Cast to any, matching the same pattern used elsewhere in the codebase for this exact class of generic/concrete EventHandlerUnion mismatch.
This file contains hidden or 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
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.
solid2
(Solid 2.0 migration) had fallen behindmain, which picked up one large commit restructuring the docs app onto@kobalte/solidbase(new theme, filesystem-based sidebar, Tailwind v4, regenerated lockfile). Rebasing directly produced ~30 conflicts because both branches touched the same docs files and severalpackages/corefiles. Rather than rewrite the sharedsolid2branch (which other in-flight branches —v2/card,v2/steps,v2/tags-inputs, etc. — are based on and would need to force-push/rebase again), this rebase was done on a new branch,solid2-rebased, based offsolid2and replayed ontoorigin/main.solid2` itself is untouched.What changed
app.config.ts,tailwind.config.cjs,header.tsx,theme-selector.tsx,root.css, etc.) — solid2's edits to them were superseded by the newvite.config.ts/solidbase-theme/Layout.tsx. New component doc pages solid2 added (calendar,drawer,otp-field,resizable) were moved into main's newcore/(1)components/directory structure.combobox.tsx,radio-group.tsx,segmented-control.tsx,tabs.tsx,toggle-button.tsx,toggle-group.tsx, and CSS module dark-theme selector conflicts (kept[data-theme*="dark"], consistent with the rest of each file, over a stale[data-kb-theme="dark"]).packages/core/src: resolved 8 files where main's pre-Solid-2.0 code (local.onChangepattern) conflicted with solid2's rewrite (mergedProps,omit(),JSX.ChangeEventHandlerUnion) — kept solid2's side throughout. One exception: kept a real bug fix from main's side increate-single-select-list-state.ts(guards againstsetSelectedKey(undefined)when a selection is cleared).package.jsondevDependencies (kept solid2's Solid-2.0-tested tooling versions — jsdom/vitest/vite/testing-library — over main's independently-bumped versions, since those weren't tested against the Solid 2.0 betas),packages/{core,tests,utils}/package.jsonpeerDependencies (Solid 2.0 versions),pnpm-workspace.yamloverrides/allowBuilds/minimumReleaseAgeExclude (union of both, dropped main'ssolid-js: ">=1.9.14"override since that range excludes the2.0.0-beta.15prerelease), andtsconfig.json(jsxImportSource: @solidjs/web,moduleResolution: Bundler).e57bb63a) for regressions the merge auto-resolved silently (no conflict markers, so easy to miss):tsconfig.jsonhad lost@testing-library/jest-domfrom itstypesarray (main's docs commit dropped it) — brokeexpect(...).toHaveAttribute(...)etc. across every test file in@kobalte/core.apps/docswas still pinned tosolid-js@1.8.15/no@solidjs/web, but now depends on@kobalte/corewhich requires Solid 2.0 — causedJSX.Element/RenderedElementtype mismatches. Bumped both to2.0.0-beta.15.pnpm-lock.yamllet@internationalized/datefloat from3.4.0to3.12.2(still satisfies the^3.4.0range but has breaking type changes). Pinned viapnpm-workspace.yamloverride.Verification
pnpm -F @kobalte/core -F @kobalte/utils -F @kobalte/tests typecheck— passes with the exact same (pre-existing, unrelated) failures as unmodifiedsolid2(verified by diffing error output against a baseline run onsolid2before any changes).apps/docstypecheck — same, once the JSX mismatch was fixed; remaining errors are pre-existing (stale.d.tsoutput caused by a pre-existingnumber-field-input.tsx@ts-expect-errorbug that also failstsup's dts build on plainsolid2).pnpm -F @kobalte/core test— 466 passed, 112 skipped (pre-existingit.skips), 0 failing.Notes for reviewer
solid2was left untouched on purpose — branches built on it don't need to rebase yet. If this gets merged,solid2(and anything based on it) should be rebased onto this branch's tip (or ontomainafter this merges) at some point.number-field-input.tsxunused-@ts-expect-errorbug and the docs-app.d.ts-resolution gaps are pre-existing onsolid2and out of scope here — flagging in case they should be tracked separately.origin/solid2-rebased, waiting on a decision of whether to targetsolid2ormain.