Skip to content

Commit

Permalink
Merge branch 'main' into node16-client-utils
Browse files Browse the repository at this point in the history
  • Loading branch information
tylerbutler committed Dec 14, 2023
2 parents 0067d51 + de43f3c commit b3b1114
Show file tree
Hide file tree
Showing 653 changed files with 12,423 additions and 10,069 deletions.
7 changes: 7 additions & 0 deletions .changeset/rich-shirts-sink.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@fluidframework/datastore-definitions": minor
---

Remove Unused IFluidDataStoreRegistry From IFluidDataStoreRuntime"

IFluidDataStoreRuntime optionally extended IFluidDataStoreRegistry. This is never used, so is removed. As with all provider interfaces, consumers can continue to extend the interface if they have a use, and use FluidObject to inspect for it existing.
9 changes: 9 additions & 0 deletions .changeset/tricky-jobs-marry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"@fluidframework/matrix": minor
"@fluidframework/sequence": minor
"@fluidframework/shared-object-base": minor
---

SharedObject processGCDataCore now takes IFluidSerializer rather than SummarySerializer

This change should be a no-op for consumers, and SummarySerializer and IFluidSerializer expose the same consumer facing APIs. This change just makes our APIs more consistent by only using interfaces, rather than a mix of interfaces and concrete implementations.
15 changes: 10 additions & 5 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,16 @@
"overrideCommand": false,

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint",
"ms-azuretools.vscode-docker",
"mutantdino.resourcemonitor"
],
"customizations": {
"vscode": {
"extensions": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"ms-azuretools.vscode-docker",
"mutantdino.resourcemonitor"
]
}
},

// Forward port for Tinylicious
"forwardPorts": [7070],
Expand Down
11 changes: 1 addition & 10 deletions azure/packages/azure-client/api-extractor-lint.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
"extends": "../../../common/build/build-common/api-extractor-lint.json",
"messages": {
"extractorMessageReporting": {
// TODO: remove once base config has this enabled as an error
"ae-incompatible-release-tags": {
"logLevel": "error",
"addToApiReportFile": false
}
}
}
"extends": "../../../common/build/build-common/api-extractor-lint.json"
}
2 changes: 1 addition & 1 deletion azure/packages/azure-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluidframework/azure-client",
"version": "2.0.0-internal.8.0.0",
"version": "2.0.0-internal.9.0.0",
"description": "A tool to enable creation and loading of Fluid containers using the Azure Fluid Relay service",
"homepage": "https://fluidframework.com",
"repository": {
Expand Down
11 changes: 1 addition & 10 deletions azure/packages/azure-local-service/api-extractor-lint.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
"extends": "../../../common/build/build-common/api-extractor-lint.json",
"messages": {
"extractorMessageReporting": {
// TODO: remove once base config has this enabled as an error
"ae-incompatible-release-tags": {
"logLevel": "error",
"addToApiReportFile": false
}
}
}
"extends": "../../../common/build/build-common/api-extractor-lint.json"
}
2 changes: 1 addition & 1 deletion azure/packages/azure-local-service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluidframework/azure-local-service",
"version": "2.0.0-internal.8.0.0",
"version": "2.0.0-internal.9.0.0",
"description": "Local implementation of the Azure Fluid Relay service for testing/development use",
"homepage": "https://fluidframework.com",
"repository": {
Expand Down
11 changes: 1 addition & 10 deletions azure/packages/azure-service-utils/api-extractor-lint.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
"extends": "../../../common/build/build-common/api-extractor-lint.json",
"messages": {
"extractorMessageReporting": {
// TODO: remove once base config has this enabled as an error
"ae-incompatible-release-tags": {
"logLevel": "error",
"addToApiReportFile": false
}
}
}
"extends": "../../../common/build/build-common/api-extractor-lint.json"
}
2 changes: 1 addition & 1 deletion azure/packages/azure-service-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluidframework/azure-service-utils",
"version": "2.0.0-internal.8.0.0",
"version": "2.0.0-internal.9.0.0",
"description": "Helper service-side utilities for connecting to Azure Fluid Relay service",
"homepage": "https://fluidframework.com",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion azure/packages/external-controller/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluid-example/app-integration-external-controller",
"version": "2.0.0-internal.8.0.0",
"version": "2.0.0-internal.9.0.0",
"private": true,
"description": "Minimal Fluid Container & Data Object sample to implement a collaborative dice roller as a standalone app.",
"homepage": "https://fluidframework.com",
Expand Down
4 changes: 2 additions & 2 deletions azure/packages/external-controller/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
import { IFluidContainer, IValueChanged, SharedMap } from "fluid-framework";

import { DevtoolsLogger, initializeDevtools } from "@fluid-experimental/devtools";
import { createDevtoolsLogger, initializeDevtools } from "@fluid-experimental/devtools";
import {
AzureClient,
AzureContainerServices,
Expand Down Expand Up @@ -116,7 +116,7 @@ async function start(): Promise<void> {
const baseLogger = createChildLogger();

// Wrap telemetry logger for use with Devtools
const devtoolsLogger = new DevtoolsLogger(baseLogger);
const devtoolsLogger = createDevtoolsLogger(baseLogger);

const clientProps = {
connection: connectionConfig,
Expand Down
2 changes: 1 addition & 1 deletion azure/packages/test/end-to-end-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluidframework/azure-end-to-end-tests",
"version": "2.0.0-internal.8.0.0",
"version": "2.0.0-internal.9.0.0",
"description": "Azure client end to end tests",
"homepage": "https://fluidframework.com",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion azure/packages/test/scenario-runner/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fluid-experimental/azure-scenario-runner",
"version": "2.0.0-internal.8.0.0",
"version": "2.0.0-internal.9.0.0",
"description": "Azure client end to end tests",
"homepage": "https://fluidframework.com",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion azure/packages/test/scenario-runner/src/packageVersion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
*/

export const pkgName = "@fluid-experimental/azure-scenario-runner";
export const pkgVersion = "2.0.0-internal.8.0.0";
export const pkgVersion = "2.0.0-internal.9.0.0";
2 changes: 1 addition & 1 deletion common/build/build-common/api-extractor-lint.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
// This is the primary error we are looking for with the linter pass.
// Ensure that release tags of API members are compatible **across package boundaries**.
"ae-incompatible-release-tags": {
"logLevel": "none", // TODO: change to "error" once we are ready to start enforcing repo-wide
"logLevel": "error",
"addToApiReportFile": false
}
}
Expand Down
11 changes: 1 addition & 10 deletions common/lib/common-definitions/api-extractor-lint.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
"extends": "../../build/build-common/api-extractor-lint.json",
"messages": {
"extractorMessageReporting": {
// TODO: remove once base config has this enabled as an error
"ae-incompatible-release-tags": {
"logLevel": "error",
"addToApiReportFile": false
}
}
}
"extends": "../../build/build-common/api-extractor-lint.json"
}
11 changes: 1 addition & 10 deletions common/lib/common-utils/api-extractor-lint.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
"extends": "../../build/build-common/api-extractor-lint.json",
"messages": {
"extractorMessageReporting": {
// TODO: remove once base config has this enabled as an error
"ae-incompatible-release-tags": {
"logLevel": "error",
"addToApiReportFile": false
}
}
}
"extends": "../../build/build-common/api-extractor-lint.json"
}
11 changes: 1 addition & 10 deletions common/lib/protocol-definitions/api-extractor-lint.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
"extends": "../../build/build-common/api-extractor-lint.json",
"messages": {
"extractorMessageReporting": {
// TODO: remove once base config has this enabled as an error
"ae-incompatible-release-tags": {
"logLevel": "error",
"addToApiReportFile": false
}
}
}
"extends": "../../build/build-common/api-extractor-lint.json"
}
Loading

0 comments on commit b3b1114

Please sign in to comment.