Merge branch 'main' into experimental-vtext-clean

Author: brrichards

.changeset/deprecate-create-and-load-container-props.md

@@ -68,7 +68,7 @@ USER node
 # PNPM_HOME is where `pnpm add -g` places binary shims; adding it to PATH makes
 # globally-installed pnpm packages (e.g. @fluid-tools/build-cli) invokable.
 ENV PNPM_HOME="/home/node/.local/share/pnpm"
-ENV PATH="${PNPM_HOME}:/home/node/.local/bin:/home/node/.cargo/bin:${PATH}"
+ENV PATH="${PNPM_HOME}/bin:/home/node/.local/bin:/home/node/.cargo/bin:${PATH}"
 
 # Optionally install Playwright CLI
 ARG INSTALL_PLAYWRIGHT_CLI=false

.devcontainer/Dockerfile

@@ -53,7 +53,7 @@
 /experimental/dds/tree/src                     @microsoft/fluid-cr-tree
 
 # presence source
-/packages/framework/presence/src               @microsoft/fluid-cr-presence
+/packages/framework/presence*/src               @microsoft/fluid-cr-presence
 
 # Fluid Devtools source
 /packages/tools/devtools/**/src                @microsoft/fluid-cr-devtools

.github/CODEOWNERS

@@ -103,8 +103,8 @@
 "area: website":
   changed-files:
     - any-glob-to-any-file:
-      - docs/**
-      - "!docs/content/**"
+      - website/**
+      - "!website/docs/**"
 
 "breaking change":
   changed-files:
@@ -124,7 +124,9 @@ dependencies:
 
 documentation:
   changed-files:
-    - any-glob-to-any-file: docs/content/**
+    - any-glob-to-any-file:
+      - website/docs/**
+      - website/src/**
 
 # flag changes to public APIs so they can be reviewed to see if they're breaking
 "public api change":

.github/labeler-areas.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
     paths:
-      - "docs/**"
+      - "website/**"
       - "*.md"
       - "**/*.md"
       - "!.changeset/**"
@@ -13,7 +13,7 @@ on:
 
 defaults:
   run:
-    working-directory: ./docs
+    working-directory: ./website
 
 permissions:
   contents: read
@@ -39,7 +39,7 @@ jobs:
         with:
           node-version: "22"
           cache: "pnpm"
-          cache-dependency-path: docs/pnpm-lock.yaml
+          cache-dependency-path: website/pnpm-lock.yaml
       - name: Build site artifact
         run: |
           pnpm i --frozen-lockfile
@@ -52,7 +52,7 @@ jobs:
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # ratchet:actions/upload-artifact@v7
         with:
           name: fluidframework-site
-          path: docs/build
+          path: website/build
           retention-days: 3
 
   # Run linter checks against the website content and infrastructure.
@@ -73,7 +73,7 @@ jobs:
         with:
           node-version: "22"
           cache: "pnpm"
-          cache-dependency-path: docs/pnpm-lock.yaml
+          cache-dependency-path: website/pnpm-lock.yaml
       - name: pnpm lint
         run: |
           pnpm i --frozen-lockfile
@@ -98,14 +98,14 @@ jobs:
         with:
           node-version: "22"
           cache: "pnpm"
-          cache-dependency-path: docs/pnpm-lock.yaml
+          cache-dependency-path: website/pnpm-lock.yaml
 
       - name: Download site artifact
         # release notes: https://github.com/actions/download-artifact/releases/tag/v6.0.0
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # ratchet:actions/download-artifact@v8
         with:
           name: fluidframework-site
-          path: docs/build
+          path: website/build
       - name: Install dependencies
         run: "pnpm i --frozen-lockfile"
       - name: Run tests
@@ -131,7 +131,7 @@ jobs:
         with:
           node-version: "22"
           cache: "pnpm"
-          cache-dependency-path: docs/pnpm-lock.yaml
+          cache-dependency-path: website/pnpm-lock.yaml
       - name: Create results folder
         run: mkdir -p ./results
 
@@ -140,7 +140,7 @@ jobs:
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # ratchet:actions/download-artifact@v8
         with:
           name: fluidframework-site
-          path: docs/build
+          path: website/build
       - name: Install dependencies
         run: "pnpm i --frozen-lockfile"
       - name: Check for broken links
@@ -163,5 +163,5 @@ jobs:
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # ratchet:actions/upload-artifact@v7
         with:
           name: website-validation-results
-          path: ./docs/results
+          path: ./website/results
           retention-days: 3

.github/workflows/website-validation.yml

@@ -43,7 +43,7 @@ bundleAnalyzerJson
 # Misc pipeline artifacts
 artifacts
 
