diff --git a/eslint.config.js b/eslint.config.js index 461563d6d..de79935f1 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -276,5 +276,11 @@ export default tseslint.config( rules: { 'tsdoc/syntax': 0 }, }, prettierRuleset, + { + rules: { + // Re-enable curly brace rule + curly: 2, + }, + }, // oxlintRuleset, ); diff --git a/packages/actions/package.json b/packages/actions/package.json index 789072458..bc0aac1fe 100644 --- a/packages/actions/package.json +++ b/packages/actions/package.json @@ -8,7 +8,7 @@ "test": "vitest run --config ../../vitest.config.ts", "build": "tsc --noEmit --lib ESNext,DOM && tsup", "lint": "prettier --check . && cross-env TIMING=1 eslint --format=pretty src __tests__", - "format": "prettier --write . && cross-env TIMING=1 eslint --fix --format=pretty src __tests__", + "format": "cross-env TIMING=1 eslint --fix --format=pretty src __tests__ && prettier --write .", "fmt": "pnpm run format" }, "type": "module", diff --git a/packages/brokers/package.json b/packages/brokers/package.json index 1bf1e48a7..406137915 100644 --- a/packages/brokers/package.json +++ b/packages/brokers/package.json @@ -8,7 +8,7 @@ "build": "tsc --noEmit --lib ESNext,DOM && tsup", "build:docs": "tsc -p tsconfig.docs.json --lib ESNext,DOM", "lint": "prettier --check . && cross-env TIMING=1 eslint --format=pretty src __tests__", - "format": "prettier --write . && cross-env TIMING=1 eslint --fix --format=pretty src __tests__", + "format": "cross-env TIMING=1 eslint --fix --format=pretty src __tests__ && prettier --write .", "fmt": "pnpm run format", "docs": "pnpm run build:docs && api-extractor run --local --minify && generate-split-documentation", "prepack": "pnpm run lint && pnpm run test && pnpm run build", diff --git a/packages/builders/package.json b/packages/builders/package.json index e2a1a1848..95010d518 100644 --- a/packages/builders/package.json +++ b/packages/builders/package.json @@ -8,7 +8,7 @@ "build": "tsc --noEmit && tsup", "build:docs": "tsc -p tsconfig.docs.json", "lint": "prettier --check . && cross-env TIMING=1 eslint --format=pretty src __tests__", - "format": "prettier --write . && cross-env TIMING=1 eslint --fix --format=pretty src __tests__", + "format": "cross-env TIMING=1 eslint --fix --format=pretty src __tests__ && prettier --write .", "fmt": "pnpm run format", "docs": "pnpm run build:docs && api-extractor run --local --minify && generate-split-documentation", "prepack": "pnpm run lint && pnpm run test && pnpm run build", diff --git a/packages/collection/package.json b/packages/collection/package.json index b82f2d3f3..a612cf133 100644 --- a/packages/collection/package.json +++ b/packages/collection/package.json @@ -8,7 +8,7 @@ "build": "tsc --noEmit && tsup", "build:docs": "tsc -p tsconfig.docs.json", "lint": "prettier --check . && cross-env TIMING=1 eslint --format=pretty src __tests__", - "format": "prettier --write . && cross-env TIMING=1 eslint --fix --format=pretty src __tests__", + "format": "cross-env TIMING=1 eslint --fix --format=pretty src __tests__ && prettier --write .", "fmt": "pnpm run format", "docs": "pnpm run build:docs && api-extractor run --local --minify && generate-split-documentation", "prepack": "pnpm run lint && pnpm run test && pnpm run build", diff --git a/packages/formatters/package.json b/packages/formatters/package.json index 8076678be..0f8d25655 100644 --- a/packages/formatters/package.json +++ b/packages/formatters/package.json @@ -8,7 +8,7 @@ "build": "tsc --noEmit && tsup", "build:docs": "tsc -p tsconfig.docs.json", "lint": "prettier --check . && cross-env TIMING=1 eslint --format=pretty src __tests__", - "format": "prettier --write . && cross-env TIMING=1 eslint --fix --format=pretty src __tests__", + "format": "cross-env TIMING=1 eslint --fix --format=pretty src __tests__ && prettier --write .", "docs": "pnpm run build:docs && api-extractor run --local --minify && generate-split-documentation", "prepack": "pnpm run build && pnpm run lint", "changelog": "git cliff --prepend ./CHANGELOG.md -u -c ./cliff.toml -r ../../ --include-path 'packages/formatters/*'", diff --git a/packages/next/package.json b/packages/next/package.json index 4af527c9a..ce58875fb 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -8,7 +8,7 @@ "build": "tsc --noEmit && tsup", "build:docs": "tsc -p tsconfig.docs.json", "lint": "prettier --check . && cross-env TIMING=1 eslint --format=pretty src __tests__", - "format": "prettier --write . && cross-env TIMING=1 eslint --fix --format=pretty src __tests__", + "format": "cross-env TIMING=1 eslint --fix --format=pretty src __tests__ && prettier --write .", "docs": "pnpm run build:docs && api-extractor run --local --minify && generate-split-documentation", "prepack": "pnpm run build && pnpm run lint", "changelog": "git cliff --prepend ./CHANGELOG.md -u -c ./cliff.toml -r ../../ --include-path 'packages/next/*'", diff --git a/packages/proxy/package.json b/packages/proxy/package.json index d4ea6d5d9..8a8209644 100644 --- a/packages/proxy/package.json +++ b/packages/proxy/package.json @@ -8,7 +8,7 @@ "build": "tsc --noEmit && tsup", "build:docs": "tsc -p tsconfig.docs.json", "lint": "prettier --check . && cross-env TIMING=1 eslint --format=pretty src __tests__", - "format": "prettier --write . && cross-env TIMING=1 eslint --fix --format=pretty src __tests__", + "format": "cross-env TIMING=1 eslint --fix --format=pretty src __tests__ && prettier --write .", "fmt": "pnpm run format", "docs": "pnpm run build:docs && api-extractor run --local --minify && generate-split-documentation", "prepack": "pnpm run lint && pnpm run test && pnpm run build", diff --git a/packages/rest/package.json b/packages/rest/package.json index 3a9f349aa..76cad202a 100644 --- a/packages/rest/package.json +++ b/packages/rest/package.json @@ -8,7 +8,7 @@ "build": "tsc --noEmit && tsup", "build:docs": "tsc -p tsconfig.docs.json", "lint": "prettier --check . && cross-env TIMING=1 eslint --format=pretty src __tests__", - "format": "prettier --write . && cross-env TIMING=1 eslint --fix --format=pretty src __tests__", + "format": "cross-env TIMING=1 eslint --fix --format=pretty src __tests__ && prettier --write .", "fmt": "pnpm run format", "docs": "pnpm run build:docs && api-extractor run --local --minify && generate-split-documentation", "prepack": "pnpm run lint && pnpm run test && pnpm run build", diff --git a/packages/voice/package.json b/packages/voice/package.json index 1865d73f4..9de2e1df2 100644 --- a/packages/voice/package.json +++ b/packages/voice/package.json @@ -8,7 +8,7 @@ "build:docs": "tsc -p tsconfig.docs.json", "test": "vitest run --config ../../vitest.config.ts", "lint": "prettier --check . && cross-env TIMING=1 eslint --format=pretty src __tests__", - "format": "prettier --write . && cross-env TIMING=1 eslint --fix --format=pretty src __tests__", + "format": "cross-env TIMING=1 eslint --fix --format=pretty src __tests__ && prettier --write .", "fmt": "pnpm run format", "docs": "pnpm run build:docs && api-extractor run --local --minify && generate-split-documentation", "prepack": "pnpm run lint && pnpm run test && pnpm run build", diff --git a/packages/ws/package.json b/packages/ws/package.json index c8ebb0549..cf6bfc0f5 100644 --- a/packages/ws/package.json +++ b/packages/ws/package.json @@ -8,7 +8,7 @@ "build": "tsc --noEmit && tsup", "build:docs": "tsc -p tsconfig.docs.json", "lint": "prettier --check . && cross-env TIMING=1 eslint --format=pretty src __tests__", - "format": "prettier --write . && cross-env TIMING=1 eslint --fix --format=pretty src __tests__", + "format": "cross-env TIMING=1 eslint --fix --format=pretty src __tests__ && prettier --write .", "docs": "pnpm run build:docs && api-extractor run --local --minify && generate-split-documentation", "prepack": "pnpm run build && pnpm run lint", "changelog": "git cliff --prepend ./CHANGELOG.md -u -c ./cliff.toml -r ../../ --include-path 'packages/ws/*'",