Merge branch 'main' into CLI

microsoft · Oct 31, 2024 · 59862d1 · 59862d1
2 parents 2f4ec4f + 8a833a6
commit 59862d1
Show file tree

Hide file tree

Showing 102 changed files with 981 additions and 799 deletions.
diff --git a/.changeset/floppy-forks-attack.md b/.changeset/floppy-forks-attack.md
@@ -0,0 +1,14 @@
+---
+"fluid-framework": minor
+"@fluidframework/tree": minor
+---
+---
+"section": tree
+---
+
+`TreeNodeSchemaClass` now specifies its `TNode` as `TreeNode`
+
+`TreeNodeSchemaClass`'s `TNode` parameter used to be `unknown` and was recently improved to be the more specific `TreeNode | TreeLeafValue`.
+This change further narrows this to `TreeNode`.
+
+`TreeNodeSchema`, which is more commonly used, still permits `TNode` of `TreeNode | TreeLeafValue`, so this change should have little impact on most code, but in some edge cases it can result in slightly more specific typing.
diff --git a/azure/packages/test/scenario-runner/package.json b/azure/packages/test/scenario-runner/package.json
@@ -86,7 +86,7 @@
 		"cross-env": "^7.0.3",
 		"js-yaml": "^4.1.0",
 		"mocha": "^10.2.0",
-		"sinon": "^17.0.1",
+		"sinon": "^18.0.1",
 		"start-server-and-test": "^2.0.3",
 		"tinylicious": "^5.0.0",
 		"uuid": "^9.0.0"

diff --git a/build-tools/package.json b/build-tools/package.json
@@ -11,28 +11,29 @@
 	"license": "MIT",
 	"author": "Microsoft and contributors",
 	"scripts": {
-		"build": "pnpm run generate:packageList && fluid-build --task build",
+		"build": "fluid-build --task build",
 		"build:compile": "fluid-build --task compile",
 		"build:docs": "fluid-build --task build:docs",
 		"build:fast": "fluid-build --worker",
 		"changelog": "conventional-changelog -p conventionalcommits -i CHANGELOG.md -s -r 2 --commit-path . -t build-tools_v --context lerna.json",
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",
+		"checks": "fluid-build --task checks",
 		"ci:build": "npm run build",
 		"ci:eslint": "fluid-build --task eslint",
 		"ci:test": "npm run test:mocha",
 		"ci:test:coverage": "npm run test:coverage",
-		"clean": "pnpm run -r --no-sort --stream clean && npm run clean:docs && npm run clean:nyc",
+		"clean": "fluid-build --task clean",
 		"clean:docs": "rimraf --glob \"**/_api-extractor-temp\"",
 		"clean:nyc": "rimraf --glob \"nyc/**\"",
 		"commit": "git-cz",
 		"format": "npm run format:biome",
 		"format:biome": "biome check --write .",
 		"generate:packageList": "concurrently \"npm:generate:packageList:*\"",
-		"generate:packageList:internal-build": "flub list --no-private -g build-tools --feed internal-build --outFile feeds/internal-build.txt",
-		"generate:packageList:internal-dev": "flub list --no-private -g build-tools --feed internal-dev --outFile feeds/internal-dev.txt",
-		"generate:packageList:internal-test": "flub list --no-private -g build-tools --feed internal-test --outFile feeds/internal-test.txt",
-		"generate:packageList:public": "flub list --no-private -g build-tools --feed public --outFile feeds/public.txt",
+		"generate:packageList:internal-build": "flub list build-tools --no-private --feed internal-build --outFile feeds/internal-build.txt",
+		"generate:packageList:internal-dev": "flub list build-tools --no-private --feed internal-dev --outFile feeds/internal-dev.txt",
+		"generate:packageList:internal-test": "flub list build-tools --no-private --feed internal-test --outFile feeds/internal-test.txt",
+		"generate:packageList:public": "flub list build-tools --no-private --feed public --outFile feeds/public.txt",
 		"preinstall": "node ../scripts/only-pnpm.cjs",
 		"install:commitlint": "npm install --global @commitlint/config-conventional",
 		"lint": "npm run syncpack:deps && npm run syncpack:versions && npm run check:format && npm run ci:eslint",
@@ -100,6 +101,36 @@
 	"dependenciesComments": {
 		"@fluidframework/build-tools": "Provides fluid-build which is used by the `build:fast` script. To allow this to work when the workspace version of build-tools has not been built yet, a prepackaged version is depended on. If this self-dependency becomes problematic, the `build` script can be used which does not require it."
 	},
+	"fluidBuild": {
+		"tasks": {
+			"build": {
+				"dependsOn": [
+					"^build",
+					"generate:packageList",
+					"syncpack:deps",
+					"syncpack:versions"
+				],
+				"script": false
+			},
+			"checks": {
+				"dependsOn": [
+					"check:format",
+					"generate:packageList",
+					"syncpack:deps",
+					"syncpack:versions"
+				],
+				"script": false
+			},
+			"clean": {
+				"dependsOn": [
+					"^clean",
+					"clean:docs",
+					"clean:nyc"
+				],
+				"script": false
+			}
+		}
+	},
 	"pnpm": {
 		"peerDependencyComments": [
 			"@types/node is a peer dependency because of build tools. The package is not needed because it's only used for compilation. It's not needed at runtime.",
@@ -132,12 +163,6 @@
 				"type-fest",
 				"typescript"
 			]
-		},
-		"patchedDependenciesComments": [
-			"jssm-viz is a dependency of jssm-viz-cli, but doesn't work with the latest jssm and TypeScript. This patch contains the changes from https://github.com/StoneCypher/jssm-viz/pull/54, which fixes the problem."
-		],
-		"patchedDependencies": {
-			"[email protected]": "patches/[email protected]"
 		}
 	}
 }
diff --git a/build-tools/packages/build-cli/package.json b/build-tools/packages/build-cli/package.json
@@ -32,8 +32,8 @@
 		"/oclif.manifest.json"
 	],
 	"scripts": {
-		"build": "concurrently npm:build:compile npm:lint && concurrently npm:build:docs npm:build:diagrams",
-		"build:compile": "npm run tsc && npm run build:test && npm run build:copy && npm run build:readme",
+		"build": "fluid-build --task build",
+		"build:compile": "fluid-build --task compile",
 		"build:copy": "copyfiles -u 1 \"src/**/*.fsl\" lib",
 		"build:diagrams": "jssm-viz -i \"./src/machines/*.fsl\"",
 		"build:docs": "api-extractor run --local",
@@ -171,7 +171,7 @@
 		"eslint-config-oclif": "^5.2.1",
 		"eslint-config-oclif-typescript": "^3.1.12",
 		"eslint-config-prettier": "~9.1.0",
-		"jssm-viz-cli": "5.101.0",
+		"jssm-viz-cli": "^5.101.0",
 		"mocha": "^10.7.3",
 		"mocha-multi-reporters": "^1.5.1",
 		"mocked-env": "^1.3.5",
@@ -185,7 +185,7 @@
 	},
 	"fluidBuild": {
 		"tasks": {
-			"compile": {
+			"build": {
 				"dependsOn": [
 					"...",
 					"build:diagrams"

diff --git a/build-tools/packages/build-infrastructure/package.json b/build-tools/packages/build-infrastructure/package.json
@@ -37,9 +37,9 @@
 		"/oclif.manifest.json"
 	],
 	"scripts": {
-		"build": "fluid-build . --task build",
+		"build": "fluid-build --task build",
 		"build:commonjs": "npm run tsc && npm run build:test",
-		"build:compile": "npm run build:commonjs",
+		"build:compile": "fluid-build --task compile",
 		"build:docs": "api-extractor run --local",
 		"build:esnext": "tsc --project ./tsconfig.json",
 		"build:manifest": "oclif manifest",

diff --git a/build-tools/packages/build-tools/package.json b/build-tools/packages/build-tools/package.json
@@ -18,9 +18,9 @@
 		"fluid-tsc": "bin/fluid-tsc"
 	},
 	"scripts": {
-		"build": "concurrently npm:build:compile npm:lint",
+		"build": "fluid-build --task build",
 		"build:commonjs": "npm run tsc && npm run build:test",
-		"build:compile": "npm run build:commonjs",
+		"build:compile": "fluid-build --task compile",
 		"build:test": "tsc --project ./src/test/tsconfig.json",
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",

diff --git a/build-tools/packages/bundle-size-tools/package.json b/build-tools/packages/bundle-size-tools/package.json
@@ -21,14 +21,14 @@
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"scripts": {
-		"build": "concurrently npm:build:compile npm:lint && npm run build:docs",
-		"build:compile": "concurrently npm:tsc npm:build:copy",
+		"build": "fluid-build --task build",
+		"build:compile": "fluid-build --task compile",
 		"build:copy": "copyfiles -u 1 \"src/**/*.fsl\" dist",
 		"build:docs": "api-extractor run --local",
 		"check:biome": "biome check .",
 		"check:format": "npm run check:biome",
 		"ci:build:docs": "api-extractor run",
-		"clean": "rimraf --glob dist \"*.tsbuildinfo\" _api-extractor-temp",
+		"clean": "rimraf --glob dist \"*.tsbuildinfo\" _api-extractor-temp \"*.build.log\"",
 		"compile": "fluid-build . --task compile",
 		"eslint": "eslint --format stylish src",
 		"eslint:fix": "eslint --format stylish src --fix",

diff --git a/build-tools/packages/version-tools/package.json b/build-tools/packages/version-tools/package.json
@@ -31,9 +31,9 @@
 		"/oclif.manifest.json"
 	],
 	"scripts": {
-		"build": "concurrently npm:build:compile npm:lint && npm run build:docs",
+		"build": "fluid-build --task build",
 		"build:commonjs": "npm run tsc && npm run build:test",
-		"build:compile": "npm run build:commonjs && npm run build:readme",
+		"build:compile": "fluid-build --task compile",
 		"build:docs": "api-extractor run --local",
 		"build:manifest": "oclif manifest",
 		"build:readme": "oclif readme --version 0.0.0",

diff --git a/build-tools/pnpm-lock.yaml b/build-tools/pnpm-lock.yaml
diff --git a/build-tools/syncpack.config.cjs b/build-tools/syncpack.config.cjs
@@ -72,7 +72,7 @@ module.exports = {
 
 		{
 			label: "Must use exact dependency ranges",
-			dependencies: ["jssm-viz-cli", "sort-package-json"],
+			dependencies: ["sort-package-json"],
 			packages: ["**"],
 			range: "",
 		},

diff --git a/common/lib/common-utils/package.json b/common/lib/common-utils/package.json
@@ -115,7 +115,7 @@
 		"puppeteer": "^23.6.0",
 		"rewire": "^5.0.0",
 		"rimraf": "^4.4.1",
-		"sinon": "^17.0.1",
+		"sinon": "^18.0.1",
 		"ts-jest": "^29.1.1",
 		"ts-node": "^10.9.1",
 		"typescript": "~5.4.5"