Skip to content

Merge master into v8-branch (carry TypeDoc TS2345 fix)#1508

Closed
mathuo wants to merge 3 commits into
v8-branchfrom
master
Closed

Merge master into v8-branch (carry TypeDoc TS2345 fix)#1508
mathuo wants to merge 3 commits into
v8-branchfrom
master

Conversation

@mathuo

@mathuo mathuo commented Jul 21, 2026

Copy link
Copy Markdown
Owner

Description

Merges master into v8-branch to carry over the TypeDoc TS2345 fix from #1507, so the deploy-docs / typedoc step passes on v8-branch too. v8-branch has the identical failing construct (VuePart passing VueComponent<T> into the non-generic registry.mount) and the same resolved Vue 3.5.34, so it fails the same way without this.

master is 3 commits ahead of v8-branch (merge base fa5c83c):

⚠️ Merge conflicts to resolve

A local dry-run merge surfaced 2 conflicts, both from the v7.0.3 release commit (b0c2ef0) — not from the TypeDoc fix:

  • packages/dockview-modules/package.json — deleted on v8-branch, modified by the release on master (modify/delete)
  • packages/dockview/package.json — version content conflict

These are release-versioning / package-structure decisions (v8-branch intentionally removed dockview-modules), so they're left for a maintainer to resolve rather than guessed at here. The utils.ts fix itself merges cleanly.

Type of change

  • Bug fix
  • Build / CI / tooling

Affected packages

  • dockview-vue

How to test

After resolving the conflicts, from v8-branch: yarn installnpx nx run-many -t build,build:bundle --projects=dockview-core,dockview,dockview-vue,dockview-react,dockview-angularnpx typedoc should exit 0 with Found 0 errors.

🤖 Generated with Claude Code


Generated by Claude Code

dockview-release-bot Bot and others added 3 commits July 21, 2026 19:12
…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

mathuo commented Jul 21, 2026

Copy link
Copy Markdown
Owner Author

Superseded by #1509, which is the same masterv8-branch merge but with the two conflicts (dockview-modules/dockview package.json, from the v7.0.3 release bump) already resolved — dockview-modules kept deleted, dockview-core at ^7.0.3. This PR's head is master, so it can't carry the conflict resolution. Closing in favor of #1509.


Generated by Claude Code

@mathuo mathuo closed this Jul 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant