merge conflict

.changeset/chilly-walls-bathe.md

@@ -0,0 +1,7 @@
+---
+"@fluidframework/odsp-client": minor
+---
+
+Move odsp-client out of experimental
+
+The scope of the odsp-client package is changed from `@fluid-experimental/odsp-client` to `@fluidframework/odsp-client`.

.changeset/fluffy-spies-add.md

@@ -0,0 +1,18 @@
+---
+"@fluidframework/azure-end-to-end-tests": minor
+"@fluidframework/azure-local-service": minor
+"@fluid-experimental/azure-scenario-runner": minor
+"@fluidframework/container-loader": minor
+"@fluidframework/driver-utils": minor
+"@fluidframework/local-driver": minor
+"@fluidframework/odsp-driver": minor
+"@fluid-experimental/property-dds": minor
+"@fluidframework/routerlicious-driver": minor
+"@fluid-private/test-drivers": minor
+"@fluid-private/test-end-to-end-tests": minor
+"@fluidframework/tinylicious-client": minor
+---
+
+Bump server deps
+
+Updated server dependencies to allow client to consume new targeted signal support

.changeset/four-hoops-train.md

@@ -0,0 +1,14 @@
+---
+"@fluidframework/driver-definitions": minor
+"fluid-framework": minor
+---
+
+Remove some types from `@public` that are not needed
+
+Mark the following APIs `@alpha` instead of `@public`:
+
+-   IBranchOrigin
+-   ISequencedDocumentMessage
+-   ISignalMessage
+-   ISignalMessageBase
+-   ITrace

.changeset/nice-olives-try.md

@@ -0,0 +1,15 @@
+---
+"@fluidframework/container-loader": minor
+"@fluidframework/container-runtime": minor
+"@fluidframework/debugger": minor
+"@fluidframework/driver-definitions": minor
+"@fluidframework/routerlicious-driver": minor
+"@fluidframework/telemetry-utils": minor
+"@fluidframework/test-runtime-utils": minor
+"@fluidframework/tree": minor
+"fluid-framework": minor
+---
+
+Update to ES 2022
+
+Update tsconfig to target ES 2022.

.changeset/sharp-mangos-reply.md

@@ -0,0 +1,6 @@
+---
+"fluid-framework": minor
+"@fluidframework/tree": minor
+---
+
+Breaking change: `TreeStatus.Created` has been renamed to `TreeStatus.New`

.changeset/smooth-clouds-wait.md

@@ -0,0 +1,11 @@
+---
+"@fluidframework/core-interfaces": minor
+"fluid-framework": minor
+"@fluidframework/tree": minor
+---
+
+Unify `IDisposable` interfaces.
+
+Public APIs in `@fluidframework/tree` now use `IDisposable` from `@fluidframework/core-interfaces` replacing `disposeSymbol` with "dispose".
+
+`IDisposable` in `@fluidframework/core-interfaces` is now `@sealed` indicating that third parties should not implement it to reserve the ability for Fluid Framework to extend it to include `Symbol.dispose` as a future non-breaking change.

.github/workflows/changeset-reporter.yml

@@ -7,7 +7,7 @@ name: changeset-reporter
 
 on:
   workflow_run:
-    workflows: [ "pr-check-changeset" ]
+    workflows: ["pr-check-changeset"]
     types:
       - completed
 
@@ -18,7 +18,7 @@ jobs:
       actions: read
       pull-requests: write
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # ratchet:actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # ratchet:actions/checkout@v3
         with:
           persist-credentials: false
 

.github/workflows/linkcheck-reporter.yml

@@ -1,7 +1,7 @@
 name: Update link report
 on:
   workflow_run:
-    workflows: [ "Website validation" ]
+    workflows: ["Website validation"]
     types:
       - completed
 

.github/workflows/pr-check-changeset.yml

@@ -21,15 +21,15 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.event.pull_request.labels.*.name, 'changeset-required')
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # ratchet:actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # ratchet:actions/checkout@v3
         with:
           fetch-depth: "0" # all history
           persist-credentials: false
           ref: ${{ github.event.pull_request.head.sha }} # Check out the head commit, not the merge commit
 
       # install and configure node, pnpm and the changeset tools
-      - uses: pnpm/action-setup@c3b53f6a16e57305370b4ae5a540c2077a1d50dd # ratchet:pnpm/action-setup@v2
-      - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # ratchet:actions/setup-node@v3
+      - uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # ratchet:pnpm/action-setup@v2
+      - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # ratchet:actions/setup-node@v3
         with:
           node-version-file: .nvmrc
           cache: "pnpm"
