diff --git a/.betterer.ts b/.betterer.ts index 305b6c35961..ad33da4affc 100644 --- a/.betterer.ts +++ b/.betterer.ts @@ -89,7 +89,6 @@ function countEslintErrors() { const baseConfig = await cli.calculateConfigForFile(filePaths[0]); const baseRules: Partial = { - '@emotion/syntax-preference': [2, 'object'], '@typescript-eslint/no-explicit-any': 'error', '@grafana/no-aria-label-selectors': 'error', 'no-restricted-imports': [ diff --git a/.eslintrc b/.eslintrc index b34a9c242e0..2109968b124 100644 --- a/.eslintrc +++ b/.eslintrc @@ -18,6 +18,7 @@ "import/external-module-folders": ["node_modules", ".yarn"], }, "rules": { + "@emotion/syntax-preference": [2, "object"], "@grafana/no-border-radius-literal": "error", "@grafana/no-unreduced-motion": "error", "react/prop-types": "off", diff --git a/packages/grafana-ui/.eslintrc b/packages/grafana-ui/.eslintrc index 13011848702..0dbcbe8022b 100644 --- a/packages/grafana-ui/.eslintrc +++ b/packages/grafana-ui/.eslintrc @@ -1,6 +1,5 @@ { "rules": { - "@emotion/syntax-preference": [2, "object"], "no-restricted-imports": [ "error", { diff --git a/public/app/angular/components/PageHeader/PageHeader.tsx b/public/app/angular/components/PageHeader/PageHeader.tsx index 176eacbb0ca..a56301c3121 100644 --- a/public/app/angular/components/PageHeader/PageHeader.tsx +++ b/public/app/angular/components/PageHeader/PageHeader.tsx @@ -139,9 +139,9 @@ function renderHeaderTitle(title: string, highlightText: NavModelItem['highlight {highlightText && ( )} @@ -159,7 +159,7 @@ const getStyles = (theme: GrafanaTheme2) => ({ flexDirection: 'column', gap: theme.spacing(1), }), - headerCanvas: css` - background: ${theme.colors.background.canvas}; - `, + headerCanvas: css({ + background: theme.colors.background.canvas, + }), });