From b75f4fdac02502f9fe1e27318c64036e80da9269 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Sep 2026 12:44:35 -0700 Subject: [PATCH 001/175] Add token playground to theme docs Show how theme and layout tokens flow to components. Readers change the radius, spacer, or primary color and see the button, input, alert, and card update together. The Remint control demonstrates how derived tokens (bg-subtle, fg, border) restate the theme today. --- .../shortcodes/TokenPlayground.astro | 358 ++++++++++++++++++ site/src/components/shortcodes/index.ts | 1 + site/src/content/docs/customize/theme.mdx | 8 + site/src/scss/_component-examples.scss | 48 +++ 4 files changed, 415 insertions(+) create mode 100644 site/src/components/shortcodes/TokenPlayground.astro diff --git a/site/src/components/shortcodes/TokenPlayground.astro b/site/src/components/shortcodes/TokenPlayground.astro new file mode 100644 index 0000000000..cc1ac5bce2 --- /dev/null +++ b/site/src/components/shortcodes/TokenPlayground.astro @@ -0,0 +1,358 @@ +--- +import Code from '@components/shortcodes/Code.astro' + +// Both menus move two steps of their scale rather than one, which is what +// changing the Sass base value does: `--radius-7` is `$radius * 1.5` and +// `--spacer-6` is `$spacer * 1.25` in scss/_config.scss. The components below +// read `--radius-5` and `--spacer` (button, input, alert) or `--radius-7` and +// `--spacer-6` (card), so driving both makes the whole group move together. +const defaultRadius = '0.5' +const defaultSpacer = '1' +const defaultColor = 'blue' + +const radiusOptions = ['0', '0.25', '0.5', '0.75', '1', '1.25', '1.5'] +const spacerOptions = ['0.75', '1', '1.25', '1.5'] + +const menus = [ + { control: 'radius', label: 'Radius', value: defaultRadius, options: radiusOptions }, + { control: 'spacer', label: 'Spacer', value: defaultSpacer, options: spacerOptions } +] + +const palette = [ + { name: 'blue', label: 'Blue' }, + { name: 'purple', label: 'Purple' }, + { name: 'pink', label: 'Pink' }, + { name: 'orange', label: 'Orange' }, + { name: 'green', label: 'Green' } +] + +// Today’s model: reminting `--bs-primary-base` alone recolors solid surfaces +// (button, badge) but leaves alerts, borders, and focus rings on the compiled +// blue pairing. To move the whole theme you must restate every derived token, +// which is what this snippet and the script below do. +const css = `.token-demo { + --bs-radius-5: ${defaultRadius}rem; + --bs-spacer: ${defaultSpacer}rem; + --bs-primary-base: var(--bs-${defaultColor}-500); + --bs-primary-bg: var(--bs-primary-base); + --bs-primary-bg-subtle: light-dark(var(--bs-${defaultColor}-100), var(--bs-${defaultColor}-900)); + --bs-primary-fg: light-dark(var(--bs-${defaultColor}-600), var(--bs-${defaultColor}-400)); + --bs-primary-border: light-dark(var(--bs-${defaultColor}-300), var(--bs-${defaultColor}-600)); +}` +--- + +
+
+
+ { + menus.map((menu) => ( +
+ + {menu.label} + + + +
+ )) + } + +
+ Primary +
+ { + palette.map((color) => ( + + )) + } +
+
+ +
+ Remint +
+ + +
+
+
+
+ +
+
+
+
+ + +
+ +
A token change reaches every component at once.
+ +
+
Card header
+
+

Card

+

Padding follows the spacer, corners follow the radius.

