Merge branch 'main' into relnotes-main

microsoft · Jan 29, 2024 · 210da89 · 210da89
2 parents 5bb1965 + 25406b7
commit 210da89
Show file tree

Hide file tree

Showing 375 changed files with 5,290 additions and 2,809 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
diff --git a/.github/workflows/changeset-reporter.yml b/.github/workflows/changeset-reporter.yml
@@ -14,6 +14,9 @@ on:
 jobs:
   load_report:
     runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      pull-requests: write
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # ratchet:actions/checkout@v3
         with:

diff --git a/.github/workflows/linkcheck-reporter.yml b/.github/workflows/linkcheck-reporter.yml
@@ -5,6 +5,10 @@ on:
     types:
       - completed
 
+permissions:
+  actions: read
+  pull-requests: write
+
 jobs:
   load_report:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/merge-next-notify.yml b/.github/workflows/merge-next-notify.yml
diff --git a/.github/workflows/pr-check-changeset.yml b/.github/workflows/pr-check-changeset.yml
@@ -11,6 +11,9 @@ on:
   pull_request:
     types: [labeled, unlabeled, opened, synchronize, reopened]
 
+permissions:
+  pull-requests: read
+
 jobs:
   # When a PR has the changeset-required label, check if it has a changeset.
   changeset-required:

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
@@ -4,6 +4,9 @@ on:
     types: [opened, synchronize, reopened, labeled, unlabeled]
     branches: [main, next, release/*]
 
+permissions:
+  pull-requests: write
+
 jobs:
   areas_label:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
@@ -11,6 +11,9 @@ on:
       - next
       - release/*
 
+permissions:
+  pull-requests: write
+
 jobs:
   validate-codeowners:
     name: Validate CODEOWNERS

diff --git a/.github/workflows/stale-branches.yml b/.github/workflows/stale-branches.yml
@@ -4,6 +4,9 @@
 name: Delete Stale Branches
 on: workflow_dispatch
 
+permissions:
+  contents: write
+
 jobs:
   stale_branches:
     name: Cleanup old branches

diff --git a/.github/workflows/sync-branch.yml b/.github/workflows/sync-branch.yml
diff --git a/.github/workflows/website-validation.yml b/.github/workflows/website-validation.yml
@@ -9,6 +9,9 @@ defaults:
   run:
     working-directory: ./docs
 
+permissions:
+  pull-requests: read
+
 jobs:
 
   build_site:

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -334,6 +334,13 @@
 				"${fileDirname}/../../dist/**/*.js",
 				"${fileDirname}/../../../dist/**/*.js",
 				"${fileDirname}/../../../../dist/**/*.js",
+				// e2e tests load ESM modules since test-end-to-end-tests specifies "type": "module" in its package.json.
+				// This ensures that source maps are loaded for those files as well (e.g. so putting a breakpoint in
+				// containerRuntime.ts while debugging a test in test-end-to-end-tests works)
+				"${workspaceFolder}/**/lib/**/!(*.spec,*.test,*.tests).mjs",
+				"${fileDirname}/../../lib/**/*.mjs",
+				"${fileDirname}/../../../lib/**/*.mjs",
+				"${fileDirname}/../../../../lib/**/*.mjs",
 			],
 			"preLaunchTask": "Build Current Tests",
 			"internalConsoleOptions": "openOnSessionStart",

diff --git a/azure/packages/azure-client/package.json b/azure/packages/azure-client/package.json
@@ -106,10 +106,10 @@
 		"@fluidframework/driver-utils": "workspace:~",
 		"@fluidframework/fluid-static": "workspace:~",
 		"@fluidframework/map": "workspace:~",
-		"@fluidframework/protocol-definitions": "^3.1.0",
+		"@fluidframework/protocol-definitions": "^3.2.0-231454",
 		"@fluidframework/routerlicious-driver": "workspace:~",
 		"@fluidframework/runtime-utils": "workspace:~",
-		"@fluidframework/server-services-client": "^3.0.0",
+		"@fluidframework/server-services-client": "^3.1.0-231702",
 		"@fluidframework/telemetry-utils": "workspace:~",
 		"axios": "^1.6.2"
 	},
@@ -126,7 +126,7 @@
 		"@fluidframework/test-runtime-utils": "workspace:~",
 		"@fluidframework/test-utils": "workspace:~",
 		"@fluidframework/tree": "workspace:~",
-		"@microsoft/api-extractor": "^7.38.3",
+		"@microsoft/api-extractor": "^7.39.1",
 		"@types/mocha": "^9.1.1",
 		"@types/node": "^18.19.0",
 		"@types/uuid": "^9.0.2",