@@ -71,7 +71,7 @@ jobs:
           echo $(jq -c '. += {required: false}' changeset-metadata.json) > changeset-metadata.json
 
       - name: Upload changeset metadata
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # ratchet:actions/upload-artifact@v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # ratchet:actions/upload-artifact@v3
         with:
           name: changeset-metadata
           path: ./changeset-metadata.json
@@ -96,7 +96,7 @@ jobs:
           echo $(jq -c '. += { pr: "${{ github.event.number }}" }' changeset-metadata.json) > changeset-metadata.json
 
       - name: Upload changeset metadata
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # ratchet:actions/upload-artifact@v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # ratchet:actions/upload-artifact@v3
         with:
           name: changeset-metadata
           path: ./changeset-metadata.json

.github/workflows/pr-labeler.yml

@@ -39,6 +39,6 @@ jobs:
     runs-on: ubuntu-latest
     name: Label base branches and external contributors
     steps:
-      - uses: srvaroa/labeler@5789c3303e99162cb381c2873ddddd88b0a76e91 # ratchet:srvaroa/labeler@v1
+      - uses: srvaroa/labeler@9c29ad1ef33d169f9ef33c52722faf47a566bcf3 # ratchet:srvaroa/labeler@v1
         env:
           GITHUB_TOKEN: "${{ github.token }}"

.github/workflows/pr-validation.yml

@@ -19,7 +19,7 @@ jobs:
     name: Validate CODEOWNERS
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # ratchet:actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # ratchet:actions/checkout@v3
         with:
           persist-credentials: false
       - uses: mszostok/codeowners-validator@7f3f5e28c6d7b8dfae5731e54ce2272ca384592f # ratchet:mszostok/[email protected]

.github/workflows/push-tag-create-release.yml

@@ -21,13 +21,13 @@ jobs:
     name: Create GitHub release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # ratchet:actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # ratchet:actions/checkout@v3
         with:
           fetch-depth: "0" # all history
           persist-credentials: false
 
-      - uses: pnpm/action-setup@c3b53f6a16e57305370b4ae5a540c2077a1d50dd # ratchet:pnpm/action-setup@v2
-      - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # ratchet:actions/setup-node@v3
+      - uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # ratchet:pnpm/action-setup@v2
+      - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # ratchet:actions/setup-node@v3
         with:
           node-version-file: .nvmrc
           cache: "pnpm"
@@ -55,7 +55,7 @@ jobs:
         run: |
           flub release fromTag ${{ github.ref }} --json | jq -c > release-metadata.json
       - name: Upload release metadata JSON
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # ratchet:actions/upload-artifact@v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # ratchet:actions/upload-artifact@v3
         with:
           name: release-metadata
           path: release-metadata.json
@@ -76,7 +76,7 @@ jobs:
           mkdir reports
           flub release report -g ${{ fromJson(env.RELEASE_JSON).packageOrReleaseGroup }} -o reports
       - name: Upload release reports
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # ratchet:actions/upload-artifact@v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # ratchet:actions/upload-artifact@v3
         with:
           name: release-reports
           path: reports
@@ -106,7 +106,7 @@ jobs:
       # Only creates GH releases for client, server, and build-tools releases.
       - name: Create GH release
         if: fromJson(env.RELEASE_JSON).packageOrReleaseGroup == 'client' || fromJson(env.RELEASE_JSON).packageOrReleaseGroup == 'build-tools' || fromJson(env.RELEASE_JSON).packageOrReleaseGroup == 'server'
-        uses: ncipollo/release-action@eb05307dcee34deaad054e98128088a30d7980dc # ratchet:ncipollo/release-action@main
+        uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 # ratchet:ncipollo/release-action@v1
         with:
           # Allow updates to existing releases.
           allowUpdates: true

.github/workflows/stale-branches.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # v2
+        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # ratchet:actions/checkout@v2
       - name: Run delete-old-branches-action
-        uses: beatlabs/delete-old-branches-action@db61ade054731e37b5740e23336445fbc75ccd7b # v0.0.9
+        uses: beatlabs/delete-old-branches-action@db61ade054731e37b5740e23336445fbc75ccd7b # ratchet:beatlabs/delete-old-branches-action@v0.0.9
         with:
           repo_token: ${{ github.token }}
           date: '6 months ago'

.github/workflows/website-validation.yml

@@ -1,7 +1,7 @@
 name: Website validation
 on:
   pull_request:
