Skip to content

refactor: Update Fluid dependencies and update Presence code to account for breaking changes #10

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
Josmithr merged 5 commits into from
May 13, 2025
Merged

refactor: Update Fluid dependencies and update Presence code to account for breaking changes #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1857491
docs: Add missing template entries
Josmithr May 13, 2025
c570f44
style: Prettier
Josmithr May 13, 2025
e7c0770
build: Update fluid deps to `2.30.x`
Josmithr May 13, 2025
2cf03ba
refactor: Update fluid deps to `2.40.x` and fix presence code
Josmithr May 13, 2025
2b0d478
build: `^` deps
Josmithr May 13, 2025
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
4 changes: 3 additions & 1 deletion .env.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
AZURE_TENANT_ID=<tenant-id>
AZURE_ORDERER=<orderer-url>
AZURE_FUNCTION_TOKEN_PROVIDER_URL=<token-provider-url>
FLUID_CLIENT=azure
FLUID_CLIENT=azure
AZURE_CLIENT_ID=<client-id>
AZURE_REDIRECT_URI=<redirect-uri>
992 changes: 537 additions & 455 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@
"@azure/msal-browser": "^3.28.0",
"@fluentui/react-components": "^9.61.6",
"@fluentui/react-icons": "^2.0.292",
"@fluidframework/azure-client": "^2.23.0",
"@fluidframework/odsp-client": "^2.23.0",
"@fluidframework/presence": "^2.23.0",
"@fluidframework/telemetry-utils": "^2.23.0",
"@fluidframework/test-runtime-utils": "^2.23.0",
"@fluidframework/azure-client": "^2.40.0",
"@fluidframework/odsp-client": "^2.40.0",
"@fluidframework/presence": "^2.40.0",
"@fluidframework/telemetry-utils": "^2.40.0",
"@fluidframework/test-runtime-utils": "^2.40.0",
"@microsoft/microsoft-graph-client": "^3.0.7",
"@tailwindcss/vite": "^4.0.9",
"@tanstack/react-table": "^8.20.6",
"@tanstack/react-virtual": "^3.13.0",
"@vitejs/plugin-react": "^4.3.4",
"axios": "^1.7.9",
"dotenv": "^16.4.7",
"fluid-framework": "^2.23.0",
"fluid-framework": "^2.40.0",
"hashids": "^2.2.10",
"jsrsasign": "^11.1.0",
"react": "^18.3.1",
Expand All @@ -53,9 +53,9 @@
"devDependencies": {
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.18.0",
"@fluidframework/azure-local-service": "^2.23.0",
"@fluidframework/azure-local-service": "^2.40.0",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/devtools": "^2.23.0",
"@fluidframework/devtools": "^2.40.0",
"@microsoft/microsoft-graph-types": "^2.40.0",
"@playwright/test": "^1.49.1",
"@types/debug": "^4.1.7",
Expand Down
6 changes: 3 additions & 3 deletions src/app_load.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { loadFluidData } from "./infra/fluid.js";
import { IFluidContainer } from "fluid-framework";
import { FluentProvider, webLightTheme } from "@fluentui/react-components";

import { acquirePresenceViaDataObject } from "@fluidframework/presence/alpha";
import { getPresenceViaDataObject } from "@fluidframework/presence/alpha";
import { createTableSelectionManager } from "./utils/selection.js";
import { createUsersManager } from "./utils/users.js";
import { UserInfo } from "./utils/Interfaces/UsersManager.js";
Expand Down Expand Up @@ -70,10 +70,10 @@ export async function loadApp(props: {
}

// Get the Presence data object from the container
const presence = acquirePresenceViaDataObject(container.initialObjects.presence);
const presence = getPresenceViaDataObject(container.initialObjects.presence);

// Create a workspace for the selection manager
const workspace = presence.getStates("workspace:main", {});
const workspace = presence.states.getWorkspace("workspace:main", {});

// Create the current UserInfo object
const userInfo: UserInfo = {
Expand Down
Loading
Loading