Merge pull request microsoft#9643 from heliocliu/MainToNext328

Integrate main to next
tylerbutler · Mar 28, 2022 · 2b13c61 · 2b13c61
2 parents bc1f3da + 67208ee
commit 2b13c61
Show file tree

Hide file tree

Showing 102 changed files with 558 additions and 28,595 deletions.
diff --git a/.github/actions-labeler.yml b/.github/actions-labeler.yml
@@ -0,0 +1,78 @@
+# This file is a map of labels to repo glob paths. See https://github.com/marketplace/actions/labeler
+# for more details.
+
+"area: build":
+  - ".github/*"
+  - ".github/workflows/**"
+  - "tools/pipelines/**"
+
+"area: contributor experience":
+  - ".vscode/**"
+
+"area: dds":
+  - experimental/dds/**
+  - packages/dds/**
+
+"area: dds: propertydds":
+  - experimental/PropertyDDS/**
+
+"area: dds: sharedstring":
+  - packages/dds/sequence/**
+
+"area: definitions":
+  - common/lib/container-definitions/**
+  - common/lib/core-interfaces/**
+  - common/lib/driver-definitions/**
+
+"area: dev experience":
+  - experimental/framework/**
+
+"area: driver":
+  - packages/drivers/**
+
+"area: examples":
+  - examples/**
+  - experimental/examples/**
+
+"area: framework":
+  - packages/framework/**
+
+"area: loader":
+  - packages/loader/**
+
+"area: odsp-driver":
+  - packages/drivers/*odsp*/**
+  - packages/utils/odsp-doclib-utils/**
+
+# Add "area: repo" label to any root or .github changes
+"area: repo":
+  - any: ["*", ".github/**", "!BREAKING.md"]
+
+"area: runtime":
+  - packages/runtime/**
+
+"area: server":
+  - server/**
+
+"area: tests":
+  - packages/test/**
+
+"area: tools":
+  - any: ["common/build/**", "tools/**", "tools/pipelines/**"]
+
+"area: website":
+  - any: ["docs/**", "!docs/content/**"]
+
+"breaking change":
+  - BREAKING.md
+
+dependencies:
+  - lerna-package-lock.json
+  - package-lock.json
+
+documentation:
+  - docs/content/**
+
+# flag changes to public APIs so they can be reviewed to see if they're breaking
+"public api change":
+  - "**/api-report/**"
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,78 +1,10 @@
-# This file is a map of labels to repo glob paths. See https://github.com/marketplace/actions/labeler
-# for more details.
-
-"area: build":
-  - ".github/*"
-  - ".github/workflows/**"
-  - "tools/pipelines/**"
-
-"area: contributor experience":
-  - ".vscode/**"
-
-"area: dds":
-  - experimental/dds/**
-  - packages/dds/**
-
-"area: dds: propertydds":
-  - experimental/PropertyDDS/**
-
-"area: dds: sharedstring":
-  - packages/dds/sequence/**
-
-"area: definitions":
-  - common/lib/container-definitions/**
-  - common/lib/core-interfaces/**
-  - common/lib/driver-definitions/**
-
-"area: dev experience":
-  - experimental/framework/**
-
-"area: driver":
-  - packages/drivers/**
-
-"area: examples":
-  - examples/**
-  - experimental/examples/**
-
-"area: framework":
-  - packages/framework/**
-
-"area: loader":
-  - packages/loader/**
-
-"area: odsp-driver":
-  - packages/drivers/*odsp*/**
-  - packages/utils/odsp-doclib-utils/**
-
-# Add "area: repo" label to any root or .github changes
-"area: repo":
-  - any: ["*", ".github/**", "!BREAKING.md"]
-
-"area: runtime":
-  - packages/runtime/**
-
-"area: server":
-  - server/**
-
-"area: test":
-  - packages/test/**
-
-"area: tools":
-  - any: ["common/build/**", "tools/**", "tools/pipelines/**"]
-
-"area: website":
-  - any: ["docs/**", "!docs/content/**"]
-
-"breaking change":
-  - BREAKING.md
-
-dependencies:
-  - lerna-package-lock.json
-  - package-lock.json
-
-documentation:
-  - docs/content/**
-
-# flag changes to public APIs so they can be reviewed to see if they're breaking
-"public api change":
-  - "**/api-report/**"
+# This file is used as the configuration for srvaroa/labeler
+
+version: 1
+labels:
+- label: "base: main"
+  base-branch: "main"
+- label: "base: next"
+  base-branch: "next"
+- label: "base: release"
+  base-branch: "^release/.*"
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
@@ -8,14 +8,22 @@ jobs:
     runs-on: ubuntu-latest
     name: Label based on file paths
     steps:
-    - uses: actions/labeler@v3
+    - uses: actions/labeler@26546f6c4d63b6c0623e8e39bde7869e3c2b1d7b # pin@v3
       with:
+        configuration-path: ".github/actions-labeler.yml"
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         sync-labels: true # add/remove labels as modified paths in the PR change
+  branches_label:
+    runs-on: ubuntu-latest
+    name: Label base branches
+    steps:
+    - uses: srvaroa/labeler@36ad6b8842ea13d9ce2e4d22993bbf6fc0d20b5e # pin@v0.9
+      env:
+        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
   external_label:
     runs-on: ubuntu-latest
     name: Label external PRs
     steps:
-    - uses: tylerbutler/labelmaker-action@main
+    - uses: tylerbutler/labelmaker-action@4d05a42cd2272689037a1cd82b7ad0e36aaddb23 # pin@main
       with:
         token: "${{ secrets.ORG_TOKEN }}"
diff --git a/BREAKING.md b/BREAKING.md
@@ -30,13 +30,16 @@ These should not be used and there is no replacement provided.
 # 0.58
 
 ## 0.58 Upcoming changes
+- [raiseContainerWarning removed from IContainerContext](#raiseContainerWarning-removed-from-IContainerContext)
+
+### raiseContainerWarning removed from IContainerContext
+`raiseContainerWarning` property will be removed from `IContainerContext` interface and `ContainerContext` class. Please refer to [raiseContainerWarning property](#Remove-raisecontainerwarning-property) for more details.
 
 ## 0.58 Breaking changes
 - [Move IntervalType from merge-tree to sequence package](#Move-IntervalType-from-merge-tree-to-sequence-package)
 - [Remove logger property from IContainerContext](#Remove-logger-property-from-IContainerContext)
 - [Set raiseContainerWarning property as optional parameter on IContainerContext](#Set-raiseContainerWarning-property-as-optional-parameter-on-IContainerContext)
 - [Consolidate fluidErrorCode and message on FF Errors](#Consolidate-fluidErrorCode-and-message-on-FF-Errors)
-- [Doing operations not allowed on deleted sub directory](#Doing-operations-not-allowed-on-deleted-sub-directory)
 
 ### Move IntervalType from merge-tree to sequence package
 Move the type from the merge-tree package where it isn't used to the sequence package where it is used
@@ -49,7 +52,7 @@ Move the type from the merge-tree package where it isn't used to the sequence pa
 The logger property in IContainerContext became an optional parameter in [release 0.56](#Set-logger-property-as-optional-parameter-in-IContainerContext). This property has now been removed. The `taggedLogger` property is now set as a required parameter in `IContainerContext` interface.
 
 ## Set raiseContainerWarning property as optional parameter on IContainerContext
-`raiseContainerWarning` is set as an optional parameter on `IContainerContext` interface and would be removed from `IContainerContext` interface and `ContainerContext` class in the next release. Please see [#Remove-raiseContainerWarning-property] for more details.
+`raiseContainerWarning` is set as an optional parameter on `IContainerContext` interface and would be removed from `IContainerContext` interface and `ContainerContext` class in the next release. Please see [raiseContainerWarning property](#Remove-raisecontainerwarning-property) for more details.
 
 ### Consolidate fluidErrorCode and message on FF Errors
 Errors raised by the Fluid Framework will no longer contain the property `fluidErrorCode`.
@@ -58,11 +61,6 @@ Previously, the fluidErrorCode value (a pascaleCased term) was often used as the
 Now all error messages can be expected to be easily-read sentences,
 sometimes followed by a colon and an inner error message when applicable.
 
-
-### Doing operations not allowed on deleted sub directory
-Users will not be allowed to do operations on a deleted directory. Users can subscribe to `disposed` event to know if a sub directory is deleted. Accessing deleted sub directory
-will throw `UsageError` exception now.
-
 # 0.57
 
 ## 0.57 Upcoming changes

diff --git a/api-report/driver-utils.api.md b/api-report/driver-utils.api.md
@@ -232,9 +232,9 @@ export class MultiDocumentServiceFactory implements IDocumentServiceFactory {
     // (undocumented)
     static create(documentServiceFactory: IDocumentServiceFactory | IDocumentServiceFactory[]): IDocumentServiceFactory;
     // (undocumented)
-    createContainer(createNewSummary: ISummaryTree, createNewResolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger): Promise<IDocumentService>;
+    createContainer(createNewSummary: ISummaryTree, createNewResolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
     // (undocumented)
-    createDocumentService(resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger): Promise<IDocumentService>;
+    createDocumentService(resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
     // (undocumented)
     readonly protocolName = "none:";
     }

diff --git a/api-report/file-driver.api.md b/api-report/file-driver.api.md
@@ -60,8 +60,8 @@ export class FileDocumentService implements api_2.IDocumentService {
 export class FileDocumentServiceFactory implements IDocumentServiceFactory {
     constructor(storage: IDocumentStorageService, deltaStorage: FileDeltaStorageService, deltaConnection: IDocumentDeltaConnection);
     // (undocumented)
-    createContainer(createNewSummary: ISummaryTree, resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger): Promise<IDocumentService>;
-    createDocumentService(fileURL: IResolvedUrl, logger?: ITelemetryBaseLogger): Promise<IDocumentService>;
+    createContainer(createNewSummary: ISummaryTree, resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
+    createDocumentService(fileURL: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
     // (undocumented)
     readonly protocolName = "fluid-file:";
     }

diff --git a/api-report/iframe-driver.api.md b/api-report/iframe-driver.api.md
@@ -125,9 +125,9 @@ export class InnerDocumentServiceFactory implements IDocumentServiceFactory {
     // (undocumented)
     static create(outerPort: MessagePort): Promise<InnerDocumentServiceFactory>;
     // (undocumented)
-    createContainer(createNewSummary: ISummaryTree, resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger): Promise<IDocumentService>;
+    createContainer(createNewSummary: ISummaryTree, resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
     // (undocumented)
-    createDocumentService(resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger): Promise<IDocumentService>;
+    createDocumentService(resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
     // (undocumented)
     static readonly protocolName = "fluid:";
     // (undocumented)

diff --git a/api-report/map.api.md b/api-report/map.api.md
@@ -8,7 +8,6 @@ import { IChannelAttributes } from '@fluidframework/datastore-definitions';
 import { IChannelFactory } from '@fluidframework/datastore-definitions';
 import { IChannelServices } from '@fluidframework/datastore-definitions';
 import { IChannelStorageService } from '@fluidframework/datastore-definitions';
-import { IDisposable } from '@fluidframework/common-definitions';
 import { IEvent } from '@fluidframework/common-definitions';
 import { IEventProvider } from '@fluidframework/common-definitions';
 import { IEventThisPlaceHolder } from '@fluidframework/common-definitions';
@@ -38,7 +37,7 @@ export class DirectoryFactory {
 }
 
 // @public
-export interface IDirectory extends Map<string, any>, IEventProvider<IDirectoryEvents>, IDisposable {
+export interface IDirectory extends Map<string, any>, IEventProvider<IDirectoryEvents> {
     readonly absolutePath: string;
     createSubDirectory(subdirName: string): IDirectory;
     deleteSubDirectory(subdirName: string): boolean;
@@ -66,8 +65,6 @@ export interface IDirectoryDataObject {
 export interface IDirectoryEvents extends IEvent {
     // (undocumented)
     (event: "containedValueChanged", listener: (changed: IValueChanged, local: boolean, target: IEventThisPlaceHolder) => void): any;
-    // (undocumented)
-    (event: "disposed", listener: (target: IEventThisPlaceHolder) => void): any;
 }
 
 // @public (undocumented)
@@ -174,10 +171,6 @@ export class SharedDirectory extends SharedObject<ISharedDirectoryEvents> implem
     createSubDirectory(subdirName: string): IDirectory;
     delete(key: string): boolean;
     deleteSubDirectory(subdirName: string): boolean;
-    // (undocumented)
-    dispose(error?: Error): void;
-    // (undocumented)
-    get disposed(): boolean;
     entries(): IterableIterator<[string, any]>;
     forEach(callback: (value: any, key: string, map: Map<string, any>) => void): void;
     get<T = any>(key: string): T | undefined;

diff --git a/api-report/odsp-driver.api.md b/api-report/odsp-driver.api.md
@@ -94,9 +94,9 @@ export class OdspDocumentServiceFactory extends OdspDocumentServiceFactoryCore i
 export class OdspDocumentServiceFactoryCore implements IDocumentServiceFactory {
     constructor(getStorageToken: TokenFetcher<OdspResourceTokenFetchOptions>, getWebsocketToken: TokenFetcher<OdspResourceTokenFetchOptions> | undefined, getSocketIOClient: () => Promise<typeof io>, persistedCache?: IPersistedCache, hostPolicy?: HostStoragePolicy);
     // (undocumented)
-    createContainer(createNewSummary: ISummaryTree | undefined, createNewResolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger): Promise<IDocumentService>;
+    createContainer(createNewSummary: ISummaryTree | undefined, createNewResolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
     // (undocumented)
-    createDocumentService(resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger): Promise<IDocumentService>;
+    createDocumentService(resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
     // (undocumented)
     protected persistedCache: IPersistedCache;
     // (undocumented)

diff --git a/api-report/replay-driver.api.md b/api-report/replay-driver.api.md
@@ -117,8 +117,8 @@ export class ReplayDocumentServiceFactory implements IDocumentServiceFactory {
     // (undocumented)
     static create(from: number, to: number, documentServiceFactory: IDocumentServiceFactory): ReplayDocumentServiceFactory;
     // (undocumented)
-    createContainer(createNewSummary: ISummaryTree, resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger): Promise<IDocumentService>;
-    createDocumentService(resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger): Promise<IDocumentService>;
+    createContainer(createNewSummary: ISummaryTree, resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
+    createDocumentService(resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
     // (undocumented)
     readonly protocolName: any;
 }
@@ -159,9 +159,9 @@ export class StaticStorageDocumentService implements IDocumentService {
 export class StaticStorageDocumentServiceFactory implements IDocumentServiceFactory {
     constructor(storage: IDocumentStorageService);
     // (undocumented)
-    createContainer(createNewSummary: ISummaryTree, resolvedUrl: IResolvedUrl, logger: ITelemetryLogger): Promise<IDocumentService>;
+    createContainer(createNewSummary: ISummaryTree, resolvedUrl: IResolvedUrl, logger: ITelemetryLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
     // (undocumented)
-    createDocumentService(fileURL: IResolvedUrl): Promise<IDocumentService>;
+    createDocumentService(fileURL: IResolvedUrl, logger?: ITelemetryLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
     // (undocumented)
     readonly protocolName = "fluid-static-storage:";
     // (undocumented)

diff --git a/api-report/routerlicious-driver.api.md b/api-report/routerlicious-driver.api.md
@@ -141,8 +141,8 @@ export class NullBlobStorageService implements IDocumentStorageService {
 export class RouterliciousDocumentServiceFactory implements IDocumentServiceFactory {
     constructor(tokenProvider: ITokenProvider, driverPolicies?: Partial<IRouterliciousDriverPolicies>);
     // (undocumented)
-    createContainer(createNewSummary: ISummaryTree | undefined, resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger): Promise<IDocumentService>;
-    createDocumentService(resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger): Promise<IDocumentService>;
+    createContainer(createNewSummary: ISummaryTree | undefined, resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
+    createDocumentService(resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
     // (undocumented)
     readonly protocolName = "fluid:";
     }

diff --git a/common/build/build-common/package.json b/common/build/build-common/package.json
@@ -14,8 +14,5 @@
   "bin": {
     "gen-version": "bin/gen-version"
   },
-  "scripts": {},
-  "peerDependencies": {
-    "typescript": ">=3.7.4"
-  }
+  "scripts": {}
 }