From b7205ff1674d4d8c4e5350ff12ae8a531166e38c Mon Sep 17 00:00:00 2001 From: Teffen Ellis <592134+GirlBossRush@users.noreply.github.com> Date: Mon, 1 Dec 2025 19:57:32 +0100 Subject: [PATCH] web: Fixes for Docusaurus & ESlint Upgrade (#18452) * Fix style regressions in Docusaurus 3.9 * Fix ignore file regression. * Bump package versions. * Update packages/docusaurus-config/css/navbar.css Co-authored-by: Ken Sternberg <133134217+kensternberg-authentik@users.noreply.github.com> Signed-off-by: Teffen Ellis <592134+GirlBossRush@users.noreply.github.com> --------- Signed-off-by: Teffen Ellis <592134+GirlBossRush@users.noreply.github.com> Co-authored-by: Ken Sternberg <133134217+kensternberg-authentik@users.noreply.github.com> --- packages/docusaurus-config/css/navbar.css | 15 +++++++++++++++ packages/docusaurus-config/package-lock.json | 6 +++--- packages/docusaurus-config/package.json | 2 +- packages/eslint-config/index.js | 6 ++---- packages/eslint-config/package-lock.json | 6 +++--- packages/eslint-config/package.json | 2 +- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/packages/docusaurus-config/css/navbar.css b/packages/docusaurus-config/css/navbar.css index fa8eb0126d..cb72fe56be 100644 --- a/packages/docusaurus-config/css/navbar.css +++ b/packages/docusaurus-config/css/navbar.css @@ -130,12 +130,19 @@ } } +@media (width < 998px) { + .navbar__item.navbar__link { + display: none; + } +} + .DocSearch-Button { --docsearch-primary-color: var(--ifm-color-primary-darkest); --docsearch-text-color: var(--ifm-navbar-link-color); --docsearch-searchbox-shadow: unset; --docsearch-searchbox-background: transparent; --docsearch-searchbox-focus-background: var(--ifm-hover-overlay); + --docsearch-subtle-color: transparent; --docsearch-muted-color: hsl(0 0% 85% / 1); --docsearch-key-gradient: linear-gradient( @@ -153,6 +160,14 @@ padding: var(--ifm-navbar-item-padding-vertical) var(--ifm-navbar-item-padding-horizontal) !important; padding-inline-end: calc(var(--ifm-navbar-item-padding-horizontal) * 1.25) !important; + /* TODO: Remove this after Docusaurus's CSS layers is stable. */ + height: auto !important; + border-radius: 1rem !important; + + &:hover { + --docsearch-searchbox-background: var(--ifm-hover-overlay); + } + .DocSearch-Button-Placeholder { font-family: var(--ifm-heading-font-family); color: var(--ifm-navbar-link-color); diff --git a/packages/docusaurus-config/package-lock.json b/packages/docusaurus-config/package-lock.json index 44548835c8..d5451e29fe 100644 --- a/packages/docusaurus-config/package-lock.json +++ b/packages/docusaurus-config/package-lock.json @@ -1,12 +1,12 @@ { "name": "@goauthentik/docusaurus-config", - "version": "2.2.1", + "version": "2.2.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@goauthentik/docusaurus-config", - "version": "2.2.1", + "version": "2.2.2", "license": "MIT", "dependencies": { "deepmerge-ts": "^7.1.5", @@ -61,7 +61,7 @@ }, "../eslint-config": { "name": "@goauthentik/eslint-config", - "version": "1.1.0", + "version": "1.1.1", "dev": true, "license": "MIT", "dependencies": { diff --git a/packages/docusaurus-config/package.json b/packages/docusaurus-config/package.json index 7fa0d07814..e8aa5207fd 100644 --- a/packages/docusaurus-config/package.json +++ b/packages/docusaurus-config/package.json @@ -1,6 +1,6 @@ { "name": "@goauthentik/docusaurus-config", - "version": "2.2.1", + "version": "2.2.2", "description": "authentik's Docusaurus config", "license": "MIT", "scripts": { diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js index 60f538396a..cdbe830be9 100644 --- a/packages/eslint-config/index.js +++ b/packages/eslint-config/index.js @@ -10,7 +10,7 @@ import { reactConfig } from "./lib/react-config.js"; import { typescriptConfig } from "./lib/typescript-config.js"; import eslint from "@eslint/js"; -import { defineConfig } from "eslint/config"; +import { defineConfig, globalIgnores } from "eslint/config"; import tseslint from "typescript-eslint"; // @ts-check @@ -56,9 +56,7 @@ export function createESLintPackageConfig({ parserOptions = {}, } = {}) { return defineConfig( - { - ignores: ignorePatterns, - }, + globalIgnores(ignorePatterns), { languageOptions: { diff --git a/packages/eslint-config/package-lock.json b/packages/eslint-config/package-lock.json index cf9412ccb9..329940431e 100644 --- a/packages/eslint-config/package-lock.json +++ b/packages/eslint-config/package-lock.json @@ -1,12 +1,12 @@ { "name": "@goauthentik/eslint-config", - "version": "1.1.0", + "version": "1.1.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@goauthentik/eslint-config", - "version": "1.1.0", + "version": "1.1.1", "license": "MIT", "dependencies": { "eslint": "^9.39.1", @@ -45,7 +45,7 @@ }, "../prettier-config": { "name": "@goauthentik/prettier-config", - "version": "3.2.0", + "version": "3.2.1", "dev": true, "license": "MIT", "dependencies": { diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index d24eba73cf..89402089f1 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@goauthentik/eslint-config", - "version": "1.1.0", + "version": "1.1.1", "description": "authentik's ESLint config", "license": "MIT", "scripts": {