-docs/resources/_gen/
+website/resources/_gen/
 
 # PNPM store (when mounting host file system in docker container)
 .pnpm-store/

.gitignore

@@ -86,18 +86,18 @@ packages/runtime/test-runtime-utils/src/assertionShortCodesMap.ts
 
 # Prettier does not yet support mdx v3.
 # See <https://github.com/prettier/prettier/issues/12209>
-docs/**/*.mdx
+website/**/*.mdx
 
 # Generated
-docs/.doc-models
-docs/.docusaurus
-docs/build
-docs/versions.json
-docs/docs/api/*
-docs/versioned_docs/*/api/*
+website/.doc-models
+website/.docusaurus
+website/build
+website/versions.json
+website/docs/api/*
+website/versioned_docs/*/api/*
 
 # Formatting gets clobbered by swa
-docs/swa-cli.config.json
+website/swa-cli.config.json
 
 # This is a test file
 tools/markdown-magic/test/include.md

.prettierignore

@@ -22,8 +22,12 @@ client running a checkpoint version is guaranteed to be compatible with. Upper
 bounds for in-window checkpoints are estimated and depend on when future
 checkpoints are designated.
 
+<!-- GENERATED-TABLE-START -->
+<!-- NOTE: This table is automatically generated. Do not update it directly. -->
+<!-- To modify this table, edit `packages/test/test-version-utils/src/checkpoints.ts` then run `pnpm --filter @fluid-private/test-version-utils run update-compat-versions` -->
+
 <!-- prettier-ignore -->
-| Checkpoint | Version Range | Earliest Date | Compatible Checkpoints | Compatible Semantic Versions |
+| Checkpoint | Version Range | Start Date | Compatible Checkpoints | Compatible Semantic Versions |
 | --- | --- | --- | --- | --- |
 | CC-1 | `>=1.4.0 <2.0.0 \| 2.0.0-internal* \| 2.0.0-rc*` | 2024-04-09 | CC-1, CC-2, CC-3, CC-4 | `>=1.4.0 <2.101.0`` \| 2.0.0-internal* \| 2.0.0-rc*` |
 | CC-2 | `>=2.0.0 <2.40.0` | 2024-06-26 | CC-1, CC-2, CC-3, CC-4, CC-5 | `>=1.4.0 <4.0.0`(estimated)` \| 2.0.0-internal* \| 2.0.0-rc*` |
@@ -33,6 +37,8 @@ checkpoints are designated.
 | CC-6 (TBD) | `>=4.0.0 <5.0.0`(estimated) | ~2027-01-06 | CC-3, CC-4, CC-5, CC-6, CC-7 | `>=2.40.0 <6.0.0`(estimated) |
 | CC-7 (TBD) | `>=5.0.0 <6.0.0`(estimated) | ~2027-07-06 | CC-4, CC-5, CC-6, CC-7 | `>=2.80.0 <6.0.0`(estimated) |
 
+<!-- GENERATED-TABLE-END -->
+
 > **Notes:**
 >
 > 1. `CC-1` through `CC-4` were designated retroactively based on existing

CompatibilityCheckpoints.md

@@ -197,7 +197,12 @@ Designation is the act of officially marking a Fluid Framework release as a new
 
 A new checkpoint should be designated no less than 6 months after the previous one. It should also land on a new major or beta boundary (e.g., `3.0.0`, `2.100.0`), so the prior checkpoint's range can extend cleanly to the new boundary.
 
-**To designate a new checkpoint:** update the [Compatibility Checkpoints](./CompatibilityCheckpoints.md) document and include a changeset noting the new boundary so it appears in the release notes.
+**To designate a new checkpoint:**
+
+1. Add the new checkpoint to `checkpoints` in [`packages/test/test-version-utils/src/checkpoints.ts`](./packages/test/test-version-utils/src/checkpoints.ts), and remove the corresponding future (TBD) estimate from the `futureCheckpoints` array in the same file.
+2. From `packages/test/test-version-utils`, run `pnpm run update-compat-versions` to refresh the per-version compat workspaces and regenerate the table in [`CompatibilityCheckpoints.md`](./CompatibilityCheckpoints.md). Do **not** edit that table by hand.
+3. From `packages/test/test-version-utils`, run `pnpm run update-compat-versions` to update the installed versions used by e2e tests.
+4. Include a changeset noting the new boundary so it appears in the release notes.
 
 ## Tightening Runtime Enforcement
 
@@ -219,9 +224,6 @@ To tighten runtime enforcement:
    (e.g., `2.x` → `3.x`), also narrow the `MinimumVersionForCollab` type in
    [compatibilityDefinitions.ts](./packages/runtime/runtime-definitions/src/compatibilityDefinitions.ts)
    to drop the now-unsupported major from its definition.
-3. **Update the e2e test matrix:** The `FullCompat` version matrix is derived
-   from the currently supported checkpoints — update it so tests only run
-   against versions within the new window.
 
 ## Testing
 
@@ -230,25 +232,22 @@ variations using `describeCompat()` with `"FullCompat"`. The variations test
 cross-client compatibility scenarios by using one version of the Fluid runtime for
 creating containers and a different version for loading containers.
 
-**Example:** A test may generate the following variations for cross-client
-compatibility scenarios:
-
-> **Note:** The version labels below (e.g., "N-1 fast train") reflect the current
-> test infrastructure naming. These labels will be updated to reflect
-> checkpoint-based versioning as part of the checkpoint adoption work.
+**Example:** With current build `2.101.0` (N) and in-window prior Compatibility
+Checkpoints `2.40.0` (CC-3), `2.0.9` (CC-2), and `1.4.0` (CC-1), a SharedCell
+test generates these cross-client variations:
 
 ```
-compat cross-client - create with 2.43.0 (N) + load with 2.33.2 (N-1 fast train)
+compat cross-client - create with 2.101.0 (N) + load with 2.40.0 (CC-3)
   ✔ Example test
-compat cross-client - create with 2.43.0 (N) + load with 2.23.0 (N-2 fast train)
+compat cross-client - create with 2.101.0 (N) + load with 2.0.9 (CC-2)
   ✔ Example test
-compat cross-client - create with 2.43.0 (N) + load with 1.4.0 (N-1 slow train/LTS)
+compat cross-client - create with 2.101.0 (N) + load with 1.4.0 (CC-1)
   ✔ Example test
-compat cross-client - create with 2.33.2 (N-1 fast train) + load with 2.43.0 (N)
+compat cross-client - create with 2.40.0 (CC-3) + load with 2.101.0 (N)
   ✔ Example test
-compat cross-client - create with 2.23.0 (N-2 fast train) + load with 2.43.0 (N)
+compat cross-client - create with 2.0.9 (CC-2) + load with 2.101.0 (N)
   ✔ Example test
-compat cross-client - create with 1.4.0 (N-1 slow train/LTS) + load with 2.43.0 (N)
+compat cross-client - create with 1.4.0 (CC-1) + load with 2.101.0 (N)
   ✔ Example test
 ```
 

CrossClientCompatibilityDevGuide.md

@@ -0,0 +1,50 @@
+<!-- THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -->
+
+# Fluid Framework v2.103.0
+
+## Contents
+
+- [⚠️ Deprecations](#️-deprecations)
+  - [Deprecate ICreateAndLoadContainerProps in favor of composable building blocks (#27347)](#deprecate-icreateandloadcontainerprops-in-favor-of-composable-building-blocks-27347)
+
+## ⚠️ Deprecations
+
+### Deprecate ICreateAndLoadContainerProps in favor of composable building blocks ([#27347](https://github.com/microsoft/FluidFramework/issues/27347))
+
+`ICreateAndLoadContainerProps` is now `@deprecated`. It remains as a structurally-identical alias and the props types that previously extended it (`ILoadExistingContainerProps`, `ICreateDetachedContainerProps`, `IRehydrateDetachedContainerProps`) now extend the building blocks directly, so no caller migration is required for those.
+
+Callers writing new props types should compose from the building blocks directly:
+
+```ts
+import type {
+  IContainerHostProps,
+  IContainerDriverServices,
+} from "@fluidframework/container-loader/legacy";
+
+// Equivalent to the old ICreateAndLoadContainerProps
+type MyProps = IContainerHostProps & IContainerDriverServices;
+
+// Add only what you need
+interface MyHostOnlyProps extends IContainerHostProps {
+  readonly extraOption: boolean;
+}
+```
+
+- `IContainerHostProps` covers the code loader plus optional policy / observability fields (`options`, `scope`, `logger`, `configProvider`, `protocolHandlerBuilder`, `allowReconnect`, `clientDetailsOverride`).
+- `IContainerDriverServices` covers the `urlResolver` + `documentServiceFactory` pair.
+
+`ICreateAndLoadContainerProps` will be removed in a future major release.
+
+#### Change details
+
+Commit: [`4091373`](https://github.com/microsoft/FluidFramework/commit/4091373ee5a60204d5f08736eede03af242fc425)
+
+Affected packages:
+
+- @fluidframework/container-loader
+
+[⬆️ Table of contents](#contents)
+
+### 🛠️ Start Building Today!
+
+Please continue to engage with us on GitHub [Discussion](https://github.com/microsoft/FluidFramework/discussions) and [Issue](https://github.com/microsoft/FluidFramework/issues) pages as you adopt Fluid Framework!