+
+
+
+
+ + +
+
+ + diff --git a/site/src/components/shortcodes/index.ts b/site/src/components/shortcodes/index.ts index 1bbf86b949..1165cd4a21 100644 --- a/site/src/components/shortcodes/index.ts +++ b/site/src/components/shortcodes/index.ts @@ -24,3 +24,4 @@ export { default as SpacingResponsive } from './SpacingResponsive.astro' export { default as Swatch } from './Swatch.astro' export { default as Table } from './Table.astro' export { default as TableContent } from './TableContent.md' +export { default as TokenPlayground } from './TokenPlayground.astro' diff --git a/site/src/content/docs/customize/theme.mdx b/site/src/content/docs/customize/theme.mdx index cd5a4e9303..c7ed926092 100644 --- a/site/src/content/docs/customize/theme.mdx +++ b/site/src/content/docs/customize/theme.mdx @@ -53,6 +53,14 @@ And within each semantic theme color, you’ll find the following keys, most of | `contrast` | Text color that needs to be readable on the `base` and `bg` colors | +## Token playground + +Every component reads the same theme and layout tokens, so one change reaches the whole group. Change the radius, the spacer, or the primary color below and watch the button, input, alert, and card update together. + + + +The **Remint** control shows how the theme works today. Set it to **All** and each color restates every derived token—`bg-subtle`, `fg`, `border`, and the rest—so the whole preview follows. Set it to **Base** and only `--bs-primary-base` and `--bs-primary-bg` change. The solid button recolors, but the alert keeps the compiled blue pairing, because its `bg-subtle`, `fg`, and `border` tokens still point at the blue palette on `:root`. + ## Theme colors Every token is available as a CSS variable, and most are then consumed by our utilities and components. So for the `primary` color, you have the following colors: diff --git a/site/src/scss/_component-examples.scss b/site/src/scss/_component-examples.scss index d2d1143024..0228a7ec7f 100644 --- a/site/src/scss/_component-examples.scss +++ b/site/src/scss/_component-examples.scss @@ -426,4 +426,52 @@ grid-template-columns: repeat(9, 1fr); } } + + // + // Token playground + // + + .bd-playground { + --bd-example-border-color: var(--bs-border-subtle); + + border: 1px solid var(--bd-example-border-color); + @include border-radius(var(--radius-5)); + + .bd-playground-controls { + border-bottom: 1px solid var(--bd-example-border-color); + @include border-top-radius(calc(var(--radius-5) - 1px)); + } + + .bd-code-snippet { + border: 0; + @include border-radius(0 0 calc(var(--radius-5) - 1px) calc(var(--radius-5) - 1px)); + } + + .menu-item.selected { + font-weight: var(--font-weight-semibold); + } + } + + .bd-token-swatch { + display: inline-flex; + align-items: center; + justify-content: center; + width: 1.75rem; + height: 1.75rem; + padding: 0; + color: var(--bs-white); + cursor: pointer; + border: 1px solid color-mix(in srgb, var(--bs-fg-body) 15%, transparent); + @include border-radius(var(--radius-4)); + + svg { + width: 1rem; + height: 1rem; + opacity: 0; + } + + &.selected svg { + opacity: 1; + } + } } From 047ee5eca037777338c08b4529a1f98886c48339 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Sep 2026 13:03:03 +0200 Subject: [PATCH 002/175] Bump streetsidesoftware/cspell-action in the github-actions group (#42934) Bumps the github-actions group with 1 update: [streetsidesoftware/cspell-action](https://github.com/streetsidesoftware/cspell-action). Updates `streetsidesoftware/cspell-action` from 9.0.1 to 9.1.0 - [Release notes](https://github.com/streetsidesoftware/cspell-action/releases) - [Changelog](https://github.com/streetsidesoftware/cspell-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/streetsidesoftware/cspell-action/compare/e0668cf020899e887ee8ad4d173c31738a79eae8...6f3c77c1406bc930f944ba97e9801a22e42caf58) --- updated-dependencies: - dependency-name: streetsidesoftware/cspell-action dependency-version: 9.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cspell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cspell.yml b/.github/workflows/cspell.yml index 21da3f9e35..83b06fa551 100644 --- a/.github/workflows/cspell.yml +++ b/.github/workflows/cspell.yml @@ -29,7 +29,7 @@ jobs: persist-credentials: false - name: Run cspell - uses: streetsidesoftware/cspell-action@e0668cf020899e887ee8ad4d173c31738a79eae8 # v9.0.1 + uses: streetsidesoftware/cspell-action@6f3c77c1406bc930f944ba97e9801a22e42caf58 # v9.1.0 with: config: ".cspell.json" files: | From 5726523804eb48e2536cbf7e5c8121e54423a491 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Sep 2026 13:08:30 +0200 Subject: [PATCH 003/175] Bump dependencies with 4 updates (#42933) Bumps the development-dependencies group with 4 updates in the / directory: [autoprefixer](https://github.com/postcss/autoprefixer), [cspell](https://github.com/streetsidesoftware/cspell/tree/HEAD/packages/cspell), [postcss](https://github.com/postcss/postcss) and [postcss-cli](https://github.com/postcss/postcss-cli). Updates `autoprefixer` from 10.5.4 to 10.5.5 - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/autoprefixer/compare/10.5.4...10.5.5) Updates `cspell` from 10.2.0 to 10.3.0 - [Release notes](https://github.com/streetsidesoftware/cspell/releases) - [Changelog](https://github.com/streetsidesoftware/cspell/blob/main/packages/cspell/CHANGELOG.md) - [Commits](https://github.com/streetsidesoftware/cspell/commits/v10.3.0/packages/cspell) Updates `postcss` from 8.5.26 to 8.5.28 - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.5.26...8.5.28) Updates `postcss-cli` from 11.0.1 to 12.0.0 - [Release notes](https://github.com/postcss/postcss-cli/releases) - [Changelog](https://github.com/postcss/postcss-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss-cli/compare/11.0.1...12.0.0) --- updated-dependencies: - dependency-name: autoprefixer dependency-version: 10.5.5 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies - dependency-name: cspell dependency-version: 10.3.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: development-dependencies - dependency-name: postcss dependency-version: 8.5.28 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies - dependency-name: postcss-cli dependency-version: 12.0.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: development-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 668 +++++++++++++++++++++++++--------------------- package.json | 8 +- 2 files changed, 369 insertions(+), 307 deletions(-) diff --git a/package-lock.json b/package-lock.json index eab3bc4c68..c17ef097ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,12 +34,12 @@ "@vitest/coverage-istanbul": "^4.1.11", "astro": "^7.3.2", "astro-broken-links-checker": "^1.1.0", - "autoprefixer": "^10.5.4", + "autoprefixer": "^10.5.5", "bootstrap-vscode-theme": "^0.0.9", "bundlewatch": "^0.4.2", "clipboard": "^2.0.11", "cross-env": "^10.1.0", - "cspell": "^10.2.0", + "cspell": "^10.3.0", "eslint": "^10.9.1", "eslint-config-xo": "^0.53.2", "eslint-plugin-html": "^8.2.0", @@ -64,8 +64,8 @@ "npm-run-all2": "^9.0.3", "pagefind": "^1.5.2", "playwright": "^1.62.1", - "postcss": "^8.5.26", - "postcss-cli": "^11.0.1", + "postcss": "^8.5.28", + "postcss-cli": "^12.0.0", "postcss-prefix-custom-properties": "^0.1.0", "prettier": "^3.9.6", "prettier-plugin-astro": "^0.14.1", @@ -1170,9 +1170,9 @@ } }, "node_modules/@cspell/cspell-bundled-dicts": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-10.2.0.tgz", - "integrity": "sha512-pNdBzc3+njM1A8cp0t/az+FbwBoiIzKCJ15gHVdEtynGOH+GLKzpbNeRAXe3ci+BYUjQQXlQrCKalXaa+ZXVtQ==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-10.3.2.tgz", + "integrity": "sha512-b0f6fQCwcTP32dsibbPbdU2m5R0ZAwAVaB1u04187OqfRBJxr2m77bAXa50xSsjonRILLAGzxgT4+HkPojIBpA==", "dev": true, "license": "MIT", "dependencies": { @@ -1180,8 +1180,8 @@ "@cspell/dict-al": "^1.1.1", "@cspell/dict-aws": "^4.0.17", "@cspell/dict-bash": "^4.2.3", - "@cspell/dict-companies": "^3.2.12", - "@cspell/dict-cpp": "^7.1.0", + "@cspell/dict-companies": "^3.2.13", + "@cspell/dict-cpp": "^7.1.2", "@cspell/dict-cryptocurrencies": "^5.0.5", "@cspell/dict-csharp": "^4.0.8", "@cspell/dict-css": "^4.1.2", @@ -1189,11 +1189,11 @@ "@cspell/dict-data-science": "^2.0.16", "@cspell/dict-django": "^4.1.6", "@cspell/dict-docker": "^1.1.17", - "@cspell/dict-dotnet": "^5.0.13", + "@cspell/dict-dotnet": "^5.0.15", "@cspell/dict-elixir": "^4.0.8", - "@cspell/dict-en_us": "^4.4.37", - "@cspell/dict-en-common-misspellings": "^2.2.0", - "@cspell/dict-en-gb-mit": "^3.1.26", + "@cspell/dict-en_us": "^4.4.40", + "@cspell/dict-en-common-misspellings": "^2.2.2", + "@cspell/dict-en-gb-mit": "^3.1.29", "@cspell/dict-filetypes": "^3.0.18", "@cspell/dict-flutter": "^1.1.1", "@cspell/dict-fonts": "^4.0.6", @@ -1201,7 +1201,7 @@ "@cspell/dict-fullstack": "^3.2.9", "@cspell/dict-gaming-terms": "^1.1.2", "@cspell/dict-git": "^3.1.0", - "@cspell/dict-golang": "^6.0.27", + "@cspell/dict-golang": "^6.0.29", "@cspell/dict-google": "^1.0.9", "@cspell/dict-haskell": "^4.0.6", "@cspell/dict-html": "^4.0.16", @@ -1215,19 +1215,19 @@ "@cspell/dict-lua": "^4.0.8", "@cspell/dict-makefile": "^1.0.5", "@cspell/dict-markdown": "^2.0.18", - "@cspell/dict-monkeyc": "^1.1.0", + "@cspell/dict-monkeyc": "^1.1.2", "@cspell/dict-node": "^5.0.9", - "@cspell/dict-npm": "^5.2.47", - "@cspell/dict-php": "^4.1.1", - "@cspell/dict-powershell": "^5.0.15", + "@cspell/dict-npm": "^5.2.49", + "@cspell/dict-php": "^4.1.3", + "@cspell/dict-powershell": "^5.0.17", "@cspell/dict-public-licenses": "^2.0.16", - "@cspell/dict-python": "^4.5.0", + "@cspell/dict-python": "^4.5.2", "@cspell/dict-r": "^2.1.1", - "@cspell/dict-ruby": "^5.1.2", + "@cspell/dict-ruby": "^5.1.4", "@cspell/dict-rust": "^4.1.2", - "@cspell/dict-scala": "^5.0.9", + "@cspell/dict-scala": "^5.0.11", "@cspell/dict-shell": "^1.2.0", - "@cspell/dict-software-terms": "^5.4.2", + "@cspell/dict-software-terms": "^5.4.4", "@cspell/dict-sql": "^2.2.1", "@cspell/dict-svelte": "^1.0.7", "@cspell/dict-swift": "^2.0.6", @@ -1241,22 +1241,22 @@ } }, "node_modules/@cspell/cspell-json-reporter": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-10.2.0.tgz", - "integrity": "sha512-2iKTU/UPkSV9O4EzWSFreqM4/RTLoYnvCA9dmh9hJnmarYu/eDJk1CIVu+HgMlOiyCI3cgVux+649vJ0T2dHrA==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-10.3.2.tgz", + "integrity": "sha512-X4K1lWhrf2NUtLfX+9LrZPyN1XoYv0jzAyzME7qs/LFtmZlPnjlFjLfh2gO48bYJWnd9WN0AzzEzwOMD331l2A==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-types": "10.2.0" + "@cspell/cspell-types": "10.3.2" }, "engines": { "node": ">=22.18.0" } }, "node_modules/@cspell/cspell-performance-monitor": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/cspell-performance-monitor/-/cspell-performance-monitor-10.2.0.tgz", - "integrity": "sha512-Wzh984VNI+nkNiVSC4yXbzdVhVnxtxcvtCmslVhk7wc0nmwN5r9M4TQ1k5tSOihVMJn4iV3+fy3TUjkrSsppFA==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-performance-monitor/-/cspell-performance-monitor-10.3.2.tgz", + "integrity": "sha512-n2/nXk4tOHzQDbh9X5yTuofQDprZTywrYow8Fua0Gy9gyanmRShTSpnooOMk8SraIuRhIPNm98ge2XNgQrsH7Q==", "dev": true, "license": "MIT", "engines": { @@ -1264,9 +1264,9 @@ } }, "node_modules/@cspell/cspell-pipe": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-10.2.0.tgz", - "integrity": "sha512-BlA7k9kjgH7LxA3DZGRvOo2Cs9wArR0ux6gvmweoyD+zbOsZquTfrCwnU9IoctTy7HjuYrsE7mvCCN6xP11E7g==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-10.3.2.tgz", + "integrity": "sha512-Iyy5aC6kgymCXwQkV56LJAbkVl8mfEVoyTgfi3Nv72CWvaPo7tStYdmyqFNs2oj3jpVArc8gRoi6uztV8wJ9rQ==", "dev": true, "license": "MIT", "engines": { @@ -1274,9 +1274,9 @@ } }, "node_modules/@cspell/cspell-resolver": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-10.2.0.tgz", - "integrity": "sha512-m94I4iTzWaklOr+eNxy/kgpcJYS9dMzeEsZKV6uprVCPNLNn63Ic+ChadNErwV2ii3tiNLAkn8VJy84oe2h1YA==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-10.3.2.tgz", + "integrity": "sha512-StPrbknIKYOmgKGUYb1YLFnOR309aG/Rvo8RbNBKCBtvRV9dDynwioK1H712uva3B/+8EDjW8bOduM8ZIrovyw==", "dev": true, "license": "MIT", "dependencies": { @@ -1287,9 +1287,9 @@ } }, "node_modules/@cspell/cspell-service-bus": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-10.2.0.tgz", - "integrity": "sha512-r061UxqmEwZK+XiW0dnbE6r7nKHNavQJ4PVw2zqzBVtcFj9YU9LCpOZx4mL49IlmCWxy7jf2jAD9w8nFPn1pWg==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-10.3.2.tgz", + "integrity": "sha512-WyBH2Ek3+viH/B3adXKUYH8mKqXx7qjUI3aro8Ci4KbCIqllRmfQisx4WnaW9b9Y471+xy4FCGRC77Qdclnewg==", "dev": true, "license": "MIT", "engines": { @@ -1297,9 +1297,9 @@ } }, "node_modules/@cspell/cspell-types": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-10.2.0.tgz", - "integrity": "sha512-tkmOVCm2XzPUipa8eIu88ShRogjJ5RIen3y9kzBn51re5Nmjw4HDWRLbeBP1WTGFYR7bMi2h0ybnH0BuBCA29g==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-10.3.2.tgz", + "integrity": "sha512-Ld9OiU4PhsaYFZ2AcnfqB+YA1piyMf/C9rASQBQrEEcB9n/2Hbmd3gSA1KF29FGyfuAJBrigt7N/GTSSUZVrWw==", "dev": true, "license": "MIT", "engines": { @@ -1307,13 +1307,13 @@ } }, "node_modules/@cspell/cspell-worker": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/cspell-worker/-/cspell-worker-10.2.0.tgz", - "integrity": "sha512-6yom68ucNQIUA56gEsXtoquM55AeQBKaMe/a35a91HIvB7AyhrTRTTeheuE/Gl2FUyszHecdewC6sbYELaAsvA==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-worker/-/cspell-worker-10.3.2.tgz", + "integrity": "sha512-YUGOI5u4aR/1Ld069mBVhi0/rDQrhmqg0TQgKy+PUhUcR4LdKZ/PFhA+3NObyZy8k2lPYdpbAYf27zuGA39HFA==", "dev": true, "license": "MIT", "dependencies": { - "cspell-lib": "10.2.0" + "cspell-lib": "10.3.2" }, "engines": { "node": ">=22.18.0" @@ -1351,16 +1351,16 @@ } }, "node_modules/@cspell/dict-companies": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.2.12.tgz", - "integrity": "sha512-mjiz/N3zWOCsz5VfwMUydSl7uW0OU9H2PnbCNc3RV44Vj6Q59CSp6EYGSGZQxrXU1gpsuZUrwr6QCjNjFOOg5A==", + "version": "3.2.13", + "resolved": "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.2.13.tgz", + "integrity": "sha512-mBJeYzCkiiWgNQxKg7zyQOpFPwcXO4IAzXGbOEFfcQ4Q0G5Fa7Kqd8z+gvnvSK7NPWKJaFmiApC6I0cka02qmQ==", "dev": true, "license": "MIT" }, "node_modules/@cspell/dict-cpp": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-7.1.0.tgz", - "integrity": "sha512-rcjycobioQUd9Jm/Y1n8U+sq6ytpZ0iV8AYIo+vyEFfutC5x7g6hL6Fh3bCdh6IporGHRqfEutGK/4sfopD2ZA==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-7.1.2.tgz", + "integrity": "sha512-bkR33oE+ToyD1hwSV4XeEUB9oDkizHRX03CrQfj23tX4VUVbie5vkEHzlKVhcw/Q+fO2dtV/Vz4f6O5M4a2iZQ==", "dev": true, "license": "MIT" }, @@ -1414,9 +1414,9 @@ "license": "MIT" }, "node_modules/@cspell/dict-dotnet": { - "version": "5.0.13", - "resolved": "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-5.0.13.tgz", - "integrity": "sha512-xPp7jMnFpOri7tzmqmm/dXMolXz1t2bhNqxYkOyMqXhvs08oc7BFs+EsbDY0X7hqiISgeFZGNqn0dOCr+ncPYw==", + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-5.0.15.tgz", + "integrity": "sha512-j2MUKPlzMeDy/mnb1EjmtkX8e6VzZdw60Qyf6vPlp7WZhUwwp2LBlKOWx7+hASjP6k4a0nDpmn77G+4upxvbZA==", "dev": true, "license": "MIT" }, @@ -1428,23 +1428,23 @@ "license": "MIT" }, "node_modules/@cspell/dict-en_us": { - "version": "4.4.37", - "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.4.37.tgz", - "integrity": "sha512-rMKyPrk2SKmDU+Bj0U0ixsv4Du93oijwovc8XlUin0zwKOJZb0/PFG5Df4P8CrM2CrLeovpaFvhoI98DigxBLw==", + "version": "4.4.40", + "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.4.40.tgz", + "integrity": "sha512-TGyOaWP1dD28GRHH2Lt04ciMZC8Z6UX+5kJsi04pbQHq6uRxv14/bBVCBeSsajUXRZsJYUqXyHaHB9O0ODuFuQ==", "dev": true, "license": "MIT" }, "node_modules/@cspell/dict-en-common-misspellings": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.2.0.tgz", - "integrity": "sha512-5PmCHv+AhY0LVNo3bE1FdRKMmw1esKj83GPwLymnVPYNtlI2Jf6y27EjC0azg4zny5keWmku0GQiMf55Fi+qeA==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.2.2.tgz", + "integrity": "sha512-gu0zS7nm0jgVA2EswgWOR8od8wbNYVgcGzo0pGaDqcSkKS4WhABehLOwbyI0NIEVB+ME6SmckLVGk7g+VD1C6A==", "dev": true, "license": "CC BY-SA 4.0" }, "node_modules/@cspell/dict-en-gb-mit": { - "version": "3.1.26", - "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb-mit/-/dict-en-gb-mit-3.1.26.tgz", - "integrity": "sha512-F9Y/45+1oIPzfL/pyWLp4kzX+vddHPAYpIpIF+45bdc65AebeEiQHKzSmKgGGTd3qbQc3fATw2kAFdLryiQpjQ==", + "version": "3.1.29", + "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb-mit/-/dict-en-gb-mit-3.1.29.tgz", + "integrity": "sha512-mInExsCFZui0f9Vg/MToWfQZzwMfPgHX8BCYdZNdXWbYz+jITXcnvssbdUkui/DVbriZVJ74Zu9bv2jOEqTCNA==", "dev": true, "license": "MIT" }, @@ -1498,9 +1498,9 @@ "license": "MIT" }, "node_modules/@cspell/dict-golang": { - "version": "6.0.27", - "resolved": "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.27.tgz", - "integrity": "sha512-rRDb2JL8EefaezHGTEclKXCs4eMOS0q/datk94Lm7KQOhlGlzS9FDVZiR1/guh0o+iJCmejQuf5NR2FQeQSWsg==", + "version": "6.0.29", + "resolved": "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.29.tgz", + "integrity": "sha512-EZCgfxrr5lPnYQLmSvB6YtpfoDFt2KKxAD4ppq2xGSIgDFXAF7Mv4doiXIFUQaynCBIEfAMl3f/uDfrIUo4fyQ==", "dev": true, "license": "MIT" }, @@ -1602,9 +1602,9 @@ } }, "node_modules/@cspell/dict-monkeyc": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@cspell/dict-monkeyc/-/dict-monkeyc-1.1.0.tgz", - "integrity": "sha512-mc/hgvSy/emOIYtc8kuVEaLUlnaERunfAubfJ5plUXq6s0A69bcukJzUzSt9C0UTCwS28641ILRPv80m3L9QbA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-monkeyc/-/dict-monkeyc-1.1.2.tgz", + "integrity": "sha512-4VzwdSUVqyUVmAKAzMkVwVa7AkvSi1l1OHdQr58MWq4VR4NQDO8sVQSibd2PMxruXTkxJt9UwVQVHgaaVTiV1Q==", "dev": true, "license": "MIT" }, @@ -1616,23 +1616,23 @@ "license": "MIT" }, "node_modules/@cspell/dict-npm": { - "version": "5.2.48", - "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.2.48.tgz", - "integrity": "sha512-R5dDnXTxZFOdb/4XSugCjsb3gXTHcEURGFAVOThg5QVu2YRI+yYj5vGgj9gSNffbgoQsNnaukPoB5v1tjF+tRA==", + "version": "5.2.49", + "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.2.49.tgz", + "integrity": "sha512-7NoDyLcuzQKVA7pNt5vdtqpok9XJyYPxeL7FGzUTbYWi7SuTCk3QbFhoMiYoHSCc6C5G+NCI9xxWHMZnDflXlA==", "dev": true, "license": "MIT" }, "node_modules/@cspell/dict-php": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.1.1.tgz", - "integrity": "sha512-EXelI+4AftmdIGtA8HL8kr4WlUE11OqCSVlnIgZekmTkEGSZdYnkFdiJ5IANSALtlQ1mghKjz+OFqVs6yowgWA==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.1.3.tgz", + "integrity": "sha512-41oKzl7rLVrrVZA/Gs0ESnP6KliEX7c+IwaaNmOL3PAoHasFDVEmIFeENIzuDdM12UcHT+MlLkAm3Qw/lS/ERA==", "dev": true, "license": "MIT" }, "node_modules/@cspell/dict-powershell": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.15.tgz", - "integrity": "sha512-l4S5PAcvCFcVDMJShrYD0X6Huv9dcsQPlsVsBGbH38wvuN7gS7+GxZFAjTNxDmTY1wrNi1cCatSg6Pu2BW4rgg==", + "version": "5.0.17", + "resolved": "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.17.tgz", + "integrity": "sha512-khOoIdBgKRk2scnr7888pf70yJ1Tr3RGdnYcAN0MJ2vtaNRKoOTCFc13gXUkNDHwEyhMI1h9oz3KsT180F2amw==", "dev": true, "license": "MIT" }, @@ -1644,9 +1644,9 @@ "license": "MIT" }, "node_modules/@cspell/dict-python": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.5.0.tgz", - "integrity": "sha512-O1lSuFXoX8p+4hvJMbqvg3blbn0Zx8LHqdPQSNaOxFZGf7hmq6pc8sfta+98E7Q/WtDooAnU3XpBxBXcn0r94g==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.5.2.tgz", + "integrity": "sha512-CFcTDGN/ycn45WXC5ZZ06pG09WbGKMpPm1rkMuqMP98/jwjw3iiK8c0izWRd8x027n1rOZ9kJ8f9Sd+bQ22HJg==", "dev": true, "license": "MIT", "dependencies": { @@ -1661,9 +1661,9 @@ "license": "MIT" }, "node_modules/@cspell/dict-ruby": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.1.2.tgz", - "integrity": "sha512-f6Slf11N91ittf71AWlfVVG9GZPezVRBfcMPCTNTWhUsY/VEspkBRZYDhPXjV4df3jqHy5YJs8nlsFcFVF/bMA==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.1.4.tgz", + "integrity": "sha512-Slw1dLY/pW5liJ5Fle+MIPphIdleZkIM6STDoXCN7sy298GfbfT34sJTcSZcXzZJVXiCEAvlLp+s1YNr6DuWNg==", "dev": true, "license": "MIT" }, @@ -1675,9 +1675,9 @@ "license": "MIT" }, "node_modules/@cspell/dict-scala": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-5.0.9.tgz", - "integrity": "sha512-AjVcVAELgllybr1zk93CJ5wSUNu/Zb5kIubymR/GAYkMyBdYFCZ3Zbwn4Zz8GJlFFAbazABGOu0JPVbeY59vGg==", + "version": "5.0.11", + "resolved": "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-5.0.11.tgz", + "integrity": "sha512-+D59847Y61KZ0MBoXJzBMtOXfFhezEb6ShjvJlL7bnryyy6iBwAfozbz7OJAe+KrEpYm+GlVV7Wy4FmJSgxBag==", "dev": true, "license": "MIT" }, @@ -1689,9 +1689,9 @@ "license": "MIT" }, "node_modules/@cspell/dict-software-terms": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-5.4.2.tgz", - "integrity": "sha512-C2tS1JjxqHef9TpPRm08a6n+PJCrKrD6FsmPEyXb2J6TFef4FFnKRcGOf3pFnd+a6/oyQgXZWeKiECH6lBFjQA==", + "version": "5.4.4", + "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-5.4.4.tgz", + "integrity": "sha512-GqZSRm3sm6fHVfNnvC9GGTBQpV6FzuCBRZuw7LBlaYXJyozmqGdj55T9iZ/Z7L567eMye4TzEEexkvdI0ylCJw==", "dev": true, "license": "MIT" }, @@ -1745,13 +1745,13 @@ "license": "MIT" }, "node_modules/@cspell/dynamic-import": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-10.2.0.tgz", - "integrity": "sha512-FpmedZcu9qcN14/awVPISEBi3A1nPR2zyLslvSRhp6GPJt0YsRVBR5BDKxbLNIGqvM2xg3ZLjo2eGTjThiyHxA==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-10.3.2.tgz", + "integrity": "sha512-n7vpABAl6msXh5Li4dxBdA2n0ux3sCznb/F4ysEzyRJJ4gHXmC75fTeeDQbzdERxwz7bSc8K3nqlDiebyLq9aw==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/url": "10.2.0", + "@cspell/url": "10.3.2", "import-meta-resolve": "^4.2.0" }, "engines": { @@ -1759,9 +1759,9 @@ } }, "node_modules/@cspell/filetypes": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-10.2.0.tgz", - "integrity": "sha512-1I1wnjGqJkQqoHWZ8I28HuMPLG7yzJOh//rGGHBZE6Ly2loJWhk4+/Fa4wEoZ71Ss1HQii9d7smB0B/w1dqGDA==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-10.3.2.tgz", + "integrity": "sha512-6dunxj9bNfVR1l8yuW5tU165l8wYzQZJQAnunonnYTdk6zeguu2odpaKMebS/Mo2PuGknhhz53KBJzVBEQZFHQ==", "dev": true, "license": "MIT", "engines": { @@ -1769,9 +1769,9 @@ } }, "node_modules/@cspell/rpc": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/rpc/-/rpc-10.2.0.tgz", - "integrity": "sha512-K8g80OcuhsGqFQvX2kjhgCGs7mOQf5lSeR2Jg34Uq6VQQ/WapJ9pE7CK6R3RKFjhWT8hlrbALiByk9Mj+7GyeQ==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/rpc/-/rpc-10.3.2.tgz", + "integrity": "sha512-5TZJvPhNo8KhjFYWAlg7pX3+RnQsrLUWE3OdSsfQ6yAbJGP9SulPHjzr7wapGE/jhPVH3vg9OlZhO6o1lRKISA==", "dev": true, "license": "MIT", "engines": { @@ -1779,9 +1779,9 @@ } }, "node_modules/@cspell/strong-weak-map": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-10.2.0.tgz", - "integrity": "sha512-fBLmVOakQ42Wy+7ZnIdnOSk4/WtJFoNLMEG4yqX/cGML3tIh06PTd9UphwltuwPDCL/tXJQsN/LOY8iLx6hmfw==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-10.3.2.tgz", + "integrity": "sha512-P/QVqEzKedoRAOcQnAO23BvYdK47K4T0h3iSZE411EgAFG2RJSL2YNXyIhMe86XkK20ePXnh91/xtoC6oST7PQ==", "dev": true, "license": "MIT", "engines": { @@ -1789,9 +1789,9 @@ } }, "node_modules/@cspell/url": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@cspell/url/-/url-10.2.0.tgz", - "integrity": "sha512-TIgG/pCkgo3SiayAbV0CorYPdnaNkYWfJFKHhSBTKIdBDwK4YwcbbDlXWGCTJ6gxhhwnrNhcw4jDjz8jejKS4A==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/@cspell/url/-/url-10.3.2.tgz", + "integrity": "sha512-7KG8iDDIckYf6CSCn9CoHzxABREOSA2c8pLQz4lEBJcIL4NOZbD8O7Zw69rRQ2nDIDPAbHeu+6KAr86EQJ7lUQ==", "dev": true, "license": "MIT", "engines": { @@ -6950,9 +6950,9 @@ "license": "MIT" }, "node_modules/autoprefixer": { - "version": "10.5.4", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.4.tgz", - "integrity": "sha512-MaU0U/za7N3r6brxD4YB/l4NSrFzLPlANv6wEuQVaIPlD3L4W9rFcQPbL/EilY9BHhHvhfcz3gInDLrEtWT4EA==", + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.6.0.tgz", + "integrity": "sha512-A26d6qs9kqGgkmImIXMYvXTzqb4Qv7AVgpY1NXzr9Y659J8qHHnLOO/zE8ewIGFMprOolAoRAQYDgNryXIJKBw==", "dev": true, "funding": [ { @@ -6970,8 +6970,8 @@ ], "license": "MIT", "dependencies": { - "browserslist": "^4.28.6", - "caniuse-lite": "^1.0.30001806", + "browserslist": "^4.28.9", + "caniuse-lite": "^1.0.30001810", "fraction.js": "^5.3.4", "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" @@ -7055,9 +7055,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.0.tgz", - "integrity": "sha512-oCu2wfipvX3AePSgmOuKkIywOu+8n9psz7hXYmk56ghpu3+7KzNIBopaOs4c9BrtdnTtW30unG9GTfHo7EwERQ==", + "version": "2.11.23", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.23.tgz", + "integrity": "sha512-le521dGVfxM7yRX0EikCoSz+rOK+hHzdDt/E7mG1jOJB/6WAAUuwVroLwaB7ApaUsz5Q0kFlDXLSA9MheUIfRQ==", "dev": true, "license": "Apache-2.0", "bin": { @@ -7175,9 +7175,9 @@ } }, "node_modules/browserslist": { - "version": "4.28.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.7.tgz", - "integrity": "sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==", + "version": "4.28.9", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.9.tgz", + "integrity": "sha512-EWazOblFYUvlGZcfGhPUPmYh3nikUxBVb+y9MJun5f3hBi812X+8MSQTujLBtgK3cf51fJWbWfOjyeO954d+Eg==", "dev": true, "funding": [ { @@ -7195,11 +7195,11 @@ ], "license": "MIT", "dependencies": { - "baseline-browser-mapping": "^2.10.44", - "caniuse-lite": "^1.0.30001806", - "electron-to-chromium": "^1.5.393", - "node-releases": "^2.0.51", - "update-browserslist-db": "^1.2.3" + "baseline-browser-mapping": "^2.11.20", + "caniuse-lite": "^1.0.30001810", + "electron-to-chromium": "^1.5.420", + "node-releases": "^2.0.54", + "update-browserslist-db": "^1.3.2" }, "bin": { "browserslist": "cli.js" @@ -7355,9 +7355,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001806", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001806.tgz", - "integrity": "sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==", + "version": "1.0.30001810", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001810.tgz", + "integrity": "sha512-TITQPUkaz+aVk5GL6NhOdwk1aEaNTSDPsGFWrTuhKGtjTF70jL/Oht2W4c6rXUe5fu7Ie19VIahAXHIIiWWNeg==", "dev": true, "funding": [ { @@ -7813,30 +7813,29 @@ } }, "node_modules/cspell": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/cspell/-/cspell-10.2.0.tgz", - "integrity": "sha512-BZaciNlTSZ72IQtju46JlVXyXIMOdoqjU/i1KamisH1uYw1OO4HgG6T0Y8doB99s6v1WJH7W2RL2kqpfq7e1Kw==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/cspell/-/cspell-10.3.2.tgz", + "integrity": "sha512-r4G/4rjaFe/ASCX43+3T4sKJQQzbiyBzWQhTl+kjcEfDYZsG++Ut5dXeXVld364QrGOqry3KQbvwUijci4vrIA==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-json-reporter": "10.2.0", - "@cspell/cspell-performance-monitor": "10.2.0", - "@cspell/cspell-pipe": "10.2.0", - "@cspell/cspell-types": "10.2.0", - "@cspell/cspell-worker": "10.2.0", - "@cspell/dynamic-import": "10.2.0", - "@cspell/url": "10.2.0", + "@cspell/cspell-json-reporter": "10.3.2", + "@cspell/cspell-performance-monitor": "10.3.2", + "@cspell/cspell-pipe": "10.3.2", + "@cspell/cspell-types": "10.3.2", + "@cspell/cspell-worker": "10.3.2", + "@cspell/dynamic-import": "10.3.2", + "@cspell/url": "10.3.2", "ansi-regex": "^6.3.0", "chalk": "^6.0.0", "chalk-template": "^1.1.2", "commander": "^15.0.0", - "cspell-config-lib": "10.2.0", - "cspell-dictionary": "10.2.0", - "cspell-gitignore": "10.2.0", - "cspell-glob": "10.2.0", - "cspell-io": "10.2.0", - "cspell-lib": "10.2.0", - "fast-json-stable-stringify": "^2.1.0", + "cspell-config-lib": "10.3.2", + "cspell-dictionary": "10.3.2", + "cspell-gitignore": "10.3.2", + "cspell-glob": "10.3.2", + "cspell-io": "10.3.2", + "cspell-lib": "10.3.2", "flatted": "^3.4.4", "semver": "^7.8.5", "tinyglobby": "^0.2.17" @@ -7853,13 +7852,13 @@ } }, "node_modules/cspell-config-lib": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-10.2.0.tgz", - "integrity": "sha512-QweJ6dtHm1UkguapTm3Csra6p87HiOmLKiVRAxn75tW9Yojb5fGnqLxErO5sGQZvwgWAqQeT9lrqm3ohvCJjVw==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-10.3.2.tgz", + "integrity": "sha512-ukPSVWkiNaiwW26yERfs2+o4rHZ5+YG9uSEqiTqRTcCTrItopyNTizurI+H3pzgrGwcZwPwxNsRZy9oKyOqfjQ==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-types": "10.2.0", + "@cspell/cspell-types": "10.3.2", "comment-json": "^5.0.0", "smol-toml": "^1.8.0", "yaml": "^2.9.0" @@ -7882,16 +7881,16 @@ } }, "node_modules/cspell-dictionary": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-10.2.0.tgz", - "integrity": "sha512-5r7HBf3nkST6mwsFvRV51i3ETcqFuDQoYK03EqzZYTX4ZLVR/nGrRSOZuFW+d9yU3IKjLWgY14Ab4dDKmBcw7A==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-10.3.2.tgz", + "integrity": "sha512-KHjGUEGNm9jvDQL3CK1vkFgRMk2AJ/6NvWHM5sh8eGX6HBEWd0GAlpnL8087YRao70gToGw/IFxTqsSTktkraw==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-performance-monitor": "10.2.0", - "@cspell/cspell-pipe": "10.2.0", - "@cspell/cspell-types": "10.2.0", - "cspell-trie-lib": "10.2.0", + "@cspell/cspell-performance-monitor": "10.3.2", + "@cspell/cspell-pipe": "10.3.2", + "@cspell/cspell-types": "10.3.2", + "cspell-trie-lib": "10.3.2", "fast-equals": "^6.0.2" }, "engines": { @@ -7899,15 +7898,15 @@ } }, "node_modules/cspell-gitignore": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-10.2.0.tgz", - "integrity": "sha512-2/b64Niu5wNlUOW6N7QBRnU8dpnCdvRfZbOgcCO5f5m0OuIbrXTsnrfHJk25w/9M9H2yv2VS8LRKPWuxGXiZpA==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-10.3.2.tgz", + "integrity": "sha512-AnfW9XMHOJ1BgEsapLn7VHV9KT+SuqtDEy0chQtHG/2ZcP2UOFJC8bHH35DUD2cYdBNhp5Dr6BHnvvCHgQE1+w==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/url": "10.2.0", - "cspell-glob": "10.2.0", - "cspell-io": "10.2.0" + "@cspell/url": "10.3.2", + "cspell-glob": "10.3.2", + "cspell-io": "10.3.2" }, "bin": { "cspell-gitignore": "bin.mjs" @@ -7917,13 +7916,13 @@ } }, "node_modules/cspell-glob": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-10.2.0.tgz", - "integrity": "sha512-b6H3zFMkqM5OUVabAvdd4sqyziEo3fFlss73Jn2RsHY2h5PH8gOwM1WsWQOcbDSEn7tj5NsA9a3iETXMkY1thw==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-10.3.2.tgz", + "integrity": "sha512-fmyBeErzjF0Vtf8oGqlc76qsx257x7bUQ7hHB2SQUOJb50KOoZ+en+hfE2g1eAIPX0yEXqU65D9f6D83XaaiLw==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/url": "10.2.0", + "@cspell/url": "10.3.2", "picomatch": "^4.0.7" }, "engines": { @@ -7931,14 +7930,14 @@ } }, "node_modules/cspell-grammar": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-10.2.0.tgz", - "integrity": "sha512-CrMM0Qoh9WuputdD08n3qrJKtzoLEZArT7QhMaeZkl58fARYqmx8JgtrE9X0+GSV4Uden0zVa5o4KcdXtXUSAQ==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-10.3.2.tgz", + "integrity": "sha512-Dpi1PgyAk9fYKfJqHHWxBL51ESWR8EMn6NodplYcx8i0UVr8rCcUrISq9+yhgdsi0R547lxe3iufUBdaP1RiFg==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-pipe": "10.2.0", - "@cspell/cspell-types": "10.2.0" + "@cspell/cspell-pipe": "10.3.2", + "@cspell/cspell-types": "10.3.2" }, "bin": { "cspell-grammar": "bin.mjs" @@ -7948,42 +7947,42 @@ } }, "node_modules/cspell-io": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-10.2.0.tgz", - "integrity": "sha512-UqZcOCH+W9DhcjQGRiKJIwQaeNLGA+PKBHVmw4hvmBvuWGCH7uSiHuOeO+WrvJbolFDfZ9f7gV5ItmITgSANHg==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-10.3.2.tgz", + "integrity": "sha512-0tY0wMPHvGN0G1DG+NLlJNEcRzY2ycZwWOpz6p/zgaBimEanLY+NJjoOsYPBAhzXhFbDdamsttL0bBPoJKYJPA==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-service-bus": "10.2.0", - "@cspell/url": "10.2.0" + "@cspell/cspell-service-bus": "10.3.2", + "@cspell/url": "10.3.2" }, "engines": { "node": ">=22.18.0" } }, "node_modules/cspell-lib": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-10.2.0.tgz", - "integrity": "sha512-uIU4RtUzodzlS39O26Q1g0AxdHNB7CndkaN40Ekmb19kKrOf49umsXhRhdzrYc/uQ9dsp4AFp/mQI5Yc1MK1NA==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-10.3.2.tgz", + "integrity": "sha512-svq9qWoMY58/BdyEQwY1YJhDKrmE8/z4VIiwvtgNkxV/km/6wPTNvm2iQNI4VjSa+DWYSvHyX16LwNjrcGp0sw==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-bundled-dicts": "10.2.0", - "@cspell/cspell-performance-monitor": "10.2.0", - "@cspell/cspell-pipe": "10.2.0", - "@cspell/cspell-resolver": "10.2.0", - "@cspell/cspell-types": "10.2.0", - "@cspell/dynamic-import": "10.2.0", - "@cspell/filetypes": "10.2.0", - "@cspell/rpc": "10.2.0", - "@cspell/strong-weak-map": "10.2.0", - "@cspell/url": "10.2.0", - "cspell-config-lib": "10.2.0", - "cspell-dictionary": "10.2.0", - "cspell-glob": "10.2.0", - "cspell-grammar": "10.2.0", - "cspell-io": "10.2.0", - "cspell-trie-lib": "10.2.0", + "@cspell/cspell-bundled-dicts": "10.3.2", + "@cspell/cspell-performance-monitor": "10.3.2", + "@cspell/cspell-pipe": "10.3.2", + "@cspell/cspell-resolver": "10.3.2", + "@cspell/cspell-types": "10.3.2", + "@cspell/dynamic-import": "10.3.2", + "@cspell/filetypes": "10.3.2", + "@cspell/rpc": "10.3.2", + "@cspell/strong-weak-map": "10.3.2", + "@cspell/url": "10.3.2", + "cspell-config-lib": "10.3.2", + "cspell-dictionary": "10.3.2", + "cspell-glob": "10.3.2", + "cspell-grammar": "10.3.2", + "cspell-io": "10.3.2", + "cspell-trie-lib": "10.3.2", "env-paths": "^4.0.0", "gensequence": "^8.0.8", "import-fresh": "^4.0.0", @@ -8036,16 +8035,16 @@ } }, "node_modules/cspell-trie-lib": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-10.2.0.tgz", - "integrity": "sha512-lvEfGc/SfNfkdq9LZYQENDMuPoILsLwo2o4QHqdyic65MvmL1fZLi77O/qgSJ4aKgVja0/A8cbsdtKnFuruHbw==", + "version": "10.3.2", + "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-10.3.2.tgz", + "integrity": "sha512-YYberpBG16hLviQHLkciXjtqEUc6Q7f9UL71GlJAflSD9TYFuXIvhpIYV80YXPyDrh2Jk3ZYeUqWLQmpZjKaeQ==", "dev": true, "license": "MIT", "engines": { "node": ">=22.18.0" }, "peerDependencies": { - "@cspell/cspell-types": "10.2.0" + "@cspell/cspell-types": "10.3.2" } }, "node_modules/cspell/node_modules/ansi-regex": { @@ -8479,9 +8478,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.394", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.394.tgz", - "integrity": "sha512-Wmt2Gm0o8JWBuGgmc4XZ0u9s1RaCRqhxP47phplmfg04+qypTUurpeJGP45A7Fhv7jdrrVH44PLlR9qXo37cVQ==", + "version": "1.5.428", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.428.tgz", + "integrity": "sha512-1JxbaFJj1bRKurj1uY3l4xxpU9kOUAUjcIgApj0qu1Pao5GhoIWI8iL0BeMYJ2njig1hBx0A7eKD9VGjH9wlHw==", "dev": true, "license": "ISC" }, @@ -9780,9 +9779,9 @@ "license": "Apache-2.0" }, "node_modules/fast-equals": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-6.0.2.tgz", - "integrity": "sha512-sAjhj9ZhOxYCGiNMnZLaucOqf5ZeFnHNoKoAZiD9thhJ0N8RP85qJK759/97C/3L7NzzmGVB5uiX9AUpySZmUQ==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-6.0.3.tgz", + "integrity": "sha512-IECu4C0fFZFoUC2cA2rDaNUuVIfWIZMwh3tY+ng924vOuD9OaUFFrcIrVwCKbV7TJDkGmrHfhwZ7R0AnHfVhyw==", "dev": true, "license": "MIT", "engines": { @@ -10161,21 +10160,6 @@ "url": "https://github.com/sponsors/rawify" } }, - "node_modules/fs-extra": { - "version": "11.3.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.3.tgz", - "integrity": "sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -11904,19 +11888,6 @@ "dev": true, "license": "MIT" }, - "node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, "node_modules/jsonpack": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/jsonpack/-/jsonpack-1.1.5.tgz", @@ -14814,9 +14785,9 @@ "license": "MIT" }, "node_modules/node-releases": { - "version": "2.0.51", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.51.tgz", - "integrity": "sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==", + "version": "2.0.55", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.55.tgz", + "integrity": "sha512-mIrE/Cw9y+9Au6dS5vDKDhQza9YvG6w+ZrS6X+ZzA7yFW/soAeaups4Qzn1bL6g5FVy8WtP79+0j82oPIbqRjQ==", "dev": true, "license": "MIT", "engines": { @@ -15657,9 +15628,9 @@ } }, "node_modules/postcss": { - "version": "8.5.26", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz", - "integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==", + "version": "8.5.28", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.28.tgz", + "integrity": "sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==", "dev": true, "funding": [ { @@ -15677,7 +15648,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.17", + "nanoid": "^3.3.18", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -15686,96 +15657,114 @@ } }, "node_modules/postcss-cli": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-11.0.1.tgz", - "integrity": "sha512-0UnkNPSayHKRe/tc2YGW6XnSqqOA9eqpiRMgRlV1S6HdGi16vwJBx7lviARzbV1HpQHqLLRH3o8vTcB0cLc+5g==", + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-12.0.0.tgz", + "integrity": "sha512-57J2u1NuXuqGXftaK9JFEr/J3vtLzWpdN+RHs8GeeKUlvX7PU18VQJA57t0Rzf4CmbSfQApCwJIPrSFanQu5tQ==", "dev": true, "license": "MIT", "dependencies": { - "chokidar": "^3.3.0", + "chokidar": "^5.0.0", "dependency-graph": "^1.0.0", - "fs-extra": "^11.0.0", "picocolors": "^1.0.0", - "postcss-load-config": "^5.0.0", + "postcss-load-config": "^6.0.0", "postcss-reporter": "^7.0.0", "pretty-hrtime": "^1.0.3", "read-cache": "^1.0.0", "slash": "^5.0.0", "tinyglobby": "^0.2.12", - "yargs": "^17.0.0" + "yargs": "^18.0.0" }, "bin": { "postcss": "index.js" }, "engines": { - "node": ">=18" + "node": ">=22" }, "peerDependencies": { "postcss": "^8.0.0" } }, + "node_modules/postcss-cli/node_modules/ansi-regex": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz", + "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, "node_modules/postcss-cli/node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", "dev": true, "license": "MIT", "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" + "readdirp": "^5.0.0" }, "engines": { - "node": ">= 8.10.0" + "node": ">= 20.19.0" }, "funding": { "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" } }, - "node_modules/postcss-cli/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "node_modules/postcss-cli/node_modules/cliui": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz", + "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==", "dev": true, "license": "ISC", "dependencies": { - "is-glob": "^4.0.1" + "string-width": "^7.2.0", + "strip-ansi": "^7.1.0", + "wrap-ansi": "^9.0.0" }, "engines": { - "node": ">= 6" + "node": ">=20" } }, - "node_modules/postcss-cli/node_modules/picomatch": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", - "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/postcss-cli/node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "node_modules/postcss-cli/node_modules/cliui/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "dev": true, "license": "MIT", "dependencies": { - "picomatch": "^2.2.1" + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=8.10.0" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/postcss-cli/node_modules/emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "dev": true, + "license": "MIT" + }, + "node_modules/postcss-cli/node_modules/readdirp": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.1.1.tgz", + "integrity": "sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, "node_modules/postcss-cli/node_modules/slash": { @@ -15791,10 +15780,90 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/postcss-cli/node_modules/strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.2.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/postcss-cli/node_modules/wrap-ansi": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/postcss-cli/node_modules/wrap-ansi/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/postcss-cli/node_modules/yargs": { + "version": "18.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.1.0.tgz", + "integrity": "sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^9.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "string-width": "^8.2.1", + "y18n": "^5.0.5", + "yargs-parser": "^22.0.0" + }, + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=23" + } + }, + "node_modules/postcss-cli/node_modules/yargs-parser": { + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", + "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==", + "dev": true, + "license": "ISC", + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=23" + } + }, "node_modules/postcss-load-config": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-5.1.0.tgz", - "integrity": "sha512-G5AJ+IX0aD0dygOE0yFZQ/huFFMSNneyfp0e3/bT05a8OfPC5FUoZRPfGijUdGOJNMewJiwzcHJXFafFzeKFVA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-6.0.1.tgz", + "integrity": "sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==", "dev": true, "funding": [ { @@ -15808,8 +15877,7 @@ ], "license": "MIT", "dependencies": { - "lilconfig": "^3.1.1", - "yaml": "^2.4.2" + "lilconfig": "^3.1.1" }, "engines": { "node": ">= 18" @@ -15817,7 +15885,8 @@ "peerDependencies": { "jiti": ">=1.21.0", "postcss": ">=8.0.9", - "tsx": "^4.8.1" + "tsx": "^4.8.1", + "yaml": "^2.4.2" }, "peerDependenciesMeta": { "jiti": { @@ -15828,6 +15897,9 @@ }, "tsx": { "optional": true + }, + "yaml": { + "optional": true } } }, @@ -18992,16 +19064,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/unrs-resolver": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz", @@ -19175,9 +19237,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", - "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.3.tgz", + "integrity": "sha512-pJ2sYawQS0R/WI928Gj5GlPhTGzbMelq0+4INtSYNDV9ErKJcX6xjGWkoG/VnB3dpUm00zALaqkrUD77pO5TDQ==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index 9fd886acda..9b300e5cf5 100644 --- a/package.json +++ b/package.json @@ -145,12 +145,12 @@ "@vitest/coverage-istanbul": "^4.1.11", "astro": "^7.3.2", "astro-broken-links-checker": "^1.1.0", - "autoprefixer": "^10.5.4", + "autoprefixer": "^10.5.5", "bootstrap-vscode-theme": "^0.0.9", "bundlewatch": "^0.4.2", "clipboard": "^2.0.11", "cross-env": "^10.1.0", - "cspell": "^10.2.0", + "cspell": "^10.3.0", "eslint": "^10.9.1", "eslint-config-xo": "^0.53.2", "eslint-plugin-html": "^8.2.0", @@ -175,8 +175,8 @@ "npm-run-all2": "^9.0.3", "pagefind": "^1.5.2", "playwright": "^1.62.1", - "postcss": "^8.5.26", - "postcss-cli": "^11.0.1", + "postcss": "^8.5.28", + "postcss-cli": "^12.0.0", "postcss-prefix-custom-properties": "^0.1.0", "prettier": "^3.9.6", "prettier-plugin-astro": "^0.14.1", From 875f44d1c0764b2385b7f4476fd0e89d27057e05 Mon Sep 17 00:00:00 2001 From: Kamal Rawal Date: Mon, 21 Sep 2026 12:29:17 +0530 Subject: [PATCH 004/175] Docs: fix typo in Tooltips page (#42941) Signed-off-by: Rawal27 --- site/src/content/docs/components/tooltip.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/content/docs/components/tooltip.mdx b/site/src/content/docs/components/tooltip.mdx index 261d26d34b..05a451509e 100644 --- a/site/src/content/docs/components/tooltip.mdx +++ b/site/src/content/docs/components/tooltip.mdx @@ -172,7 +172,7 @@ const tooltip = new bootstrap.Tooltip(exampleEl, options) ``` -Tooltips automatically attempt to change positions when a parent container has `overflow: auto` or `overflow: scroll`, but still keeps the original placement’s positioning. Set the [`boundary` option](https://floating-ui.com/docs/shift#boundary) (for the shift middleware using the `floatingConfig` option) to any HTMLElement to override the default value, `'clippingParents'`, such as `document.body`: +Tooltips automatically attempt to change positions when a parent container has `overflow: auto` or `overflow: scroll`, but still keep the original placement’s positioning. Set the [`boundary` option](https://floating-ui.com/docs/shift#boundary) (for the shift middleware using the `floatingConfig` option) to any HTMLElement to override the default value, `'clippingParents'`, such as `document.body`: ```js const tooltip = new bootstrap.Tooltip('#example', { From 93c81728b31f4f31fcbe56c4b73e6210fe886328 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2026 17:44:29 +0200 Subject: [PATCH 005/175] Bump the GitHub Actions dependencies with 4 updates (#42943) Bumps the github-actions group with 4 updates: [github/codeql-action/init](https://github.com/github/codeql-action), [github/codeql-action/autobuild](https://github.com/github/codeql-action), [github/codeql-action/analyze](https://github.com/github/codeql-action) and [github/codeql-action/upload-sarif](https://github.com/github/codeql-action). Updates `github/codeql-action/init` from 4.37.9 to 4.38.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/cdf488f595d80d6e07e03d4674febd5ab45fa938...b96794f015dfd88f77b49b1c93e0fa7110f94c63) Updates `github/codeql-action/autobuild` from 4.37.9 to 4.38.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/cdf488f595d80d6e07e03d4674febd5ab45fa938...b96794f015dfd88f77b49b1c93e0fa7110f94c63) Updates `github/codeql-action/analyze` from 4.37.9 to 4.38.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/cdf488f595d80d6e07e03d4674febd5ab45fa938...b96794f015dfd88f77b49b1c93e0fa7110f94c63) Updates `github/codeql-action/upload-sarif` from 4.37.9 to 4.38.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/cdf488f595d80d6e07e03d4674febd5ab45fa938...b96794f015dfd88f77b49b1c93e0fa7110f94c63) --- updated-dependencies: - dependency-name: github/codeql-action/init dependency-version: 4.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: github/codeql-action/autobuild dependency-version: 4.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: github/codeql-action/analyze dependency-version: 4.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: github/codeql-action/upload-sarif dependency-version: 4.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql.yml | 6 +++--- .github/workflows/scorecard.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 9f7d73e1b5..7b2fa87fdb 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -31,16 +31,16 @@ jobs: persist-credentials: false - name: Initialize CodeQL - uses: github/codeql-action/init@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9 + uses: github/codeql-action/init@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0 with: config-file: ./.github/codeql/codeql-config.yml languages: "javascript" queries: +security-and-quality - name: Autobuild - uses: github/codeql-action/autobuild@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9 + uses: github/codeql-action/autobuild@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9 + uses: github/codeql-action/analyze@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0 with: category: "/language:javascript" diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 9e34312661..527e06ed46 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -73,6 +73,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard (optional). # Commenting out will disable upload of results to your repo's Code Scanning dashboard - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9 + uses: github/codeql-action/upload-sarif@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0 with: sarif_file: results.sarif From c4ce982ab09083590b53857dd3d12db0ae92f440 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2026 18:25:47 +0200 Subject: [PATCH 006/175] Bump dependencies with 7 updates (#42942) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the development-dependencies group with 7 updates in the / directory: | Package | From | To | | --- | --- | --- | | [@astrojs/markdown-remark](https://github.com/withastro/astro/tree/HEAD/packages/markdown/remark) | `7.3.0` | `7.3.1` | | [autoprefixer](https://github.com/postcss/autoprefixer) | `10.5.5` | `10.6.1` | | [cspell](https://github.com/streetsidesoftware/cspell/tree/HEAD/packages/cspell) | `10.3.0` | `10.3.2` | | [image-size](https://github.com/image-size/image-size) | `2.0.2` | `2.0.4` | | [js-yaml](https://github.com/nodeca/js-yaml) | `5.4.1` | `5.4.2` | | [rollup](https://github.com/rollup/rollup) | `4.63.1` | `4.63.3` | | [zod](https://github.com/colinhacks/zod) | `4.5.4` | `4.6.5` | Updates `@astrojs/markdown-remark` from 7.3.0 to 7.3.1 - [Release notes](https://github.com/withastro/astro/releases) - [Changelog](https://github.com/withastro/astro/blob/main/packages/markdown/remark/CHANGELOG.md) - [Commits](https://github.com/withastro/astro/commits/@astrojs/markdown-remark@7.3.1/packages/markdown/remark) Updates `autoprefixer` from 10.5.5 to 10.6.1 - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/autoprefixer/compare/10.5.5...10.6.1) Updates `cspell` from 10.3.0 to 10.3.2 - [Release notes](https://github.com/streetsidesoftware/cspell/releases) - [Changelog](https://github.com/streetsidesoftware/cspell/blob/main/packages/cspell/CHANGELOG.md) - [Commits](https://github.com/streetsidesoftware/cspell/commits/v10.3.2/packages/cspell) Updates `image-size` from 2.0.2 to 2.0.4 - [Release notes](https://github.com/image-size/image-size/releases) - [Commits](https://github.com/image-size/image-size/commits) Updates `js-yaml` from 5.4.1 to 5.4.2 - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/5.4.1...5.4.2) Updates `rollup` from 4.63.1 to 4.63.3 - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v4.63.1...v4.63.3) Updates `zod` from 4.5.4 to 4.6.5 - [Release notes](https://github.com/colinhacks/zod/releases) - [Commits](https://github.com/colinhacks/zod/compare/v4.5.4...v4.6.5) --- updated-dependencies: - dependency-name: "@astrojs/markdown-remark" dependency-version: 7.3.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies - dependency-name: autoprefixer dependency-version: 10.6.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: development-dependencies - dependency-name: cspell dependency-version: 10.3.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies - dependency-name: image-size dependency-version: 2.0.4 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies - dependency-name: js-yaml dependency-version: 5.4.2 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies - dependency-name: rollup dependency-version: 4.63.3 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies - dependency-name: zod dependency-version: 4.6.5 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: development-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Julien Déramond --- package-lock.json | 71 ++++++++++++++++++++++++++++------------------- package.json | 12 ++++---- 2 files changed, 48 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index c17ef097ce..b6257df63d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,12 +34,12 @@ "@vitest/coverage-istanbul": "^4.1.11", "astro": "^7.3.2", "astro-broken-links-checker": "^1.1.0", - "autoprefixer": "^10.5.5", + "autoprefixer": "^10.6.1", "bootstrap-vscode-theme": "^0.0.9", "bundlewatch": "^0.4.2", "clipboard": "^2.0.11", "cross-env": "^10.1.0", - "cspell": "^10.3.0", + "cspell": "^10.3.2", "eslint": "^10.9.1", "eslint-config-xo": "^0.53.2", "eslint-plugin-html": "^8.2.0", @@ -53,9 +53,9 @@ "hammer-simulator": "0.0.1", "html-validate": "^11.10.0", "htmlparser2": "^12.0.0", - "image-size": "^2.0.2", + "image-size": "^2.0.4", "jasmine": "^7.0.0", - "js-yaml": "^5.4.1", + "js-yaml": "^5.4.2", "lightningcss": "^1.33.0", "lockfile-lint": "^5.0.1", "markdownlint-cli": "^0.49.1", @@ -68,7 +68,7 @@ "postcss-cli": "^12.0.0", "postcss-prefix-custom-properties": "^0.1.0", "prettier": "^3.9.6", - "prettier-plugin-astro": "^0.14.1", + "prettier-plugin-astro": "^1.0.1", "rehype-autolink-headings": "^7.1.0", "remark": "^15.0.1", "remark-html": "^16.0.1", @@ -86,7 +86,7 @@ "unist-util-visit": "^5.1.0", "vitest": "^4.1.11", "yaml": "^2.9.0", - "zod": "^4.5.4" + "zod": "^4.6.5" }, "peerDependencies": { "@floating-ui/dom": "^1.7.6", @@ -4376,6 +4376,13 @@ "dev": true, "license": "MIT" }, + "node_modules/@prettier/parse-srcset": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@prettier/parse-srcset/-/parse-srcset-3.1.0.tgz", + "integrity": "sha512-FIRv2rZotO9NP/r66taYqD1zICpPiBbrECqjKV/xqNotqDxF7fLzzUeK+1RSRx9Tenk0DajR/GcRmTJ2qtHaKQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@prettier/sync": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/@prettier/sync/-/sync-0.6.1.tgz", @@ -6950,9 +6957,9 @@ "license": "MIT" }, "node_modules/autoprefixer": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.6.0.tgz", - "integrity": "sha512-A26d6qs9kqGgkmImIXMYvXTzqb4Qv7AVgpY1NXzr9Y659J8qHHnLOO/zE8ewIGFMprOolAoRAQYDgNryXIJKBw==", + "version": "10.6.1", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.6.1.tgz", + "integrity": "sha512-cL1Qz6ADZhcEbny/8HPfe99J6HhNoYtpX2LFLIbhgGE7Q1hlQVkYFdetDN7Id3KiQxhDrHwzlHr/YQCnZ8+xSA==", "dev": true, "funding": [ { @@ -11200,16 +11207,16 @@ "license": "ISC" }, "node_modules/image-size": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/image-size/-/image-size-2.0.2.tgz", - "integrity": "sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-2.0.4.tgz", + "integrity": "sha512-QRUkFFsRV/6fuESxb9Vkq+a0LkSrgKXuc2NEqfikiXxxN/G3tjWt5EVUlMaImRBZRZK/jRBEbYvpPYZL8t08Zw==", "dev": true, "license": "MIT", "bin": { "image-size": "bin/image-size.js" }, "engines": { - "node": ">=16.x" + "node": ">=18" } }, "node_modules/immutable": { @@ -11795,9 +11802,9 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.4.1.tgz", - "integrity": "sha512-28R/k+NAjeuf7+CKlTxWZVExJGwVVLwY06DgEnOMz2gEpfNkDcD7QvyiVPT0xy0XXhU8vHsd4Ot42OOPdJG7dQ==", + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.4.2.tgz", + "integrity": "sha512-m+aqu+LwO1O6sIopafj8HUVl5aawITwZQe/yHpMCKjaWBaA/d07B/QdMb3529REftiU+RMMHL3Vlsw3hON7vWg==", "dev": true, "funding": [ { @@ -16082,18 +16089,21 @@ } }, "node_modules/prettier-plugin-astro": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.14.1.tgz", - "integrity": "sha512-RiBETaaP9veVstE4vUwSIcdATj6dKmXljouXc/DDNwBSPTp8FRkLGDSGFClKsAFeeg+13SB0Z1JZvbD76bigJw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-1.0.1.tgz", + "integrity": "sha512-FKLtmNgyAoUbUixxmgkyO9ZMjEWCpHgMLtci8IakhCIzr8b+ML9YssBqsMfNoDdd/iE27BixwBZSq2amWDwpFQ==", "dev": true, "license": "MIT", "dependencies": { - "@astrojs/compiler": "^2.9.1", - "prettier": "^3.0.0", - "sass-formatter": "^0.7.6" + "@astrojs/compiler-rs": "^0.4.0", + "@prettier/parse-srcset": "^3.1.0", + "sass-formatter": "^0.8.0" }, "engines": { - "node": "^14.15.0 || >=16.0.0" + "node": ">=22.12.0" + }, + "peerDependencies": { + "prettier": "^3.5.3" } }, "node_modules/pretty-format": { @@ -17072,13 +17082,16 @@ } }, "node_modules/sass-formatter": { - "version": "0.7.9", - "resolved": "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.7.9.tgz", - "integrity": "sha512-CWZ8XiSim+fJVG0cFLStwDvft1VI7uvXdCNJYXhDvowiv+DsbD1nXLiQ4zrE5UBvj5DWZJ93cwN0NX5PMsr1Pw==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.8.0.tgz", + "integrity": "sha512-Nf4eMGE2O5vnJG7KPCRyksWS9gVKSYoUWtPeMXRRxwZSPVQhSGtL602xVYS65LvMkHmkvKa7xpauF0+/5pPwrg==", "dev": true, "license": "MIT", "dependencies": { "suf-log": "^2.5.3" + }, + "bin": { + "sass-formatter": "dist/cli.js" } }, "node_modules/sass-true": { @@ -20493,9 +20506,9 @@ } }, "node_modules/zod": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/zod/-/zod-4.5.4.tgz", - "integrity": "sha512-sC95tT5iHHH9gtpj6A81kh+NEaRAUFN+qlUPDUbRfOMvNf5QCBqsb3WgvnpVtK5Y+4UfA6KqufotuTvMGiTlsA==", + "version": "4.6.5", + "resolved": "https://registry.npmjs.org/zod/-/zod-4.6.5.tgz", + "integrity": "sha512-v5l/aFXZQeai4awLbOpSoHecE9UiMrnfx75tEXLjNonXVARxQ5mOeipTjROUchszUNCqnE+hqAMujRsRHsut2Q==", "dev": true, "license": "MIT", "funding": { diff --git a/package.json b/package.json index 9b300e5cf5..f130e23cf2 100644 --- a/package.json +++ b/package.json @@ -145,12 +145,12 @@ "@vitest/coverage-istanbul": "^4.1.11", "astro": "^7.3.2", "astro-broken-links-checker": "^1.1.0", - "autoprefixer": "^10.5.5", + "autoprefixer": "^10.6.1", "bootstrap-vscode-theme": "^0.0.9", "bundlewatch": "^0.4.2", "clipboard": "^2.0.11", "cross-env": "^10.1.0", - "cspell": "^10.3.0", + "cspell": "^10.3.2", "eslint": "^10.9.1", "eslint-config-xo": "^0.53.2", "eslint-plugin-html": "^8.2.0", @@ -164,9 +164,9 @@ "hammer-simulator": "0.0.1", "html-validate": "^11.10.0", "htmlparser2": "^12.0.0", - "image-size": "^2.0.2", + "image-size": "^2.0.4", "jasmine": "^7.0.0", - "js-yaml": "^5.4.1", + "js-yaml": "^5.4.2", "lightningcss": "^1.33.0", "lockfile-lint": "^5.0.1", "markdownlint-cli": "^0.49.1", @@ -179,7 +179,7 @@ "postcss-cli": "^12.0.0", "postcss-prefix-custom-properties": "^0.1.0", "prettier": "^3.9.6", - "prettier-plugin-astro": "^0.14.1", + "prettier-plugin-astro": "^1.0.1", "rehype-autolink-headings": "^7.1.0", "remark": "^15.0.1", "remark-html": "^16.0.1", @@ -197,7 +197,7 @@ "unist-util-visit": "^5.1.0", "vitest": "^4.1.11", "yaml": "^2.9.0", - "zod": "^4.5.4" + "zod": "^4.6.5" }, "files": [ "dist/{css,js}/*.{css,js,map}", From 32a7a4e1df6c6af5f46062422033d1b4fb3fbd4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Tue, 22 Sep 2026 18:34:49 +0200 Subject: [PATCH 007/175] chore(deps): pin prettier-plugin-astro to 0.14.1 --- .github/dependabot.yml | 3 +++ .ncurc.json | 1 + package-lock.json | 35 +++++++++++------------------------ package.json | 2 +- 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e59600b8bf..3a30066d25 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -28,6 +28,9 @@ updates: versioning-strategy: increase rebase-strategy: disabled ignore: + - dependency-name: "prettier-plugin-astro" + update-types: + - "version-update:semver-major" # Rolldown is pinned exactly on purpose while it is still release-candidate # software. Review each bump by hand. - dependency-name: "rolldown" diff --git a/.ncurc.json b/.ncurc.json index 101b3238f4..9a02213133 100644 --- a/.ncurc.json +++ b/.ncurc.json @@ -1,6 +1,7 @@ { "reject": [ "hammer-simulator", + "prettier-plugin-astro", "rolldown", "stylelint" ] diff --git a/package-lock.json b/package-lock.json index b6257df63d..890da21ef2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,7 +68,7 @@ "postcss-cli": "^12.0.0", "postcss-prefix-custom-properties": "^0.1.0", "prettier": "^3.9.6", - "prettier-plugin-astro": "^1.0.1", + "prettier-plugin-astro": "0.14.1", "rehype-autolink-headings": "^7.1.0", "remark": "^15.0.1", "remark-html": "^16.0.1", @@ -4376,13 +4376,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@prettier/parse-srcset": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@prettier/parse-srcset/-/parse-srcset-3.1.0.tgz", - "integrity": "sha512-FIRv2rZotO9NP/r66taYqD1zICpPiBbrECqjKV/xqNotqDxF7fLzzUeK+1RSRx9Tenk0DajR/GcRmTJ2qtHaKQ==", - "dev": true, - "license": "MIT" - }, "node_modules/@prettier/sync": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/@prettier/sync/-/sync-0.6.1.tgz", @@ -16089,21 +16082,18 @@ } }, "node_modules/prettier-plugin-astro": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-1.0.1.tgz", - "integrity": "sha512-FKLtmNgyAoUbUixxmgkyO9ZMjEWCpHgMLtci8IakhCIzr8b+ML9YssBqsMfNoDdd/iE27BixwBZSq2amWDwpFQ==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.14.1.tgz", + "integrity": "sha512-RiBETaaP9veVstE4vUwSIcdATj6dKmXljouXc/DDNwBSPTp8FRkLGDSGFClKsAFeeg+13SB0Z1JZvbD76bigJw==", "dev": true, "license": "MIT", "dependencies": { - "@astrojs/compiler-rs": "^0.4.0", - "@prettier/parse-srcset": "^3.1.0", - "sass-formatter": "^0.8.0" + "@astrojs/compiler": "^2.9.1", + "prettier": "^3.0.0", + "sass-formatter": "^0.7.6" }, "engines": { - "node": ">=22.12.0" - }, - "peerDependencies": { - "prettier": "^3.5.3" + "node": "^14.15.0 || >=16.0.0" } }, "node_modules/pretty-format": { @@ -17082,16 +17072,13 @@ } }, "node_modules/sass-formatter": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.8.0.tgz", - "integrity": "sha512-Nf4eMGE2O5vnJG7KPCRyksWS9gVKSYoUWtPeMXRRxwZSPVQhSGtL602xVYS65LvMkHmkvKa7xpauF0+/5pPwrg==", + "version": "0.7.9", + "resolved": "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.7.9.tgz", + "integrity": "sha512-CWZ8XiSim+fJVG0cFLStwDvft1VI7uvXdCNJYXhDvowiv+DsbD1nXLiQ4zrE5UBvj5DWZJ93cwN0NX5PMsr1Pw==", "dev": true, "license": "MIT", "dependencies": { "suf-log": "^2.5.3" - }, - "bin": { - "sass-formatter": "dist/cli.js" } }, "node_modules/sass-true": { diff --git a/package.json b/package.json index f130e23cf2..76a5f952d5 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ "postcss-cli": "^12.0.0", "postcss-prefix-custom-properties": "^0.1.0", "prettier": "^3.9.6", - "prettier-plugin-astro": "^1.0.1", + "prettier-plugin-astro": "0.14.1", "rehype-autolink-headings": "^7.1.0", "remark": "^15.0.1", "remark-html": "^16.0.1", From b58a235391271b27c6a1b9d65e2297e0d35fbc4e Mon Sep 17 00:00:00 2001 From: Christian Oliff Date: Fri, 25 Sep 2026 06:46:08 +0900 Subject: [PATCH 008/175] Delete CLAUDE.md (#42940) This is no longer needed (finally!) --- CLAUDE.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CLAUDE.md diff --git a/CLAUDE.md b/CLAUDE.md deleted file mode 100644 index 43c994c2d3..0000000000 --- a/CLAUDE.md +++ /dev/null @@ -1 +0,0 @@ -@AGENTS.md From 66e425780cb256bd395ed27e8925b84fe5ce7fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Thu, 24 Sep 2026 23:46:29 +0200 Subject: [PATCH 009/175] Declare missing --btn-input-font-weight token (#42931) --btn-font-weight referenced var(--btn-input-font-weight), but that token was never declared alongside its --btn-input-* siblings. Add it to scss/_root.scss so buttons resolve the intended font weight instead of silently inheriting. Co-authored-by: Claude Sonnet 5 --- scss/_root.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_root.scss b/scss/_root.scss index 7e90de6e60..6218a3f835 100644 --- a/scss/_root.scss +++ b/scss/_root.scss @@ -89,6 +89,7 @@ $root-tokens: defaults( --btn-input-padding-y: .375rem, --btn-input-padding-x: .75rem, --btn-input-font-size: var(--body-font-size), + --btn-input-font-weight: var(--font-weight-normal), --btn-input-line-height: var(--body-line-height), --btn-input-border-radius: var(--radius-5), From 4edc9f8d502d7d0419a94364e315239dd5db9d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Thu, 24 Sep 2026 23:46:49 +0200 Subject: [PATCH 010/175] Fix undefined --fg-color reference in nav tokens (#42930) --nav-tabs-link-active-color and --nav-underline-link-active-color referenced --fg-color, a token that does not exist. Use --fg-body, the same token .nav-link-active-color already uses for this state. Co-authored-by: Claude Sonnet 5 --- scss/_nav.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_nav.scss b/scss/_nav.scss index 236bd53a05..53fc2728b4 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -43,7 +43,7 @@ $nav-tabs-tokens: defaults( --nav-tabs-border-color: var(--border-color), --nav-tabs-border-radius: var(--radius-5), --nav-tabs-link-hover-border-color: var(--border-subtle), - --nav-tabs-link-active-color: var(--fg-color), + --nav-tabs-link-active-color: var(--fg-body), --nav-tabs-link-active-bg: var(--bg-body), --nav-tabs-link-active-border-color: var(--border-color) var(--border-color) var(--bg-body), ), @@ -77,7 +77,7 @@ $nav-underline-tokens: defaults( --nav-gap: 1rem, --nav-link-active-bg: transparent, --nav-underline-border-width: .125rem, - --nav-underline-link-active-color: var(--fg-color), + --nav-underline-link-active-color: var(--fg-body), ), $nav-underline-tokens ); From 30be5a470799a38107ee871656d538afa988b8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Fri, 25 Sep 2026 04:19:34 +0200 Subject: [PATCH 011/175] Wire --spacer to $spacer in root tokens (#42927) $root-tokens hardcoded --spacer: 1rem instead of interpolating $spacer. Every --spacer-N token derives from $spacer through the $spacers map, so overriding $spacer moved the scale but left the base token stuck at 1rem. Other tokens in the same map already interpolate their Sass variable (e.g. --border-width), so this brings --spacer in line with that convention. Co-authored-by: Claude Sonnet 5 --- scss/_root.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_root.scss b/scss/_root.scss index 6218a3f835..f8a0fc5292 100644 --- a/scss/_root.scss +++ b/scss/_root.scss @@ -61,7 +61,7 @@ $root-tokens: defaults( --transition-timing-overlay: cubic-bezier(.22, 1, .36, 1), // scss-docs-end root-transition-variables - --spacer: 1rem, + --spacer: #{$spacer}, // scss-docs-start root-focus-variables --focus-ring-width: 3px, From c307fa8cb895c8be5682e8a0b66581b7befbb923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Fri, 25 Sep 2026 04:20:03 +0200 Subject: [PATCH 012/175] Remove react-nextjs example from v6 docs (#42893) React Bootstrap has no Bootstrap v6-compatible release yet, and its components render their own DOM, so pairing it with v6's CSS breaks styling entirely. The example was dropped from twbs/examples' v6-dev branch for the same reason (twbs/examples#997); this removes its listing from the docs examples page to match. Co-authored-by: Claude Sonnet 5 --- site/data/examples.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/site/data/examples.yml b/site/data/examples.yml index ba89b4e6d9..69c971b427 100644 --- a/site/data/examples.yml +++ b/site/data/examples.yml @@ -21,10 +21,6 @@ description: "Import and bundle Bootstrap's source Sass and JavaScript via Parcel." url: /examples/tree/main/parcel indexPath: src/index.html - - name: React - description: "Import and bundle Bootstrap's source Sass and JavaScript with React, Next.js, and React Bootstrap." - url: /examples/tree/main/react-nextjs - indexPath: src/pages/index.tsx - name: Vite description: "Import and bundle Bootstrap's source Sass and JavaScript with Vite." url: /examples/tree/main/vite From ef95957df1815165f8bcc933e5d206bef99502d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Fri, 25 Sep 2026 04:20:11 +0200 Subject: [PATCH 013/175] Remove stale .form-select selectors from input group styles (#42928) .form-select was consolidated into .form-control on + Root + @@ -168,6 +172,7 @@ const css = `.token-demo { if (playground) { const target = playground.querySelector('[data-token-target]') + const root = document.documentElement const radiusControl = playground.querySelector('[data-control="radius"]') const spacerControl = playground.querySelector('[data-control="spacer"]') const colorControl = playground.querySelector('[data-control="color"]') @@ -188,6 +193,31 @@ const css = `.token-demo { return [...line.querySelectorAll('span')].filter((span) => span.childElementCount === 0) } + // Rewrite the selector on the snippet’s opening line (`.token-demo` ⇄ `:root`). + function setSelector(selector: string) { + const line = [...(code?.querySelectorAll('.line') ?? [])].find((candidate) => + (candidate.textContent ?? '').includes('{') + ) + + if (!line) { + return + } + + const leaves = leafSpans(line) + const brace = leaves.findIndex((span) => (span.textContent ?? '').includes('{')) + const selectorLeaves = brace === -1 ? leaves : leaves.slice(0, brace) + + if (selectorLeaves.length === 0) { + return + } + + selectorLeaves[0].textContent = `${selector} ` + + for (const extra of selectorLeaves.slice(1)) { + extra.textContent = '' + } + } + // Shiki splits values across spans, so collapse the value tokens on that // property’s line into a single rewrite. function setLineValue(property: string, value: string) { @@ -299,43 +329,64 @@ const css = `.token-demo { '--bs-primary-contrast': primary.contrast } + const isRoot = scope === 'root' + + // Radius and spacer always stay on the preview wrapper. target?.style.setProperty('--bs-radius-5', `${radius}rem`) target?.style.setProperty('--bs-radius-7', `${radius * 1.5}rem`) target?.style.setProperty('--bs-spacer', `${spacer}rem`) target?.style.setProperty('--bs-spacer-6', `${spacer * 1.25}rem`) - target?.style.setProperty('--bs-primary-base', primary.base) - target?.style.setProperty('--bs-primary-bg', primary.bg) - for (const [property, value] of Object.entries(derived)) { - if (scope === 'all') { - target?.style.setProperty(property, value) - } else { + if (isRoot) { + // One knob on `:root` re-mints every primary token, because the refactored + // `_theme.scss` derives each pairing from `--bs-primary-base`. Drop the + // wrapper overrides so the preview inherits the page-wide remint. + for (const property of ['--bs-primary-base', '--bs-primary-bg', ...Object.keys(derived)]) { target?.style.removeProperty(property) } + + root.style.setProperty('--bs-primary-base', primary.base) + } else { + // Leaving root scope: drop the page-wide override. + root.style.removeProperty('--bs-primary-base') + + target?.style.setProperty('--bs-primary-base', primary.base) + target?.style.setProperty('--bs-primary-bg', primary.bg) + + for (const [property, value] of Object.entries(derived)) { + if (scope === 'all') { + target?.style.setProperty(property, value) + } else { + target?.style.removeProperty(property) + } + } + } + + // Snippet: `:root { --bs-primary-base }` in root scope, else `.token-demo { … }`. + setSelector(isRoot ? ':root' : '.token-demo') + + const snippetLines: Record = { + '--bs-radius-5': !isRoot, + '--bs-spacer': !isRoot, + '--bs-primary-base': true, + '--bs-primary-bg': !isRoot, + '--bs-primary-bg-subtle': scope === 'all', + '--bs-primary-fg': scope === 'all', + '--bs-primary-border': scope === 'all' + } + + for (const [property, visible] of Object.entries(snippetLines)) { + lineFor(property)?.classList.toggle('d-none', !visible) } setLineValue('--bs-radius-5', `${radius}rem`) setLineValue('--bs-spacer', `${spacer}rem`) setLineValue('--bs-primary-base', primary.base) - // The derived lines in the snippet only appear in `all` scope. - const snippetDerived: Record = { - '--bs-primary-bg-subtle': primary.bgSubtle, - '--bs-primary-fg': primary.fg, - '--bs-primary-border': primary.border - } - - for (const [property, value] of Object.entries(snippetDerived)) { - const line = lineFor(property) - if (!line) { - continue - } - - line.classList.toggle('d-none', scope !== 'all') - - if (scope === 'all') { - setLineValue(property, value) - } + if (scope === 'all') { + setLineValue('--bs-primary-bg-subtle', primary.bgSubtle) + setLineValue('--bs-primary-fg', primary.fg) + setLineValue('--bs-primary-border', primary.border) } } diff --git a/site/src/content/docs/customize/theme.mdx b/site/src/content/docs/customize/theme.mdx index c7ed926092..5ebf6e6590 100644 --- a/site/src/content/docs/customize/theme.mdx +++ b/site/src/content/docs/customize/theme.mdx @@ -59,7 +59,55 @@ Every component reads the same theme and layout tokens, so one change reaches th -The **Remint** control shows how the theme works today. Set it to **All** and each color restates every derived token—`bg-subtle`, `fg`, `border`, and the rest—so the whole preview follows. Set it to **Base** and only `--bs-primary-base` and `--bs-primary-bg` change. The solid button recolors, but the alert keeps the compiled blue pairing, because its `bg-subtle`, `fg`, and `border` tokens still point at the blue palette on `:root`. +The **Remint** control shows the three ways to recolor. Set it to **All** and each color restates every derived token—`bg-subtle`, `fg`, `border`, and the rest—on the preview wrapper, so the whole group follows. Set it to **Base** and only `--bs-primary-base` and `--bs-primary-bg` change on the wrapper. The solid button recolors, but the alert keeps the compiled blue pairing, because a wrapper inherits the already-computed derived tokens from `:root`. Set it to **Root** and only `--bs-primary-base` changes, this time on `:root` itself. Each pairing derives from `--bs-primary-base`, so every derived token re-mints and every primary element on the page follows—one variable, not nine. + +## Reminting theme colors + +Each theme color builds its tokens from one base value. In `_theme.scss`, the `theme-color()` helper generates the nine tokens from `var(--{name}-base)` with the same tint and shade recipe as our [color palette]([[docsref:/customize/color/]]). So `--bs-primary-fg` is not a fixed palette stop—it is a `light-dark()` of two `color-mix()` values, each mixed against `var(--bs-primary-base)`. + +Because every derived token points back at the base, one override re-mints the whole set. Set the base on `:root` and the button, alert, border, and focus ring all follow: + +```css +:root { + --bs-primary-base: var(--bs-orange-500); +} +``` + +### Scope and the cascade + +CSS custom properties resolve where they are declared. Bootstrap declares the derived tokens on `:root`, so each `var(--bs-primary-base)` is substituted there. A descendant that resets `--bs-primary-base` inherits the already-resolved values, so the derived tokens do not re-mint: + +```css +.brand-region { + /* The solid button recolors, because it reads `--bs-primary-bg`. */ + /* The alert stays on the compiled pairing, because */ + /* `--bs-primary-bg-subtle` was already resolved on `:root`. */ + --bs-primary-base: var(--bs-orange-500); +} +``` + +To recolor a subtree, set the base on `:root`, or restate the tokens you need so they re-mint against the new base: + +```css +.brand-region { + --bs-primary-base: var(--bs-orange-500); + --bs-primary-bg-subtle: light-dark(var(--bs-orange-100), var(--bs-orange-900)); + --bs-primary-fg: light-dark(var(--bs-orange-600), var(--bs-orange-400)); + --bs-primary-border: light-dark(var(--bs-orange-300), var(--bs-orange-600)); +} +``` + +The **Remint** control in the playground shows this split. **Root** sets the base on `:root`, so every token follows. **Base** sets it on the wrapper, so only the solid surfaces move. + +### Override a single token + +You do not have to re-mint everything. Override any single token, on `:root` or a subtree, to step outside the recipe: + +```css +:root { + --bs-primary-focus-ring: var(--bs-primary-border); +} +``` ## Theme colors @@ -235,13 +283,22 @@ Here’s the same set of components rendered in both light and dark modes side b `} /> -Under the hood, token values like `--bs-primary-fg` resolve differently depending on the active color mode. For example, in our `_theme.scss`, the primary text color is defined as: +Under the hood, token values like `--bs-primary-fg` resolve differently depending on the active color mode. For example, in our `_theme.scss`, the primary text color derives from the base with `theme-pair()`: ```scss -"fg": light-dark(var(--blue-600), var(--blue-400)), +"fg": theme-pair(var(--primary-base), 600, 400), ``` -When `data-bs-theme="light"` is active (or the user’s system preference is light), this resolves to `var(--blue-600)`. In dark mode, it resolves to `var(--blue-400)`—a lighter shade that maintains readability against dark backgrounds. The same pattern applies to backgrounds, borders, and all other adaptive tokens. +That expands to a `light-dark()` of two `color-mix()` values, one per mode, each mixed against `var(--primary-base)`: + +```scss +"fg": light-dark( + color-mix(in oklch, var(--black) 16%, var(--primary-base)), // ≈ blue-600, light mode + color-mix(in oklch, var(--white) 20%, var(--primary-base)) // ≈ blue-400, dark mode +), +``` + +When `data-bs-theme="light"` is active (or the user’s system preference is light), the light value applies. In dark mode, the lighter value maintains readability against dark backgrounds. The same pattern applies to backgrounds, borders, and all other adaptive tokens. For more details on toggling color modes globally, building custom modes, and JavaScript toggler examples, see the [color modes documentation]([[docsref:/customize/color-modes/]]). @@ -319,7 +376,7 @@ The class sets each `--theme-*` custom property to `initial`. That makes the pro ## Theme Sass map -We use a large, nested Sass map to generate our theme color values. +We use a large, nested Sass map to generate our theme color values. Each built-in color runs through the `theme-color()` helper, which derives its pairing tokens from that color’s `base`. @@ -344,6 +401,8 @@ Configure `$theme-colors` through the main entrypoint with `@use ... with ()`. O Each theme color is a nested map, so the merge is one level deep. To change one sub-key of a built-in theme, pass the whole sub-map for that theme. For more detail, see the [Sass customization docs]([[docsref:/customize/sass#theme-color-map]]). +To recolor a built-in theme, you usually do not need Sass. Set `--bs-{name}-base` on `:root` and the pairings re-mint at runtime—see [Reminting theme colors](#reminting-theme-colors). Use the Sass map when you add or remove colors, or change the recipe. Colors you add through the map are used as authored, because the `theme-color()` derivation applies to the built-ins. Give a custom color the token keys its components need, or build the set yourself. + ## CSS variables CSS variables are generated from the `$theme-colors` Sass map at the `:root` level inside `_root.scss` using a Sass loop. From 3df38af28729cadfa26c8a4ebe232ea5a48ca718 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 25 Sep 2026 08:38:44 -0700 Subject: [PATCH 015/175] Update Vanilla Calendar Pro to v3.4.0 and fix datepicker dismissal (#42856) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update Vanilla Calendar Pro to v3.4.0 and register only needed extensions VCP v3.4.0 moves its optional features into extensions that ESM users must import. The datepicker now registers only `months`, which `displayMonthsCount` needs. This keeps time, weeks, motion, and annotations out of `bootstrap.bundle.js`. The v3.4.0 core is still larger than v3.2.0, so `bootstrap.bundle.min.js` grows from 55.98 kB to 57.32 kB gzipped. Raise its budget to 57.5 kB, and lower the unminified bundle budget to 73 kB. Add `Datepicker.registerExtensions()` so that pages can enable other features for every datepicker, including those the data API creates. Extensions in `vcpOptions.extensions` merge with the registered set. The docs show only core features, plus an Extensions section that explains how to add the others. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01BSipmEzpamwBN3vxKsUcge * Revert "Add a calendar docs page" The calendar docs page came with the calendar and datepicker split, which landed on v6-dev by accident. We are not keeping the split, so remove the page and its sidebar entry. This reverts commit 04e526914. * Merge the calendar Sass back into the datepicker The calendar and datepicker split landed on v6-dev by accident, pushed straight from a local branch instead of through this PR. We are not keeping it, so restore the single `_datepicker.scss` and its `--datepicker-*` tokens, and drop the calendar tokens from the docs and the migration guide. Keep the fix for the month and year grids. VCP 3.2.0 and later wrap months and years in row and cell elements, so the column grid still has to go on the row. The split also broke popup dismissal. The popup rule set `opacity: 1` with more specificity than `[data-vc-calendar-hidden]`, so a hidden popup stayed visible. The single file keeps the two rules at equal specificity, and the hidden rule wins by order. * Fix the theme sync by caching the ancestor on first lookup * Let vcpOptions.type through and style VCP's animated transitions These changes come from the VCP 3.3.1 bump, which a force push dropped from this branch. The version bump itself is no longer needed. The datepicker always set VCP's `type` itself, so `vcpOptions.type` was silently ignored. Let it through when `displayMonthsCount` is 1. More months still force VCP's required `'multiple'` type. In v3.4.0 the `'week'` type needs the `weeks` extension, so document that. With animation on, VCP clips the outgoing view and layers a ghost clone on top of it. Without the clip and the absolute positioning, the clone stays in normal flow and shows through under the calendar. Style `[data-vc-clip]`, `[data-vc-ghost]`, and `[data-vc-collapsing]`. Co-authored-by: Mark Otto * Point the VCP CDN URL at v3.4.0 The v3.4.0 upgrade bumped the package but left the docs CDN URL on v3.2.0. * Drop the week view and the weeks extension We do not want the week view, week numbers, or collapse to a week, so stop supporting them. The datepicker sets VCP's `type` itself again, and `vcpOptions.type` no longer reaches VCP. Remove the `[data-vc-collapsing]` styles, the `weeks` row in the extensions table, and the `weeks` usage in the docs, unit tests, and type tests. The tests use `motion` and `time` as the sample extensions instead. * Support only the months extension and drop registerExtensions() We do not style or test VCP's optional features, so stop offering them. The datepicker always passes `extensions: [months]`, which `displayMonthsCount` needs, and ignores `vcpOptions.extensions`. Remove `Datepicker.registerExtensions()`, the animated transition styles for the `motion` extension, and the extensions docs. The docs now say that options from other extensions are not supported. * Close the datepicker on outside presses and on a second trigger click VCP hides the popup on an outside click itself, but it skips Bootstrap's hide events. Close it on `pointerdown` outside the trigger and calendar too, so presses on non-focusable elements fire `hide.bs.datepicker` and `hidden.bs.datepicker`. The same handler already covers `focusin`. VCP also schedules a show on every click of its trigger, after the data API toggle runs. A second click on a button trigger closed the popup and VCP opened it again. Cancel that reopen when the toggle closed it. The two fixes add about 90 bytes, so raise the `bootstrap.min.js` budget to 33.75 kB. * Typo --------- Co-authored-by: Claude Co-authored-by: Julien Déramond --- .bundlewatch.config.json | 6 +- config.yml | 2 +- js/src/datepicker.ts | 71 +++- js/tests/unit/datepicker.spec.js | 161 ++++++- package-lock.json | 68 +-- package.json | 2 +- scss/_calendar.scss | 394 ------------------ scss/_datepicker.scss | 386 ++++++++++++++++- scss/bootstrap.scss | 1 - site/data/sidebar.yml | 3 - site/src/content/docs/components/calendar.mdx | 98 ----- site/src/content/docs/forms/datepicker.mdx | 11 +- site/src/content/docs/guides/migration.mdx | 1 - 13 files changed, 603 insertions(+), 601 deletions(-) delete mode 100644 scss/_calendar.scss delete mode 100644 site/src/content/docs/components/calendar.mdx diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index 36eb234270..c534dc0e1b 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -34,11 +34,11 @@ }, { "path": "./dist/js/bootstrap.bundle.js", - "maxSize": "89.0 kB" + "maxSize": "73.0 kB" }, { "path": "./dist/js/bootstrap.bundle.min.js", - "maxSize": "56.0 kB" + "maxSize": "57.5 kB" }, { "path": "./dist/js/bootstrap.js", @@ -46,7 +46,7 @@ }, { "path": "./dist/js/bootstrap.min.js", - "maxSize": "33.5 kB" + "maxSize": "33.75 kB" } ], "ci": { diff --git a/config.yml b/config.yml index 7be6e6cab9..0fab77b623 100644 --- a/config.yml +++ b/config.yml @@ -37,7 +37,7 @@ cdn: js_bundle: "https://cdn.jsdelivr.net/npm/bootstrap@6.0.0-alpha1/dist/js/bootstrap.bundle.min.js" js_bundle_hash: "sha384-I2J4jlw924JZXHU9un9Mcuixq/rKhd5A8/B1NQ6ifPAiBFacZjwNcec8d6L38jQv" floating_ui_esm: "https://cdn.jsdelivr.net/npm/@floating-ui/dom@1.7.6/dist/floating-ui.dom.esm.min.js" - vanilla_calendar_pro_esm: "https://cdn.jsdelivr.net/npm/vanilla-calendar-pro@3.2.0/index.mjs" + vanilla_calendar_pro_esm: "https://cdn.jsdelivr.net/npm/vanilla-calendar-pro@3.4.0/index.mjs" anchors: min: 2 diff --git a/js/src/datepicker.ts b/js/src/datepicker.ts index b5eab5a65c..a5cdc3c81c 100644 --- a/js/src/datepicker.ts +++ b/js/src/datepicker.ts @@ -7,6 +7,7 @@ import { Calendar, + months, type DateAny, type DateMode, type DatesArr, @@ -35,6 +36,8 @@ const EVENT_SHOWN = `shown${EVENT_KEY}` const EVENT_HIDE = `hide${EVENT_KEY}` const EVENT_HIDDEN = `hidden${EVENT_KEY}` const EVENT_FOCUSIN = `focusin${EVENT_KEY}` +const EVENT_POINTERDOWN = `pointerdown${EVENT_KEY}` +const EVENT_CLICK = `click${EVENT_KEY}` const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}` const EVENT_FOCUSIN_DATA_API = `focusin${EVENT_KEY}${DATA_API_KEY}` @@ -112,7 +115,9 @@ class Datepicker extends BaseComponent { protected declare _positionElement: HTMLElement protected declare _displayElement: HTMLElement | false | null protected declare _themeObserver: MutationObserver | null - protected declare _onFocusIn: (event: Event) => void + protected declare _themeAncestor: Element | null | undefined + protected declare _onOutside: (event: Event) => void + protected declare _onTriggerClick: () => void constructor(element?: string | Element | null, config?: Partial | null) { super(element, config) @@ -191,8 +196,13 @@ class Datepicker extends BaseComponent { this._themeObserver = null } - if (this._onFocusIn) { - EventHandler.off(document, EVENT_FOCUSIN, this._onFocusIn) + if (this._onOutside) { + EventHandler.off(document, EVENT_FOCUSIN, this._onOutside) + EventHandler.off(document, EVENT_POINTERDOWN, this._onOutside) + } + + if (this._onTriggerClick) { + EventHandler.off(this._positionElement, EVENT_CLICK, this._onTriggerClick) } if (this._calendar) { @@ -237,7 +247,7 @@ class Datepicker extends BaseComponent { // Watch for theme changes on ancestor elements (for live theme switching) this._setupThemeObserver() - this._setupDismissOnFocus() + this._setupDismiss() // Set initial value if input has a value if (this._isInput && this._element.value) { @@ -304,7 +314,14 @@ class Datepicker extends BaseComponent { } protected _getThemeAncestor(): Element | null { - return this._element.closest('[data-bs-theme]') + // Cache on first lookup: for an inline calendar, `_syncThemeAttribute` writes + // `data-bs-theme` onto this same element (it doubles as VCP's main element), which + // would make a later `closest()` match itself instead of the real ancestor. + if (this._themeAncestor === undefined) { + this._themeAncestor = this._element.closest('[data-bs-theme]') + } + + return this._themeAncestor } protected _getEffectiveTheme(): string | null { @@ -352,28 +369,41 @@ class Datepicker extends BaseComponent { }) } - // VCP ignores focus and mounts the popup on ``. - protected _setupDismissOnFocus(): void { + // VCP hides on outside `click` itself, but skips Bootstrap's hide events and + // ignores focus moves. Bootstrap closes the popup first instead. `focusin` + // covers keyboard moves and focusable targets. `pointerdown` covers presses on + // non-focusable elements (empty page area, a plain `
`, text). Use + // `pointerdown`, not `click`, so the target is read before the calendar + // re-renders on click (e.g. month or year navigation) and detaches the node. + protected _setupDismiss(): void { if (this._isInline) { return } - this._onFocusIn = event => { - if (!this._isShown) { - return + // VCP schedules a show on every click of its trigger, after the data API + // toggle runs. When that toggle closed the popup, cancel the reopen. + // `hide()` on VCP clears its pending show even when already hidden. + if (!this._isInput) { + this._onTriggerClick = () => { + if (!this._isShown) { + this._calendar?.hide() + } } - const { target } = event - const mainElement = this._calendar?.context?.mainElement - - if (target instanceof Node && (this._element.contains(target) || mainElement?.contains(target))) { - return - } - - this.hide() + EventHandler.on(this._positionElement, EVENT_CLICK, this._onTriggerClick) } - EventHandler.on(document, EVENT_FOCUSIN, this._onFocusIn) + this._onOutside = ({ target }) => { + const mainElement = this._calendar?.context?.mainElement + const isOutside = !(target instanceof Node) || (!this._element.contains(target) && !mainElement?.contains(target)) + + if (this._isShown && isOutside) { + this.hide() + } + } + + EventHandler.on(document, EVENT_FOCUSIN, this._onOutside) + EventHandler.on(document, EVENT_POINTERDOWN, this._onOutside) } protected _buildCalendarOptions(): Options { @@ -384,6 +414,9 @@ class Datepicker extends BaseComponent { const calendarOptions: Options = { ...this._config.vcpOptions, + // Vanilla Calendar Pro v3.4+ ships optional features as extensions. Bootstrap + // supports only `months`, which `displayMonthsCount` needs. + extensions: [months], inputMode: !this._isInline, positionToInput: this._config.placement, firstWeekday: this._config.firstWeekday, diff --git a/js/tests/unit/datepicker.spec.js b/js/tests/unit/datepicker.spec.js index 01ee1466ae..3dd50b0310 100644 --- a/js/tests/unit/datepicker.spec.js +++ b/js/tests/unit/datepicker.spec.js @@ -1,3 +1,4 @@ +import { months, motion } from 'vanilla-calendar-pro' import EventHandler from '../../src/dom/event-handler.js' import Datepicker from '../../src/datepicker.js' import { @@ -942,6 +943,10 @@ describe('Datepicker', () => { element.dispatchEvent(new FocusEvent('focusin', { bubbles: true })) } + const pointerDownOn = element => { + element.dispatchEvent(new PointerEvent('pointerdown', { bubbles: true })) + } + it('should hide when focus moves to an element outside the calendar', () => { return showDatepicker().then(({ datepicker }) => { expect(datepicker._isShown).toBeTrue() @@ -997,22 +1002,126 @@ describe('Datepicker', () => { const divEl = fixtureEl.querySelector('div') const datepicker = new Datepicker(divEl) - expect(datepicker._onFocusIn).toBeUndefined() + expect(datepicker._onOutside).toBeUndefined() expect(datepicker._isInline).toBeTrue() }) - it('should remove the document listener on dispose', () => { + it('should hide when a pointer press lands outside the calendar', () => { return showDatepicker().then(({ datepicker }) => { - const handler = datepicker._onFocusIn + expect(datepicker._isShown).toBeTrue() + + pointerDownOn(fixtureEl.querySelector('#outside')) + + expect(datepicker._isShown).toBeFalse() + }) + }) + + it('should hide when a pointer press lands on a non-focusable element', () => { + return showDatepicker('

Plain text

').then(({ datepicker }) => { + expect(datepicker._isShown).toBeTrue() + + pointerDownOn(fixtureEl.querySelector('#text')) + + expect(datepicker._isShown).toBeFalse() + }) + }) + + it('should not hide when a pointer press lands inside the calendar', () => { + return showDatepicker().then(({ datepicker }) => { + const dateBtn = datepicker._calendar.context.mainElement.querySelector('[data-vc-date-btn]') + + pointerDownOn(dateBtn) + + expect(datepicker._isShown).toBeTrue() + }) + }) + + it('should not hide on an outside pointer press when the popup is not shown', async () => { + const { datepicker } = await showDatepicker() + await datepicker.hide() + + const hideSpy = spyOn(datepicker, 'hide') + + pointerDownOn(fixtureEl.querySelector('#outside')) + + expect(hideSpy).not.toHaveBeenCalled() + }) + + it('should remove the document listeners on dispose', () => { + return showDatepicker().then(({ datepicker }) => { + const outsideHandler = datepicker._onOutside const offSpy = spyOn(EventHandler, 'off').and.callThrough() datepicker.dispose() - expect(offSpy).toHaveBeenCalledWith(document, 'focusin.bs.datepicker', handler) + expect(offSpy).toHaveBeenCalledWith(document, 'focusin.bs.datepicker', outsideHandler) + expect(offSpy).toHaveBeenCalledWith(document, 'pointerdown.bs.datepicker', outsideHandler) }) }) }) + describe('trigger clicks', () => { + // VCP defers its own show with `setTimeout`, so wait past it. + const settle = () => new Promise(resolve => { + setTimeout(resolve, 20) + }) + + const setupButton = () => { + fixtureEl.innerHTML = '' + return fixtureEl.querySelector('button') + } + + it('should close a button trigger on the next click', async () => { + const buttonEl = setupButton() + + buttonEl.click() + await settle() + const datepicker = Datepicker.getInstance(buttonEl) + expect(datepicker._isShown).toBeTrue() + + buttonEl.click() + await settle() + expect(datepicker._isShown).toBeFalse() + + buttonEl.click() + await settle() + expect(datepicker._isShown).toBeTrue() + }) + + it('should close a button trigger on the next click on a child element', async () => { + const buttonEl = setupButton() + const labelEl = fixtureEl.querySelector('#label') + + labelEl.click() + await settle() + const datepicker = Datepicker.getInstance(buttonEl) + expect(datepicker._isShown).toBeTrue() + + labelEl.click() + await settle() + expect(datepicker._isShown).toBeFalse() + }) + + it('should not register a trigger listener for input triggers', () => { + fixtureEl.innerHTML = '' + + const datepicker = new Datepicker(fixtureEl.querySelector('input')) + + expect(datepicker._onTriggerClick).toBeUndefined() + }) + + it('should remove the trigger listener on dispose', () => { + const buttonEl = setupButton() + const datepicker = new Datepicker(buttonEl) + const triggerHandler = datepicker._onTriggerClick + const offSpy = spyOn(EventHandler, 'off').and.callThrough() + + datepicker.dispose() + + expect(offSpy).toHaveBeenCalledWith(buttonEl, 'click.bs.datepicker', triggerHandler) + }) + }) + describe('getInstance', () => { it('should return datepicker instance', () => { fixtureEl.innerHTML = '' @@ -1132,6 +1241,50 @@ describe('Datepicker', () => { expect(datepicker._config.vcpOptions.jumpMonths).toEqual(2) }) + + it('should default to the single-month calendar type', () => { + fixtureEl.innerHTML = '' + + const inputEl = fixtureEl.querySelector('input') + const datepicker = new Datepicker(inputEl) + + expect(datepicker._buildCalendarOptions().type).toEqual('default') + }) + + it('should use the multiple calendar type when displayMonthsCount is greater than 1', () => { + fixtureEl.innerHTML = '' + + const inputEl = fixtureEl.querySelector('input') + const datepicker = new Datepicker(inputEl, { + displayMonthsCount: 2 + }) + + expect(datepicker._buildCalendarOptions().type).toEqual('multiple') + }) + }) + + describe('extensions', () => { + it('should register only the months extension', () => { + fixtureEl.innerHTML = '' + + const inputEl = fixtureEl.querySelector('input') + const datepicker = new Datepicker(inputEl) + + expect(datepicker._buildCalendarOptions().extensions).toEqual([months]) + }) + + it('should ignore vcpOptions.extensions', () => { + fixtureEl.innerHTML = '' + + const inputEl = fixtureEl.querySelector('input') + const datepicker = new Datepicker(inputEl, { + vcpOptions: { + extensions: [months, motion] + } + }) + + expect(datepicker._buildCalendarOptions().extensions).toEqual([months]) + }) }) describe('date selection handling', () => { diff --git a/package-lock.json b/package-lock.json index 890da21ef2..5bf774cfba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "peerDependencies": { "@floating-ui/dom": "^1.7.6", - "vanilla-calendar-pro": "^3.2.0" + "vanilla-calendar-pro": "^3.4.0" } }, "node_modules/@astrojs/check": { @@ -945,9 +945,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -962,9 +959,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -979,9 +973,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -996,9 +987,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -3130,9 +3118,6 @@ "arm" ], "dev": true, - "libc": [ - "glibc" - ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3150,9 +3135,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3170,9 +3152,6 @@ "ppc64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3190,9 +3169,6 @@ "riscv64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3210,9 +3186,6 @@ "s390x" ], "dev": true, - "libc": [ - "glibc" - ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3230,9 +3203,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3250,9 +3220,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3270,9 +3237,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -3290,9 +3254,6 @@ "arm" ], "dev": true, - "libc": [ - "glibc" - ], "license": "Apache-2.0", "optional": true, "os": [ @@ -3316,9 +3277,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "Apache-2.0", "optional": true, "os": [ @@ -3342,9 +3300,6 @@ "ppc64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "Apache-2.0", "optional": true, "os": [ @@ -3368,9 +3323,6 @@ "riscv64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "Apache-2.0", "optional": true, "os": [ @@ -3394,9 +3346,6 @@ "s390x" ], "dev": true, - "libc": [ - "glibc" - ], "license": "Apache-2.0", "optional": true, "os": [ @@ -3420,9 +3369,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "Apache-2.0", "optional": true, "os": [ @@ -3446,9 +3392,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "Apache-2.0", "optional": true, "os": [ @@ -3472,9 +3415,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "Apache-2.0", "optional": true, "os": [ @@ -19306,9 +19246,9 @@ } }, "node_modules/vanilla-calendar-pro": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/vanilla-calendar-pro/-/vanilla-calendar-pro-3.2.0.tgz", - "integrity": "sha512-YxGMSdIVaUxeFJAN3e0WOirlJHnYfb9XaLLMrQA8mPhMORwqs5PLMtUNfDlnrUBHn59c2GU6s+l2Zhe59B2zpw==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/vanilla-calendar-pro/-/vanilla-calendar-pro-3.4.0.tgz", + "integrity": "sha512-HLWjzHOWvMIrjI77tXK5bYzp0s5TeBSrZC247STjcTAdWI7kqEwWT6Xvu20vqdwzF498H1Da8l4WpdgVIGtc1Q==", "license": "MIT", "peer": true, "funding": { diff --git a/package.json b/package.json index 76a5f952d5..08c004d290 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ }, "peerDependencies": { "@floating-ui/dom": "^1.7.6", - "vanilla-calendar-pro": "^3.2.0" + "vanilla-calendar-pro": "^3.4.0" }, "devDependencies": { "@astrojs/check": "^0.9.10", diff --git a/scss/_calendar.scss b/scss/_calendar.scss deleted file mode 100644 index c53a30106d..0000000000 --- a/scss/_calendar.scss +++ /dev/null @@ -1,394 +0,0 @@ -// stylelint-disable selector-max-attribute, property-disallowed-list, selector-no-qualifying-type -- VCP uses extensive data attributes and requires direct border-radius properties for range selection - -@use "functions" as *; -@use "mixins/border-radius" as *; -@use "mixins/focus-ring" as *; -@use "mixins/mask-icon" as *; -@use "mixins/tokens" as *; - -$calendar-tokens: () !default; - -// scss-docs-start calendar-tokens -// stylelint-disable-next-line scss/dollar-variable-default -$calendar-tokens: defaults( - ( - --calendar-padding: 0, - --calendar-color: var(--fg-body), - --calendar-font-size: var(--font-size-sm), - --calendar-header-font-weight: 600, - --calendar-weekday-color: var(--fg-3), - --calendar-day-hover-bg: var(--bg-1), - --calendar-day-selected-bg: var(--primary-bg), - --calendar-day-selected-color: var(--primary-contrast), - --calendar-day-today-bg: var(--bg-2), - --calendar-day-today-color: var(--fg-1), - --calendar-day-disabled-color: var(--fg-4), - ), - $calendar-tokens -); -// scss-docs-end calendar-tokens - -@layer components { - // The calendar renders unadorned by default. The datepicker layers the popup - // surface on top for the `[data-vc-input]` variant. - [data-vc="calendar"] { - @include tokens($calendar-tokens); - - position: relative; - box-sizing: border-box; - display: flex; - flex-direction: column; - width: fit-content; - padding: var(--calendar-padding); - font-family: var(--body-font-family); - font-size: var(--calendar-font-size); - color: var(--calendar-color); - color-scheme: light dark; - - // Respond to Bootstrap's color mode system - &[data-bs-theme="light"] { - color-scheme: light; - } - - &[data-bs-theme="dark"] { - color-scheme: dark; - } - - // Catch-all for focus styles - button:focus-visible { - position: relative; - z-index: 1; - @include focus-ring(); - } - } - - [data-vc-arrow] { - position: relative; - display: block; - width: 2rem; - height: 2rem; - color: var(--calendar-color); - pointer-events: auto; - cursor: pointer; - background-color: transparent; - border: 0; - @include border-radius(var(--radius-5)); - - &::before { - position: absolute; - inset: .25rem; - content: ""; - background-color: var(--calendar-color); - @include mask-icon(url("data:image/svg+xml,"), $size: null); - } - - &:hover { - background-color: var(--calendar-day-hover-bg); - } - } - - [data-vc-arrow="prev"]::before { - transform: rotate(90deg); - } - - [data-vc-arrow="next"]::before { - transform: rotate(-90deg); - } - - // Grid layout - // - // The controls overlay the header, so they repeat the calendar's own inset to - // keep the arrows aligned with the content below. - [data-vc="controls"] { - position: absolute; - top: 0; - right: 0; - left: 0; - z-index: 20; - display: flex; - align-items: center; - justify-content: space-between; - padding-block-start: var(--calendar-padding); - padding-inline: var(--calendar-padding); - pointer-events: none; - } - - [data-vc="grid"] { - display: flex; - flex-grow: 1; - flex-wrap: wrap; - gap: 1.75rem; - } - - [data-vc="column"] { - display: flex; - flex-grow: 1; - flex-direction: column; - min-width: 240px; - } - - // - // Header - // - - [data-vc="header"] { - position: relative; - display: flex; - align-items: center; - margin-bottom: .75rem; - } - - // Month and year - [data-vc-header="content"] { - display: inline-flex; - flex-grow: 1; - align-items: center; - justify-content: center; - white-space: pre-wrap; - } - - [data-vc="month"], - [data-vc="year"] { - padding: .25rem .5rem; - margin-inline: -.125rem; - font-size: 1rem; - font-weight: var(--calendar-header-font-weight); - color: var(--calendar-color); - background-color: transparent; - border: 0; - @include border-radius(var(--radius-5)); - - &:disabled { - color: var(--calendar-day-disabled-color); - pointer-events: none; - } - - &:hover:not(:disabled) { - background-color: var(--calendar-day-hover-bg); - } - } - - [data-vc="content"] { - display: flex; - flex-grow: 1; - flex-direction: column; - } - - // Month/Year grids - // - // VCP wraps each set of months and years in role="row" and role="gridcell" - // elements, so the column grid goes on the row and not on the container. - [data-vc="months"], - [data-vc="years"] { - display: flex; - flex-grow: 1; - flex-direction: column; - row-gap: 1rem; - } - - [data-vc-months="row"], - [data-vc-years="row"] { - display: grid; - grid-template-columns: repeat(var(--calendar-columns, 4), minmax(0, 1fr)); - column-gap: .25rem; - align-items: center; - } - - [data-vc="years"] { - --calendar-columns: 5; - } - - [data-vc-months="cell"], - [data-vc-years="cell"] { - display: flex; - } - - [data-vc-months-month], - [data-vc-years-year] { - display: flex; - align-items: center; - justify-content: center; - width: 100%; - height: 2.5rem; - padding: .25rem; - font-size: .75rem; - font-weight: 600; - line-height: 1rem; - color: var(--calendar-weekday-color); - text-align: center; - word-break: break-all; - cursor: pointer; - background-color: transparent; - border: 0; - @include border-radius(var(--radius-5)); - - &:disabled { - color: var(--calendar-day-disabled-color); - pointer-events: none; - } - - &:hover:not(:disabled) { - background-color: var(--calendar-day-hover-bg); - } - - &[data-vc-months-month-selected], - &[data-vc-years-year-selected] { - color: var(--calendar-day-selected-color); - background-color: var(--calendar-day-selected-bg); - - &:hover { - color: var(--calendar-day-selected-color); - background-color: var(--calendar-day-selected-bg); - } - } - } - - // Week days header - [data-vc="week"] { - display: grid; - grid-template-columns: repeat(7, 1fr); - justify-items: center; - margin-bottom: .5rem; - } - - [data-vc-week-day] { - display: flex; - align-items: center; - justify-content: center; - width: 100%; - min-width: 1.875rem; - padding: 0; - margin: 0; - font-size: .75rem; - font-weight: 600; - line-height: 1rem; - color: var(--calendar-weekday-color); - background-color: transparent; - border: 0; - } - - button[data-vc-week-day] { - cursor: pointer; - } - - // Dates grid - [data-vc="dates"] { - pointer-events: none; - } - - [data-vc-dates="row"] { - display: grid; - grid-template-columns: repeat(7, 1fr); - align-items: center; - justify-items: center; - width: 100%; - } - - [data-vc-date] { - position: relative; - display: flex; - align-items: center; - justify-content: center; - width: 100%; - padding-top: .125rem; - padding-bottom: .125rem; - pointer-events: auto; - - &:not(:has([data-vc-date-btn])), - &[data-vc-date-disabled], - &[data-vc-date-disabled] [data-vc-date-btn] { - pointer-events: none; - } - } - - // Date button - [data-vc-date-btn] { - display: flex; - align-items: center; - justify-content: center; - width: 100%; - min-width: 1.875rem; - height: 100%; - min-height: 1.875rem; - padding: 0; - font-size: .75rem; - font-weight: 400; - line-height: 1rem; - color: var(--calendar-color); - cursor: pointer; - background-color: transparent; - border: 0; - border-radius: var(--radius-5); - - &:hover { - background-color: var(--calendar-day-hover-bg); - } - } - - // Today - [data-vc-date-today] [data-vc-date-btn] { - font-weight: 600; - color: var(--calendar-day-today-color); - background-color: var(--calendar-day-today-bg); - } - - // Outside month - [data-vc-date-month="next"] [data-vc-date-btn], - [data-vc-date-month="prev"] [data-vc-date-btn] { - opacity: .5; - } - - // Disabled - [data-vc-date-disabled] [data-vc-date-btn] { - color: var(--calendar-day-disabled-color); - } - - // Range selection styles - [data-vc-date-hover] [data-vc-date-btn] { - background-color: var(--calendar-day-hover-bg); - border-radius: 0; - } - - [data-vc-date-hover="first"] [data-vc-date-btn] { - border-start-start-radius: var(--radius-5); - border-end-start-radius: var(--radius-5); - } - - [data-vc-date-hover="last"] [data-vc-date-btn] { - border-start-end-radius: var(--radius-5); - border-end-end-radius: var(--radius-5); - } - - [data-vc-date-hover="first-and-last"] [data-vc-date-btn] { - border-radius: var(--radius-5); - } - - [data-vc-date-selected="middle"] [data-vc-date-btn] { - border-radius: 0; - opacity: .8; - } - - // Selected - [data-vc-date-selected] [data-vc-date-btn] { - color: var(--calendar-day-selected-color); - background-color: var(--calendar-day-selected-bg); - } - - [data-vc-date-selected="first"] [data-vc-date-btn] { - border-top-left-radius: var(--radius-5); - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: var(--radius-5); - } - - [data-vc-date-selected="last"] [data-vc-date-btn] { - border-top-left-radius: 0; - border-top-right-radius: var(--radius-5); - border-bottom-right-radius: var(--radius-5); - border-bottom-left-radius: 0; - } - - [data-vc-date-selected="first-and-last"] [data-vc-date-btn] { - border-radius: var(--radius-5); - } -} diff --git a/scss/_datepicker.scss b/scss/_datepicker.scss index ebe21268ec..f1539f399a 100644 --- a/scss/_datepicker.scss +++ b/scss/_datepicker.scss @@ -1,5 +1,10 @@ +// stylelint-disable selector-max-attribute, property-disallowed-list, selector-no-qualifying-type -- VCP uses extensive data attributes and requires direct border-radius properties for range selection + @use "functions" as *; +@use "config" as *; @use "mixins/border-radius" as *; +@use "mixins/focus-ring" as *; +@use "mixins/mask-icon" as *; @use "mixins/tokens" as *; $datepicker-tokens: () !default; @@ -10,33 +15,63 @@ $datepicker-tokens: defaults( ( --datepicker-padding: 1rem, --datepicker-bg: var(--bg-body), + --datepicker-color: var(--fg-body), --datepicker-border-color: var(--border-color-translucent), --datepicker-border-width: var(--border-width), --datepicker-border-radius: var(--radius-7), --datepicker-box-shadow: var(--box-shadow), + --datepicker-font-size: var(--font-size-sm), --datepicker-min-width: 280px, --datepicker-zindex: var(--z-menu), + --datepicker-header-font-weight: 600, + --datepicker-weekday-color: var(--fg-3), + --datepicker-day-hover-bg: var(--bg-1), + --datepicker-day-selected-bg: var(--primary-bg), + --datepicker-day-selected-color: var(--primary-contrast), + --datepicker-day-today-bg: var(--bg-2), + --datepicker-day-today-color: var(--fg-1), + --datepicker-day-disabled-color: var(--fg-4), ), $datepicker-tokens ); // scss-docs-end datepicker-tokens @layer components { - // The popup surface. VCP only adds `[data-vc-input]` when it owns a popup, so - // inline calendars keep the bare styling from the calendar component. - [data-vc="calendar"][data-vc-input] { + [data-vc="calendar"] { @include tokens($datepicker-tokens); - --calendar-padding: var(--datepicker-padding); - position: absolute; z-index: var(--datepicker-zindex); + box-sizing: border-box; + display: flex; + flex-direction: column; min-width: var(--datepicker-min-width); + padding: var(--datepicker-padding); + font-family: var(--body-font-family); + font-size: var(--datepicker-font-size); + color: var(--datepicker-color); + color-scheme: light dark; background-color: var(--datepicker-bg); border: var(--datepicker-border-width) solid var(--datepicker-border-color); box-shadow: var(--datepicker-box-shadow); opacity: 1; @include border-radius(var(--datepicker-border-radius)); + + // Respond to Bootstrap's color mode system + &[data-bs-theme="light"] { + color-scheme: light; + } + + &[data-bs-theme="dark"] { + color-scheme: dark; + } + + // Catch-all for focus styles + button:focus-visible { + position: relative; + z-index: 1; + @include focus-ring(); + } } [data-vc-calendar-hidden] { @@ -44,6 +79,17 @@ $datepicker-tokens: defaults( opacity: 0; } + // Inline calendars + // + // Remove popover styling for more neutral styling + [data-vc="calendar"]:not([data-vc-input]) { + position: relative; + width: fit-content; + padding: 0; + border: 0; + box-shadow: none; + } + [data-vc-position="bottom"] { margin-block-start: .25rem; } @@ -51,4 +97,334 @@ $datepicker-tokens: defaults( [data-vc-position="top"] { margin-block-end: -.25rem; } + + [data-vc-arrow] { + position: relative; + display: block; + width: 2rem; + height: 2rem; + color: var(--datepicker-color); + pointer-events: auto; + cursor: pointer; + background-color: transparent; + border: 0; + @include border-radius(var(--radius-5)); + + &::before { + position: absolute; + inset: .25rem; + content: ""; + background-color: var(--datepicker-color); + @include mask-icon(url("data:image/svg+xml,"), $size: null); + } + + &:hover { + background-color: var(--datepicker-day-hover-bg); + } + } + + [data-vc-arrow="prev"]::before { + transform: rotate(90deg); + } + + [data-vc-arrow="next"]::before { + transform: rotate(-90deg); + } + + // Grid layout + [data-vc="controls"] { + position: absolute; + top: 0; + right: 0; + left: 0; + z-index: 20; + display: flex; + align-items: center; + justify-content: space-between; + padding-top: 1rem; + padding-right: 1rem; + padding-left: 1rem; + pointer-events: none; + } + + [data-vc="grid"] { + display: flex; + flex-grow: 1; + flex-wrap: wrap; + gap: 1.75rem; + } + + [data-vc="column"] { + display: flex; + flex-grow: 1; + flex-direction: column; + min-width: 240px; + } + + // + // Header + // + + [data-vc="header"] { + position: relative; + display: flex; + align-items: center; + margin-bottom: .75rem; + } + + // Month and year + [data-vc-header="content"] { + display: inline-flex; + flex-grow: 1; + align-items: center; + justify-content: center; + white-space: pre-wrap; + } + + [data-vc="month"], + [data-vc="year"] { + padding: .25rem .5rem; + margin-inline: -.125rem; + font-size: 1rem; + font-weight: var(--datepicker-header-font-weight); + color: var(--datepicker-color); + // cursor: pointer; + background-color: transparent; + border: 0; + @include border-radius(var(--radius-5)); + + &:disabled { + color: var(--datepicker-day-disabled-color); + pointer-events: none; + } + + &:hover:not(:disabled) { + background-color: var(--datepicker-day-hover-bg); + } + } + + [data-vc="content"] { + display: flex; + flex-grow: 1; + flex-direction: column; + } + + // Month/Year grids + // + // VCP wraps each set of months and years in role="row" and role="gridcell" + // elements, so the column grid goes on the row and not on the container. + [data-vc="months"], + [data-vc="years"] { + display: flex; + flex-grow: 1; + flex-direction: column; + row-gap: 1rem; + } + + [data-vc-months="row"], + [data-vc-years="row"] { + display: grid; + grid-template-columns: repeat(var(--vc-columns, 4), minmax(0, 1fr)); + column-gap: .25rem; + align-items: center; + } + + [data-vc="years"] { + --vc-columns: 5; + } + + [data-vc-months="cell"], + [data-vc-years="cell"] { + display: flex; + } + + [data-vc-months-month], + [data-vc-years-year] { + display: flex; + align-items: center; + justify-content: center; + width: 100%; + height: 2.5rem; + padding: .25rem; + font-size: .75rem; + font-weight: 600; + line-height: 1rem; + color: var(--datepicker-weekday-color); + text-align: center; + word-break: break-all; + cursor: pointer; + background-color: transparent; + border: 0; + @include border-radius(var(--radius-5)); + + &:disabled { + color: var(--datepicker-day-disabled-color); + pointer-events: none; + } + + &:hover:not(:disabled) { + background-color: var(--datepicker-day-hover-bg); + } + + &[data-vc-months-month-selected], + &[data-vc-years-year-selected] { + color: var(--datepicker-day-selected-color); + background-color: var(--datepicker-day-selected-bg); + + &:hover { + color: var(--datepicker-day-selected-color); + background-color: var(--datepicker-day-selected-bg); + } + } + } + + // Week days header + [data-vc="week"] { + display: grid; + grid-template-columns: repeat(7, 1fr); + justify-items: center; + margin-bottom: .5rem; + } + + [data-vc-week-day] { + display: flex; + align-items: center; + justify-content: center; + width: 100%; + min-width: 1.875rem; + padding: 0; + margin: 0; + font-size: .75rem; + font-weight: 600; + line-height: 1rem; + color: var(--datepicker-weekday-color); + background-color: transparent; + border: 0; + } + + button[data-vc-week-day] { + cursor: pointer; + } + + // Dates grid + [data-vc="dates"] { + pointer-events: none; + } + + [data-vc-dates="row"] { + display: grid; + grid-template-columns: repeat(7, 1fr); + align-items: center; + justify-items: center; + width: 100%; + } + + [data-vc-date] { + position: relative; + display: flex; + align-items: center; + justify-content: center; + width: 100%; + padding-top: .125rem; + padding-bottom: .125rem; + pointer-events: auto; + + &:not(:has([data-vc-date-btn])), + &[data-vc-date-disabled], + &[data-vc-date-disabled] [data-vc-date-btn] { + pointer-events: none; + } + } + + // Date button + [data-vc-date-btn] { + display: flex; + align-items: center; + justify-content: center; + width: 100%; + min-width: 1.875rem; + height: 100%; + min-height: 1.875rem; + padding: 0; + font-size: .75rem; + font-weight: 400; + line-height: 1rem; + color: var(--datepicker-color); + cursor: pointer; + background-color: transparent; + border: 0; + border-radius: var(--radius-5); + + &:hover { + background-color: var(--datepicker-day-hover-bg); + } + } + + // Today + [data-vc-date-today] [data-vc-date-btn] { + font-weight: 600; + color: var(--datepicker-day-today-color); + background-color: var(--datepicker-day-today-bg); + } + + // Outside month + [data-vc-date-month="next"] [data-vc-date-btn], + [data-vc-date-month="prev"] [data-vc-date-btn] { + opacity: .5; + } + + // Disabled + [data-vc-date-disabled] [data-vc-date-btn] { + color: var(--datepicker-day-disabled-color); + } + + // Range selection styles + [data-vc-date-hover] [data-vc-date-btn] { + background-color: var(--datepicker-day-hover-bg); + border-radius: 0; + } + + [data-vc-date-hover="first"] [data-vc-date-btn] { + border-start-start-radius: var(--radius-5); + border-end-start-radius: var(--radius-5); + } + + [data-vc-date-hover="last"] [data-vc-date-btn] { + border-start-end-radius: var(--radius-5); + border-end-end-radius: var(--radius-5); + } + + [data-vc-date-hover="first-and-last"] [data-vc-date-btn] { + border-radius: var(--radius-5); + } + + [data-vc-date-selected="middle"] [data-vc-date-btn] { + border-radius: 0; + opacity: .8; + } + + // Selected + [data-vc-date-selected] [data-vc-date-btn] { + color: var(--datepicker-day-selected-color); + background-color: var(--datepicker-day-selected-bg); + + } + + [data-vc-date-selected="first"] [data-vc-date-btn] { + border-top-left-radius: var(--radius-5); + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: var(--radius-5); + } + + [data-vc-date-selected="last"] [data-vc-date-btn] { + border-top-left-radius: 0; + border-top-right-radius: var(--radius-5); + border-bottom-right-radius: var(--radius-5); + border-bottom-left-radius: 0; + } + + [data-vc-date-selected="first-and-last"] [data-vc-date-btn] { + border-radius: var(--radius-5); + } } diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index d914cc470a..58960c6e9a 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -26,7 +26,6 @@ @forward "avatar"; @forward "badge"; @forward "breadcrumb"; -@forward "calendar"; @forward "chip"; @forward "card"; @forward "carousel"; diff --git a/site/data/sidebar.yml b/site/data/sidebar.yml index d7a681c761..73dee44b39 100644 --- a/site/data/sidebar.yml +++ b/site/data/sidebar.yml @@ -127,9 +127,6 @@ - title: Breadcrumb - title: Button - title: Button group - - title: Calendar - meta: - - added: 6.0.0 - title: Card - title: Carousel meta: diff --git a/site/src/content/docs/components/calendar.mdx b/site/src/content/docs/components/calendar.mdx deleted file mode 100644 index c78598590d..0000000000 --- a/site/src/content/docs/components/calendar.mdx +++ /dev/null @@ -1,98 +0,0 @@ ---- -title: Calendar -description: The date grid that powers the datepicker. Render it inline for a standalone calendar, and style it with its own set of tokens. -toc: true -css_layer: components -js: required -deps: - - title: Datepicker - - title: Vanilla Calendar Pro - url: https://vanilla-calendar.pro/ ---- - -## How it works - -The calendar is the date grid: the header, the weekdays, the dates, and the month and year views. The [datepicker]([[docsref:/forms/datepicker]]) adds the popup surface around it and binds it to a form control. - -- [Vanilla Calendar Pro](https://vanilla-calendar.pro/) builds the markup. Bootstrap styles the `data-vc-*` attributes it writes. -- Bootstrap has no separate `Calendar` class. Render a calendar with the datepicker’s `inline` option. -- A calendar renders unadorned. It has no background, border, or padding, so it sits in your own container. -- The datepicker adds the popup surface only when it owns a popup. Style the two parts apart with `--calendar-*` and `--datepicker-*` tokens. - -Add `data-bs-inline="true"` to render a calendar instead of a popup. Bootstrap initializes inline calendars on page load, so they need no extra JavaScript. - -
`} /> - -Point at the month or the year in the header to switch to the month or year view. - -## Examples - -### In a card - -A calendar inherits the page background and adds no padding of its own. Put it in a [card]([[docsref:/components/card]]) to give it a surface. - - -
-
-
- `} /> - -### Range selection - -Add `data-bs-selection-mode="multiple-ranged"` to select a start date and an end date. - -`} /> - -### Multiple dates - -Add `data-bs-selection-mode="multiple"` to select any number of dates. - -`} /> - -### Multiple months - -Add `data-bs-display-months-count` to show more than one month side by side. - -`} /> - -### Form binding - -Put a hidden input inside the calendar to submit the selection with a form. Bootstrap writes the selected dates to it in `YYYY-MM-DD` format, separated by commas. - - -
- -
- - `} /> - -## Color modes - -The calendar follows Bootstrap’s color modes. Set `data-bs-theme` on any ancestor and the calendar picks it up. - - -
- `} /> - -## Accessibility - -Vanilla Calendar Pro marks up the grid with `role="grid"`, `role="row"`, and `role="gridcell"`, and it labels each date. It also handles keyboard navigation. Give the calendar an accessible name when the surrounding content does not already name it. - -## Usage - -The calendar has no JavaScript of its own. Use the [datepicker]([[docsref:/forms/datepicker]]) for options, methods, and events, and pass `inline: true` to render a calendar. - -```js -const calendar = new bootstrap.Datepicker(element, { - inline: true, - selectionMode: 'multiple-ranged' -}) -``` - -## CSS - -### Variables - -The calendar owns the tokens for the grid. The datepicker owns the tokens for the popup surface, such as its background, border, and shadow. Override the `--calendar-*` tokens to restyle a calendar in both places at once. - - diff --git a/site/src/content/docs/forms/datepicker.mdx b/site/src/content/docs/forms/datepicker.mdx index 2142fa0fe5..4c63562ef4 100644 --- a/site/src/content/docs/forms/datepicker.mdx +++ b/site/src/content/docs/forms/datepicker.mdx @@ -209,7 +209,7 @@ Use `data-bs-datepicker-theme` to set the datepicker popup’s theme independent The calendar renders inside a shadow root, which is useful for encapsulated web components. Two things differ from normal use: -- Initialize the datepicker with JavaScript. Delegated events change their target at the shadow boundary, so `data-bs-toggle="datepicker"` does not reach elements inside a shadow root. +- Initialize the datepicker with JavaScript. Delegated events re-target at the shadow boundary, so `data-bs-toggle="datepicker"` does not reach elements inside a shadow root. - Adopt Bootstrap’s stylesheet into the shadow root. Document styles do not cross the boundary, so the calendar renders unstyled without it. ```js @@ -227,10 +227,6 @@ new bootstrap.Datepicker(root.getElementById('shadowDatepicker')) ### Variables -The calendar grid and the popup surface use separate token maps. Style an inline calendar with the `--calendar-*` tokens. The `--datepicker-*` tokens only apply to the popup that the datepicker adds. - - - ## Usage @@ -297,14 +293,15 @@ const datepicker = new bootstrap.Datepicker(element, { disableDatesPast: true, // Disable past dates disableWeekdays: [0, 6], // Disable weekends disableDates: ['2026-12-25', '2026-12-26'], // Disable specific dates - selectedHolidays: ['2026-01-01'], // Highlight holidays - selectionTimeMode: 24 // Enable 24-hour time selection + selectedHolidays: ['2026-01-01'] // Highlight holidays } }) ``` See the [Vanilla Calendar Pro documentation](https://vanilla-calendar.pro/docs/reference/settings) for all available options. +Vanilla Calendar Pro ships its optional features as extensions. Bootstrap uses only the `months` extension, which `displayMonthsCount` needs. Options from other extensions are not supported, and Vanilla Calendar Pro throws an error when you set them. These include `animation`, `enableSwipe`, `selectionTimeMode`, `popups`, and the week view options. + ### Methods diff --git a/site/src/content/docs/guides/migration.mdx b/site/src/content/docs/guides/migration.mdx index 7bf723e066..a443f5a39d 100644 --- a/site/src/content/docs/guides/migration.mdx +++ b/site/src/content/docs/guides/migration.mdx @@ -615,7 +615,6 @@ Bootstrap 6 is a major release with many breaking changes to modernize our codeb - **Range** — `Range` JavaScript plugin that turns `.form-range` into a styled slider with a filled track, optional value bubble, and `` tick marks, with a `changed.bs.range` event. - **Toggler** — `Toggler` JavaScript plugin for toggling classes or attributes on elements via `data-bs-toggle="toggler"`. - **Datepicker** — `Datepicker` JavaScript plugin built on Vanilla Calendar Pro, with events: `change.bs.datepicker`, `show.bs.datepicker`, `hide.bs.datepicker`. -- **Calendar** — CSS-only date grid that styles Vanilla Calendar Pro’s `data-vc-*` markup. There is no `Calendar` JavaScript class. Render an inline calendar with the Datepicker `inline` option. See the [Calendar docs]([[docsref:/components/calendar]]). - **Form Adorn** — new `.form-adorn` component for adding icons or text decoration to form inputs. - **Prose** — new `.prose` class for rich typography scoping and `.not-prose` to opt out of prose styles within a prose container. - **NavOverflow** — Wrap a `.nav` in ` `} /> From 1c746ff83e549c7ddcce536ac634f0529b4c1260 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 25 Sep 2026 20:11:27 -0700 Subject: [PATCH 017/175] Relocate overflowing nav menus as overflow submenus (#42873) * Relocate overflowing nav menus as overflow submenus A nav item that hosts a menu used to collapse into a plain cloned link. The menu became unreachable once the nav item overflowed, so a nested menu was lost at narrow widths. Move the original `.menu` into a `.submenu` of the overflow menu instead of cloning it. One live menu keeps its ids, its nested submenus, and its node state. Only the trigger is cloned, with the menu data attributes stripped and `aria-haspopup` added. Restore moves the menu back to its nav item and disposes the menu instances that were created. * Type a relocated menu parent as ParentNode `tsc` rejected `parent.append(menu)`, because `Node` does not declare `append`. Store the parent as `ParentNode`, which does, and which is what `Node.parentNode` already returns. * Raise the JS bundlewatch budgets The submenu relocation adds about 0.4KB gzipped to the minified builds, and both budgets had under 0.1KB of headroom. Move `bootstrap.min.js` to 34.0KB and `bootstrap.bundle.min.js` to 56.0KB. * Handle menu state during nav overflow relocation An open nav menu kept stale classes when its item moved into overflow. Menus moved to another container were also missed, and cloned anchor triggers lost keyboard focus. Cache each hosted menu before it can move, reset open state during relocation, and keep anchor triggers focusable. Add regression coverage for relocation, nested interaction, container menus, and menu rebuilds. Raise the bundled size budget to fit the added handling. * Raise the unminified bundlewatch budget The bundled build is 73.13KB after the nav overflow changes, which is above the 73KB limit. Raise the limit to 73.25KB. * Fully round nav pills The radius token leaves visible corners on taller pill navigation. Use a component-specific 3rem radius for the pill container and links. * Fix nav overflow startup and clipped menus Resizable examples clip the generated overflow menu because their fixed positioning strategy cannot reach the toggle that NavOverflow creates. Expose a menu strategy option and use it in those previews. Hide the expanded nav until its first calculation completes to prevent a startup flash and scrollbar. Remove the icon line box so icon-only toggles stay vertically centered. --- .bundlewatch.config.json | 6 +- js/src/nav-overflow.ts | 151 ++++++++++-- js/tests/unit/nav-overflow.spec.js | 224 ++++++++++++++++++ scss/_nav-overflow.scss | 15 ++ scss/_nav.scss | 4 +- .../shortcodes/ResizableExample.astro | 16 +- .../content/docs/components/nav-overflow.mdx | 56 ++++- 7 files changed, 444 insertions(+), 28 deletions(-) diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index c534dc0e1b..d5d4fa1ced 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -34,11 +34,11 @@ }, { "path": "./dist/js/bootstrap.bundle.js", - "maxSize": "73.0 kB" + "maxSize": "73.25 kB" }, { "path": "./dist/js/bootstrap.bundle.min.js", - "maxSize": "57.5 kB" + "maxSize": "58.25 kB" }, { "path": "./dist/js/bootstrap.js", @@ -46,7 +46,7 @@ }, { "path": "./dist/js/bootstrap.min.js", - "maxSize": "33.75 kB" + "maxSize": "34.25 kB" } ], "ci": { diff --git a/js/src/nav-overflow.ts b/js/src/nav-overflow.ts index 3d4397b057..9796ef8ba6 100644 --- a/js/src/nav-overflow.ts +++ b/js/src/nav-overflow.ts @@ -8,6 +8,7 @@ import BaseComponent from './base-component.js' import EventHandler from './dom/event-handler.js' import SelectorEngine from './dom/selector-engine.js' +import Menu from './menu.js' import { DefaultIconAllowlist, sanitizeHtml } from './util/sanitizer.js' /** @@ -26,6 +27,9 @@ const CLASS_NAME_OVERFLOW = 'nav-overflow' const CLASS_NAME_OVERFLOW_MENU = 'nav-overflow-menu' const CLASS_NAME_HIDDEN = 'd-none' const CLASS_NAME_KEEP = 'nav-overflow-keep' +const CLASS_NAME_INITIALIZED = 'nav-overflow-initialized' +const CLASS_NAME_SUBMENU = 'submenu' +const CLASS_NAME_SHOW = 'show' const SELECTOR_NAV = '.nav' const SELECTOR_NAV_ITEM = '.nav-item' @@ -33,11 +37,14 @@ const SELECTOR_NAV_LINK = '.nav-link' const SELECTOR_OVERFLOW_TOGGLE = '.nav-overflow-toggle' const SELECTOR_OVERFLOW_MENU = '.nav-overflow-menu' const SELECTOR_CUSTOM_ICON = '[data-bs-overflow-icon]' +const SELECTOR_MENU = '.menu' +const SELECTOR_MENU_TOGGLE = '[data-bs-toggle="menu"]' type NavOverflowConfig = { collapseBelow: number | string iconPlacement: string menuPlacement: string + menuStrategy: string moreText: string | false moreIcon: string threshold: number @@ -50,6 +57,7 @@ const Default: NavOverflowConfig = { collapseBelow: 0, iconPlacement: 'start', menuPlacement: 'bottom-end', + menuStrategy: 'absolute', moreText: DEFAULT_TEXT, moreIcon: '', threshold: 0 // Minimum items to keep visible before showing overflow @@ -59,6 +67,7 @@ const DefaultType = { collapseBelow: '(number|string)', iconPlacement: 'string', menuPlacement: 'string', + menuStrategy: 'string', moreText: '(string|boolean)', moreIcon: 'string', threshold: 'number' @@ -78,6 +87,8 @@ class NavOverflow extends BaseComponent { protected declare _resizeObserver: ResizeObserver | null protected declare _resizeHandler: (() => void) | null protected declare _collapseBelow: number + protected declare _itemMenus: Map + protected declare _relocatedMenus: Map constructor(element?: string | Element | null, config?: Partial | null) { super(element, config) @@ -96,6 +107,8 @@ class NavOverflow extends BaseComponent { this._resizeObserver = null this._resizeHandler = null this._collapseBelow = 0 + this._itemMenus = new Map() + this._relocatedMenus = new Map() this._init() } @@ -152,6 +165,11 @@ class NavOverflow extends BaseComponent { // Store original order data for (const [index, item] of this._items.entries()) { item.dataset.bsNavOrder = index as any + + const link = SelectorEngine.findOne(SELECTOR_NAV_LINK, item) + if (link?.matches(SELECTOR_MENU_TOGGLE)) { + this._findItemMenu(item, link) + } } // Resolve collapseBelow threshold once @@ -165,6 +183,7 @@ class NavOverflow extends BaseComponent { // Initial calculation this._calculateOverflow() + this._element.classList.add(CLASS_NAME_INITIALIZED) } protected _createOverflowMenu(): void { @@ -189,6 +208,7 @@ class NavOverflow extends BaseComponent { button.className = 'nav-link nav-overflow-toggle' button.setAttribute('data-bs-toggle', 'menu') button.setAttribute('data-bs-placement', this._config.menuPlacement) + button.setAttribute('data-bs-strategy', this._config.menuStrategy) button.setAttribute('aria-expanded', 'false') // An icon-only toggle still needs a name. Fall back to the default text, @@ -357,8 +377,7 @@ class NavOverflow extends BaseComponent { return } - // Clear existing overflow items - this._overflowMenu.innerHTML = '' + this._overflowMenu.replaceChildren() this._overflowItems = [] for (const item of items) { @@ -367,20 +386,14 @@ class NavOverflow extends BaseComponent { continue } - const clonedLink = link.cloneNode(true) as HTMLElement - clonedLink.className = 'menu-item' + const menu = this._findItemMenu(item, link) - if (link.classList.contains('active')) { - clonedLink.classList.add('active') + if (menu && link.matches(SELECTOR_MENU_TOGGLE)) { + this._overflowMenu.append(this._relocateAsSubmenu(item, link, menu)) + } else { + this._overflowMenu.append(this._cloneAsMenuItem(link)) } - if (link.classList.contains('disabled') || link.hasAttribute('disabled')) { - clonedLink.classList.add('disabled') - } - - this._overflowMenu.append(clonedLink) - - // Hide original item item.classList.add(CLASS_NAME_HIDDEN) item.dataset.bsNavOverflow = 'true' @@ -388,7 +401,114 @@ class NavOverflow extends BaseComponent { } } + // A nav item that already hosts a Menu becomes a submenu of the overflow + // menu. Move the original `.menu` (do not clone it) so nested submenus, + // ids, and live node state stay on one element. + protected _relocateAsSubmenu(item: HTMLElement, link: HTMLElement, menu: HTMLElement): HTMLElement { + this._resetMenu(link, menu) + item.classList.remove(CLASS_NAME_SHOW) + + this._relocatedMenus.set(item, { + menu, + parent: menu.parentNode!, + nextSibling: menu.nextSibling + }) + + const submenu = document.createElement('div') + submenu.className = CLASS_NAME_SUBMENU + submenu.append(this._cloneAsMenuItem(link, true), menu) + + return submenu + } + + protected _cloneAsMenuItem(link: HTMLElement, submenu = false): HTMLElement { + const clonedLink = link.cloneNode(true) as HTMLElement + clonedLink.className = 'menu-item' + clonedLink.removeAttribute('id') + + if (link.classList.contains('active')) { + clonedLink.classList.add('active') + } + + if (link.classList.contains('disabled') || link.hasAttribute('disabled')) { + clonedLink.classList.add('disabled') + } + + if (submenu) { + for (const name of clonedLink.getAttributeNames()) { + if (name.startsWith('data-bs-') && name !== 'data-bs-theme') { + clonedLink.removeAttribute(name) + } + } + + clonedLink.removeAttribute('href') + clonedLink.setAttribute('aria-haspopup', 'true') + clonedLink.setAttribute('aria-expanded', 'false') + + if (clonedLink.tagName === 'A') { + clonedLink.setAttribute('role', 'button') + + if (!clonedLink.hasAttribute('tabindex')) { + clonedLink.setAttribute('tabindex', '0') + } + } + } + + return clonedLink + } + + protected _findItemMenu(item: HTMLElement, link: HTMLElement): HTMLElement | null { + const sibling = SelectorEngine.next(link, SELECTOR_MENU)[0] as HTMLElement | undefined + + if (sibling && !sibling.classList.contains(CLASS_NAME_OVERFLOW_MENU)) { + this._itemMenus.set(item, sibling) + return sibling + } + + const nested = SelectorEngine.findOne(SELECTOR_MENU, item) + + if (nested && !nested.classList.contains(CLASS_NAME_OVERFLOW_MENU)) { + this._itemMenus.set(item, nested) + return nested + } + + const cached = this._itemMenus.get(item) + if (cached?.isConnected) { + return cached + } + + this._itemMenus.delete(item) + return null + } + + protected _resetMenu(toggle: HTMLElement, menu: HTMLElement): void { + Menu.getInstance(toggle)?.dispose() + toggle.classList.remove(CLASS_NAME_SHOW) + toggle.setAttribute('aria-expanded', 'false') + toggle.parentElement?.classList.remove(CLASS_NAME_SHOW) + menu.classList.remove(CLASS_NAME_SHOW) + } + + protected _restoreRelocatedMenus(): void { + for (const { menu, parent, nextSibling } of this._relocatedMenus.values()) { + if (nextSibling) { + nextSibling.before(menu) + } else { + parent.append(menu) + } + } + + this._relocatedMenus.clear() + } + protected _restoreItems(): void { + if (this._overflowToggle && this._overflowMenu) { + this._resetMenu(this._overflowToggle, this._overflowMenu) + this._overflowToggle.closest(SELECTOR_NAV_ITEM)?.classList.remove(CLASS_NAME_SHOW) + } + + this._restoreRelocatedMenus() + for (const item of this._items) { item.classList.remove(CLASS_NAME_HIDDEN) delete item.dataset.bsNavOverflow @@ -397,10 +517,7 @@ class NavOverflow extends BaseComponent { // Show the toggle too, so it is measured at its real width and not zero this._overflowToggle?.closest(SELECTOR_NAV_ITEM)?.classList.remove(CLASS_NAME_HIDDEN) - if (this._overflowMenu) { - this._overflowMenu.innerHTML = '' - } - + this._overflowMenu?.replaceChildren() this._overflowItems = [] } } diff --git a/js/tests/unit/nav-overflow.spec.js b/js/tests/unit/nav-overflow.spec.js index 8f612b7237..e3301eec5b 100644 --- a/js/tests/unit/nav-overflow.spec.js +++ b/js/tests/unit/nav-overflow.spec.js @@ -1,4 +1,5 @@ import EventHandler from '../../src/dom/event-handler.js' +import Menu from '../../src/menu.js' import NavOverflow from '../../src/nav-overflow.js' import { clearFixture, getFixture } from '../helpers/fixture.js' @@ -27,6 +28,7 @@ describe('NavOverflow', () => { it('should return plugin default config', () => { expect(NavOverflow.Default).toEqual(jasmine.any(Object)) expect(NavOverflow.Default.moreText).toEqual('More') + expect(NavOverflow.Default.menuStrategy).toEqual('absolute') expect(NavOverflow.Default.threshold).toEqual(0) }) }) @@ -97,6 +99,7 @@ describe('NavOverflow', () => { const navOverflow = new NavOverflow(wrapperEl) expect(wrapperEl).toHaveClass('nav-overflow') + expect(wrapperEl).toHaveClass('nav-overflow-initialized') expect(wrapperEl.querySelector('.nav')).not.toHaveClass('nav-overflow') navOverflow.dispose() @@ -652,6 +655,7 @@ describe('NavOverflow', () => { collapseBelow: '(number|string)', iconPlacement: 'string', menuPlacement: 'string', + menuStrategy: 'string', moreText: '(string|boolean)', moreIcon: 'string', threshold: 'number' @@ -741,6 +745,25 @@ describe('NavOverflow', () => { navOverflow.dispose() }) + it('should pass menuStrategy to the generated menu toggle', () => { + fixtureEl.innerHTML = [ + '' + ].join('') + + const wrapperEl = fixtureEl.querySelector('[data-bs-toggle="nav-overflow"]') + const navOverflow = new NavOverflow(wrapperEl, { + menuStrategy: 'fixed' + }) + + expect(wrapperEl.querySelector('.nav-overflow-toggle').getAttribute('data-bs-strategy')).toEqual('fixed') + + navOverflow.dispose() + }) + it('should use a child element with [data-bs-overflow-icon] as the icon', () => { fixtureEl.innerHTML = [ '`} /> + ## Customizing the toggle ### Custom text @@ -347,6 +400,7 @@ const navOverflow = new bootstrap.NavOverflow(wrapperElement, { | `collapseBelow` | number\|string | `0` | Wrapper width below which all items collapse into the overflow dropdown. Pass a breakpoint name (e.g., `'md'`) to resolve from `--bs-breakpoint-{name}`, or a number for a direct pixel value. `0` disables. | | `iconPlacement` | string | `'start'` | Position of the icon relative to the text in the toggle button. Use `'start'` for before the text or `'end'` for after. | | `menuPlacement` | string | `'bottom-end'` | Placement of the overflow dropdown menu, passed as `data-bs-placement` to the menu toggle. | +| `menuStrategy` | string | `'absolute'` | Positioning strategy for the overflow menu, passed as `data-bs-strategy` to the menu toggle. Use `'fixed'` when an overflow ancestor would clip the menu. | | `moreText` | string\|boolean | `'More'` | Text label for the overflow toggle button. Inserted as plain text. Use `false` (or an empty string) for an icon-only toggle, which is labeled `aria-label="More"` instead. | | `moreIcon` | string | `'...'` | SVG or HTML icon for the overflow toggle button. Passed through the [icon content sanitizer]([[docsref:/getting-started/javascript#sanitizer]]) before insertion. Overridden by a child element with `data-bs-overflow-icon` if present (also sanitized). | | `threshold` | number | `0` | Minimum number of items to keep visible before showing overflow. | From 7889996c645921fccd4edc74d716ec0755c0198c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 25 Sep 2026 21:34:04 -0700 Subject: [PATCH 018/175] Improve placeholder sizing and loading animations (#42882) * Update placeholder sizing, docs, and animations * feat(placeholders): favor shimmer for loading states Use the wave animation for loading skeletons and inline status text. Move the old opacity effect to placeholder-pulse while keeping the placeholder-glow class as a compatibility alias. Update the component docs, migration guidance, migration skill, and docs search loader to use the new recommendation. * Fix bundlewatch --- .bundlewatch.config.json | 2 +- scss/_placeholder.scss | 42 +++++++++++++------ site/src/assets/search.js | 2 +- .../content/docs/components/placeholder.mdx | 38 ++++++++++------- site/src/content/docs/guides/migration.mdx | 1 + skills/bootstrap-v5-v6-migration/SKILL.md | 4 ++ 6 files changed, 59 insertions(+), 30 deletions(-) diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index d5d4fa1ced..5079a2d9cb 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -26,7 +26,7 @@ }, { "path": "./dist/css/bootstrap.css", - "maxSize": "53.5 kB" + "maxSize": "53.75 kB" }, { "path": "./dist/css/bootstrap.min.css", diff --git a/scss/_placeholder.scss b/scss/_placeholder.scss index 706ef7f9e2..1a83e9a9d6 100644 --- a/scss/_placeholder.scss +++ b/scss/_placeholder.scss @@ -1,18 +1,29 @@ @use "config" as *; @use "functions" as *; +@use "mixins/border-radius" as *; @use "mixins/tokens" as *; $placeholder-tokens: () !default; +$placeholder-wave-tokens: () !default; // scss-docs-start placeholder-tokens // stylelint-disable-next-line scss/dollar-variable-default $placeholder-tokens: defaults( ( - --placeholder-opacity-max: .5, - --placeholder-opacity-min: .2, + --placeholder-opacity-max: .18, + --placeholder-opacity-min: .1, ), $placeholder-tokens ); + +// stylelint-disable-next-line scss/dollar-variable-default +$placeholder-wave-tokens: defaults( + ( + --placeholder-wave-opacity-max: 1, + --placeholder-wave-opacity-min: .4, + ), + $placeholder-wave-tokens +); // scss-docs-end placeholder-tokens @layer components { @@ -20,10 +31,11 @@ $placeholder-tokens: defaults( @include tokens($placeholder-tokens); display: inline-block; - min-height: 1em; + min-height: 1.25em; vertical-align: middle; cursor: wait; background-color: currentcolor; + @include border-radius(var(--radius-3)); opacity: var(--placeholder-opacity-max); &.btn::before { @@ -34,21 +46,22 @@ $placeholder-tokens: defaults( // Sizing .placeholder-xs { - min-height: .6em; + min-height: .75em; } .placeholder-sm { - min-height: .8em; + min-height: 1em; } .placeholder-lg { - min-height: 1.2em; + min-height: 1.75em; } // Animation + .placeholder-pulse, .placeholder-glow { .placeholder { - animation: placeholder-glow 2s ease-in-out infinite; + animation: placeholder-pulse 2s ease-in-out infinite; @if $enable-reduced-motion { @media (prefers-reduced-motion: reduce) { @@ -58,19 +71,24 @@ $placeholder-tokens: defaults( } } - @keyframes placeholder-glow { + @keyframes placeholder-pulse { 50% { opacity: var(--placeholder-opacity-min); } } .placeholder-wave { - mask-image: linear-gradient(130deg, var(--black) 55%, rgb(0 0 0 / calc(1 - var(--placeholder-opacity-min))) 75%, var(--black) 95%); - mask-size: 200% 100%; - animation: placeholder-wave 2s linear infinite; + @include tokens($placeholder-wave-tokens); + + mask-image: linear-gradient(110deg, rgb(0 0 0 / var(--placeholder-wave-opacity-min)) 35%, rgb(0 0 0 / var(--placeholder-wave-opacity-max)) 50%, rgb(0 0 0 / var(--placeholder-wave-opacity-min)) 65%); + mask-repeat: no-repeat; + mask-position: 100% 0%; + mask-size: 250% 100%; + animation: placeholder-wave 1.6s linear infinite; @if $enable-reduced-motion { @media (prefers-reduced-motion: reduce) { + mask-image: none; animation: none; } } @@ -78,7 +96,7 @@ $placeholder-tokens: defaults( @keyframes placeholder-wave { 100% { - mask-position: -200% 0%; + mask-position: 0% 0%; } } } diff --git a/site/src/assets/search.js b/site/src/assets/search.js index a6a012afaa..5814012e13 100644 --- a/site/src/assets/search.js +++ b/site/src/assets/search.js @@ -320,7 +320,7 @@ class BdSearchResults extends HTMLElement { _paintLoading() { this.innerHTML = ` -
+
${escapeHtml(instance.translate('searching') || 'Searching…')} ${Array.from({ length: 3 }, () => `
diff --git a/site/src/content/docs/components/placeholder.mdx b/site/src/content/docs/components/placeholder.mdx index 0323beb56c..9d0a0795f1 100644 --- a/site/src/content/docs/components/placeholder.mdx +++ b/site/src/content/docs/components/placeholder.mdx @@ -29,17 +29,17 @@ In the example below, we take a typical card component and recreate it with plac