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

Merged
merged 2 commits into from
Dec 11, 2023
Merged

Automation: main-next integrate #18748

merged 2 commits into from
Dec 11, 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. This branch has MERGE CONFLICTS with next due to this commit. 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. Merge main-next-458f23f into the target branch, next. The direction of the merge matters! You need to checkout next and merge main-next-458f23f into it, then fast-forward main-next-458f23f to the merge commit. To do that use the following git commands:
  • git fetch --all -- this ensures your remote refs are updated
  • git remote -v -- displays the list of remote repositories associated with your Git repository along with their corresponding URLs. You have to choose the remote associated with the microsoft/FluidFramework repository. Change the remote name in these example commands if yours is not upstream.
  • git checkout -b next-merge-head upstream/next -- make a temporary branch at next.
  • git merge upstream/main-next-458f23f -- merge next into main-next-458f23f
  1. Resolve any merge conflicts between the branches, then commit all the changes using the following commands:
  • git add . -- stage all the local changes
  • git commit -m "Automation: main-next integrate" -- commit the merge
  1. Fast-forward the main-next-458f23f branch to the merge commit and push to the remote.
  • git checkout main-next-458f23f -- check out the mergeBranch locally
  • git merge next-merge-head --ff-only -- fast-forward to the merge commit
  • git push upstream -- and push it to upstream (your upstream remote name may be different)
  1. Address any CI failures. If you need to make additional changes to the PR, always amend the 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.

This PR adds [the
CLI](https://github.com/arethetypeswrong/arethetypeswrong.github.io/tree/main/packages/cli)
from <https://arethetypeswrong.github.io> to our client packages and
adds a script that runs it against the package. The check is slow
because it packs the package first and runs on the packed contents.

Because the check is slow, it does not run automatically during local
builds but can be triggered manually. In CI the checks run as a test
since they rely on the build output. Ideally this check would be done in
the "pack" phase since we are already packing packages there and could
run on the packed content directly. But that is a bigger CI-centric
change, so I opted not to do that right now.

There are several azure projects that are [producing invalid ESM
types](https://github.com/arethetypeswrong/arethetypeswrong.github.io/blob/main/docs/problems/FalseCJS.md).
Those failures are ignored for now using .attw.json config files in the
individual projects - they'll be cleaned up as we fix the types/exports
field for those packages.

This PR also removes the exports field from most packages, so that we
can re-enable exports in a controlled fashion, while being protected
from releasing bad types by attw.
@msfluid-bot
Copy link
Collaborator Author

msfluid-bot commented Dec 11, 2023

@fluid-example/bundle-size-tests: +14 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 147.36 KB 147.36 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 287.36 KB 287.36 KB No change
Total Size 1.75 MB 1.75 MB +14 Bytes

Baseline commit: 2c8e405

Generated by 🚫 dangerJS against e666815

@sonalideshpandemsft sonalideshpandemsft merged commit e666815 into next Dec 11, 2023
33 checks passed
@sonalideshpandemsft sonalideshpandemsft deleted the main-next-458f23f branch December 11, 2023 21:35
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.

3 participants