From 58328e193fd5c67d381aaef08854c5c476e0fc23 Mon Sep 17 00:00:00 2001 From: Drew Davis Date: Wed, 18 Nov 2026 20:24:26 -0500 Subject: [PATCH 1/2] ci: Migrate to oxfmt --- .claude/skills/refactor-component/SKILL.md | 2 +- .github/workflows/docker-build.yml | 3 +- .oxfmtrc.json | 19 ++ .prettierignore | 8 - .prettierrc | 11 - .vscode/extensions.json | 3 +- .vscode/settings.json | 8 +- agent_docs/architecture.md | 3 +- agent_docs/development.md | 2 +- docker/hyperdx/Dockerfile | 2 +- nx.json | 3 +- package.json | 10 +- packages/api/Dockerfile | 2 +- packages/api/package.json | 4 +- packages/api/scripts/seed-alerts.ts | 4 +- packages/api/src/models/savedSearch.ts | 6 +- packages/app/.prettierignore | 5 - packages/app/Dockerfile | 2 +- packages/app/instrumentation.ts | 5 +- packages/app/package.json | 6 +- packages/app/src/DBDashboardImportPage.tsx | 4 +- packages/app/src/DBDashboardPage.tsx | 3 +- packages/app/src/DBSearchPage.tsx | 3 +- .../useAdhocFilterOptions.ts | 70 +++-- .../InlineNameInput/InlineNameInput.tsx | 11 +- .../app/src/components/InputControlled.tsx | 18 +- .../Sources/SourceForm/SourceForm.tsx | 8 +- .../hooks/useFetchMetricAttributeValues.tsx | 16 +- .../app/src/hooks/useFetchMetricMetadata.tsx | 10 +- .../src/hooks/useFetchMetricResourceAttrs.tsx | 10 +- .../hooks/useMVOptimizationExplanation.tsx | 4 +- packages/app/src/hooks/useMetricCatalog.ts | 14 +- packages/app/stylelint.config.mjs | 2 +- packages/app/styles/Home.module.css | 5 +- packages/cli/package.json | 2 +- packages/cli/src/__tests__/sourcemaps.test.ts | 6 +- packages/common-utils/package.json | 4 +- packages/common-utils/src/core/metadata.ts | 7 +- packages/hdx-eval/package.json | 4 +- .../service-health-check/generate.ts | 9 +- yarn.lock | 261 +++++++++++++++--- 41 files changed, 374 insertions(+), 205 deletions(-) create mode 100644 .oxfmtrc.json delete mode 100644 .prettierignore delete mode 100644 .prettierrc delete mode 100644 packages/app/.prettierignore diff --git a/.claude/skills/refactor-component/SKILL.md b/.claude/skills/refactor-component/SKILL.md index 28788a39b3..fcbfd6a101 100644 --- a/.claude/skills/refactor-component/SKILL.md +++ b/.claude/skills/refactor-component/SKILL.md @@ -178,7 +178,7 @@ cd packages/app && yarn ci:unit # Unit tests (or the appropriate package) make e2e # E2E tests — re-run the same tests from step 1 to catch regressions ``` -If lint fails with import-sort or formatting errors, run `npx oxlint --fix ` and `npx prettier --write ` from the package directory and re-check. If there are unused-import warnings, remove the unused imports manually. +If lint fails with import-sort or formatting errors, run `npx oxlint --fix ` and `npx oxfmt ` from the package directory and re-check. If there are unused-import warnings, remove the unused imports manually. If an E2E test fails, investigate whether the failure is related to the refactoring (e.g. a broken import path at runtime) or a pre-existing flake. Fix refactoring-related failures before presenting the result. The E2E tests identified in step 1 are the most important — if those pass, the refactor is safe. diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 513261b0d1..9e578208d3 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -104,8 +104,7 @@ jobs: yarn.lock .yarn/** .yarnrc.yml - .prettierrc - .prettierignore + .oxfmtrc.json tsconfig.base.json nx.json - name: Setup Docker Buildx diff --git a/.oxfmtrc.json b/.oxfmtrc.json new file mode 100644 index 0000000000..6ea3445153 --- /dev/null +++ b/.oxfmtrc.json @@ -0,0 +1,19 @@ +{ + "$schema": "./node_modules/oxfmt/configuration_schema.json", + "printWidth": 80, + "tabWidth": 2, + "useTabs": false, + "semi": true, + "singleQuote": true, + "trailingComma": "all", + "bracketSpacing": true, + "arrowParens": "avoid", + "proseWrap": "always", + "sortPackageJson": false, + "ignorePatterns": [ + "dist", + "coverage", + ".volumes", + "packages/api/openapi.json" + ] +} diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index 1d502b5d15..0000000000 --- a/.prettierignore +++ /dev/null @@ -1,8 +0,0 @@ -# Ignore artifacts: -dist -coverage -.volumes - -# docgen serialises with JSON.stringify; prettier would reformat ~1400 lines and -# the two would fight, leaving check-openapi-sync.sh permanently red. -packages/api/openapi.json diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 30b5a54251..0000000000 --- a/.prettierrc +++ /dev/null @@ -1,11 +0,0 @@ -{ - "printWidth": 80, - "tabWidth": 2, - "useTabs": false, - "semi": true, - "singleQuote": true, - "trailingComma": "all", - "bracketSpacing": true, - "arrowParens": "avoid", - "proseWrap": "always" -} diff --git a/.vscode/extensions.json b/.vscode/extensions.json index c0945d6142..46cd898190 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -4,7 +4,6 @@ "clinyong.vscode-css-modules", "streetsidesoftware.code-spell-checker", "oxc.oxc-vscode", - "stylelint.vscode-stylelint", - "esbenp.prettier-vscode" + "stylelint.vscode-stylelint" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 43789f5da6..373f7f65fb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,16 +8,16 @@ "source.fixAll.stylelint": "always" }, "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "oxc.oxc-vscode" }, "[typescriptreact]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "oxc.oxc-vscode" }, "[scss]": { - "editor.defaultFormatter": "stylelint.vscode-stylelint" + "editor.defaultFormatter": "oxc.oxc-vscode" }, "[css]": { - "editor.defaultFormatter": "stylelint.vscode-stylelint" + "editor.defaultFormatter": "oxc.oxc-vscode" }, "stylelint.validate": ["css", "postcss", "scss"], "cssVariables.lookupFiles": [ diff --git a/agent_docs/architecture.md b/agent_docs/architecture.md index b42eaebe5d..7bf65bd4e7 100644 --- a/agent_docs/architecture.md +++ b/agent_docs/architecture.md @@ -70,7 +70,8 @@ the OpenAPI spec and `yarn lint:openapi` to validate it. `scripts/ci/check-openapi-sync.sh` (run by `make ci-lint` and by CI) fails if the committed spec is stale. `swaggerOptions` in `src/utils/swagger.ts` is also an -input, and the spec is in `.prettierignore` because docgen owns its formatting. +input, and the spec is in `ignorePatterns` in `.oxfmtrc.json` because docgen owns +its formatting. ### MCP Server (`src/mcp/`) diff --git a/agent_docs/development.md b/agent_docs/development.md index 71fe4e4d03..24518b2344 100644 --- a/agent_docs/development.md +++ b/agent_docs/development.md @@ -268,7 +268,7 @@ does not overlap with CI integration tests (14320-40098) or the dev stack The project uses Husky + lint-staged to automatically run: -- Prettier for formatting +- oxfmt for formatting (`.oxfmtrc.json`) - oxlint for linting (each file with its package's `.oxlintrc.json`) - API doc generation (for external API changes) diff --git a/docker/hyperdx/Dockerfile b/docker/hyperdx/Dockerfile index 87f4783c47..4c80ac6d8d 100644 --- a/docker/hyperdx/Dockerfile +++ b/docker/hyperdx/Dockerfile @@ -48,7 +48,7 @@ FROM node:${NODE_VERSION}-alpine AS node_base WORKDIR /app COPY .yarn ./.yarn -COPY .yarnrc.yml yarn.lock package.json nx.json .prettierrc .prettierignore ./tsconfig.base.json ./ +COPY .yarnrc.yml yarn.lock package.json nx.json .oxfmtrc.json ./tsconfig.base.json ./ # Only copy package.json for workspace resolution during yarn install; # full source is copied in the build stages that need it. COPY ./packages/common-utils/package.json ./packages/common-utils/package.json diff --git a/nx.json b/nx.json index 547da0624a..5766be1917 100644 --- a/nx.json +++ b/nx.json @@ -81,8 +81,7 @@ ], "sharedGlobals": [ "{workspaceRoot}/tsconfig.base.json", - "{workspaceRoot}/.prettierrc", - "{workspaceRoot}/.prettierignore", + "{workspaceRoot}/.oxfmtrc.json", "{workspaceRoot}/package.json", "{workspaceRoot}/yarn.lock", "{workspaceRoot}/.nvmrc" diff --git a/package.json b/package.json index 6752e6a87e..8f0c5dfcbe 100644 --- a/package.json +++ b/package.json @@ -27,10 +27,10 @@ "knip": "^6.19.0", "lint-staged": "^13.1.2", "nx": "23.3.2", + "oxfmt": "^0.78.0", "oxlint": "^1.92.0", "oxlint-plugin-eslint": "^1.93.0", "oxlint-tsgolint": "^7.0.2006", - "prettier": "3.3.3", "tslib": "^2.6.0" }, "scripts": { @@ -60,16 +60,16 @@ }, "lint-staged": { "packages/api/src/{routers/external-api/**/*.ts,utils/swagger.ts}": [ - "prettier --write --ignore-unknown", + "oxfmt --no-error-on-unmatched-pattern", "node scripts/ci/oxlint-warnings.mjs --staged --fix", "sh -c 'cd packages/api && yarn run lint:openapi && git add openapi.json'" ], "**/*.{ts,tsx}": [ - "prettier --write --ignore-unknown", + "oxfmt --no-error-on-unmatched-pattern", "node scripts/ci/oxlint-warnings.mjs --staged --fix" ], - "**/*.{mdx,json,yml}": [ - "prettier --write --ignore-unknown" + "**/*.{mdx,json,yml,css,scss}": [ + "oxfmt --no-error-on-unmatched-pattern" ] }, "packageManager": "yarn@4.13.0", diff --git a/packages/api/Dockerfile b/packages/api/Dockerfile index d692d04079..31a23cc9b1 100644 --- a/packages/api/Dockerfile +++ b/packages/api/Dockerfile @@ -4,7 +4,7 @@ FROM node:22.23.4-alpine AS base WORKDIR /app COPY .yarn ./.yarn -COPY .yarnrc.yml yarn.lock package.json nx.json .prettierrc .prettierignore ./tsconfig.base.json ./ +COPY .yarnrc.yml yarn.lock package.json nx.json .oxfmtrc.json ./tsconfig.base.json ./ # Only copy package.json for workspace resolution during yarn install; # full source is copied in the build stages that need it. COPY ./packages/common-utils/package.json ./packages/common-utils/package.json diff --git a/packages/api/package.json b/packages/api/package.json index 2dd6b98693..a46ff850dc 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -106,8 +106,8 @@ "dev-task": "DOTENV_CONFIG_PATH=.env.development nodemon --exec 'ts-node' --transpile-only -r tsconfig-paths/register -r dotenv-expand/config -r ./src/telemetry.ts ./src/tasks/index.ts", "build": "rimraf ./build && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && cp -r ./src/opamp/proto ./build/opamp/", "build:vercel": "rimraf ./build && tsc -p tsconfig.vercel.json && tsc-alias -p tsconfig.vercel.json && cp -r ./src/opamp/proto ./build/opamp/", - "lint": "node ../../scripts/ci/oxlint-warnings.mjs --max-warnings 302 && yarn run -T prettier --check --log-level warn 'src/**/*.ts' 'scripts/**/*.ts'", - "lint:fix": "yarn run -T oxlint --fix && yarn run -T prettier --write --log-level warn 'src/**/*.ts' 'scripts/**/*.ts'", + "lint": "node ../../scripts/ci/oxlint-warnings.mjs --max-warnings 302 && yarn run -T oxfmt --check 'src/**/*.ts' 'scripts/**/*.ts'", + "lint:fix": "yarn run -T oxlint --fix && yarn run -T oxfmt 'src/**/*.ts' 'scripts/**/*.ts'", "ci:lint": "yarn lint && yarn tsc --noEmit && yarn lint:openapi", "ci:unit": "jest --ci --coverage", "dev:unit": "jest --watch", diff --git a/packages/api/scripts/seed-alerts.ts b/packages/api/scripts/seed-alerts.ts index 532176fb7b..8216efc001 100644 --- a/packages/api/scripts/seed-alerts.ts +++ b/packages/api/scripts/seed-alerts.ts @@ -330,7 +330,7 @@ async function seed(count: number, tag: string) { name: string; tags: string[]; }[] = []; - for (let remaining = savedSearchAlertTotal; remaining > 0; ) { + for (let remaining = savedSearchAlertTotal; remaining > 0;) { const alerts = Math.min( remaining, randomInt(1, MAX_ALERTS_PER_SAVED_SEARCH), @@ -381,7 +381,7 @@ async function seed(count: number, tag: string) { alertedTiles: { id: string; displayName: string }[]; tags: string[]; }[] = []; - for (let remaining = tileAlertTotal; remaining > 0; ) { + for (let remaining = tileAlertTotal; remaining > 0;) { const index = dashboardPlans.length; const tileCount = randomInt(1, MAX_TILES_PER_DASHBOARD); const tiles = Array.from({ length: tileCount }, (_, tileIndex) => diff --git a/packages/api/src/models/savedSearch.ts b/packages/api/src/models/savedSearch.ts index 54e49ea657..294214d3b3 100644 --- a/packages/api/src/models/savedSearch.ts +++ b/packages/api/src/models/savedSearch.ts @@ -19,8 +19,10 @@ type ExternalSavedSearch = { updatedAt?: string; }; -export interface ISavedSearch - extends Omit, 'source'> { +export interface ISavedSearch extends Omit< + z.infer, + 'source' +> { _id: ObjectId; team: ObjectId; source: ObjectId; diff --git a/packages/app/.prettierignore b/packages/app/.prettierignore deleted file mode 100644 index f13b499ef3..0000000000 --- a/packages/app/.prettierignore +++ /dev/null @@ -1,5 +0,0 @@ -# Next.js build output. The root ignore files do not apply: prettier reads -# them only from its working directory. -.next -.next-e2e -next-env.d.ts diff --git a/packages/app/Dockerfile b/packages/app/Dockerfile index d5183c55cd..5c9ac9a197 100644 --- a/packages/app/Dockerfile +++ b/packages/app/Dockerfile @@ -5,7 +5,7 @@ RUN apk add --no-cache libc6-compat WORKDIR /app COPY .yarn ./.yarn -COPY .yarnrc.yml yarn.lock package.json nx.json .prettierrc .prettierignore ./tsconfig.base.json ./ +COPY .yarnrc.yml yarn.lock package.json nx.json .oxfmtrc.json ./tsconfig.base.json ./ # Only copy package.json for workspace resolution during yarn install; # full source is copied in the build stages that need it. COPY ./packages/common-utils/package.json ./packages/common-utils/package.json diff --git a/packages/app/instrumentation.ts b/packages/app/instrumentation.ts index 4b48483153..a97fe2e92e 100644 --- a/packages/app/instrumentation.ts +++ b/packages/app/instrumentation.ts @@ -3,9 +3,8 @@ export async function register() { // The edge build drops this branch, so it never bundles the Node.js SDK if (process.env.NEXT_RUNTIME === 'nodejs') { - const { startNextServerTelemetry } = await import( - '@/utils/nextServerTelemetry' - ); + const { startNextServerTelemetry } = + await import('@/utils/nextServerTelemetry'); await startNextServerTelemetry(); } } diff --git a/packages/app/package.json b/packages/app/package.json index e01e44d9c0..6fd972dcd1 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -14,8 +14,8 @@ "build:clickhouse": "NEXT_PUBLIC_IS_LOCAL_MODE=true NEXT_PUBLIC_CLICKHOUSE_BUILD=true next build --webpack && node scripts/prepare-clickhouse-build-export.js", "run:clickhouse": "test -d out && npx rimraf tmp && mkdir tmp && cp -r out tmp/clickstack && echo 'visit http://localhost:3000/clickstack to start' && npx serve tmp -l 3000 || echo 'run build:clickhouse first'", "start": "next start", - "lint": "node ../../scripts/ci/oxlint-warnings.mjs --max-warnings 576 && yarn run -T prettier --check --log-level warn '**/*.{ts,tsx}'", - "lint:fix": "yarn run -T oxlint --fix && yarn run -T prettier --write --log-level warn '**/*.{ts,tsx}'", + "lint": "node ../../scripts/ci/oxlint-warnings.mjs --max-warnings 576 && yarn run -T oxfmt --check '**/*.{ts,tsx,css,scss}'", + "lint:fix": "yarn run -T oxlint --fix && yarn run -T oxfmt '**/*.{ts,tsx,css,scss}'", "lint:styles": "stylelint **/*/*.{css,scss}", "ci:lint": "yarn lint && yarn tsc --noEmit && yarn lint:styles --quiet", "ci:unit": "jest --ci --coverage", @@ -147,13 +147,11 @@ "postcss": "^8.5.23", "postcss-preset-mantine": "^1.18.0", "postcss-simple-vars": "^7.0.0", - "prettier": "3.3.3", "rimraf": "^4.4.1", "serve": "^14.0.0", "storybook": "^10.6.2", "stylelint": "^16.26.1", "stylelint-config-standard-scss": "^16.0.0", - "stylelint-prettier": "^5.0.3", "ts-jest": "^29.4.11", "typescript": "^6.0.3" }, diff --git a/packages/app/src/DBDashboardImportPage.tsx b/packages/app/src/DBDashboardImportPage.tsx index bbb350bae3..0e97cb35e5 100644 --- a/packages/app/src/DBDashboardImportPage.tsx +++ b/packages/app/src/DBDashboardImportPage.tsx @@ -514,9 +514,7 @@ const appliesToSourceKinds = ( * The source kinds a filter of this type can read its dropdown values from, or * `undefined` for a filter that reads no source at all. */ -const filterSourceKinds = ( - filter: DashboardFilter, -): SourceKind[] | undefined => +const filterSourceKinds = (filter: DashboardFilter): SourceKind[] | undefined => isPrometheusLabelFilter(filter) ? [SourceKind.Promql] : isQueryExpressionFilter(filter) diff --git a/packages/app/src/DBDashboardPage.tsx b/packages/app/src/DBDashboardPage.tsx index 00403f39d5..023a0a0abc 100644 --- a/packages/app/src/DBDashboardPage.tsx +++ b/packages/app/src/DBDashboardPage.tsx @@ -3000,7 +3000,8 @@ function DBDashboardPage({ {dashboard.createdBy && ( - Created by {dashboard.createdBy.name || dashboard.createdBy.email}.{' '} + Created by {dashboard.createdBy.name || dashboard.createdBy.email} + .{' '} )} {dashboard.updatedAt && ( diff --git a/packages/app/src/DBSearchPage.tsx b/packages/app/src/DBSearchPage.tsx index e9b8678858..668f59584e 100644 --- a/packages/app/src/DBSearchPage.tsx +++ b/packages/app/src/DBSearchPage.tsx @@ -2571,7 +2571,8 @@ function DBSearchPageContent() { {savedSearch.createdBy && ( Created by{' '} - {savedSearch.createdBy.name || savedSearch.createdBy.email}.{' '} + {savedSearch.createdBy.name || savedSearch.createdBy.email} + .{' '} )} {savedSearch.updatedAt && ( diff --git a/packages/app/src/components/AdhocDashboardFilter/useAdhocFilterOptions.ts b/packages/app/src/components/AdhocDashboardFilter/useAdhocFilterOptions.ts index 559999cac0..d10be91ef8 100644 --- a/packages/app/src/components/AdhocDashboardFilter/useAdhocFilterOptions.ts +++ b/packages/app/src/components/AdhocDashboardFilter/useAdhocFilterOptions.ts @@ -260,24 +260,22 @@ function usePromqlSourceKeys( ); return useQueries({ - queries: sources.map( - (source): UseQueryOptions => ({ - queryKey: [ - 'adhoc-filter-promql-keys', - source.id, - seconds.start, - seconds.end, - ], - queryFn: async () => { - const labels = await fetchPromqlLabelNames( - promqlLookupParams(source, seconds, attribution), - ); - return labels.filter(label => label !== '__name__'); - }, - staleTime: STALE_TIME_MS, - placeholderData: keepPreviousData, - }), - ), + queries: sources.map((source): UseQueryOptions => ({ + queryKey: [ + 'adhoc-filter-promql-keys', + source.id, + seconds.start, + seconds.end, + ], + queryFn: async () => { + const labels = await fetchPromqlLabelNames( + promqlLookupParams(source, seconds, attribution), + ); + return labels.filter(label => label !== '__name__'); + }, + staleTime: STALE_TIME_MS, + placeholderData: keepPreviousData, + })), combine: combineKeys, }); } @@ -340,25 +338,23 @@ function usePromqlSourceValues( const seconds = toPromqlSeconds(dateRange); return useQueries({ - queries: sources.map( - (source): UseQueryOptions => ({ - queryKey: [ - 'adhoc-filter-promql-values', - source.id, - key, - seconds.start, - seconds.end, - ], - queryFn: () => - fetchPromqlLabelValues({ - label: key, - ...promqlLookupParams(source, seconds, attribution), - }), - enabled: !!key, - staleTime: STALE_TIME_MS, - retry: false, - }), - ), + queries: sources.map((source): UseQueryOptions => ({ + queryKey: [ + 'adhoc-filter-promql-values', + source.id, + key, + seconds.start, + seconds.end, + ], + queryFn: () => + fetchPromqlLabelValues({ + label: key, + ...promqlLookupParams(source, seconds, attribution), + }), + enabled: !!key, + staleTime: STALE_TIME_MS, + retry: false, + })), combine: combineValues, }); } diff --git a/packages/app/src/components/InlineNameInput/InlineNameInput.tsx b/packages/app/src/components/InlineNameInput/InlineNameInput.tsx index 65608192c6..ae9af56f9c 100644 --- a/packages/app/src/components/InlineNameInput/InlineNameInput.tsx +++ b/packages/app/src/components/InlineNameInput/InlineNameInput.tsx @@ -75,8 +75,10 @@ function InlineNameField({ ); } -export interface InlineNameInputProps - extends Omit { +export interface InlineNameInputProps extends Omit< + InlineNameFieldProps, + 'value' | 'onChange' | 'invalid' +> { value: string; /** * Called with the trimmed name when it changed and isn't empty. Return a @@ -150,8 +152,9 @@ export function InlineNameInput({ ); } -export interface InlineNameInputControlledProps - extends Omit { +export interface InlineNameInputControlledProps< + T extends FieldValues, +> extends Omit { name: Path; control: Control; rules?: Parameters['register']>[1]; diff --git a/packages/app/src/components/InputControlled.tsx b/packages/app/src/components/InputControlled.tsx index 4dccd91c1a..0e33ea551a 100644 --- a/packages/app/src/components/InputControlled.tsx +++ b/packages/app/src/components/InputControlled.tsx @@ -14,7 +14,8 @@ import { } from '@mantine/core'; interface InputControlledProps - extends Omit, + extends + Omit, Omit, 'name' | 'size'> { name: Path; control: Control; @@ -22,7 +23,8 @@ interface InputControlledProps } interface PasswordInputControlledProps - extends Omit, + extends + Omit, Omit, 'name' | 'size'> { name: Path; control: Control; @@ -30,7 +32,8 @@ interface PasswordInputControlledProps } interface TextInputControlledProps - extends Omit, + extends + Omit, Omit, 'name' | 'size'> { name: Path; control: Control; @@ -38,7 +41,8 @@ interface TextInputControlledProps } interface CheckboxControlledProps - extends Omit, + extends + Omit, Omit< React.InputHTMLAttributes, 'name' | 'size' | 'color' @@ -51,8 +55,10 @@ interface CheckboxControlledProps // Autocomplete already extends the native input attributes (minus its own // value-based onChange and size), so it carries maxLength/placeholder without // a second InputHTMLAttributes extend that would clash on onChange. -interface AutocompleteControlledProps - extends Omit { +interface AutocompleteControlledProps extends Omit< + AutocompleteProps, + 'name' | 'style' +> { name: Path; control: Control; rules?: Parameters['register']>[1]; diff --git a/packages/app/src/components/Sources/SourceForm/SourceForm.tsx b/packages/app/src/components/Sources/SourceForm/SourceForm.tsx index cfcd2542c5..2d20ff6ed1 100644 --- a/packages/app/src/components/Sources/SourceForm/SourceForm.tsx +++ b/packages/app/src/components/Sources/SourceForm/SourceForm.tsx @@ -580,11 +580,9 @@ export function TableSourceForm({ return (
diff --git a/packages/app/src/hooks/useFetchMetricAttributeValues.tsx b/packages/app/src/hooks/useFetchMetricAttributeValues.tsx index bcc397b24e..e6493f925a 100644 --- a/packages/app/src/hooks/useFetchMetricAttributeValues.tsx +++ b/packages/app/src/hooks/useFetchMetricAttributeValues.tsx @@ -45,14 +45,14 @@ export const useFetchMetricAttributeValues = ({ const shouldFetch = Boolean( enabled && - databaseName && - tableName && - metricType && - metricName && - attributeName && - attributeCategory && - tableSource && - tableSource?.kind === SourceKind.Metric, + databaseName && + tableName && + metricType && + metricName && + attributeName && + attributeCategory && + tableSource && + tableSource?.kind === SourceKind.Metric, ); const attribution = useMetadataQueryAttribution(); diff --git a/packages/app/src/hooks/useFetchMetricMetadata.tsx b/packages/app/src/hooks/useFetchMetricMetadata.tsx index a6a54ce82c..612df30e50 100644 --- a/packages/app/src/hooks/useFetchMetricMetadata.tsx +++ b/packages/app/src/hooks/useFetchMetricMetadata.tsx @@ -39,11 +39,11 @@ export const useFetchMetricMetadata = ({ const shouldFetch = Boolean( databaseName && - metricType && - metricName && - tableSource && - tableName && - tableSource?.kind === SourceKind.Metric, + metricType && + metricName && + tableSource && + tableName && + tableSource?.kind === SourceKind.Metric, ); const attribution = useMetadataQueryAttribution(); diff --git a/packages/app/src/hooks/useFetchMetricResourceAttrs.tsx b/packages/app/src/hooks/useFetchMetricResourceAttrs.tsx index a2c35d6591..d08955bfeb 100644 --- a/packages/app/src/hooks/useFetchMetricResourceAttrs.tsx +++ b/packages/app/src/hooks/useFetchMetricResourceAttrs.tsx @@ -153,11 +153,11 @@ export const useFetchMetricResourceAttrs = ({ const shouldFetch = Boolean( databaseName && - tableName && - metricType && - metricName && - tableSource && - tableSource?.kind === SourceKind.Metric, + tableName && + metricType && + metricName && + tableSource && + tableSource?.kind === SourceKind.Metric, ); const attribution = useMetadataQueryAttribution(); diff --git a/packages/app/src/hooks/useMVOptimizationExplanation.tsx b/packages/app/src/hooks/useMVOptimizationExplanation.tsx index 22e5b57d88..8fce592601 100644 --- a/packages/app/src/hooks/useMVOptimizationExplanation.tsx +++ b/packages/app/src/hooks/useMVOptimizationExplanation.tsx @@ -18,8 +18,8 @@ import { useSource } from '@/source'; import { useMetadataWithSettings } from './useMetadata'; export interface MVOptimizationExplanationResult< - C extends - BuilderChartConfigWithOptDateRange = BuilderChartConfigWithOptDateRange, + C extends BuilderChartConfigWithOptDateRange = + BuilderChartConfigWithOptDateRange, > { optimizedConfig?: C; explanations: MVOptimizationExplanation[]; diff --git a/packages/app/src/hooks/useMetricCatalog.ts b/packages/app/src/hooks/useMetricCatalog.ts index 94209a2c02..ccec9e9ff1 100644 --- a/packages/app/src/hooks/useMetricCatalog.ts +++ b/packages/app/src/hooks/useMetricCatalog.ts @@ -155,14 +155,12 @@ export function useMetricCatalog({ }) .then(res => res.json())) as ResponseJSON; - return (result?.data ?? []).map( - (row): MetricCatalogEntry => ({ - name: row.MetricName, - type: kind, - unit: row.MetricUnit || undefined, - description: row.MetricDescription || undefined, - }), - ); + return (result?.data ?? []).map((row): MetricCatalogEntry => ({ + name: row.MetricName, + type: kind, + unit: row.MetricUnit || undefined, + description: row.MetricDescription || undefined, + })); }), ); diff --git a/packages/app/stylelint.config.mjs b/packages/app/stylelint.config.mjs index f5d0bac8a2..31233d3023 100644 --- a/packages/app/stylelint.config.mjs +++ b/packages/app/stylelint.config.mjs @@ -1,6 +1,6 @@ /** @type {import('stylelint').Config} */ export default { - extends: ['stylelint-config-standard-scss', 'stylelint-prettier/recommended'], + extends: ['stylelint-config-standard-scss'], rules: { 'selector-class-pattern': null, 'no-descending-specificity': null, diff --git a/packages/app/styles/Home.module.css b/packages/app/styles/Home.module.css index 7974488e95..0cd9504814 100644 --- a/packages/app/styles/Home.module.css +++ b/packages/app/styles/Home.module.css @@ -65,8 +65,9 @@ border-radius: 5px; padding: 0.75rem; font-size: 1.1rem; - font-family: Menlo, Monaco, 'Lucida Console', 'Liberation Mono', - 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', monospace; + font-family: + Menlo, Monaco, 'Lucida Console', 'Liberation Mono', 'DejaVu Sans Mono', + 'Bitstream Vera Sans Mono', 'Courier New', monospace; } .grid { diff --git a/packages/cli/package.json b/packages/cli/package.json index ba27522267..f922b75f7d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -33,7 +33,7 @@ "compile:linux": "bun build src/cli.tsx --compile --target=bun-linux-x64 --outfile dist/hdx-linux-x64", "compile:macos": "bun build src/cli.tsx --compile --target=bun-darwin-arm64 --outfile dist/hdx-darwin-arm64", "compile:macos-x64": "bun build src/cli.tsx --compile --target=bun-darwin-x64 --outfile dist/hdx-darwin-x64", - "lint": "node ../../scripts/ci/oxlint-warnings.mjs --max-warnings 0 && yarn run -T prettier --check --log-level warn 'src/**/*.{ts,tsx}'", + "lint": "node ../../scripts/ci/oxlint-warnings.mjs --max-warnings 0 && yarn run -T oxfmt --check 'src/**/*.{ts,tsx}'", "ci:build": "tsup", "ci:lint": "yarn lint && yarn tsc --noEmit", "ci:unit": "NODE_OPTIONS=--experimental-vm-modules jest --runInBand --ci --passWithNoTests", diff --git a/packages/cli/src/__tests__/sourcemaps.test.ts b/packages/cli/src/__tests__/sourcemaps.test.ts index ca320c4c76..c06a80b28b 100644 --- a/packages/cli/src/__tests__/sourcemaps.test.ts +++ b/packages/cli/src/__tests__/sourcemaps.test.ts @@ -121,11 +121,7 @@ describe('uploadSourcemaps', () => { createFile('a.js.map'); mockFetch .mockResolvedValueOnce(okJson({ user: { team: 'team-1' } })) - .mockResolvedValueOnce( - okJson({ - /* missing data field */ - }), - ); + .mockResolvedValueOnce(okJson({/* missing data field */})); await expect( uploadSourcemaps({ serviceKey: 'key', path: tempDir }), diff --git a/packages/common-utils/package.json b/packages/common-utils/package.json index 259ae0dc79..acf485e4ab 100644 --- a/packages/common-utils/package.json +++ b/packages/common-utils/package.json @@ -51,8 +51,8 @@ "build": "tsup && yarn build:types", "build:types": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json", "ci:build": "yarn build", - "lint": "node ../../scripts/ci/oxlint-warnings.mjs --max-warnings 80 && yarn run -T prettier --check --log-level warn 'src/**/*.ts'", - "lint:fix": "yarn run -T oxlint --fix && yarn run -T prettier --write --log-level warn 'src/**/*.ts'", + "lint": "node ../../scripts/ci/oxlint-warnings.mjs --max-warnings 80 && yarn run -T oxfmt --check 'src/**/*.ts'", + "lint:fix": "yarn run -T oxlint --fix && yarn run -T oxfmt 'src/**/*.ts'", "ci:lint": "yarn lint && yarn tsc --noEmit", "ci:unit": "jest --ci --coverage", "dev:unit": "jest --watchAll", diff --git a/packages/common-utils/src/core/metadata.ts b/packages/common-utils/src/core/metadata.ts index 739ad6c77a..999ab85cbd 100644 --- a/packages/common-utils/src/core/metadata.ts +++ b/packages/common-utils/src/core/metadata.ts @@ -3477,9 +3477,10 @@ export class Metadata { return Object.entries(json?.data?.[0]).map(([key, value]) => ({ key: keys[parseInt(key.replace('param', ''))], // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion - value: value?.filter(v => v != null && v !== '') as // remove nulls and empty strings - | string[] - | number[], + value: value?.filter( + v => v != null && v !== '', + ) as // remove nulls and empty strings + string[] | number[], })); }, ); diff --git a/packages/hdx-eval/package.json b/packages/hdx-eval/package.json index f550375d74..b5c3632169 100644 --- a/packages/hdx-eval/package.json +++ b/packages/hdx-eval/package.json @@ -36,8 +36,8 @@ "scripts": { "build": "rimraf ./dist && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json", "dev": "NODE_OPTIONS=--max-old-space-size=8192 ./scripts/env.sh tsx src/cli.ts", - "lint": "node ../../scripts/ci/oxlint-warnings.mjs --max-warnings 0 && yarn run -T prettier --check --log-level warn 'src/**/*.ts'", - "lint:fix": "yarn run -T oxlint --fix && yarn run -T prettier --write --log-level warn 'src/**/*.ts'", + "lint": "node ../../scripts/ci/oxlint-warnings.mjs --max-warnings 0 && yarn run -T oxfmt --check 'src/**/*.ts'", + "lint:fix": "yarn run -T oxlint --fix && yarn run -T oxfmt 'src/**/*.ts'", "ci:lint": "yarn lint && yarn tsc --noEmit", "ci:unit": "jest --ci --coverage --forceExit", "dev:unit": "jest --watch", diff --git a/packages/hdx-eval/src/scenarios/service-health-check/generate.ts b/packages/hdx-eval/src/scenarios/service-health-check/generate.ts index 2087cada7a..9ed87e3e01 100644 --- a/packages/hdx-eval/src/scenarios/service-health-check/generate.ts +++ b/packages/hdx-eval/src/scenarios/service-health-check/generate.ts @@ -130,12 +130,9 @@ type Rng = GenerateContext['rng']; function sampleLatencyMs(rng: Rng, scale: number): number { const r = rng.next(); let base: number; - if (r < 0.5) - base = 30 + rng.next() * 70; // 30..100 (p50 ~65) - else if (r < 0.9) - base = 60 + rng.next() * 140; // 60..200 (p90 ~190) - else if (r < 0.99) - base = 180 + rng.next() * 120; // 180..300 (p99 entry) + if (r < 0.5) base = 30 + rng.next() * 70; // 30..100 (p50 ~65) + else if (r < 0.9) base = 60 + rng.next() * 140; // 60..200 (p90 ~190) + else if (r < 0.99) base = 180 + rng.next() * 120; // 180..300 (p99 entry) else base = 280 + rng.next() * 80; // 280..360 (p99 tail) return base * scale; } diff --git a/yarn.lock b/yarn.lock index 8a9a93b05b..4c27b757f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4271,7 +4271,6 @@ __metadata: postcss: "npm:^8.5.23" postcss-preset-mantine: "npm:^1.18.0" postcss-simple-vars: "npm:^7.0.0" - prettier: "npm:3.3.3" react: "npm:^19.2.3" react-copy-to-clipboard: "npm:^5.1.0" react-dom: "npm:^19.2.3" @@ -4295,7 +4294,6 @@ __metadata: strip-ansi: "npm:^6.0.1" stylelint: "npm:^16.26.1" stylelint-config-standard-scss: "npm:^16.0.0" - stylelint-prettier: "npm:^5.0.3" timestamp-nano: "npm:^1.0.1" ts-jest: "npm:^29.4.11" typescript: "npm:^6.0.3" @@ -7870,6 +7868,139 @@ __metadata: languageName: node linkType: hard +"@oxfmt/binding-android-arm-eabi@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-android-arm-eabi@npm:0.78.0" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@oxfmt/binding-android-arm64@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-android-arm64@npm:0.78.0" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@oxfmt/binding-darwin-arm64@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-darwin-arm64@npm:0.78.0" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@oxfmt/binding-darwin-x64@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-darwin-x64@npm:0.78.0" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@oxfmt/binding-freebsd-x64@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-freebsd-x64@npm:0.78.0" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@oxfmt/binding-linux-arm-gnueabihf@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-linux-arm-gnueabihf@npm:0.78.0" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@oxfmt/binding-linux-arm-musleabihf@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-linux-arm-musleabihf@npm:0.78.0" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@oxfmt/binding-linux-arm64-gnu@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-linux-arm64-gnu@npm:0.78.0" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@oxfmt/binding-linux-arm64-musl@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-linux-arm64-musl@npm:0.78.0" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@oxfmt/binding-linux-ppc64-gnu@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-linux-ppc64-gnu@npm:0.78.0" + conditions: os=linux & cpu=ppc64 & libc=glibc + languageName: node + linkType: hard + +"@oxfmt/binding-linux-riscv64-gnu@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-linux-riscv64-gnu@npm:0.78.0" + conditions: os=linux & cpu=riscv64 & libc=glibc + languageName: node + linkType: hard + +"@oxfmt/binding-linux-riscv64-musl@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-linux-riscv64-musl@npm:0.78.0" + conditions: os=linux & cpu=riscv64 & libc=musl + languageName: node + linkType: hard + +"@oxfmt/binding-linux-s390x-gnu@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-linux-s390x-gnu@npm:0.78.0" + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + +"@oxfmt/binding-linux-x64-gnu@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-linux-x64-gnu@npm:0.78.0" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@oxfmt/binding-linux-x64-musl@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-linux-x64-musl@npm:0.78.0" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@oxfmt/binding-openharmony-arm64@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-openharmony-arm64@npm:0.78.0" + conditions: os=openharmony & cpu=arm64 + languageName: node + linkType: hard + +"@oxfmt/binding-win32-arm64-msvc@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-win32-arm64-msvc@npm:0.78.0" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@oxfmt/binding-win32-ia32-msvc@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-win32-ia32-msvc@npm:0.78.0" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@oxfmt/binding-win32-x64-msvc@npm:0.78.0": + version: 0.78.0 + resolution: "@oxfmt/binding-win32-x64-msvc@npm:0.78.0" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@oxlint-tsgolint/darwin-arm64@npm:7.0.2006": version: 7.0.2006 resolution: "@oxlint-tsgolint/darwin-arm64@npm:7.0.2006" @@ -16760,13 +16891,6 @@ __metadata: languageName: node linkType: hard -"fast-diff@npm:^1.1.2": - version: 1.2.0 - resolution: "fast-diff@npm:1.2.0" - checksum: 10c0/2fbcb23957fb0bc920832a94ba627b860400f9cce45e1594e931dabf62e858369a58c6c2603e2ecc4f7679580f710b5b5b6e698a355a9a9bfcfd93c06c7c4350 - languageName: node - linkType: hard - "fast-glob@npm:3.3.1": version: 3.3.1 resolution: "fast-glob@npm:3.3.1" @@ -18327,10 +18451,10 @@ __metadata: knip: "npm:^6.19.0" lint-staged: "npm:^13.1.2" nx: "npm:23.3.2" + oxfmt: "npm:^0.78.0" oxlint: "npm:^1.92.0" oxlint-plugin-eslint: "npm:^1.93.0" oxlint-tsgolint: "npm:^7.0.2006" - prettier: "npm:3.3.3" tslib: "npm:^2.6.0" languageName: unknown linkType: soft @@ -23167,6 +23291,86 @@ __metadata: languageName: node linkType: hard +"oxfmt@npm:^0.78.0": + version: 0.78.0 + resolution: "oxfmt@npm:0.78.0" + dependencies: + "@oxfmt/binding-android-arm-eabi": "npm:0.78.0" + "@oxfmt/binding-android-arm64": "npm:0.78.0" + "@oxfmt/binding-darwin-arm64": "npm:0.78.0" + "@oxfmt/binding-darwin-x64": "npm:0.78.0" + "@oxfmt/binding-freebsd-x64": "npm:0.78.0" + "@oxfmt/binding-linux-arm-gnueabihf": "npm:0.78.0" + "@oxfmt/binding-linux-arm-musleabihf": "npm:0.78.0" + "@oxfmt/binding-linux-arm64-gnu": "npm:0.78.0" + "@oxfmt/binding-linux-arm64-musl": "npm:0.78.0" + "@oxfmt/binding-linux-ppc64-gnu": "npm:0.78.0" + "@oxfmt/binding-linux-riscv64-gnu": "npm:0.78.0" + "@oxfmt/binding-linux-riscv64-musl": "npm:0.78.0" + "@oxfmt/binding-linux-s390x-gnu": "npm:0.78.0" + "@oxfmt/binding-linux-x64-gnu": "npm:0.78.0" + "@oxfmt/binding-linux-x64-musl": "npm:0.78.0" + "@oxfmt/binding-openharmony-arm64": "npm:0.78.0" + "@oxfmt/binding-win32-arm64-msvc": "npm:0.78.0" + "@oxfmt/binding-win32-ia32-msvc": "npm:0.78.0" + "@oxfmt/binding-win32-x64-msvc": "npm:0.78.0" + tinypool: "npm:2.2.0" + peerDependencies: + "@astrojs/compiler-rs": ^0.5.0 + svelte: ^5.0.0 + vite-plus: "*" + dependenciesMeta: + "@oxfmt/binding-android-arm-eabi": + optional: true + "@oxfmt/binding-android-arm64": + optional: true + "@oxfmt/binding-darwin-arm64": + optional: true + "@oxfmt/binding-darwin-x64": + optional: true + "@oxfmt/binding-freebsd-x64": + optional: true + "@oxfmt/binding-linux-arm-gnueabihf": + optional: true + "@oxfmt/binding-linux-arm-musleabihf": + optional: true + "@oxfmt/binding-linux-arm64-gnu": + optional: true + "@oxfmt/binding-linux-arm64-musl": + optional: true + "@oxfmt/binding-linux-ppc64-gnu": + optional: true + "@oxfmt/binding-linux-riscv64-gnu": + optional: true + "@oxfmt/binding-linux-riscv64-musl": + optional: true + "@oxfmt/binding-linux-s390x-gnu": + optional: true + "@oxfmt/binding-linux-x64-gnu": + optional: true + "@oxfmt/binding-linux-x64-musl": + optional: true + "@oxfmt/binding-openharmony-arm64": + optional: true + "@oxfmt/binding-win32-arm64-msvc": + optional: true + "@oxfmt/binding-win32-ia32-msvc": + optional: true + "@oxfmt/binding-win32-x64-msvc": + optional: true + peerDependenciesMeta: + "@astrojs/compiler-rs": + optional: true + svelte: + optional: true + vite-plus: + optional: true + bin: + oxfmt: bin/oxfmt + checksum: 10c0/ff74ac93e176314191bed0a61a01681cb193cbb29ae0610b683ce5adb334637ded94bc3e007b9bb58a22f3678b7f9c72b1881cfcfbe5392dfc853453cb924180 + languageName: node + linkType: hard + "oxlint-plugin-eslint@npm:^1.93.0": version: 1.93.0 resolution: "oxlint-plugin-eslint@npm:1.93.0" @@ -24167,24 +24371,6 @@ __metadata: languageName: node linkType: hard -"prettier-linter-helpers@npm:^1.0.0": - version: 1.0.0 - resolution: "prettier-linter-helpers@npm:1.0.0" - dependencies: - fast-diff: "npm:^1.1.2" - checksum: 10c0/81e0027d731b7b3697ccd2129470ed9913ecb111e4ec175a12f0fcfab0096516373bf0af2fef132af50cafb0a905b74ff57996d615f59512bb9ac7378fcc64ab - languageName: node - linkType: hard - -"prettier@npm:3.3.3": - version: 3.3.3 - resolution: "prettier@npm:3.3.3" - bin: - prettier: bin/prettier.cjs - checksum: 10c0/b85828b08e7505716324e4245549b9205c0cacb25342a030ba8885aba2039a115dbcf75a0b7ca3b37bc9d101ee61fab8113fc69ca3359f2a226f1ecc07ad2e26 - languageName: node - linkType: hard - "prettier@npm:^2.7.1": version: 2.8.8 resolution: "prettier@npm:2.8.8" @@ -27302,18 +27488,6 @@ __metadata: languageName: node linkType: hard -"stylelint-prettier@npm:^5.0.3": - version: 5.0.3 - resolution: "stylelint-prettier@npm:5.0.3" - dependencies: - prettier-linter-helpers: "npm:^1.0.0" - peerDependencies: - prettier: ">=3.0.0" - stylelint: ">=16.0.0" - checksum: 10c0/955e647131b96e088f3ea80ef409772aff8854d9f9831ac5826b76780fc9a49e0ad0f5aac1b5e6ed714848bea85068a7ba815585ed8b9f1e4da41a29b5666e4d - languageName: node - linkType: hard - "stylelint-scss@npm:^6.12.1": version: 6.13.0 resolution: "stylelint-scss@npm:6.13.0" @@ -27801,6 +27975,13 @@ __metadata: languageName: node linkType: hard +"tinypool@npm:2.2.0": + version: 2.2.0 + resolution: "tinypool@npm:2.2.0" + checksum: 10c0/93b2ce0e0cf1a83f003f577d05b0f9860d490d9c082d30687134f4724ea67501847a308c659f658f3cfa545a4cc4b3cd8a8d100d715245988989be6fb0acdcc4 + languageName: node + linkType: hard + "tinyrainbow@npm:^2.0.0": version: 2.0.0 resolution: "tinyrainbow@npm:2.0.0" From 9e5149f5fd38274d772300ffdbe6648136ac7951 Mon Sep 17 00:00:00 2001 From: Drew Davis Date: Fri, 20 Nov 2026 10:57:05 -0500 Subject: [PATCH 2/2] fix: Fix formatting --- packages/app/src/DBDashboardPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app/src/DBDashboardPage.tsx b/packages/app/src/DBDashboardPage.tsx index 023a0a0abc..43c7dfcef0 100644 --- a/packages/app/src/DBDashboardPage.tsx +++ b/packages/app/src/DBDashboardPage.tsx @@ -2991,8 +2991,8 @@ function DBDashboardPage({ const hasTiles = dashboard && dashboard.tiles.length > 0; const hasSavedDefaults = Boolean( dashboard?.savedQuery || - dashboard?.savedFilterValues?.length || - dashboard?.savedDateRange, + dashboard?.savedFilterValues?.length || + dashboard?.savedDateRange, ); const dashboardMeta =