Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
aa6a972
move eslint out
tylerbutler Mar 11, 2026
126daaa
catalogs
tylerbutler Mar 11, 2026
e1bc7e6
fix: address PR feedback
tylerbutler Mar 11, 2026
4888255
merge: integrate main into eslint-return-solo
tylerbutler Mar 16, 2026
d81f999
policy
tylerbutler Mar 16, 2026
7fc4f06
Merge branch 'main' into eslint-return-solo
tylerbutler Mar 16, 2026
75f6eb7
merge: resolve conflicts from main integration
tylerbutler Mar 17, 2026
b091e1c
fix: remove private flag from eslint-config-fluid
tylerbutler Mar 17, 2026
831f4b6
Merge branch 'main' into eslint-return-solo
tylerbutler Mar 19, 2026
295fe68
Merge branch 'main' into eslint-return-solo
tylerbutler Mar 19, 2026
38935af
lockfile
tylerbutler Mar 20, 2026
5f81635
Apply suggestion from @tylerbutler
tylerbutler Mar 20, 2026
a8eb878
Merge branch 'main' into eslint-return-solo
tylerbutler Mar 20, 2026
bc65f3b
clean script
tylerbutler Mar 20, 2026
b609990
fix syntax
tylerbutler Mar 20, 2026
08eb83f
revert
tylerbutler Mar 20, 2026
c0f5842
feedback
tylerbutler Mar 20, 2026
8047128
Merge branch 'main' into eslint-return-solo
tylerbutler Mar 23, 2026
3621049
fix(eslint-config-fluid): regenerate README with current package scripts
tylerbutler Mar 23, 2026
4b5f896
feedback
tylerbutler Mar 24, 2026
9e6ebc1
Merge branch 'main' into eslint-return-solo
tylerbutler Mar 24, 2026
c232c4c
lockfile
tylerbutler Mar 24, 2026
78742c0
Merge branch 'main' into eslint-return-solo
tylerbutler Mar 24, 2026
e2f679d
refactor: use catalog:eslint for eslint-config-fluid devDependency
tylerbutler Mar 24, 2026
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
2 changes: 1 addition & 1 deletion PACKAGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ The dependencies between layers are enforced by the layer-check command._

| Packages | Layer Dependencies |
| --- | --- |
| - [@fluidframework/build-common](/common/build/build-common)</br>- [@fluidframework/eslint-config-fluid](/common/build/eslint-config-fluid) (private)</br>- [@fluid-internal/eslint-plugin-fluid](/common/build/eslint-plugin-fluid)</br>- [@fluid-tools/benchmark](/tools/benchmark) | &nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp; |
| - [@fluidframework/build-common](/common/build/build-common)</br>- [@fluidframework/eslint-config-fluid](/common/build/eslint-config-fluid)</br>- [@fluid-internal/eslint-plugin-fluid](/common/build/eslint-plugin-fluid)</br>- [@fluid-tools/benchmark](/tools/benchmark) | &nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp; |

### AzureClient

Expand Down
6 changes: 3 additions & 3 deletions azure/packages/azure-local-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
"@biomejs/biome": "~2.4.5",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"eslint": "~9.39.1",
"eslint-config-prettier": "~10.1.8",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"eslint": "catalog:eslint",
"eslint-config-prettier": "catalog:eslint",
"jiti": "^2.6.1",
"pm2": "^5.4.2",
"rimraf": "^6.1.3"
Expand Down
6 changes: 3 additions & 3 deletions azure/packages/azure-service-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@
"@fluidframework/azure-service-utils-previous": "npm:@fluidframework/azure-service-utils@2.83.0",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@microsoft/api-extractor": "7.52.11",
"@types/jsrsasign": "^10.5.12",
"concurrently": "^9.2.1",
"copyfiles": "^2.4.1",
"eslint": "~9.39.1",
"eslint-config-prettier": "~10.1.8",
"eslint": "catalog:eslint",
"eslint-config-prettier": "catalog:eslint",
"jiti": "^2.6.1",
"rimraf": "^6.1.3",
"typescript": "~5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion common/build/eslint-config-fluid/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ a diff to review as part of a PR -- just like we do with API reports for code ch
|--------|-------------|
| `build` | `npm run print-config` |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pre-existing: build does npm run print-configs && npm run prettier

