Merge branch 'v6-dev' into dev/coliff/accordion-animation

Author: mdo

.babelrc.js .babelrc.mjs.babelrc.js renamed to .babelrc.mjs

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   presets: [
     [
       '@babel/preset-env',

.bundlewatch.config.json

@@ -2,59 +2,51 @@
   "files": [
     {
       "path": "./dist/css/bootstrap-grid.css",
-      "maxSize": "9.5 kB"
+      "maxSize": "8.75 kB"
     },
     {
       "path": "./dist/css/bootstrap-grid.min.css",
-      "maxSize": "10.25 kB"
+      "maxSize": "8.0 kB"
     },
     {
       "path": "./dist/css/bootstrap-reboot.css",
       "maxSize": "5.25 kB"
     },
     {
       "path": "./dist/css/bootstrap-reboot.min.css",
-      "maxSize": "6.75 kB"
+      "maxSize": "5.0 kB"
     },
     {
       "path": "./dist/css/bootstrap-utilities.css",
-      "maxSize": "14.25 kB"
+      "maxSize": "15.75 kB"
     },
     {
       "path": "./dist/css/bootstrap-utilities.min.css",
       "maxSize": "15.0 kB"
     },
     {
       "path": "./dist/css/bootstrap.css",
-      "maxSize": "39.25 kB"
+      "maxSize": "42.5 kB"
     },
     {
       "path": "./dist/css/bootstrap.min.css",
-      "maxSize": "38.0 kB"
+      "maxSize": "39.25 kB"
     },
     {
       "path": "./dist/js/bootstrap.bundle.js",
-      "maxSize": "68.25 kB"
+      "maxSize": "70.5 kB"
     },
     {
       "path": "./dist/js/bootstrap.bundle.min.js",
-      "maxSize": "41.75 kB"
-    },
-    {
-      "path": "./dist/js/bootstrap.esm.js",
-      "maxSize": "38.75 kB"
-    },
-    {
-      "path": "./dist/js/bootstrap.esm.min.js",
-      "maxSize": "24.0 kB"
+      "maxSize": "47.5 kB"
     },
     {
       "path": "./dist/js/bootstrap.js",
-      "maxSize": "39.5 kB"
+      "maxSize": "40.75 kB"
     },
     {
       "path": "./dist/js/bootstrap.min.js",
-      "maxSize": "21.25 kB"
+      "maxSize": "25.5 kB"
     }
   ],
   "ci": {

.cspell.json

@@ -73,6 +73,7 @@
     "mouseleave",
     "navbars",
     "navs",
+    "navoverflow",
     "Neue",
     "noindex",
     "Noto",

.eslintrc.json

@@ -215,6 +215,19 @@
         "ecmaVersion": 2020
       }
     },
+    {
+      "files": [
+        "site/src/assets/examples/cheatsheet/cheatsheet.js",
+        "site/src/assets/examples/sidebars/sidebars.js"
+      ],
+      "parserOptions": {
+        "sourceType": "module",
+        "ecmaVersion": 2020
+      },
+      "rules": {
+        "import/no-unresolved": "off"
+      }
+    },
     {
       "files": [
         "**/*.md"

.github/CONTRIBUTING.md

@@ -18,7 +18,7 @@ the preferred channel for [bug reports](#bug-reports), [features requests](#feat
 and [submitting pull requests](#pull-requests), but please respect the following
 restrictions:
 
-- Please **do not** use the issue tracker for personal support requests. Stack Overflow ([`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag), [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions) or [IRC](/README.md#community) are better places to get help.
+- Please **do not** use the issue tracker for personal support requests. Stack Overflow ([`bootstrap-6`](https://stackoverflow.com/questions/tagged/bootstrap-6) tag), Reddit ([`r/bootstrap` subreddit](https://www.reddit.com/r/bootstrap/)), [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions), [the community Discord](https://discord.gg/bZUvakRU3M), or [IRC](/README.md#community) are better places to get help.
 
 - Please **do not** derail or troll issues. Keep the discussion on topic and
   respect the opinions of others.
@@ -44,7 +44,7 @@ Our bug tracker utilizes several labels to help organize and identify issues. He
 - `css` - Issues stemming from our compiled CSS or source Sass files.
 - `docs` - Issues for improving or updating our documentation.
 - `examples` - Issues involving the example templates included in our docs.
-- `feature` - Issues asking for a new feature to be added, or an existing one to be extended or modified. New features require a minor version bump (e.g., `v3.0.0` to `v3.1.0`).
+- `feature` - Issues asking for a new feature to be added, or an existing one to be extended or modified. New features require a minor version bump (e.g., `v6.0.0` to `v6.1.0`).
 - `build` - Issues with our build system, which is used to run all our tests, concatenate and compile source files, and more.
 - `help wanted` - Issues we need or would love help from the community to resolve.
 - `js` - Issues stemming from our compiled or source JavaScript files.

.gitignore

@@ -16,6 +16,7 @@
 # OS or Editor folders
 ._*
 .cache
+.claude
 .DS_Store
 .idea
 .nvmrc

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2025 The Bootstrap Authors
+Copyright (c) 2011-2026 The Bootstrap Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://getbootstrap.com/">
-    <img src="https://getbootstrap.com/docs/5.3/assets/brand/bootstrap-logo-shadow.png" alt="Bootstrap logo" width="200" height="165">
+    <img src="https://getbootstrap.com/docs/6.0/assets/brand/bootstrap-logo-shadow.png" alt="Bootstrap logo" width="200" height="165">
   </a>
 </p>
 
@@ -9,7 +9,7 @@
 <p align="center">
   Sleek, intuitive, and powerful front-end framework for faster and easier web development.
   <br>
-  <a href="https://getbootstrap.com/docs/5.3/"><strong>Explore Bootstrap docs »</strong></a>
+  <a href="https://getbootstrap.com/docs/6.0/"><strong>Explore Bootstrap docs »</strong></a>
   <br>
   <br>
   <a href="https://github.com/twbs/bootstrap/issues/new?assignees=-&labels=bug&template=bug_report.yml">Report bug</a>
@@ -20,9 +20,9 @@
 </p>
 
 
-## Bootstrap 5
+## Bootstrap 6
 
-Our default branch is for development of our Bootstrap 5 release. Head to the [`v4-dev` branch](https://github.com/twbs/bootstrap/tree/v4-dev) to view the readme, documentation, and source code for Bootstrap 4.
+Our default branch is for development of our Bootstrap 6 release. Head to the [`v5-dev` branch](https://github.com/twbs/bootstrap/tree/v5-dev) to view the readme, documentation, and source code for Bootstrap 5.
 
 
 ## Table of contents
@@ -44,15 +44,15 @@ Our default branch is for development of our Bootstrap 5 release. Head to the [`
 
 Several quick start options are available:
 
-- [Download the latest release](https://github.com/twbs/bootstrap/archive/v5.3.8.zip)
+- [Download the latest release](https://github.com/twbs/bootstrap/archive/v6.0.0-alpha1.zip)
 - Clone the repo: `git clone https://github.com/twbs/bootstrap.git`
-- Install with [npm](https://www.npmjs.com/): `npm install bootstrap@v5.3.8`
-- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@v5.3.8`
-- Install with [Bun](https://bun.sh/): `bun add bootstrap@v5.3.8`
-- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.3.8`
+- Install with [npm](https://www.npmjs.com/): `npm install bootstrap@6.0.0-alpha1`
+- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@6.0.0-alpha1`
+- Install with [Bun](https://bun.sh/): `bun add bootstrap@6.0.0-alpha1`
+- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:6.0.0-alpha1`
 - Install with [NuGet](https://www.nuget.org/): CSS: `Install-Package bootstrap` Sass: `Install-Package bootstrap.sass`
 
-Read the [Getting started page](https://getbootstrap.com/docs/5.3/getting-started/) for information on the framework contents, templates, examples, and more.
+Read the [Getting started page](https://getbootstrap.com/docs/6.0/getting-started/) for information on the framework contents, templates, examples, and more.
 
 
 ## Status
@@ -104,18 +104,14 @@ Within the download you’ll find the following directories and files, logically
       ├── bootstrap.bundle.js.map
       ├── bootstrap.bundle.min.js
       ├── bootstrap.bundle.min.js.map
-      ├── bootstrap.esm.js
-      ├── bootstrap.esm.js.map
-      ├── bootstrap.esm.min.js
-      ├── bootstrap.esm.min.js.map
       ├── bootstrap.js
       ├── bootstrap.js.map
       ├── bootstrap.min.js
       └── bootstrap.min.js.map
   ```
 </details>
 
-We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). [Source maps](https://web.dev/articles/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Bundled JS files (`bootstrap.bundle.js` and minified `bootstrap.bundle.min.js`) include [Floating UI](https://floating-ui.com/). All CSS files work for both LTR and RTL layouts thanks to logical properties—simply set `dir="rtl"` on your HTML element.
+We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). [Source maps](https://web.dev/articles/source-maps) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Bundled JS files (`bootstrap.bundle.js` and minified `bootstrap.bundle.min.js`) include [Floating UI](https://floating-ui.com/) and [Vanilla Calendar Pro](https://vanilla-calendar.pro/). All CSS files work for both LTR and RTL layouts thanks to logical properties—simply set `dir="rtl"` on your HTML element.
 
 
 ## Bugs and feature requests
@@ -227,4 +223,4 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
 
 ## Copyright and license
 
-Code and documentation copyright 2011-2025 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors). Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
+Code and documentation copyright 2011-2026 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors). Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).

build/build-plugins.mjs

@@ -2,7 +2,7 @@
 
 /*!
  * Script to build our plugins to use them separately.
- * Copyright 2020-2025 The Bootstrap Authors
+ * Copyright 2020-2026 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 
@@ -22,26 +22,15 @@ const jsFiles = await globby(`${sourcePath}/**/*.js`)
 // Array which holds the resolved plugins
 const resolvedPlugins = []
 
-// Trims the "js" extension and uppercases => first letter, hyphens, backslashes & slashes
-const filenameToEntity = filename => filename.replace('.js', '')
-  .replace(/(?:^|-|\/|\\)[a-z]/g, str => str.slice(-1).toUpperCase())
-
 for (const file of jsFiles) {
   resolvedPlugins.push({
     src: file,
     dist: file.replace('src', 'dist'),
-    fileName: path.basename(file),
-    className: filenameToEntity(path.basename(file))
-    // safeClassName: filenameToEntity(path.relative(sourcePath, file))
+    fileName: path.basename(file)
   })
 }
 
 const build = async plugin => {
-  /**
-   * @type {import('rollup').GlobalsOption}
-   */
-  const globals = {}
-
   const bundle = await rollup({
     input: plugin.src,
     plugins: [
@@ -52,42 +41,18 @@ const build = async plugin => {
         babelHelpers: 'bundled'
       })
     ],
-    external(source) {
-      // Pattern to identify local files
-      const pattern = /^(\.{1,2})\//
-
-      // It's not a local file, e.g a Node.js package
-      if (!pattern.test(source)) {
-        globals[source] = source
-        return true
-      }
-
-      const usedPlugin = resolvedPlugins.find(plugin => {
-        return plugin.src.includes(source.replace(pattern, ''))
-      })
-
-      if (!usedPlugin) {
-        throw new Error(`Source ${source} is not mapped!`)
-      }
-
-      // We can change `Index` with `UtilIndex` etc if we use
-      // `safeClassName` instead of `className` everywhere
-      globals[path.normalize(usedPlugin.src)] = usedPlugin.className
-      return true
-    }
+    external: () => true
   })
 
   await bundle.write({
     banner: banner(plugin.fileName),
-    format: 'umd',
-    name: plugin.className,
+    format: 'esm',
     sourcemap: true,
-    globals,
     generatedCode: 'es2015',
     file: plugin.dist
   })
 
-  console.log(`Built ${plugin.className}`)
+  console.log(`Built ${plugin.fileName}`)
 }
 
 (async () => {

build/change-version.mjs

@@ -2,7 +2,7 @@
 
 /*!
  * Script to update version number references in the project.
- * Copyright 2017-2025 The Bootstrap Authors
+ * Copyright 2017-2026 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */