-
Notifications
You must be signed in to change notification settings - Fork 537
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into zhangxin/profile499
- Loading branch information
Showing
181 changed files
with
1,484 additions
and
581 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --- | ||
| "@fluidframework/azure-client": minor | ||
| --- | ||
| --- | ||
| "section": deprecation | ||
| --- | ||
|
|
||
| ITokenClaims and ScopeType types are now deprecated | ||
|
|
||
| The `ITokenClaims` and `ScopeType` types in `@fluidframework/azure-client` are now deprecated. These were isolated types | ||
| re-exported for convenience but they do not directly interact with typical azure-client APIs. | ||
|
|
||
| See [issue #23702](https://github.com/microsoft/FluidFramework/issues/23702) for details and alternatives. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /*! | ||
| * Copyright (c) Microsoft Corporation and contributors. All rights reserved. | ||
| * Licensed under the MIT License. | ||
| */ | ||
|
|
||
| /* | ||
| * .pnpmfile.cjs is a pnpm hook file that allows modification of package.json content | ||
| * (in memory) of the packages that are being installed. | ||
| * https://pnpm.io/pnpmfile | ||
| * | ||
| * This implementation is based on https://gist.github.com/dvins/33b8fb52480149d37cdeb98890244c5b. | ||
| * Changes: | ||
| * - Added support for complete dependency removal (specify null for newVersion) | ||
| * - Apply stylistic and naming preferences and comment cleanup | ||
| * - Specify remapPeerDependencies for local needs | ||
| */ | ||
|
|
||
| //@ts-check | ||
|
|
||
| // https://pnpm.io/pnpmfile | ||
| // https://github.com/pnpm/pnpm/issues/4214 | ||
| // https://github.com/pnpm/pnpm/issues/5391 | ||
|
|
||
| const remapPeerDependencies = [ | ||
| // @fluidframework/azure-client 1.x declares a peerDependency on fluid-framework but does not require it. | ||
| // It should have been an optional peer dependency. We just remove it. | ||
| { | ||
| package: "@fluidframework/azure-client", | ||
| packageVersionPrefix: "1.", | ||
| peerDependency: "fluid-framework", | ||
| newVersion: null, | ||
| }, | ||
| ]; | ||
|
|
||
| // Only emit the checking banner once. | ||
| // And only if engaged. Some pnpm uses expect specific output (like `pnpm list`) and may break if anything is emitted. | ||
| let emittedCheckBanner = false; | ||
|
|
||
| function overridesPeerDependencies(pkg) { | ||
| if (!emittedCheckBanner) { | ||
| console.log(`Checking for package peerDependency overrides`); | ||
| emittedCheckBanner = true; | ||
| } | ||
|
|
||
| if (!pkg.peerDependencies) { | ||
| return; | ||
| } | ||
|
|
||
| const applicableRemapPeerDependencies = remapPeerDependencies.filter( | ||
| (remap) => | ||
| remap.package === pkg.name && pkg.version.startsWith(remap.packageVersionPrefix), | ||
| ); | ||
|
|
||
| if (applicableRemapPeerDependencies.length === 0) { | ||
| return; | ||
| } | ||
|
|
||
| console.log(` - Checking ${pkg.name}@${pkg.version}`); | ||
| for (const dep of applicableRemapPeerDependencies) { | ||
| if (dep.peerDependency in pkg.peerDependencies) { | ||
| console.log( | ||
| ` - Overriding ${pkg.name}@${pkg.version} peerDependency ${dep.peerDependency}@${pkg.peerDependencies[dep.peerDependency]}`, | ||
| ); | ||
|
|
||
| // First add a new dependency to the package, if defined, and then remove the peer dependency. | ||
| if (dep.newVersion) { | ||
| // This approach has the added advantage that scoped overrides should now work, too. | ||
| pkg.dependencies[dep.peerDependency] = dep.newVersion; | ||
| } | ||
| delete pkg.peerDependencies[dep.peerDependency]; | ||
|
|
||
| const newDep = pkg.dependencies[dep.peerDependency]; | ||
| console.log( | ||
| newDep | ||
| ? ` - Overrode ${pkg.name}@${pkg.version} peerDependency to ${dep.peerDependency}@${newDep} (as full dependency)` | ||
| : ` - Removed ${pkg.name}@${pkg.version} peerDependency`, | ||
| ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| module.exports = { | ||
| hooks: { | ||
| readPackage(pkg, _context) { | ||
| overridesPeerDependencies(pkg); | ||
| return pkg; | ||
| }, | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| <!-- THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. --> | ||
|
|
||
| # Fluid Framework v2.21.0 | ||
|
|
||
| ## Contents | ||
|
|
||
| - [🐛 Bug Fixes](#-bug-fixes) | ||
| - [SharedMap, SharedIntervalCollection and AttributableMap now throw an error when they encounter unrecognized Ops (#23659)](#sharedmap-sharedintervalcollection-and-attributablemap-now-throw-an-error-when-they-encounter-unrecognized-ops-23659) | ||
| - [⚠️ Deprecations](#️-deprecations) | ||
| - [Many unnecessary exports have been deprecated in the container-runtime package (#23607)](#many-unnecessary-exports-have-been-deprecated-in-the-container-runtime-package-23607) | ||
| - [The IContainerContext.supportedFeatures property is now deprecated (#22877)](#the-icontainercontextsupportedfeatures-property-is-now-deprecated-22877) | ||
| - [ITokenClaims and ScopeType types are now deprecated (#23703)](#itokenclaims-and-scopetype-types-are-now-deprecated-23703) | ||
|
|
||
| ## 🐛 Bug Fixes | ||
|
|
||
| ### SharedMap, SharedIntervalCollection and AttributableMap now throw an error when they encounter unrecognized Ops ([#23659](https://github.com/microsoft/FluidFramework/issues/23659)) | ||
|
|
||
| To avoid future versions of DDSes with new Op types causing silent data corruption and de-sync between clients, DDSes should error when unable to apply an Op. This prevents data loss and corruption scenarios like a summary client using old code discarding all Ops from newer clients. | ||
|
|
||
| If updating applications using SharedMap, SharedIntervalCollection and AttributableMap use a newer version which adds Ops types in the future, old clients which are old enough to be from before this fix will ignore the new ops instead of erroring. Therefore it may be useful to ensure this update is deployed as widely as possible before migrating any to newer versions which add new op formats to these DDSes. | ||
|
|
||
| #### Change details | ||
|
|
||
| Commit: [`3dd4208`](https://github.com/microsoft/FluidFramework/commit/3dd4208dd329a9200c4405f07e302b0ab1ff6159) | ||
|
|
||
| Affected packages: | ||
|
|
||
| - @fluid-experimental/attributable-map | ||
| - @fluidframework/map | ||
| - @fluidframework/sequence | ||
|
|
||
| [⬆️ Table of contents](#contents) | ||
|
|
||
| ## ⚠️ Deprecations | ||
|
|
||
| ### Many unnecessary exports have been deprecated in the container-runtime package ([#23607](https://github.com/microsoft/FluidFramework/issues/23607)) | ||
|
|
||
| The following types in the `@fluidframework/container-runtime` package are now deprecated. These types are unnecessary for external users of this package. | ||
|
|
||
| - currentDocumentVersionSchema | ||
| - DeletedResponseHeaderKey | ||
| - DocumentSchemaValueType | ||
| - DocumentsSchemaController | ||
| - GCFeatureMatrix | ||
| - GCNodeType | ||
| - GCVersion | ||
| - IBlobManagerLoadInfo | ||
| - ICancellableSummarizerController | ||
| - ICancellationToken | ||
| - IConnectableRuntime | ||
| - IContainerRuntimeMetadata | ||
| - ICreateContainerMetadata | ||
| - IDocumentSchema | ||
| - IDocumentSchemaChangeMessage | ||
| - IDocumentSchemaCurrent | ||
| - IDocumentSchemaFeatures | ||
| - IGCMetadata | ||
| - IGCStats | ||
| - IMarkPhaseStats | ||
| - IRefreshSummaryAckOptions | ||
| - ISerializedElection | ||
| - ISubmitSummaryOptions | ||
| - ISummarizerInternalsProvider | ||
| - ISummarizerRuntime | ||
| - ISummaryCancellationToken | ||
| - ISummaryMetadataMessage | ||
| - ISweepPhaseStats | ||
| - Summarizer | ||
|
|
||
| #### Change details | ||
|
|
||
| Commit: [`3da5b42`](https://github.com/microsoft/FluidFramework/commit/3da5b427ef406799abade04196e43bb6d66d898d) | ||
|
|
||
| Affected packages: | ||
|
|
||
| - @fluidframework/container-runtime | ||
|
|
||
| [⬆️ Table of contents](#contents) | ||
|
|
||
| ### The IContainerContext.supportedFeatures property is now deprecated ([#22877](https://github.com/microsoft/FluidFramework/issues/22877)) | ||
|
|
||
| The `IContainerContext.supportedFeatures` optional property was used internally to communicate features supported by the Loader layer to the Runtime layer. This has since been replaced with functionality that is not exposed externally. | ||
|
|
||
| #### Change details | ||
|
|
||
| Commit: [`4c06412`](https://github.com/microsoft/FluidFramework/commit/4c06412bb365d680430f83b87c456d132d9da1be) | ||
|
|
||
| Affected packages: | ||
|
|
||
| - @fluidframework/container-definitions | ||
|
|
||
| [⬆️ Table of contents](#contents) | ||
|
|
||
| ### ITokenClaims and ScopeType types are now deprecated ([#23703](https://github.com/microsoft/FluidFramework/issues/23703)) | ||
|
|
||
| The `ITokenClaims` and `ScopeType` types in `@fluidframework/azure-client` are now deprecated. These were isolated types re-exported for convenience but they do not directly interact with typical azure-client APIs. | ||
|
|
||
| See [issue #23702](https://github.com/microsoft/FluidFramework/issues/23702) for details and alternatives. | ||
|
|
||
| #### Change details | ||
|
|
||
| Commit: [`f679945`](https://github.com/microsoft/FluidFramework/commit/f67994577597aae6dc8b42f3c6557c744adc0964) | ||
|
|
||
| Affected packages: | ||
|
|
||
| - @fluidframework/azure-client | ||
|
|
||
| [⬆️ Table of contents](#contents) | ||
|
|
||
| ### 🛠️ Start Building Today! | ||
|
|
||
| Please continue to engage with us on GitHub [Discussion](https://github.com/microsoft/FluidFramework/discussions) and [Issue](https://github.com/microsoft/FluidFramework/issues) pages as you adopt Fluid Framework! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.