Skip to content

Commit

Permalink
Integrate main to next (#9408)
Browse files Browse the repository at this point in the history
* Run static web app deployment in linux, and guardian tasks in windows (#9386)

* Integrate latest prerelease of eslint-config-fluid throughout the repo and fix up errors (#9389)

* Support string parserOptions.project in eslint configuration (#9392)

* Handle errors in docs pipeline more gracefully (#9393)

* Fixing some error logging race conditions for the root datastore end-to-end tests (#9387)

it's disabling the summarizer, which either runs or not, depending on how long the test takes.

* Remove duplicate implementation from toInstrumentedOdspTokenFetcher (toInstrumentedTokenFetcher) (#9375)

* Remove duplicate toInstrumentedTokenFetcher implementation (duplicate from toInstrumentedOdspTokenFetcher )

* MergeTree: Add stress for LocalReferences (#9340)

This change leverages the existing stress infra in merge tree, we call them farms as in bug farm as they find lots of bugs. This is in preparation for how we do local reference sliding.

related to #1008

* Fix lint issues

* Missed one

Co-authored-by: Tyler Butler <tyler@tylerbutler.com>
Co-authored-by: Matt Rakow <ChumpChief@users.noreply.github.com>
Co-authored-by: Andrei Iacob <84357545+andre4i@users.noreply.github.com>
Co-authored-by: NicholasCouri <nichoc@microsoft.com>
Co-authored-by: Tony Murphy <anthony.murphy@microsoft.com>
Co-authored-by: Matt Rakow <marakow@microsoft.com>
  • Loading branch information
7 people committed Mar 9, 2022
1 parent 0d98514 commit 9287bb2
Show file tree
Hide file tree
Showing 378 changed files with 6,077 additions and 6,101 deletions.
5 changes: 1 addition & 4 deletions api-report/sequence.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import { BaseSegment } from '@fluidframework/merge-tree';
import { Client } from '@fluidframework/merge-tree';
import { Deferred } from '@fluidframework/common-utils';
import { FluidObject } from '@fluidframework/core-interfaces';
import { IChannelAttributes } from '@fluidframework/datastore-definitions';
import { IChannelFactory } from '@fluidframework/datastore-definitions';
import { IChannelServices } from '@fluidframework/datastore-definitions';
Expand All @@ -17,8 +16,6 @@ import { IEvent } from '@fluidframework/common-definitions';
import { IEventThisPlaceHolder } from '@fluidframework/common-definitions';
import { IFluidDataStoreRuntime } from '@fluidframework/datastore-definitions';
import { IFluidHandle } from '@fluidframework/core-interfaces';
import { IFluidLoadable } from '@fluidframework/core-interfaces';
import { IFluidObject } from '@fluidframework/core-interfaces';
import { IFluidSerializer } from '@fluidframework/shared-object-base';
import { IInterval } from '@fluidframework/merge-tree';
import { IJSONSegment } from '@fluidframework/merge-tree';
Expand Down Expand Up @@ -673,7 +670,7 @@ export class SparseMatrix extends SharedSegmentSequence<MatrixSegment> {
static create(runtime: IFluidDataStoreRuntime, id?: string): SparseMatrix;
static getFactory(): IChannelFactory;
// (undocumented)
getItem(row: number, col: number): Jsonable<string | number | boolean | IFluidHandle<IFluidObject & FluidObject & IFluidLoadable>>;
getItem(row: number, col: number): Jsonable<string | number | boolean | IFluidHandle>;
// (undocumented)
getPositionProperties(row: number, col: number): PropertySet;
// (undocumented)
Expand Down
6 changes: 3 additions & 3 deletions common/lib/common-definitions/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/lib/common-definitions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@microsoft/api-extractor": "^7.16.1",
"@rushstack/eslint-config": "^2.5.1",
"@typescript-eslint/eslint-plugin": "~5.9.0",
Expand Down
6 changes: 3 additions & 3 deletions common/lib/common-utils/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/lib/common-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@microsoft/api-extractor": "^7.16.1",
"@rushstack/eslint-config": "^2.5.1",
"@types/base64-js": "^1.3.0",
Expand Down
6 changes: 3 additions & 3 deletions common/lib/container-definitions/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/lib/container-definitions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@microsoft/api-extractor": "^7.16.1",
"@rushstack/eslint-config": "^2.5.1",
"@types/mocha": "^8.2.2",
Expand Down
6 changes: 3 additions & 3 deletions common/lib/core-interfaces/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/lib/core-interfaces/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@microsoft/api-extractor": "^7.16.1",
"@rushstack/eslint-config": "^2.5.1",
"@types/node": "^14.18.0",
Expand Down
6 changes: 3 additions & 3 deletions common/lib/driver-definitions/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/lib/driver-definitions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@microsoft/api-extractor": "^7.16.1",
"@rushstack/eslint-config": "^2.5.1",
"@typescript-eslint/eslint-plugin": "~5.9.0",
Expand Down
6 changes: 3 additions & 3 deletions common/lib/protocol-definitions/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/lib/protocol-definitions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"devDependencies": {
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/build-tools": "^0.2.54658",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-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",
Expand Down
10 changes: 7 additions & 3 deletions docs/.gdnbaselines
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
"552baaa9d24596ed82e97b538dbef8abfcc9a0a8a9fdc8d3423424bf003b4fa7": {
"signature": "552baaa9d24596ed82e97b538dbef8abfcc9a0a8a9fdc8d3423424bf003b4fa7",
"alternativeSignatures": [
"b5f214e29b5462952a2841914ef8d1fc8141a9e8a69ea2b2be6c0cd409bf15d7"
"b5f214e29b5462952a2841914ef8d1fc8141a9e8a69ea2b2be6c0cd409bf15d7",
"f7352489c50aed5529c30f15f2d6e019dc840612ceb612ea5ffb44a0d994c641",
"956ef6761cd88e6cc39f6bd892c0e1e0719ac955d3e4bd5a52189ab9e64db97f"
],
"target": "docs/themes/thxvscode/assets/js/bundle.js",
"memberOf": [
Expand All @@ -27,7 +29,9 @@
"0d4fa60d5f0b4f1d15e59fc8d68612e8f79f722ef23af4b073a0167ab4878fd6": {
"signature": "0d4fa60d5f0b4f1d15e59fc8d68612e8f79f722ef23af4b073a0167ab4878fd6",
"alternativeSignatures": [
"0c23128bddf2d4096ab21304a1026ea81637d87cf6c31a0ce9f56b97d03aad13"
"0c23128bddf2d4096ab21304a1026ea81637d87cf6c31a0ce9f56b97d03aad13",
"9ee87cd6cc4a7c3ee2b369ab55776beffe036908ab73e36bdc1ee30f78f925f4",
"b7a109924c97e48aae0751db9f9fae3963865ec0fcef79db223b22e1f72d8a20"
],
"target": "docs/themes/thxvscode/assets/js/bundle.js",
"memberOf": [
Expand All @@ -41,4 +45,4 @@
"type": null
}
}
}
}
2 changes: 1 addition & 1 deletion examples/apps/collaborative-textarea/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"devDependencies": {
"@fluid-tools/webpack-fluid-loader": "^0.58.1000",
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@fluidframework/test-tools": "^0.2.3074",
"@fluidframework/test-utils": "^0.58.1000",
"@rushstack/eslint-config": "^2.5.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/contact-collection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"devDependencies": {
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@fluidframework/test-tools": "^0.2.3074",
"@rushstack/eslint-config": "^2.5.1",
"@types/expect-puppeteer": "2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/spaces/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"devDependencies": {
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@fluidframework/test-tools": "^0.2.3074",
"@rushstack/eslint-config": "^2.5.1",
"@types/expect-puppeteer": "2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/view-framework-sampler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"devDependencies": {
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@fluidframework/test-tools": "^0.2.3074",
"@rushstack/eslint-config": "^2.5.1",
"@types/expect-puppeteer": "2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/data-objects/badge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"devDependencies": {
"@fluid-tools/webpack-fluid-loader": "^0.58.1000",
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@rushstack/eslint-config": "^2.5.1",
"@types/node": "^14.18.0",
"@types/react": "^16.9.15",
Expand Down
2 changes: 1 addition & 1 deletion examples/data-objects/canvas/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"devDependencies": {
"@fluid-tools/webpack-fluid-loader": "^0.58.1000",
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@fluidframework/test-tools": "^0.2.3074",
"@rushstack/eslint-config": "^2.5.1",
"@types/expect-puppeteer": "2.2.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"devDependencies": {
"@fluid-tools/webpack-fluid-loader": "^0.58.1000",
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@fluidframework/test-tools": "^0.2.3074",
"@rushstack/eslint-config": "^2.5.1",
"@types/expect-puppeteer": "2.2.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"devDependencies": {
"@fluid-tools/webpack-fluid-loader": "^0.58.1000",
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@fluidframework/test-tools": "^0.2.3074",
"@rushstack/eslint-config": "^2.5.1",
"@types/expect-puppeteer": "2.2.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"devDependencies": {
"@fluid-tools/webpack-fluid-loader": "^0.58.1000",
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@fluidframework/test-tools": "^0.2.3074",
"@fluidframework/test-utils": "^0.58.1000",
"@rushstack/eslint-config": "^2.5.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"devDependencies": {
"@fluid-tools/webpack-fluid-loader": "^0.58.1000",
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@fluidframework/test-tools": "^0.2.3074",
"@fluidframework/test-utils": "^0.58.1000",
"@rushstack/eslint-config": "^2.5.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"devDependencies": {
"@fluid-tools/webpack-fluid-loader": "^0.58.1000",
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@fluidframework/test-tools": "^0.2.3074",
"@fluidframework/test-utils": "^0.58.1000",
"@rushstack/eslint-config": "^2.5.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/data-objects/clicker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"devDependencies": {
"@fluid-tools/webpack-fluid-loader": "^0.58.1000",
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@fluidframework/test-tools": "^0.2.3074",
"@fluidframework/test-utils": "^0.58.1000",
"@rushstack/eslint-config": "^2.5.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/data-objects/client-ui-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
},
"devDependencies": {
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@fluidframework/mocha-test-setup": "^0.58.1000",
"@rushstack/eslint-config": "^2.5.1",
"@types/debug": "^4.1.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const CommandBox: React.FC<ICommandBoxProps> = (props: ICommandBoxProps)
inputEl.focus();
return () => {
inputEl.removeEventListener("input", filterCommands);
}
};
}
});

Expand Down
4 changes: 2 additions & 2 deletions examples/data-objects/client-ui-lib/src/controls/flowView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,13 +799,13 @@ function lineIntersectsRect(y: number, rect: IExcludedRectangle) {

class Viewport {
// Keep the line divs in order
private lineDivs: ILineDiv[] = [];
private readonly lineDivs: ILineDiv[] = [];
private lineTop = 0;
private excludedRects = <IExcludedRectangle[]>[];
private lineX = 0;
private readonly inclusions: Map<string, HTMLVideoElement> = new Map<string, HTMLVideoElement>();

constructor(private maxHeight: number, public div: IViewportDiv, private width: number) {
constructor(private readonly maxHeight: number, public div: IViewportDiv, private readonly width: number) {
}

// Remove inclusions that are not in the excluded rect list
Expand Down
2 changes: 1 addition & 1 deletion examples/data-objects/codemirror/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"devDependencies": {
"@fluid-tools/webpack-fluid-loader": "^0.58.1000",
"@fluidframework/build-common": "^0.23.0",
"@fluidframework/eslint-config-fluid": "^0.26.0",
"@fluidframework/eslint-config-fluid": "^0.27.0-0",
"@rushstack/eslint-config": "^2.5.1",
"@types/node": "^14.18.0",
"@typescript-eslint/eslint-plugin": "~5.9.0",
Expand Down
39 changes: 18 additions & 21 deletions examples/data-objects/codemirror/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { IContainerContext } from "@fluidframework/container-definitions";
import { ContainerRuntime } from "@fluidframework/container-runtime";
import { IContainerRuntime } from "@fluidframework/container-runtime-definitions";
import { IFluidDataStoreFactory } from "@fluidframework/runtime-definitions";
import { buildRuntimeRequestHandler, RuntimeRequestHandler } from "@fluidframework/request-handler";
import { buildRuntimeRequestHandler } from "@fluidframework/request-handler";
import { mountableViewRequestHandler } from "@fluidframework/aqueduct";
import {
requestFluidObject,
Expand Down Expand Up @@ -35,25 +35,22 @@ const defaultComponentId = "default";

const smde = new SmdeFactory();

type ViewCallback<T> = (fluidModel: T) => any;

const makeViewRequestHandler = <T>(viewCallback: ViewCallback<T>): RuntimeRequestHandler =>
async (request: RequestParser, runtime: IContainerRuntime) => {
if (request.pathParts.length === 0) {
const objectRequest = RequestParser.create({
url: ``,
headers: request.headers,
});
const fluidObject = await requestFluidObject<T>(
await runtime.getRootDataStore(defaultComponentId),
objectRequest);
const viewResponse = viewCallback(fluidObject);
return { status: 200, mimeType: "fluid/view", value: viewResponse };
}
};

const viewCallback =
(codeMirror: CodeMirrorComponent) => new CodeMirrorView(codeMirror.text, codeMirror.presenceManager);
const viewRequestHandler = async (request: RequestParser, runtime: IContainerRuntime) => {
if (request.pathParts.length === 0) {
const objectRequest = RequestParser.create({
url: ``,
headers: request.headers,
});
const codeMirror = await requestFluidObject<CodeMirrorComponent>(
await runtime.getRootDataStore(defaultComponentId),
objectRequest);
return {
status: 200,
mimeType: "fluid/view",
value: new CodeMirrorView(codeMirror.text, codeMirror.presenceManager),
};
}
};

class CodeMirrorFactory extends RuntimeFactoryHelper {
public async instantiateFirstTime(runtime: ContainerRuntime): Promise<void> {
Expand All @@ -72,7 +69,7 @@ class CodeMirrorFactory extends RuntimeFactoryHelper {
context,
registry,
buildRuntimeRequestHandler(
mountableViewRequestHandler(MountableView, [makeViewRequestHandler(viewCallback)]),
mountableViewRequestHandler(MountableView, [viewRequestHandler]),
),
undefined, // runtimeOptions
undefined, // containerScope
Expand Down
Loading

0 comments on commit 9287bb2

Please sign in to comment.