-    types: [ opened, synchronize, reopened ]
+    types: [opened, synchronize, reopened]
     paths:
       - "docs/**"
 
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Build site
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # ratchet:actions/checkout@v4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # ratchet:actions/checkout@v4
         with:
           submodules: false
       - uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # ratchet:pnpm/action-setup@v2
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
     name: pnpm lint
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # ratchet:actions/checkout@v4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # ratchet:actions/checkout@v4
         with:
           submodules: false
       - uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # ratchet:pnpm/action-setup@v2

.vscode/launch.json

@@ -412,6 +412,20 @@
 				"../../../../lib/test/**/${fileBasenameNoExtension}.js",
 			],
 			"cwd": "${fileDirname}",
+			// These skipped files contain exceptions that are consistently thrown during test setup
+			// You can comment out this part if you want to debug these files
+			"skipFiles": [
+				"<node_internals>/**",
+				// @fluid-internal/mocha-test-setup is resolved first using esm resolution algorithm first before cjs resolution algorithm (require)
+				"**/node_modules/mocha/lib/nodejs/esm-utils.js",
+				// We pass multiple glob patterns to mocha (as seen above) to look for the correct spec file to debug
+				// Two of these will always throw file not found error, so we skip them here
+				"**/node_modules/mocha/lib/cli/lookup-files.js",
+				// There's an empty catch here for CommonJS default export support
+				"**/node_modules/uuid/dist/v35.js",
+				// test-version-utils checks for valid semver version first and handles ranges seperately.
+				"**/node_modules/semver/classes/semver.js",
+			],
 			"outFiles": [
 				"${fileDirname}/../../lib/**/*.js",
 				"${fileDirname}/../../../lib/**/*.js",

.vscode/settings.json

@@ -77,6 +77,12 @@
 	"files.trimFinalNewlines": true,
 	"files.trimTrailingWhitespace": true,
 
+	// Don't search for the biome executable in the path, as it's not a globally installed tool.
+	"biome.searchInPath": false,
+
+	// Use the biome executable from the node_modules folder.
+  "biome.lspBin": "node_modules/@biomejs/biome/bin/biome",
+
 	// Customizations for VSCode search results.
 	// These entries should probably be kept more or less in sync with the .gitignore file.
 	// They are added here because when doing a search in VSCode and using the "files to include" feature, the underlying

PACKAGES.md

@@ -183,7 +183,7 @@ The dependencies between layers are enforced by the layer-check command._
 
 | Packages | Layer Dependencies |
 | --- | --- |
-| - [@fluidframework/azure-client](/packages/service-clients/azure-client)</br>- [@fluid-experimental/odsp-client](/packages/service-clients/odsp-client)</br>- [@fluidframework/tinylicious-client](/packages/service-clients/tinylicious-client)</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp; | - [Core-Interfaces](#Core-Interfaces)</br>- [Protocol-Definitions](#Protocol-Definitions)</br>- [Driver-Definitions](#Driver-Definitions)</br>- [Container-Definitions](#Container-Definitions)</br>- [Core-Utils](#Core-Utils)</br>- [Telemetry-Utils](#Telemetry-Utils)</br>- [Driver-Utils](#Driver-Utils)</br>- [Other-Utils](#Other-Utils)</br>- [Driver](#Driver)</br>- [Loader](#Loader)</br>- [Runtime](#Runtime)</br>- [Framework](#Framework)</br>- [Routerlicious-Driver](#Routerlicious-Driver) |
+| - [@fluidframework/azure-client](/packages/service-clients/azure-client)</br>- [@fluidframework/odsp-client](/packages/service-clients/odsp-client)</br>- [@fluidframework/tinylicious-client](/packages/service-clients/tinylicious-client)</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp; | - [Core-Interfaces](#Core-Interfaces)</br>- [Protocol-Definitions](#Protocol-Definitions)</br>- [Driver-Definitions](#Driver-Definitions)</br>- [Container-Definitions](#Container-Definitions)</br>- [Core-Utils](#Core-Utils)</br>- [Telemetry-Utils](#Telemetry-Utils)</br>- [Driver-Utils](#Driver-Utils)</br>- [Other-Utils](#Other-Utils)</br>- [Driver](#Driver)</br>- [Loader](#Loader)</br>- [Runtime](#Runtime)</br>- [Framework](#Framework)</br>- [Routerlicious-Driver](#Routerlicious-Driver) |
 
 ### Examples
 
@@ -214,4 +214,3 @@ The dependencies between layers are enforced by the layer-check command._
 | Packages | Layer Dependencies |
 | --- | --- |
 | - [@fluidframework/server-routerlicious](/server/routerlicious/packages/routerlicious)</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp; | - [Common-Definitions](#Common-Definitions)</br>- [Protocol-Definitions](#Protocol-Definitions)</br>- [Common-Utils](#Common-Utils)</br>- [Server-Shared-Utils](#Server-Shared-Utils)</br>- [Server-Libs](#Server-Libs) |
-

azure/packages/azure-local-service/biome.jsonc

@@ -0,0 +1,4 @@
+{
+	"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
+	"extends": ["../../../biome.jsonc"]
+}

azure/packages/azure-local-service/package.json

@@ -16,11 +16,14 @@
 		"build": "fluid-build . --task build",
 		"build:compile": "fluid-build . --task compile",
 		"build:esnext": "tsc --project ./tsconfig.json",
+		"check:biome": "biome check . --formatter-enabled=true",
+		"check:format": "npm run check:prettier",
 		"check:prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
 		"clean": "rimraf --glob dist lib \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp",
 		"eslint": "eslint --format stylish src",
 		"eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
-		"format": "fluid-build --task format .",
+		"format": "npm run format:prettier",
+		"format:biome": "biome check . --formatter-enabled=true --apply",
 		"format:prettier": "prettier --write . --cache --ignore-path ../../../.prettierignore",
 		"lint": "fluid-build . --task lint",
 		"lint:fix": "fluid-build . --task eslint:fix --task format",
@@ -30,10 +33,10 @@
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
 	"dependencies": {
-		"tinylicious": "^4.0.1"
+		"tinylicious": "^5.0.0-265463"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^1.6.2",
+		"@biomejs/biome": "^1.7.3",
 		"@fluidframework/build-common": "^2.0.3",
 		"@fluidframework/build-tools": "^0.39.0-264124",
 		"@fluidframework/eslint-config-fluid": "^5.3.0",

azure/packages/azure-service-utils/api-report/azure-service-utils.api.md → azure/packages/azure-service-utils/api-report/azure-service-utils.alpha.api.md

@@ -1,4 +1,4 @@
-## API Report File for "@fluidframework/azure-service-utils"
+## Alpha API Report File for "@fluidframework/azure-service-utils"
 
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 

azure/packages/azure-service-utils/api-report/azure-service-utils.beta.api.md

@@ -0,0 +1,14 @@
+## Beta API Report File for "@fluidframework/azure-service-utils"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { IUser } from '@fluidframework/driver-definitions';
+import { ScopeType } from '@fluidframework/driver-definitions/internal';
+
+export { IUser }
+
+export { ScopeType }
+
+```

azure/packages/azure-service-utils/api-report/azure-service-utils.public.api.md

@@ -0,0 +1,14 @@
+## Public API Report File for "@fluidframework/azure-service-utils"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { IUser } from '@fluidframework/driver-definitions';
+import { ScopeType } from '@fluidframework/driver-definitions/internal';
+
+export { IUser }
+
+export { ScopeType }
+
+```

azure/packages/azure-service-utils/biome.jsonc

@@ -0,0 +1,4 @@
+{
+	"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
+	"extends": ["../../../biome.jsonc"]
+}

azure/packages/azure-service-utils/package.json

@@ -59,13 +59,16 @@
 		"build:test:cjs": "fluid-tsc commonjs --project ./src/test/tsconfig.cjs.json",
 		"build:test:esm": "tsc --project ./src/test/tsconfig.json",
 		"check:are-the-types-wrong": "attw --pack .",
+		"check:biome": "biome check . --formatter-enabled=true",
+		"check:format": "npm run check:prettier",
 		"check:prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
 		"check:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
 		"ci:build:docs": "api-extractor run",
 		"clean": "rimraf --glob dist lib \"*.d.ts\" \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp",
 		"eslint": "eslint --format stylish src",
 		"eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
-		"format": "fluid-build --task format .",
+		"format": "npm run format:prettier",
+		"format:biome": "biome check . --formatter-enabled=true --apply",
 		"format:prettier": "prettier --write . --cache --ignore-path ../../../.prettierignore",
 		"lint": "fluid-build . --task lint",
 		"lint:fix": "fluid-build . --task eslint:fix --task format",
@@ -81,7 +84,7 @@
 	},
 	"devDependencies": {
 		"@arethetypeswrong/cli": "^0.15.2",
-		"@biomejs/biome": "^1.6.2",
+		"@biomejs/biome": "^1.7.3",
 		"@fluid-tools/build-cli": "^0.39.0-264124",
 		"@fluidframework/azure-service-utils-previous": "npm:@fluidframework/[email protected]",
 		"@fluidframework/build-common": "^2.0.3",

azure/packages/test/scenario-runner/biome.jsonc

@@ -0,0 +1,4 @@
+{
+	"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
+	"extends": ["../../../../biome.jsonc"]
+}