Skip to content

Support Fluid Framework 3, and bump to 2.0.0-internal.19 #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huntj88 merged 11 commits into from
Nov 2, 2026
Merged

Support Fluid Framework 3, and bump to 2.0.0-internal.19 #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
afe77d4
Drop the CommonJS build and migrate build/tests to ESM + Node16
Sep 9, 2026
532f932
Address PR feedback: ES2022 target and trim redundant package entry p…
Sep 14, 2026
2b1dca2
Support Fluid Framework 3, and bump to 2.0.0-internal.19
Sep 9, 2026
b2e6c9d
Address PR feedback: correct Fluid 3 compatibility claims in docs
Sep 15, 2026
e0cd095
fix(react): preserve SharedMap typing across Fluid versions
Sep 15, 2026
bececa6
docs: move Fluid migration rationale to PR description
Sep 15, 2026
80f8159
Merge mainv2 into user/jameshunt/2.0.0-internal.19
Sep 15, 2026
87e2ac2
Widen Fluid dependency ranges for internal test utilities
Sep 15, 2026
be25b24
Remove redundant ESLint suppressions from copied Fluid types
Sep 15, 2026
2eb914d
Simplify TypedSharedMap mutator typing
Sep 22, 2026
123edbc
module fixes
Nov 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions internal/build-tools/update-fluid-range.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,20 @@
* node internal/build-tools/update-fluid-range.js
* The repo root is auto-detected via git; no CLI flags required.
* This writes changes in place (no dry-run). Commit/revert as needed after inspection.
*
* DEFAULT_FROM_RANGE must be the exact range string currently present in package.json
* files (whitespace-trimmed, but otherwise character-for-character, including any `||`
* clauses). A near-miss silently matches nothing instead of failing.
*/

const fs = require("fs");
const path = require("path");
const { getRootFolder } = require("./utils");

const DEFAULT_FROM_RANGE = ">=2.40 <2.110";
const DEFAULT_TO_RANGE = ">=2.40 <2.120";
const DEFAULT_VERSION_FROM = "2.0.0-internal.17";
const DEFAULT_VERSION_TO = "2.0.0-internal.18";
const DEFAULT_FROM_RANGE = ">=2.40 <2.120";
const DEFAULT_TO_RANGE = ">=2.102 <2.120 || >=3.0.0 <3.10.0";
const DEFAULT_VERSION_FROM = "2.0.0-internal.18";
const DEFAULT_VERSION_TO = "2.0.0-internal.19";
const INTERNAL_PKG_PREFIX = "@microsoft/live-share";
const IGNORED_FOLDERS = new Set([
"node_modules",
Expand Down
4 changes: 4 additions & 0 deletions internal/test-utils/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
This package contains code to setup tests for live share data objects using a local fluid server.

Code is duplicated and simplified from "@fluid-private/test-version-utils" and "@fluid-private/test-drivers", which are no longer available over npm in fluid v2.

Fluid client dependencies intentionally use `^2.102.0 || ^3.0.0` here. This is an internal, development-only test harness, so we accept the maintenance risk of breaking changes in its legacy, internal, and experimental APIs. Published Live Share packages retain their narrower compatibility ranges.

When checking a specific Fluid version, align all Fluid client dependencies across the test harness and workspace packages to that version, including `@fluid-experimental` and `@fluid-internal` packages. Use a separate installation, rebuild the packages and test utilities, then run the Live Share, canvas, and media test suites; changing only `fluid-framework` can leave incompatible Fluid versions in the same dependency graph.
44 changes: 22 additions & 22 deletions internal/test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@
"tsc": "tsc"
},
"dependencies": {
"@fluid-experimental/attributor": "^2.0.0",
"@fluid-experimental/sequence-deprecated": "^2.0.0",
"@fluid-internal/test-driver-definitions": "^2.0.0",
"@fluidframework/agent-scheduler": "^2.0.0",
"@fluidframework/aqueduct": "^2.0.0",
"@fluidframework/cell": "^2.0.0",
"@fluidframework/container-loader": "^2.0.0",
"@fluidframework/container-runtime": "^2.0.0",
"@fluidframework/core-interfaces": "^2.0.0",
"@fluidframework/core-utils": "^2.0.0",
"@fluidframework/counter": "^2.0.0",
"@fluidframework/datastore-definitions": "^2.0.0",
"@fluidframework/driver-definitions": "^2.0.0",
"@fluidframework/local-driver": "^2.0.0",
"@fluidframework/map": "^2.0.0",
"@fluidframework/matrix": "^2.0.0",
"@fluidframework/ordered-collection": "^2.0.0",
"@fluidframework/register-collection": "^2.0.0",
"@fluidframework/runtime-definitions": "^2.0.0",
"@fluidframework/sequence": "^2.0.0",
"@fluid-experimental/attributor": "^2.102.0 || ^3.0.0",
"@fluid-experimental/sequence-deprecated": "^2.102.0 || ^3.0.0",
"@fluid-internal/test-driver-definitions": "^2.102.0 || ^3.0.0",
"@fluidframework/agent-scheduler": "^2.102.0 || ^3.0.0",
"@fluidframework/aqueduct": "^2.102.0 || ^3.0.0",
"@fluidframework/cell": "^2.102.0 || ^3.0.0",
"@fluidframework/container-loader": "^2.102.0 || ^3.0.0",
"@fluidframework/container-runtime": "^2.102.0 || ^3.0.0",
"@fluidframework/core-interfaces": "^2.102.0 || ^3.0.0",
"@fluidframework/core-utils": "^2.102.0 || ^3.0.0",
"@fluidframework/counter": "^2.102.0 || ^3.0.0",
"@fluidframework/datastore-definitions": "^2.102.0 || ^3.0.0",
"@fluidframework/driver-definitions": "^2.102.0 || ^3.0.0",
"@fluidframework/local-driver": "^2.102.0 || ^3.0.0",
"@fluidframework/map": "^2.102.0 || ^3.0.0",
"@fluidframework/matrix": "^2.102.0 || ^3.0.0",
"@fluidframework/ordered-collection": "^2.102.0 || ^3.0.0",
"@fluidframework/register-collection": "^2.102.0 || ^3.0.0",
"@fluidframework/runtime-definitions": "^2.102.0 || ^3.0.0",
"@fluidframework/sequence": "^2.102.0 || ^3.0.0",
"@fluidframework/server-local-server": "^7.0.0",
"@fluidframework/telemetry-utils": "^2.0.0",
"@fluidframework/test-utils": "^2.0.0"
"@fluidframework/telemetry-utils": "^2.102.0 || ^3.0.0",
"@fluidframework/test-utils": "^2.102.0 || ^3.0.0"
},
"devDependencies": {
"@fluidframework/eslint-config-fluid": "^8.1.0",
Expand Down
4 changes: 2 additions & 2 deletions internal/usage-test/esm-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"license": "ISC",
"dependencies": {
"@microsoft/live-share": "file:/../../../packages/live-share",
"fluid-framework": ">=2.40 <2.120"
"fluid-framework": ">=2.102 <2.120 || >=3.0.0 <3.10.0"
},
"devDependencies": {
"@fluidframework/test-runtime-utils": ">=2.40 <2.120"
"@fluidframework/test-runtime-utils": ">=2.102 <2.120 || >=3.0.0 <3.10.0"
}
}
4 changes: 2 additions & 2 deletions internal/usage-test/pnpm-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"license": "ISC",
"dependencies": {
"@microsoft/live-share": "file:/../../../packages/live-share",
"fluid-framework": ">=2.40 <2.120"
"fluid-framework": ">=2.102 <2.120 || >=3.0.0 <3.10.0"
},
"devDependencies": {
"@fluidframework/test-runtime-utils": ">=2.40 <2.120",
"@fluidframework/test-runtime-utils": ">=2.102 <2.120 || >=3.0.0 <3.10.0",
"@types/node": "^20.14.14"
}
}
Loading
Loading