Merge master into v8-branch (TypeDoc TS2345 fix, conflicts resolved)#1509
Merged
Conversation
…istry.mount TypeDoc conversion of dockview-vue failed on master with TS2345: VuePart<T> passed `this.vueComponent` (VueComponent<T>) to VueRendererRegistry.mount, whose parameter is the non-generic VueComponent (VueComponent<any>). A newer Vue 3.5.x pulled in by the v7.0.3 lockfile bump tightened DefineComponent so that DefineComponent<T> is no longer assignable to DefineComponent<any>. mount() stores the component type-erased (markRaw into a non-generic field), so cast at the call site to match every other call site in the file. The non-registry branch keeps full T inference via the generic mountVueComponent.
…3d6y8j fix(dockview-vue): fix TypeDoc TS2345 failure in registry.mount call
Carries the dockview-vue TypeDoc TS2345 fix (#1507) into v8-branch. Conflicts resolved: - packages/dockview-modules/package.json: kept deleted — dockview-modules was removed on v8-branch (superseded by dockview-enterprise). - packages/dockview/package.json: dropped the dockview-modules devDependency; took dockview-core ^7.0.3 to match the rest of the tree after the v7.0.3 release bump.
3 tasks
|
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
1 participant
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.
Description
Merges
masterintov8-branch, carrying the dockview-vue TypeDocTS2345fix from #1507. This is a merge commit with the conflicts already resolved, so it merges cleanly intov8-branch— unlike the directmaster → v8-branchPR (#1508), whose head ismasterand therefore can't carry conflict resolutions.masterwas 3 commits ahead ofv8-branch(merge basefa5c83c): the v7.0.3 release, the TS2345 fix, and the #1507 merge.Conflicts resolved
Both conflicts came from the v7.0.3 release commit, not the fix:
packages/dockview-modules/package.json— kept deleted.dockview-moduleswas removed on v8-branch (superseded bydockview-enterprise), so master's modification to it is dropped.packages/dockview/package.json— removed thedockview-modulesdevDependency master added; tookdockview-core: ^7.0.3, matching the rest of the tree after the release bump. All of v8-branch's own changes to this file (biome, rolldown,sideEffects,files, exports) are preserved.The
packages/dockview-vue/src/utils.tsfix itself merged cleanly.Follow-up commit
packages/dockview-enterprise/package.json— bumpedversionand itsdockviewdependency from7.0.2→7.0.3, so the v8-only enterprise package lines up with the rest of the workspace (all now at 7.0.3). Existing exact-pin style kept.Type of change
Affected packages
dockview-vuedockview(package.json only)dockview-enterprise(version bump)How to test
Verified on the merged tree:
yarn install --frozen-lockfile→npx nx run-many -t build,build:bundle --projects=dockview-core,dockview,dockview-vue,dockview-react,dockview-angular(exit 0) →npx typedoc→ exit 0,Found 0 errors(75 warnings, all pre-existing "referenced but not documented" notes).Checklist
yarn lint:fixpassesyarn formatpassesnpm run genhas been run and generated files are up to dateyarn testpasses🤖 Generated with Claude Code