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

Finalize TS5.3 and TypeDoc 0.25.x support. (backport #6716) [release/4.6.x] #6721

Merged
merged 4 commits into from
May 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2024

  • Replace BWC with iTwinUI
  • Fix a couple of link errors.
  • Run docs json extraction on darwin/mac os boxes until TypeDoc discrepancy is resolved: TypeDoc produces different json output for at least core-common when built on different platforms. I have not yet come up with a minimal reproduction, but it surrounds the use of re-exporting types from another package: Is the re-exported type a reference or a declaration? On Windows, TypeDoc produces a reference, but on Mac it produces a declaration.

This is an automatic backport of pull request #6716 done by [Mergify](https://mergify.com).

Co-authored-by: Ben Polinsky <ben-polinsky@users.noreply.github.com>
(cherry picked from commit 1c2c71e)

# Conflicts:
#	core/common/src/annotation/TextAnnotation.ts
@mergify mergify bot requested a review from a team as a code owner May 13, 2024 15:20
@mergify mergify bot added the conflicts label May 13, 2024
Copy link
Contributor Author

mergify bot commented May 13, 2024

Cherry-pick of 1c2c71e has failed:

On branch mergify/bp/release/4.6.x/pr-6716
Your branch is up to date with 'origin/release/4.6.x'.

You are currently cherry-picking commit 1c2c71ee5c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   common/api/core-backend.api.md
	new file:   common/changes/@itwin/core-backend/docs-bms5.3.0-support_2024-05-13-14-22.json
	new file:   common/changes/@itwin/core-common/docs-bms5.3.0-support_2024-05-13-14-22.json
	modified:   common/config/azure-pipelines/jobs/docs-build.yaml
	modified:   core/backend/src/BackendLoggerCategory.ts
	modified:   docs/learning/ECSQLTutorial/ChangeSummaryQueries.md
	modified:   docs/learning/tutorials/index.md
	modified:   docs/learning/tutorials/itwin-snapshot-app.md
	modified:   docs/presentation/index.md
	modified:   docs/reference/leftNav.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/common/src/annotation/TextAnnotation.ts

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from a team May 13, 2024 15:21
@mergify mergify bot requested a review from a team May 13, 2024 15:32
@ben-polinsky ben-polinsky enabled auto-merge (squash) May 13, 2024 15:44
@aruniverse aruniverse disabled auto-merge May 13, 2024 16:03
@aruniverse aruniverse merged commit 01fb728 into release/4.6.x May 13, 2024
16 checks passed
@aruniverse aruniverse deleted the mergify/bp/release/4.6.x/pr-6716 branch May 13, 2024 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants