Skip to content

Commit

Permalink
Merge branch 'main' into test/tianzhu/add-ip
Browse files Browse the repository at this point in the history
* main: (36 commits)
  feat(tree): create refreshers during delta visit (#20303)
  Lint against import of @fluidframework/datastore in e2e tests (#20307)
  server: cover edge cases for scrubbed checkpoint users (#20259)
  refactor: Update dev dep on package 'start-server-and-test' (#20298)
  ci: Move templates out of the 1ES folder (#20056)
  Added unit tests to check usage of IRedisClientConnectionManager for Historian and Gitrest (#20306)
  build(test-snapshots): use node16 module resolution (#20233)
  Forbid import of @fluidframework/aqueduct in e2e tests (#20261)
  fix(tree): Make failure to provide id-compressor a usage error (#20282)
  fix(api-markdown-documenter): Reduce package version to correct next version (#20302)
  Added customization for gitrest and historian (#20243)
  fix(build-tools): mixed internal range detection (#18828)
  Removing 'paused session' path from SessionResult Metric (#20294)
  fix(fluid-build): limit Biome config tracking to repo (#20296)
  refactor: Update webpack-dev-server dependency (#20278)
  Create framework for safe rollout of back-compatible runtime document schema changes (#20174)
  Test enabling IdCompressor in RC2 (#20256)
  refactor(tree): Extract leaf schemas into their own module (#20289)
  build(client,build-tools): Upgrade biome to 1.6.2 (#20285)
  feat(build-cli): Add `modify fluid-imports` command (#20006)
  ...
  • Loading branch information
tianzhu007 committed Mar 25, 2024
2 parents 147c4f9 + c401449 commit f4f1a4d
Show file tree
Hide file tree
Showing 560 changed files with 9,548 additions and 8,011 deletions.
11 changes: 11 additions & 0 deletions .changeset/chatty-pears-doubt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
"@fluidframework/container-loader": minor
"@fluidframework/driver-base": minor
"@fluidframework/driver-definitions": minor
"@fluidframework/local-driver": minor
"@fluidframework/odsp-driver": minor
---

update submitSignal content type to string

Change IDocumentDeltaConnection.submitSignal's content argument type to string which represents actual/known use.
13 changes: 13 additions & 0 deletions .changeset/lazy-keys-sink.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
"fluid-framework": minor
"@fluidframework/fluid-static": minor
"@fluidframework/map": minor
"@fluidframework/shared-object-base": minor
"@fluidframework/tree": minor
---

Replace SharedObjectClass with new ISharedObjectKind type.

The static objects used as SharedObjectClass now explicitly implement the new ISharedObjectKind type.
SharedObjectClass has been removed as ISharedObjectKind now fills that role.
LoadableObjectCtor has been inlined as it only had one use: an external user of it can replace it with `(new (...args: any[]) => T)`.
10 changes: 10 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,16 @@
"type": "node",
"args": ["list", "--private", "-g", "build-tools", "-v"],
},
{
// Runs the `flub modify fluid-imports` command with a debugger attached.
"name": "flub modify fluid-imports",
"program": "${workspaceFolder}/build-tools/packages/build-cli/bin/dev.js",
"cwd": "${workspaceFolder}/packages/framework/aqueduct",
"request": "launch",
"skipFiles": ["<node_internals>/**"],
"type": "node",
"args": ["modify", "fluid-imports", "-v"],
},
{
// Runs the `flub generate upcoming` command with a debugger attached.
"name": "flub generate upcoming",
Expand Down
2 changes: 1 addition & 1 deletion azure/packages/azure-local-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"tinylicious": "^4.0.0"
},
"devDependencies": {
"@biomejs/biome": "^1.6.1",
"@biomejs/biome": "^1.6.2",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "^0.34.0",
"@fluidframework/eslint-config-fluid": "^5.1.0",
Expand Down
2 changes: 1 addition & 1 deletion azure/packages/azure-service-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.13.3",
"@biomejs/biome": "^1.6.1",
"@biomejs/biome": "^1.6.2",
"@fluid-tools/build-cli": "^0.34.0",
"@fluidframework/azure-service-utils-previous": "npm:@fluidframework/[email protected]",
"@fluidframework/build-common": "^2.0.3",
Expand Down
4 changes: 2 additions & 2 deletions azure/packages/test/scenario-runner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@
"js-yaml": "^4.1.0",
"mocha": "^10.2.0",
"sinon": "^17.0.1",
"start-server-and-test": "^1.11.7",
"start-server-and-test": "^2.0.3",
"tinylicious": "^4.0.0",
"uuid": "^9.0.0"
},
"devDependencies": {
"@biomejs/biome": "^1.6.1",
"@biomejs/biome": "^1.6.2",
"@fluid-tools/build-cli": "^0.34.0",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "^0.34.0",
Expand Down
5 changes: 3 additions & 2 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"**/localOdspSnapshots/**",
"**/_package.json",
"**/biome.jsonc",
"**/oclif.manifest.json"
"**/oclif.manifest.json",
"packages/test/snapshots/content/**"
],
"maxSize": 2097152
},
Expand Down Expand Up @@ -53,7 +54,7 @@
},
"overrides": [
{
"include": ["**/.vscode/*.json", "**/tsconfig*.json", "**/api-extractor*.json"],
"include": ["**/*.jsonc", "**/.vscode/*.json", "**/tsconfig*.json", "**/api-extractor*.json"],
"json": {
"parser": {
"allowComments": true,
Expand Down
6 changes: 3 additions & 3 deletions build-tools/biome.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"extends": ["../biome.json"],
"organizeImports": {
// TODO: Will be enabled in a separate change.
"enabled": false
"enabled": false,
},
"formatter": {
"enabled": true
}
"enabled": true,
},
}
2 changes: 1 addition & 1 deletion build-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"temp-directory": "nyc/.nyc_output"
},
"devDependencies": {
"@biomejs/biome": "^1.6.1",
"@biomejs/biome": "^1.6.2",
"@commitlint/cli": "^17.6.6",
"@commitlint/config-conventional": "^17.6.6",
"@commitlint/cz-commitlint": "^17.5.0",
Expand Down
3 changes: 3 additions & 0 deletions build-tools/packages/build-cli/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ module.exports = {
// In commands, destructuring is useful in some places but makes others less legible, so consistency isn't preferred.
"unicorn/consistent-destructuring": "off",

// This package is currently CJS-only.
"unicorn/prefer-module": "off",

// Deprecated in 2018: https://eslint.org/blog/2018/11/jsdoc-end-of-life/
"valid-jsdoc": "off",

Expand Down
1 change: 1 addition & 0 deletions build-tools/packages/build-cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ USAGE
* [`flub info`](docs/info.md) - Get info about the repo, release groups, and packages.
* [`flub list`](docs/list.md) - List packages in a release group in topological order.
* [`flub merge`](docs/merge.md) - Sync branches depending on the batch size passed
* [`flub modify`](docs/modify.md) - Modify commands are used to modify projects to add or remove dependencies, update Fluid imports, etc.
* [`flub release`](docs/release.md) - Release commands are used to manage the Fluid release process.
* [`flub rename-types`](docs/rename-types.md) - Renames type declaration files from .d.ts to .d.mts.
* [`flub run`](docs/run.md) - Generate a report from input bundle stats collected through the collect bundleStats command.
Expand Down
Loading

0 comments on commit f4f1a4d

Please sign in to comment.