Merge pull request microsoft#9379 from microsoft/main

Merge "main" into "next" in prep for "next" version bump

api-report/merge-tree.api.md

@@ -111,7 +111,7 @@ export class Client {
     cloneFromSegments(): Client;
     // (undocumented)
     createTextHelper(): MergeTreeTextHelper;
-    findReconnectionPostition(segment: ISegment, localSeq: number): number;
+    protected findReconnectionPosition(segment: ISegment, localSeq: number): number;
     // (undocumented)
     findTile(startPos: number, tileLabel: string, preceding?: boolean): {
         tile: ReferencePosition;
@@ -293,9 +293,6 @@ export function extend<T>(base: MapLike<T>, extension: MapLike<T> | undefined, c
 // @public (undocumented)
 export function extendIfUndefined<T>(base: MapLike<T>, extension: MapLike<T> | undefined): MapLike<T>;
 
-// @public (undocumented)
-export function glc(mergeTree: MergeTree, id: number): string;
-
 // @public (undocumented)
 export class Heap<T> {
     constructor(a: T[], comp: Comparer<T>);
@@ -997,8 +994,6 @@ export class MergeTree {
     // (undocumented)
     getLength(refSeq: number, clientId: number): number;
     // (undocumented)
-    getLongClientId?: (id: number) => string;
-    // (undocumented)
     getMarkerFromId(id: string): ISegment | undefined;
     // (undocumented)
     getPosition(node: MergeNode, refSeq: number, clientId: number): number;
@@ -1028,8 +1023,6 @@ export class MergeTree {
     // (undocumented)
     mergeTreeMaintenanceCallback?: MergeTreeMaintenanceCallback;
     // (undocumented)
-    nodeToString(block: IMergeBlock, strbuf: string, indentCount?: number): string;
-    // (undocumented)
     options?: PropertySet | undefined;
     // (undocumented)
     static readonly options: {
@@ -1054,8 +1047,6 @@ export class MergeTree {
     // (undocumented)
     startCollaboration(localClientId: number, minSeq: number, currentSeq: number): void;
     // (undocumented)
-    toString(): string;
-    // (undocumented)
     walkAllSegments<TClientData>(block: IMergeBlock, action: (segment: ISegment, accum?: TClientData) => boolean, accum?: TClientData): boolean;
     }
 

common/lib/common-definitions/package.json

@@ -42,7 +42,7 @@
     "@fluidframework/build-common": "^0.23.0",
     "@fluidframework/build-tools": "^0.2.54658",
     "@fluidframework/common-definitions-0.20.0": "npm:@fluidframework/common-definitions@0.20.0",
-    "@fluidframework/eslint-config-fluid": "^0.26.0-0",
+    "@fluidframework/eslint-config-fluid": "^0.26.0",
     "@microsoft/api-extractor": "^7.16.1",
     "@rushstack/eslint-config": "^2.5.1",
     "@typescript-eslint/eslint-plugin": "~5.9.0",

common/lib/common-utils/package.json

@@ -85,7 +85,7 @@
     "@fluidframework/build-common": "^0.23.0",
     "@fluidframework/build-tools": "^0.2.54658",
     "@fluidframework/common-utils-0.32.1": "npm:@fluidframework/common-utils@0.32.1",
-    "@fluidframework/eslint-config-fluid": "^0.26.0-0",
+    "@fluidframework/eslint-config-fluid": "^0.26.0",
     "@microsoft/api-extractor": "^7.16.1",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/base64-js": "^1.3.0",

common/lib/container-definitions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-definitions",
-  "version": "0.47.0",
+  "version": "0.47.1000",
   "description": "Fluid container definitions",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -52,7 +52,7 @@
     "@fluidframework/container-definitions-0.44.0": "npm:@fluidframework/container-definitions@0.44.0",
     "@fluidframework/container-definitions-0.45.0": "npm:@fluidframework/container-definitions@0.45.0",
     "@fluidframework/container-definitions-0.46.0": "npm:@fluidframework/container-definitions@0.46.0",
-    "@fluidframework/eslint-config-fluid": "^0.26.0-0",
+    "@fluidframework/eslint-config-fluid": "^0.26.0",
     "@microsoft/api-extractor": "^7.16.1",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/mocha": "^8.2.2",

common/lib/core-interfaces/package.json

@@ -41,7 +41,7 @@
     "@fluidframework/core-interfaces-0.40.0": "npm:@fluidframework/core-interfaces@0.40.0",
     "@fluidframework/core-interfaces-0.41.0": "npm:@fluidframework/core-interfaces@0.41.0",
     "@fluidframework/core-interfaces-0.42.0": "npm:@fluidframework/core-interfaces@0.42.0",
-    "@fluidframework/eslint-config-fluid": "^0.26.0-0",
+    "@fluidframework/eslint-config-fluid": "^0.26.0",
     "@microsoft/api-extractor": "^7.16.1",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/node": "^14.18.0",

common/lib/driver-definitions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/driver-definitions",
-  "version": "0.45.0",
+  "version": "0.45.1000",
   "description": "Fluid driver definitions",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -47,7 +47,7 @@
     "@fluidframework/driver-definitions-0.42.0": "npm:@fluidframework/driver-definitions@0.42.0",
     "@fluidframework/driver-definitions-0.43.0": "npm:@fluidframework/driver-definitions@0.43.0",
     "@fluidframework/driver-definitions-0.44.0": "npm:@fluidframework/driver-definitions@0.44.0",
-    "@fluidframework/eslint-config-fluid": "^0.26.0-0",
+    "@fluidframework/eslint-config-fluid": "^0.26.0",
     "@microsoft/api-extractor": "^7.16.1",
     "@rushstack/eslint-config": "^2.5.1",
     "@typescript-eslint/eslint-plugin": "~5.9.0",

common/lib/protocol-definitions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/protocol-definitions",
-  "version": "0.1027.0",
+  "version": "0.1027.1000",
   "description": "Fluid protocol definitions",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -39,7 +39,7 @@
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
     "@fluidframework/build-tools": "^0.2.54658",
-    "@fluidframework/eslint-config-fluid": "^0.26.0-0",
+    "@fluidframework/eslint-config-fluid": "^0.26.0",
     "@fluidframework/protocol-definitions-0.1024.0": "npm:@fluidframework/protocol-definitions@0.1024.0",
     "@fluidframework/protocol-definitions-0.1025.1": "npm:@fluidframework/protocol-definitions@0.1025.1",
     "@fluidframework/protocol-definitions-0.1026.0": "npm:@fluidframework/protocol-definitions@0.1026.0",

examples/apps/collaborative-textarea/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-example/collaborative-textarea",
-  "version": "0.58.0",
+  "version": "0.58.1000",
   "description": "A minimal example using the react collaborative-textarea",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -33,24 +33,24 @@
     "webpack:dev": "webpack --env.development"
   },
   "dependencies": {
-    "@fluid-experimental/get-container": "^0.58.0",
-    "@fluid-experimental/react-inputs": "^0.58.0",
-    "@fluidframework/aqueduct": "^0.58.0",
+    "@fluid-experimental/get-container": "^0.58.1000",
+    "@fluid-experimental/react-inputs": "^0.58.1000",
+    "@fluidframework/aqueduct": "^0.58.1000",
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/core-interfaces": "^0.42.0",
-    "@fluidframework/sequence": "^0.58.0",
-    "@fluidframework/view-interfaces": "^0.58.0",
+    "@fluidframework/sequence": "^0.58.1000",
+    "@fluidframework/view-interfaces": "^0.58.1000",
     "css-loader": "^1.0.0",
     "react": "^16.10.2",
     "react-dom": "^16.10.2",
     "style-loader": "^1.0.0"
   },
   "devDependencies": {
-    "@fluid-tools/webpack-fluid-loader": "^0.58.0",
+    "@fluid-tools/webpack-fluid-loader": "^0.58.1000",
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/eslint-config-fluid": "^0.26.0-0",
+    "@fluidframework/eslint-config-fluid": "^0.26.0",
     "@fluidframework/test-tools": "^0.2.3074",
-    "@fluidframework/test-utils": "^0.58.0",
+    "@fluidframework/test-utils": "^0.58.1000",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/expect-puppeteer": "2.2.1",
     "@types/jest": "22.2.3",

examples/apps/contact-collection/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-example/contact-collection",
-  "version": "0.58.0",
+  "version": "0.58.1000",
   "description": "Example of using a Fluid Object as a collection of items",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -33,12 +33,12 @@
     "webpack:dev": "webpack --env.development"
   },
   "dependencies": {
-    "@fluid-experimental/get-container": "^0.58.0",
-    "@fluidframework/aqueduct": "^0.58.0",
+    "@fluid-experimental/get-container": "^0.58.1000",
+    "@fluidframework/aqueduct": "^0.58.1000",
     "@fluidframework/common-definitions": "^0.20.1",
-    "@fluidframework/container-runtime-definitions": "^0.58.0",
+    "@fluidframework/container-runtime-definitions": "^0.58.1000",
     "@fluidframework/core-interfaces": "^0.42.0",
-    "@fluidframework/runtime-utils": "^0.58.0",
+    "@fluidframework/runtime-utils": "^0.58.1000",
     "css-loader": "^1.0.0",
     "react": "^16.10.2",
     "react-dom": "^16.10.2",
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/eslint-config-fluid": "^0.26.0-0",
+    "@fluidframework/eslint-config-fluid": "^0.26.0",
     "@fluidframework/test-tools": "^0.2.3074",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/expect-puppeteer": "2.2.1",

examples/apps/likes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-example/likes",
-  "version": "0.58.0",
+  "version": "0.58.1000",
   "description": "A Fluid object for storing like counts using pre-build DDS hooks",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -31,18 +31,18 @@
     "webpack:dev": "webpack --env.development"
   },
   "dependencies": {
-    "@fluid-experimental/get-container": "^0.58.0",
-    "@fluid-experimental/react": "^0.58.0",
-    "@fluid-experimental/react-inputs": "^0.58.0",
-    "@fluidframework/aqueduct": "^0.58.0",
+    "@fluid-experimental/get-container": "^0.58.1000",
+    "@fluid-experimental/react": "^0.58.1000",
+    "@fluid-experimental/react-inputs": "^0.58.1000",
+    "@fluidframework/aqueduct": "^0.58.1000",
     "@fluidframework/common-definitions": "^0.20.1",
-    "@fluidframework/counter": "^0.58.0",
-    "@fluidframework/datastore-definitions": "^0.58.0",
-    "@fluidframework/map": "^0.58.0",
-    "@fluidframework/merge-tree": "^0.58.0",
-    "@fluidframework/protocol-definitions": "^0.1026.0",
-    "@fluidframework/sequence": "^0.58.0",
-    "@fluidframework/shared-object-base": "^0.58.0",
+    "@fluidframework/counter": "^0.58.1000",
+    "@fluidframework/datastore-definitions": "^0.58.1000",
+    "@fluidframework/map": "^0.58.1000",
+    "@fluidframework/merge-tree": "^0.58.1000",
+    "@fluidframework/protocol-definitions": "^0.1027.0-0",
+    "@fluidframework/sequence": "^0.58.1000",
+    "@fluidframework/shared-object-base": "^0.58.1000",
     "react": "^16.10.2",
     "react-dom": "^16.10.2"
   },

examples/apps/spaces/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-example/spaces",
-  "version": "0.58.0",
+  "version": "0.58.1000",
   "description": "Spaces is a grid layout component",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -35,20 +35,20 @@
     "webpack:dev": "webpack --env.development"
   },
   "dependencies": {
-    "@fluid-example/clicker": "^0.58.0",
-    "@fluid-example/codemirror": "^0.58.0",
-    "@fluid-example/collaborative-textarea": "^0.58.0",
-    "@fluid-example/multiview-coordinate-model": "^0.58.0",
-    "@fluid-example/multiview-slider-coordinate-view": "^0.58.0",
-    "@fluid-example/prosemirror": "^0.58.0",
-    "@fluid-experimental/get-container": "^0.58.0",
-    "@fluidframework/aqueduct": "^0.58.0",
+    "@fluid-example/clicker": "^0.58.1000",
+    "@fluid-example/codemirror": "^0.58.1000",
+    "@fluid-example/collaborative-textarea": "^0.58.1000",
+    "@fluid-example/multiview-coordinate-model": "^0.58.1000",
+    "@fluid-example/multiview-slider-coordinate-view": "^0.58.1000",
+    "@fluid-example/prosemirror": "^0.58.1000",
+    "@fluid-experimental/get-container": "^0.58.1000",
+    "@fluidframework/aqueduct": "^0.58.1000",
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/core-interfaces": "^0.42.0",
-    "@fluidframework/datastore-definitions": "^0.58.0",
-    "@fluidframework/runtime-definitions": "^0.58.0",
-    "@fluidframework/runtime-utils": "^0.58.0",
-    "@fluidframework/view-adapters": "^0.58.0",
+    "@fluidframework/datastore-definitions": "^0.58.1000",
+    "@fluidframework/runtime-definitions": "^0.58.1000",
+    "@fluidframework/runtime-utils": "^0.58.1000",
+    "@fluidframework/view-adapters": "^0.58.1000",
     "office-ui-fabric-react": "^7.28.1",
     "prop-types": "^15.7.2",
     "react": "^16.10.2",
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/eslint-config-fluid": "^0.26.0-0",
+    "@fluidframework/eslint-config-fluid": "^0.26.0",
     "@fluidframework/test-tools": "^0.2.3074",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/expect-puppeteer": "2.2.1",