| `build:readme:disabled` | `markdown-magic --files "**/*.md"` |
| `clean` | `rimraf --glob dist` |
| `clean` | `rimraf --glob dist "**/*.build.log"` |
| `format` | `npm run prettier:fix` |
| `prettier` | `prettier --check .` |
| `prettier:fix` | `prettier --write .` |
Expand Down
6 changes: 1 addition & 5 deletions common/build/eslint-config-fluid/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@fluidframework/eslint-config-fluid",
"version": "2.92.0",
"private": true,
"version": "9.0.0",
"description": "Shareable ESLint config for the Fluid Framework",
"homepage": "https://fluidframework.com",
"repository": {
Expand Down Expand Up @@ -99,8 +98,5 @@
"esbuild",
"unrs-resolver"
]
},
"typeValidation": {
"disabled": true
}
}
4 changes: 2 additions & 2 deletions examples/apps/blobs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@
"@fluid-tools/build-cli": "catalog:buildTools",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
"@types/node": "~20.19.30",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"html-webpack-plugin": "^5.6.0",
"jest": "^29.6.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/apps/collaborative-textarea/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@fluid-tools/build-cli": "catalog:buildTools",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@fluidframework/test-utils": "workspace:~",
"@types/jest": "29.5.3",
Expand All @@ -70,7 +70,7 @@
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"html-webpack-plugin": "^5.6.0",
"jest": "^29.6.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/apps/contact-collection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
"@fluid-tools/build-cli": "catalog:buildTools",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
"@types/node": "~20.19.30",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"html-webpack-plugin": "^5.6.0",
"jest": "^29.6.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/apps/data-object-grid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@fluid-tools/build-cli": "catalog:buildTools",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
Expand All @@ -79,7 +79,7 @@
"copyfiles": "^2.4.1",
"cross-env": "^10.1.0",
"css-loader": "^7.1.2",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"html-loader": "^5.1.0",
"html-webpack-plugin": "^5.6.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/apps/diceroller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@
"@fluid-tools/build-cli": "catalog:buildTools",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
"@types/node": "~20.19.30",
"@types/react": "^18.3.11",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"html-webpack-plugin": "^5.6.0",
"jest": "^29.6.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/apps/presence-tracker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@
"@fluid-tools/build-cli": "catalog:buildTools",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
"@types/node": "~20.19.30",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"html-webpack-plugin": "^5.6.0",
"jest": "^29.6.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/apps/staging/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@fluid-tools/build-cli": "catalog:buildTools",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
Expand All @@ -70,7 +70,7 @@
"@types/react-dom": "^18.3.0",
"cross-env": "^10.1.0",
"css-loader": "^7.1.2",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"html-webpack-plugin": "^5.6.0",
"jest": "^29.6.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/apps/task-selection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
"@fluid-tools/build-cli": "catalog:buildTools",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
"@types/node": "~20.19.30",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"html-webpack-plugin": "^5.6.0",
"jest": "^29.6.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/apps/tree-cli-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
"@biomejs/biome": "~2.4.5",
"@fluid-internal/mocha-test-setup": "workspace:~",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@types/mocha": "^10.0.10",
"@types/node": "~20.19.30",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"jiti": "^2.6.1",
"mocha": "^11.7.5",
"mocha-multi-reporters": "^1.5.1",
Expand Down
4 changes: 2 additions & 2 deletions examples/apps/tree-comparison/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"@fluid-tools/build-cli": "catalog:buildTools",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
Expand All @@ -71,7 +71,7 @@
"@types/react-dom": "^18.3.0",
"cross-env": "^10.1.0",
"css-loader": "^7.1.2",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"html-webpack-plugin": "^5.6.0",
"jest": "^29.6.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/benchmarks/bubblebench/baseline/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
"@fluid-example/webpack-fluid-loader": "workspace:~",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
"@types/react": "^18.3.11",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"jest": "^29.6.2",
"jest-environment-puppeteer": "^10.1.3",
Expand Down
4 changes: 2 additions & 2 deletions examples/benchmarks/bubblebench/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
"@fluid-tools/build-cli": "catalog:buildTools",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"jiti": "^2.6.1",
"rimraf": "^6.1.3",
"typescript": "~5.4.5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
"@fluid-example/webpack-fluid-loader": "workspace:~",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
"@types/node": "~20.19.30",
"@types/react": "^18.3.11",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"jest": "^29.6.2",
"jest-environment-puppeteer": "^10.1.3",
Expand Down
4 changes: 2 additions & 2 deletions examples/benchmarks/bubblebench/ot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@
"@fluid-example/webpack-fluid-loader": "workspace:~",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
"@types/node": "~20.19.30",
"@types/react": "^18.3.11",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"jest": "^29.6.2",
"jest-environment-puppeteer": "^10.1.3",
Expand Down
4 changes: 2 additions & 2 deletions examples/benchmarks/bubblebench/shared-tree/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@
"@fluid-example/webpack-fluid-loader": "workspace:~",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
"@types/node": "~20.19.30",
"@types/react": "^18.3.11",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"jest": "^29.6.2",
"jest-environment-puppeteer": "^10.1.3",
Expand Down
4 changes: 2 additions & 2 deletions examples/benchmarks/tablebench/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@
"@fluid-tools/benchmark": "^0.52.0",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/id-compressor": "workspace:~",
"@types/mocha": "^10.0.10",
"@types/node": "~20.19.30",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"jiti": "^2.6.1",
"mocha": "^11.7.5",
"mocha-multi-reporters": "^1.5.1",
Expand Down
6 changes: 3 additions & 3 deletions examples/client-logger/app-insights-logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@biomejs/biome": "~2.4.5",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^16.3.0",
Expand All @@ -66,8 +66,8 @@
"@types/react-dom": "^18.3.0",
"@types/testing-library__jest-dom": "^5.14.5",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint-config-prettier": "~10.1.8",
"eslint": "catalog:eslint",
"eslint-config-prettier": "catalog:eslint",
"eslint-plugin-jest": "~29.5.0",
"eslint-plugin-react": "~7.37.5",
"eslint-plugin-react-hooks": "~7.0.1",
Expand Down
4 changes: 2 additions & 2 deletions examples/data-objects/canvas/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@
"@fluid-example/webpack-fluid-loader": "workspace:~",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
"@types/node": "~20.19.30",
"@types/react": "^18.3.11",
"cross-env": "^10.1.0",
"css-loader": "^7.1.2",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"jest": "^29.6.2",
"jest-environment-puppeteer": "^10.1.3",
Expand Down
4 changes: 2 additions & 2 deletions examples/data-objects/clicker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@
"@fluid-example/webpack-fluid-loader": "workspace:~",
"@fluidframework/build-common": "^2.0.3",
"@fluidframework/build-tools": "catalog:buildTools",
"@fluidframework/eslint-config-fluid": "workspace:~",
"@fluidframework/eslint-config-fluid": "catalog:eslint",
"@fluidframework/test-tools": "^2.0.0",
"@fluidframework/test-utils": "workspace:~",
"@types/jest": "29.5.3",
"@types/jest-environment-puppeteer": "workspace:~",
"@types/node": "~20.19.30",
"@types/react": "^18.3.11",
"cross-env": "^10.1.0",
"eslint": "~9.39.1",
"eslint": "catalog:eslint",
"expect-puppeteer": "^9.0.2",
"jest": "^29.6.2",
"jest-environment-puppeteer": "^10.1.3",
Expand Down
Loading
Loading