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

Automation: main-next integrate #18699

Merged
merged 7 commits into from
Dec 7, 2023
Merged

Automation: main-next integrate #18699

merged 7 commits into from
Dec 7, 2023

Conversation

msfluid-bot
Copy link
Collaborator

main-next integrate PR

DO NOT MERGE THIS PR USING THE GITHUB UI.

The aim of this pull request is to sync main and next branch. If this PR is assigned to you, you need to do the following:

  1. Acknowledge the pull request by adding a comment -- "Actively working on it".
  2. If there are no CI failures, add the "msftbot: merge-next" label to the PR and one of the people with merge permissions will merge it in.
  3. If there are CI failures, check out the main-next-bb9258a branch and make code changes to fix the failures.
  • You can ignore any failures in the Real service e2e test and Stress test pipelines. These pipelines are not required to pass to merge changes.
  1. Do NOT rebase or squash the main-next-bb9258a branch: its history must be preserved. Always amend the HEAD commit using the following git commands:
  • git commit --amend -m "Automation: main-next integrate"
  • git push --force-with-lease

Once CI passes and the PR is ready to merge, add the "msftbot: merge-next" label to the PR and one of the people with merge permissions will merge it in.

noencke and others added 6 commits December 2, 2023 01:16
This TODO has been resolved and is no longer relevant.
## Description

Converts some inline comments to JSDoc comments, adds more elaboration
on the semantics of localSeq.

---------

Co-authored-by: Abram Sanderson <[email protected]>
Co-authored-by: jzaffiro <[email protected]>
## Description

Converts OptionalField's format to refer to child node changes using the
RegisterId that the node occupies in the input context of the change
rather than the output context.
This makes it consistent with the delta format (which is not necessary,
but convenient) and generally simplifies some of the ChangeRebaser
logic.

## Breaking Changes

This is a breaking change to OptionalField's format semantics, since
child changes refer to the node occupied by a register in the input
context rather than the output context. I was mildly disturbed that this
didn't already result in snapshot test failure, so I added a snapshot
scenario which exercises most of optional-field's interesting scenarios
from the edit manager perspective (this snapshot test would have been
broken had it existed before this change). As usual, no back-compat
attempt was made as the format is not yet stable.

---------

Co-authored-by: Abram Sanderson <[email protected]>
…ss to be alpha (#18608)

This PR is preparation for changing the tagging on the ContainerRuntime
class to be alpha. All these types were automatically identified as
transitive dependency of the ContainerRuntime class which will be made
alpha in a later review.

We will stage these commits and invite review, however review items will
generally be added to the backlog as future items, as these type updates
are necessary for the current state of the code base.

Co-authored-by: Tony Murphy <[email protected]>
… be alpha (#18610)

This PR updates tagging so the ContainerRuntime class can be alpha. All
these types were automatically identified as transitive dependency of
the ContainerRuntime class is made alpha.

We will stage these commits and invite review, however review items will
generally be added to the backlog as future items, as these type updates
are necessary for the current state of the code base.

Co-authored-by: Tony Murphy <[email protected]>
@msfluid-bot
Copy link
Collaborator Author

msfluid-bot commented Dec 7, 2023

@fluid-example/bundle-size-tests: -116 Bytes
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 452.78 KB 452.78 KB +2 Bytes
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 239.23 KB 239.23 KB No change
loader.js 166.81 KB 166.82 KB +2 Bytes
map.js 46.7 KB 46.7 KB +2 Bytes
matrix.js 144.75 KB 144.76 KB +2 Bytes
odspDriver.js 90.35 KB 90.36 KB +2 Bytes
odspPrefetchSnapshot.js 41.82 KB 41.82 KB +2 Bytes
sharedString.js 165.55 KB 165.55 KB No change
sharedTree2.js 289 KB 288.87 KB -130 Bytes
Total Size 1.75 MB 1.75 MB -116 Bytes

Baseline commit: 440bf1f

Generated by 🚫 dangerJS against 175c6ee

@sonalideshpandemsft sonalideshpandemsft merged commit 175c6ee into next Dec 7, 2023
26 checks passed
@sonalideshpandemsft sonalideshpandemsft deleted the main-next-bb9258a branch December 7, 2023 23: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.

6 participants