Merge main into next branch #10468
Merge main into next branch #10468
Conversation
* Remove prelease dependencies on release packages
@fluidframework/eslint-config-fluid -> ^0.28.2000
Server -> ^0.1036.3000
* update routerlicious to webpack 5 * Add explicit dependency on query string in packages that import it * Explicitly opt out of buffer polyfill * opt out of util polyfill * Opt out of buffer and util polyfills in fluid-lambdas-test Co-authored-by: Craig Macomber <[email protected]>
Removes a lingering, unpaired #endregion comment
* Http request logging improvements * Removing debug logs and updating logic around morgan logging * Fixing ES Lint error and removing obsolete function * Centralizing moran logging middleware in services-utils package * Defining computeExtraPropertis function inline to avoid morgan import
* Update index.md -Change "Fluid object in the first diagram for Shared Object" given that that's how the same document refers to it in line 61. -DDS in the first diagram now inside the shared object instead of outside of them. Not sure if we should go for "shared" or "fluid" object but at least keep it consistent. * another fluid object
Co-authored-by: Craig Macomber <[email protected]>
* Use webpack's built in types in bundle-size-tools Co-authored-by: Craig Macomber <[email protected]>
…de container-definitions (#10355)
* Cleanup webpack tests in Routerlicious, and remove webpack types package Co-authored-by: Craig Macomber <[email protected]>
Co-authored-by: Craig Macomber <[email protected]>
* [server] HTTP metric improvements in GitRest, Historian and t9s * Moving types/morgan dependency to appropriate package and fixing typo
Fix to align with the build/test documentation which says that some tests will be skipped if the test collateral which they depend on isn't there. Now they are actually skipped instead of failing.
Co-authored-by: Jatin Garg <[email protected]>
* [gitrest] Persisting latest full summary during getSummary * Fixing comments and reverting config change
* Add the routing endpoint to e2e test * Add the discovery endpoint * Remove extra stages * Add the new line * Add the comments
github-actions
bot
added
area: website
breaking change
|
🔗 No broken links found! ✅ Your attention to detail is admirable. linkcheck output |
| CatchingUp = 1, | ||
| Connected = 2, | ||
| // @deprecated (undocumented) | ||
| Connecting = 1, | ||
| Disconnected = 0 | ||
| Disconnected = 0, | ||
| EstablishingConnection = 3 |
There was a problem hiding this comment.
This is pretty interesting syntax. Is it intended to have two ConnectionState values of 1? or is it a bad merge?
There was a problem hiding this comment.
@skylerjokiel, that's intentional. We are essentially renaming Connecting to CatchingUp, so they share the same value here. You can see #10416 for more context.
| @@ -6,7 +6,6 @@ | |||
| * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. | |||
| * Generated by fluid-type-validator in @fluidframework/build-tools. | |||
| */ | |||
| /* eslint-disable max-lines */ | |||
There was a problem hiding this comment.
I think these are in here By Design to avoid this generated file from breaking the linter. I'm guessing they'll just get added back next time the file is generated so probably no action here, JFYI. cc @tylerbutler @anthony-murphy
There was a problem hiding this comment.
I fixed this in a main branch commit. The generated files no longer emit the disable comment, and there's a straightforward way to add type-compat-specific lint overrides in the config if needed.
There was a problem hiding this comment.
🎂 LGTM, I compared my PR #10447 to this and that part looks good. I'll still follow up with a BREAKING.md change for those changes, btw.
|
@skylerjokiel @markfields @scottn12 Thanks for the reviews. Merged! |
This PR merges main (commit 73929f2) into the next branch. After the merge, there were several issues that needed to be fixed manually in order to get the build to succeed.