diff --git a/.yarn/patches/playground-elements-npm-0.18.1-d292eadd94.patch b/.yarn/patches/playground-elements-npm-0.18.1-d292eadd94.patch index 7448057a75729..55360ef6ba0d4 100644 --- a/.yarn/patches/playground-elements-npm-0.18.1-d292eadd94.patch +++ b/.yarn/patches/playground-elements-npm-0.18.1-d292eadd94.patch @@ -117,6 +117,19 @@ index 1c2996fe16a91fe52074e65144aca9e1098043fd..4259730b04a73d0f5f5fec00d558d97c ], PlaygroundPreview.prototype, "iframe", void 0); __decorate([ query('slot') +diff --git a/playground-project.js b/playground-project.js +index 6d6c8452286d3c0d2cde0c22d65327881bcb1fbd..0b5be95e67a41fbfd8a12b573b500253351d2b4a 100644 +--- a/playground-project.js ++++ b/playground-project.js +@@ -178,7 +178,7 @@ let PlaygroundProject = class PlaygroundProject extends LitElement { + return this._validImportMap; + } + get _normalizedSandboxBaseUrl() { +- const url = new URL(this.sandboxBaseUrl, import.meta.url); ++ const url = new URL(this.sandboxBaseUrl, location.href); + url.pathname = endWithSlash(url.pathname); + return url; + } diff --git a/playground-typescript-worker.js b/playground-typescript-worker.js index 764edfea8a536a660ad983d0aeb369c064ebfc22..6ff369d0bd0c28f80d83868932171c3608806a8a 100644 --- a/playground-typescript-worker.js diff --git a/packages/ai/package.json b/packages/ai/package.json index 4188efc8b29d6..011255b05ef00 100644 --- a/packages/ai/package.json +++ b/packages/ai/package.json @@ -57,7 +57,7 @@ "@custom-elements-manifest/analyzer": "^0.10.10", "@ui5/cypress-internal": "0.1.0", "@ui5/webcomponents-tools": "2.25.0-rc.0", - "cypress": "15.9.0", + "cypress": "15.18.1", "vite": "5.4.21" } } diff --git a/packages/base/package.json b/packages/base/package.json index 1ce17e4f69036..3cd38c01df596 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -68,7 +68,7 @@ "@ui5/cypress-internal": "0.1.0", "@ui5/webcomponents-tools": "2.25.0-rc.0", "clean-css": "^5.2.2", - "cypress": "15.9.0", + "cypress": "15.18.1", "mocha": "^11.7.2", "replace-in-file": "^6.3.5", "resolve": "^1.20.0", diff --git a/packages/cypress-ct-ui5-webc/package.json b/packages/cypress-ct-ui5-webc/package.json index 87b9c0eaeec9c..83d2c19ae13a3 100644 --- a/packages/cypress-ct-ui5-webc/package.json +++ b/packages/cypress-ct-ui5-webc/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@cypress/mount-utils": "^4.1.2", - "cypress": "^15.3.0", + "cypress": "^15.18.1", "preact": "^10.25.4" }, "peerDependencies": { diff --git a/packages/cypress-internal/package.json b/packages/cypress-internal/package.json index fa8384faa0788..dec91465d9166 100644 --- a/packages/cypress-internal/package.json +++ b/packages/cypress-internal/package.json @@ -16,13 +16,13 @@ "dependencies": { "@cypress/code-coverage": "^3.14.6", "@ui5/cypress-ct-ui5-webc": "0.0.4", - "cypress": "15.9.0", + "cypress": "15.18.1", "cypress-real-events": "^1.15.0", "eslint-plugin-cypress": "^3.4.0", "rimraf": "^3.0.2", "typescript": "^5.6.2" }, "peerDependencies": { - "@ui5/webcomponents-base": "2.14.0-rc.6" + "@ui5/webcomponents-base": "^2.14.0" } } diff --git a/packages/fiori/package.json b/packages/fiori/package.json index 8dff1a17db394..687710855cff9 100644 --- a/packages/fiori/package.json +++ b/packages/fiori/package.json @@ -66,7 +66,7 @@ "@custom-elements-manifest/analyzer": "^0.10.10", "@ui5/cypress-internal": "0.1.0", "@ui5/webcomponents-tools": "2.25.0-rc.0", - "cypress": "15.9.0", + "cypress": "15.18.1", "lit": "^2.0.0", "vite": "5.4.21", "yarn": "^1.22.22" diff --git a/packages/main/package.json b/packages/main/package.json index ee2fd890cdf80..c27df482a3151 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -67,10 +67,10 @@ "@custom-elements-manifest/analyzer": "^0.10.10", "@ui5/cypress-internal": "0.1.0", "@ui5/webcomponents-tools": "2.25.0-rc.0", - "cypress": "15.9.0", + "cypress": "15.18.1", "jsdom": "^26.0.0", "lit": "^2.0.0", "vite": "5.4.21", - "vitest": "^3.0.2" + "vitest": "^3.2.7" } } diff --git a/packages/tools/package.json b/packages/tools/package.json index 9ead8fc1d3087..1727c85699e15 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -23,12 +23,12 @@ "@custom-elements-manifest/analyzer": "^0.10.10", "@typescript-eslint/eslint-plugin": "^6.9.0", "@typescript-eslint/parser": "^6.9.0", - "@wdio/cli": "^7.19.7", - "@wdio/dot-reporter": "^7.19.7", - "@wdio/local-runner": "^7.19.7", - "@wdio/mocha-framework": "^7.19.7", - "@wdio/spec-reporter": "^7.19.7", - "@wdio/static-server-service": "^7.19.5", + "@wdio/cli": "^7.40.0", + "@wdio/dot-reporter": "^7.40.0", + "@wdio/local-runner": "^7.40.0", + "@wdio/mocha-framework": "^7.40.0", + "@wdio/spec-reporter": "^7.40.0", + "@wdio/static-server-service": "^7.40.0", "ajv": "^8.12.0", "cem-plugin-vs-code-custom-data-generator": "^1.4.2", "chai": "^4.3.4", diff --git a/packages/website/package.json b/packages/website/package.json index aba24980c0d4a..baf2a9bfba1d2 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -34,8 +34,8 @@ }, "dependencies": { "@babel/standalone": "^7.24.0", - "@docusaurus/core": "3.1.1", - "@docusaurus/preset-classic": "3.1.1", + "@docusaurus/core": "3.10.2", + "@docusaurus/preset-classic": "3.10.2", "@mdx-js/react": "^3.0.0", "@monaco-editor/react": "^4.6.0", "clsx": "^2.0.0", @@ -51,9 +51,9 @@ "tarts": "^2.0.1" }, "devDependencies": { - "@docusaurus/module-type-aliases": "3.1.1", - "@docusaurus/tsconfig": "3.1.1", - "@docusaurus/types": "3.1.1", + "@docusaurus/module-type-aliases": "3.10.2", + "@docusaurus/tsconfig": "3.10.2", + "@docusaurus/types": "3.10.2", "copy-and-watch": "^0.1.5", "dotenv-cli": "^7.4.1", "pako": "^2.1.0", diff --git a/packages/website/src/theme/DocItem/Content/index.js b/packages/website/src/theme/DocItem/Content/index.js index d6e14983db8c7..be038250196aa 100644 --- a/packages/website/src/theme/DocItem/Content/index.js +++ b/packages/website/src/theme/DocItem/Content/index.js @@ -1,7 +1,7 @@ import React from 'react'; import clsx from 'clsx'; import {ThemeClassNames} from '@docusaurus/theme-common'; -import {useDoc} from '@docusaurus/theme-common/internal'; +import {useDoc} from '@docusaurus/plugin-content-docs/client'; import Heading from '@theme/Heading'; import MDXContent from '@theme/MDXContent'; import AskAI from '@site/src/components/AskAI'; diff --git a/packages/website/src/theme/DocSidebarItem/Category/index.js b/packages/website/src/theme/DocSidebarItem/Category/index.js index a6535e78ea55e..dc4e63a6bb50f 100644 --- a/packages/website/src/theme/DocSidebarItem/Category/index.js +++ b/packages/website/src/theme/DocSidebarItem/Category/index.js @@ -7,49 +7,53 @@ import { Collapsible, useCollapsible, } from '@docusaurus/theme-common'; +import {isSamePath} from '@docusaurus/theme-common/internal'; import { isActiveSidebarItem, findFirstSidebarItemLink, useDocSidebarItemsExpandedState, - isSamePath, -} from '@docusaurus/theme-common/internal'; + useVisibleSidebarItems, +} from '@docusaurus/plugin-content-docs/client'; import Link from '@docusaurus/Link'; import {translate} from '@docusaurus/Translate'; import useIsBrowser from '@docusaurus/useIsBrowser'; import DocSidebarItems from '@theme/DocSidebarItems'; -// If we navigate to a category and it becomes active, it should automatically -// expand itself -function useAutoExpandActiveCategory({isActive, collapsed, updateCollapsed}) { +import DocSidebarItemLink from '@theme/DocSidebarItem/Link'; +import styles from './styles.module.css'; + +function useAutoExpandActiveCategory({isActive, collapsed, updateCollapsed, activePath}) { const wasActive = usePrevious(isActive); + const previousActivePath = usePrevious(activePath); useEffect(() => { const justBecameActive = isActive && !wasActive; - if (justBecameActive && collapsed) { + const stillActiveButPathChanged = + isActive && wasActive && activePath !== previousActivePath; + if ((justBecameActive || stillActiveButPathChanged) && collapsed) { updateCollapsed(false); } - }, [isActive, wasActive, collapsed, updateCollapsed]); + }, [ + isActive, + wasActive, + collapsed, + updateCollapsed, + activePath, + previousActivePath, + ]); } -/** - * When a collapsible category has no link, we still link it to its first child - * during SSR as a temporary fallback. This allows to be able to navigate inside - * the category even when JS fails to load, is delayed or simply disabled - * React hydration becomes an optional progressive enhancement - * see https://github.com/facebookincubator/infima/issues/36#issuecomment-772543188 - * see https://github.com/facebook/docusaurus/issues/3030 - */ + function useCategoryHrefWithSSRFallback(item) { const isBrowser = useIsBrowser(); return useMemo(() => { if (item.href && !item.linkUnlisted) { return item.href; } - // In these cases, it's not necessary to render a fallback - // We skip the "findFirstCategoryLink" computation if (isBrowser || !item.collapsible) { return undefined; } return findFirstSidebarItemLink(item); }, [item, isBrowser]); } + function CollapseButton({collapsed, categoryLabel, onClick}) { return (