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 #18325

Merged
merged 10 commits into from
Nov 15, 2023
Merged

Automation: main-next integrate #18325

merged 10 commits into from
Nov 15, 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-9e359f6 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-9e359f6 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.

scottn12 and others added 10 commits November 10, 2023 16:50
#18201)

## Description

This PR reworks the existing `getRequestedRange` function into
`getRequestedVersion`. The main change is that it returns the latest
exact version requested instead of a semver range. This will be helpful
when debugging compat testing since it will be more clear which version
was used in testing.

Logic pulled out form
#17158 /
#18087

## Misc 

[AB#5929](https://dev.azure.com/fluidframework/235294da-091d-4c29-84fc-cdfc3d90890b/_workitems/edit/5929)
## Description

Cleanup typed/simple tree entry point to actually use a wrapper object
for the view and expose what's needed for undo+redo and disposal.

This should allow apps to use this simpler entry point.

It also makes it possible to refer to TreeView types without needing
access to the schema types, since its now parametric over the Proxy type
instead.

This is work toward having the "simple" public layer be more of a
wrapper and less of an API subset, which better aligns with the
differing data model and concepts between the public API and the
implementation logic.

The changes to the inventoryList sample show the main intended impact of
these changes.

## Breaking Changes

Code explicitly providing type parameters to TypedTree view will need to
provide the proxy API instead. Users of the internal types and
"schematize" need to call schemtizeInternal now. The typed tree types
have been renamed.
This reverts commit 3bdedb9.

The full compat is enabled for some tests that were not running in full
compat, it broke the ci starting from:
https://dev.azure.com/fluidframework/internal/_build/results?buildId=209931&view=results
…-insights-logger` to `@fluidframework/app-insights-logger` (#18252)

Updates app insights example app dependency from
`@fluid-internal/app-insights-logger` to
`@fluidframework/app-insights-logger`. This was missed and didn't get
caught in the build checks when the packages scope changed in a previous
pr: https://github.com/microsoft/FluidFramework/pull/18239/files
PR #18198 added a dependency to the root that caused a peer dependency
warning. The dep is not needed at the root, so I added it to the peer
dep overrides.
## Description

FieldNodes in editable-tree will no longer implicitly unbox.

This means unboxing now removes at most 2 tree levels (leaf in an
unboxing field) instead of potentially infinite.
This simplifies typing a bit, fixes an issue where recursive field nodes
were lossy when traversing enumerable own properties, and better aligns
with how the Proxy API handles Lists.

## Breaking Changes

Use `.content` to access the content of field nodes in cases where they
no longer implicitly unbox to that.
@alexvy86
Copy link
Contributor

Ack

@msfluid-bot
Copy link
Collaborator Author

@fluid-example/bundle-size-tests: +7 Bytes
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 443.2 KB 443.2 KB No change
connectionState.js 680 Bytes 680 Bytes No change
containerRuntime.js 239.58 KB 239.58 KB No change
loader.js 178.97 KB 178.97 KB No change
map.js 47.39 KB 47.39 KB No change
matrix.js 138.34 KB 138.34 KB No change
odspDriver.js 90.27 KB 90.27 KB No change
odspPrefetchSnapshot.js 41.9 KB 41.9 KB No change
sharedString.js 158.87 KB 158.87 KB No change
sharedTree2.js 274.29 KB 274.3 KB +7 Bytes
Total Size 1.72 MB 1.72 MB +7 Bytes

Baseline commit: 1a95198

Generated by 🚫 dangerJS against 93ddfd5

Copy link
Contributor

This PR is ready to merge! Please review it and squash merge into next: @sonalideshpandemsft @tylerbutler @scottn12

@tylerbutler tylerbutler merged commit 93ddfd5 into next Nov 15, 2023
@tylerbutler tylerbutler deleted the main-next-9e359f6 branch November 15, 2023 21:46
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.

7 participants