From d3ab0e63a02a8c9d41d93fb19c56e8cea8400298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Lorber?= Date: Thu, 5 Jun 2025 17:03:41 +0200 Subject: [PATCH] fix(css-cascade-layers): fix windows css cascade layers bug (#11241) --- packages/docusaurus-plugin-css-cascade-layers/package.json | 1 + .../docusaurus-plugin-css-cascade-layers/src/options.ts | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/docusaurus-plugin-css-cascade-layers/package.json b/packages/docusaurus-plugin-css-cascade-layers/package.json index ab2bb9f46d..ca579d4a19 100644 --- a/packages/docusaurus-plugin-css-cascade-layers/package.json +++ b/packages/docusaurus-plugin-css-cascade-layers/package.json @@ -20,6 +20,7 @@ "dependencies": { "@docusaurus/core": "3.8.0", "@docusaurus/types": "3.8.0", + "@docusaurus/utils": "3.8.0", "@docusaurus/utils-validation": "3.8.0", "tslib": "^2.6.0" }, diff --git a/packages/docusaurus-plugin-css-cascade-layers/src/options.ts b/packages/docusaurus-plugin-css-cascade-layers/src/options.ts index 180e9d427e..60af502ba1 100644 --- a/packages/docusaurus-plugin-css-cascade-layers/src/options.ts +++ b/packages/docusaurus-plugin-css-cascade-layers/src/options.ts @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. */ import {Joi} from '@docusaurus/utils-validation'; +import {posixPath} from '@docusaurus/utils'; import {isValidLayerName} from './layers'; import type {OptionValidationContext} from '@docusaurus/types'; @@ -20,7 +21,10 @@ export type Options = { // Not ideal to compute layers using "filePath.includes()" // But this is mostly temporary until we add first-class layers everywhere function layerFor(...params: string[]) { - return (filePath: string) => params.some((p) => filePath.includes(p)); + return (filePath: string) => { + const posixFilePath = posixPath(filePath); + return params.some((p) => posixFilePath.includes(p)); + }; } // Object order matters, it defines the layer order