Skip to content
Draft
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 15 additions & 2 deletions azure/packages/azure-local-service/biome.jsonc
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
{
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
"extends": ["../../../biome.jsonc"]
"root": false,
"overrides": [
{
"includes": ["**/.vscode/**/*.json", "**/tsconfig*.json"],
"json": {
"parser": {
"allowComments": true,
"allowTrailingCommas": true
},
"formatter": {
"trailingCommas": "all"
}
}
}
]
}
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 @@ -31,7 +31,7 @@
"tinylicious": "^7.0.0"
},
"devDependencies": {
"@biomejs/biome": "~1.9.3",
"@biomejs/biome": "~2.3.8",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "^0.60.0",
"@fluidframework/eslint-config-fluid": "workspace:~",
Expand Down
17 changes: 15 additions & 2 deletions azure/packages/azure-service-utils/biome.jsonc
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
{
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
"extends": ["../../../biome.jsonc"]
"root": false,
"overrides": [
{
"includes": ["**/.vscode/**/*.json", "**/tsconfig*.json"],
"json": {
"parser": {
"allowComments": true,
"allowTrailingCommas": true
},
"formatter": {
"trailingCommas": "all"
}
}
}
]
}
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 @@ -93,7 +93,7 @@
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.17.1",
"@biomejs/biome": "~1.9.3",
"@biomejs/biome": "~2.3.8",
"@fluid-tools/build-cli": "^0.60.0",
"@fluidframework/azure-service-utils-previous": "npm:@fluidframework/[email protected]",
"@fluidframework/build-common": "^2.0.3",
Expand Down
204 changes: 74 additions & 130 deletions biome.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -10,118 +10,76 @@
"files": {
"ignoreUnknown": true,

"ignore": [
// Build output
"**/dist/*",
"**/lib/*",
"examples/**/build/*",
"**/*.done.build.log",
"**/.next", // NextJS

// test collateral
"**/_package.json",
"**/fluid-runner/src/test/localOdspSnapshots/**",
"**/fluid-runner/src/test/telemetryExpectedOutputs/**",
"**/snapshots/*.json",
"**/snapshots/content",

// Generated files
"**/src/**/test/types/*.generated.ts",
"**/src/packageVersion.ts",
"**/src/layerGenerationState.ts",

// Dependencies
"**/node_modules/*",

// Used by API-Extractor
"**/_api-extractor-temp/*",
"**/api-report/*",
"**/*.api.md",

// Templates
".changeset/templates/",
"*.hbs",

// Test json
"build-tools/packages/build-tools/src/test/data/biome/empty.jsonc",
"experimental/dds/tree/src/test/documents/**",
"packages/dds/map/src/test/mocha/snapshots/**/*.json",
"packages/dds/matrix/src/test/results/**/*.json",
"packages/dds/merge-tree/src/test/literature/*.txt",
"packages/dds/merge-tree/src/test/results/*.json",
"packages/dds/sequence/src/test/snapshots/**/*.json",
"packages/dds/sequence/src/test/results/**/*.json",
"packages/dds/sequence/src/test/fuzz/**/*.json",
"packages/dds/tree/src/test/snapshots/**/*.json",
"packages/dds/tree/src/test/shared-tree/fuzz/failures/**/*.json",
"packages/drivers/odsp-driver/src/test/**/*.json",
"packages/framework/attributor/src/test/attribution/documents/**/*.json",
"packages/test/snapshots/content/**",
"packages/tools/fluid-runner/src/test/localOdspSnapshots/**",
"packages/tools/fluid-runner/src/test/telemetryExpectedOutputs/**",
"tools/api-markdown-documenter/src/test/snapshots/**",
// TODO: why does examples/apps/tree-cli-app/*.json not work?
"**/data/*.json",

// Generated type-tests
"**/*.generated.ts",

// Generated bundle analysis files
"**/bundleAnalysis/**",

// Generated oclif manifest files
"**/oclif.manifest.json",

// es5 build output
"packages/framework/data-object-base/es5",

// Test coverage reports
"**/coverage/*",
"**/nyc/*",

// Git configuration file
".git-blame-ignore-revs",

// Generated by policy-check
"**/assertionShortCodesMap.ts",

// These are actually templates, not pure YAML files
"**/templates/*.yaml",

// These files are auto-generated according to the comments in the files
"**/charts/**/Chart.yaml",

// Reports generated by dependency-cruiser
"**/.dependency-cruiser-known-violations.json",

// Reports generated by our benchmark tests
".timeTestsOutput/**",
".memoryTestsOutput/**",
".customBenchmarksOutput/**",

// The paths below are not formatted by Biome. We ignore them explicitly so other tools that read this ignore
// list, like fluid-build, know to ignore these files as well.
"**/*.md",
"**/.gitignore",
"**/.npmignore",
"**/LICENSE",
"**/.changeset/**",

// Paths below are outside the client release group and aren't configured for biome.
"common/build/**",
"common/lib/**",
"docs/**",
"server/**",
"tools/benchmark/**",
"tools/getkeys/**",
"tools/pipelines/**",
"tools/test-tools/**"
"includes": [
"**",
"!**/dist/**/*",
"!**/lib/**/*",
"!**/examples/**/build/**/*",
"!**/*.done.build.log",
"!**/.next",
"!**/_package.json",
"!**/fluid-runner/src/test/localOdspSnapshots/**",
"!**/fluid-runner/src/test/telemetryExpectedOutputs/**",
"!**/snapshots/**/*.json",
"!**/snapshots/content",
"!**/src/**/test/types/**/*.generated.ts",
"!**/src/packageVersion.ts",
"!**/src/layerGenerationState.ts",
"!**/node_modules/**/*",
"!**/_api-extractor-temp/**/*",
"!**/api-report/**/*",
"!**/*.api.md",
"!**/.changeset/templates/",
"!**/*.hbs",
"!**/build-tools/packages/build-tools/src/test/data/biome/empty.jsonc",
"!**/experimental/dds/tree/src/test/documents/**",
"!**/packages/dds/map/src/test/mocha/snapshots/**/*.json",
"!**/packages/dds/matrix/src/test/results/**/*.json",
"!**/packages/dds/merge-tree/src/test/literature/**/*.txt",
"!**/packages/dds/merge-tree/src/test/results/**/*.json",
"!**/packages/dds/sequence/src/test/snapshots/**/*.json",
"!**/packages/dds/sequence/src/test/results/**/*.json",
"!**/packages/dds/sequence/src/test/fuzz/**/*.json",
"!**/packages/dds/tree/src/test/snapshots/**/*.json",
"!**/packages/dds/tree/src/test/shared-tree/fuzz/failures/**/*.json",
"!**/packages/drivers/odsp-driver/src/test/**/*.json",
"!**/packages/framework/attributor/src/test/attribution/documents/**/*.json",
"!**/packages/test/snapshots/content/**",
"!**/packages/tools/fluid-runner/src/test/localOdspSnapshots/**",
"!**/packages/tools/fluid-runner/src/test/telemetryExpectedOutputs/**",
"!**/tools/api-markdown-documenter/src/test/snapshots/**",
"!**/data/**/*.json",
"!**/*.generated.ts",
"!**/bundleAnalysis/**",
"!**/oclif.manifest.json",
"!**/packages/framework/data-object-base/es5",
"!**/coverage/**/*",
"!**/nyc/**/*",
"!**/.git-blame-ignore-revs",
"!**/assertionShortCodesMap.ts",
"!**/templates/**/*.yaml",
"!**/charts/**/Chart.yaml",
"!**/.dependency-cruiser-known-violations.json",
"!**/.timeTestsOutput/**",
"!**/.memoryTestsOutput/**",
"!**/.customBenchmarksOutput/**",
"!**/*.md",
"!**/.gitignore",
"!**/.npmignore",
"!**/LICENSE",
"!**/.changeset/**",
"!**/common/build/**",
"!**/common/lib/**",
"!**/docs/**",
"!**/server/**",
"!**/tools/benchmark/**",
"!**/tools/getkeys/**",
"!**/tools/pipelines/**",
"!**/tools/test-tools/**"
],
"maxSize": 2097152
},
"organizeImports": {
"enabled": false
},
"assist": { "actions": { "source": { "organizeImports": "off" } } },
"linter": {
"enabled": false,
"rules": {
Expand All @@ -130,10 +88,10 @@
},
"formatter": {
"enabled": true,
"ignore": ["**/dist/**", "**/lib/**"],
"includes": ["**", "!**/dist/**", "!**/lib/**"],
"formatWithErrors": true,
"indentStyle": "tab",
"lineWidth": 95,
"lineWidth": 120,
"lineEnding": "lf"
},
"javascript": {
Expand All @@ -160,7 +118,7 @@
// of the repo.
//
// This configuration should be kept up-to-date with the settings in `experimental/dds/tree/biome.jsonc`.
"include": ["experimental/dds/tree/**"],
"includes": ["**/experimental/dds/tree/**"],
"formatter": {
"lineWidth": 120
},
Expand All @@ -179,20 +137,12 @@
// format them conservatively without trailing commas.
//
// See also: https://github.com/microsoft/vscode/issues/102061
"include": [
"includes": [
"**/*.jsonc",

// Tools reading api-extractor config files do not consistently support trailing commas.
"**/api-extractor*.json",

// Tools reading tsdoc config files do not consistently support trailing commas.
"**/tsdoc*.json",

// fence.json files don't support trailing commas
"**/fence.json",

// These files contain comments, but are not JSONC files
"tools/api-markdown-documenter/src/**/test/test-data/**"
"**/tools/api-markdown-documenter/src/**/test/test-data/**"
],
"json": {
"parser": {
Expand All @@ -207,13 +157,7 @@
{
// JSONC WITH TRAILING COMMAS
// These JSONC files are known to support trailing commas.
"include": [
// vscode config files all support trailing commas.
"**/.vscode/*.json",

// tsconfig files support trailing commas.
"**/tsconfig*.json"
],
"includes": ["**/.vscode/**/*.json", "**/tsconfig*.json"],
"json": {
"parser": {
"allowComments": true,
Expand All @@ -228,7 +172,7 @@
// PACKAGE.JSON
// These settings are used to format package.json files in the way npm itself does, with the exception of using
// tabs instead of spaces.
"include": ["**/package.json"],
"includes": ["**/package.json"],
"json": {
"formatter": {
"lineWidth": 1
Expand Down
36 changes: 31 additions & 5 deletions build-tools/biome.jsonc
Original file line number Diff line number Diff line change
@@ -1,13 +1,39 @@
{
"root": false,
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
"extends": ["../biome.jsonc"],
"organizeImports": {
"enabled": true
"assist": {
"actions": {
"source": {
"organizeImports": "on"
}
}
},
"formatter": {
"enabled": true
},
"files": {
"ignore": ["packages/build-tools/src/test/data/biome/empty.jsonc"]
}
"includes": [
"**",
"!**/packages/build-tools/src/test/data/biome/empty.jsonc"
]
},
"overrides": [
{
"includes": [
"**/.vscode/**/*.json",
"**/tsconfig*.json",
"**/api-extractor*.json",
"**/tsdoc*.json"
],
"json": {
"parser": {
"allowComments": true,
"allowTrailingCommas": true
},
"formatter": {
"trailingCommas": "all"
}
}
}
]
}
6 changes: 3 additions & 3 deletions build-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"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",
"check:biome": "biome check .",
"check:biome": "biome format .",
"check:format": "npm run check:biome",
"checks": "fluid-build --task checks",
"ci:build": "npm run build",
Expand All @@ -28,7 +28,7 @@
"clean:nyc": "rimraf --glob \"nyc/**\"",
"commit": "git-cz",
"format": "npm run format:biome",
"format:biome": "biome check --write .",
"format:biome": "biome format --write .",
"generate:packageList": "concurrently \"npm:generate:packageList:*\"",
"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",
Expand Down Expand Up @@ -71,7 +71,7 @@
"temp-directory": "nyc/.nyc_output"
},
"devDependencies": {
"@biomejs/biome": "~1.9.4",
"@biomejs/biome": "~2.3.8",
"@commitlint/cli": "^20.1.0",
"@commitlint/config-conventional": "^20.0.0",
"@commitlint/cz-commitlint": "^20.1.0",
Expand Down
Loading
Loading