[pull] master from react-bootstrap:master

.babelrc.js

@@ -1,4 +1,4 @@
-module.exports = (api) => {
+export default (api) => {
   const env = api.env();
 
   let dev = false;

CHANGELOG.md

@@ -1,3 +1,15 @@
+# [3.0.0-beta.3](https://github.com/react-bootstrap/react-bootstrap/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2025-07-28)
+
+
+### Features
+
+* **AccordionHeader:** add disabled prop ([#6940](https://github.com/react-bootstrap/react-bootstrap/issues/6940)) ([376c9ae](https://github.com/react-bootstrap/react-bootstrap/commit/376c9aeda3bf86ce88f36e42e6f78c66eb8ced4f))
+* add better ESM support ([#6939](https://github.com/react-bootstrap/react-bootstrap/issues/6939)) ([e9e9457](https://github.com/react-bootstrap/react-bootstrap/commit/e9e9457c9b4d4d677d33c8fb664f7082fc0da304))
+
+
+
+
+
 # [3.0.0-beta.2](https://github.com/react-bootstrap/react-bootstrap/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2025-05-24)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-bootstrap",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.3",
   "description": "Bootstrap 5 components built with React",
   "keywords": [
     "bootstrap",
@@ -24,6 +24,7 @@
     "lib",
     "cjs"
   ],
+  "type": "module",
   "main": "cjs/index.js",
   "module": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -58,7 +59,7 @@
   "scripts": {
     "bootstrap": "yarn --network-timeout 100000 && yarn --cwd www --network-timeout 100000",
     "build": "rimraf lib && yarn build:esm && yarn build:esm:types && yarn build:cjs && yarn build:cjs:types",
-    "build:esm": "babel src --out-dir lib --delete-dir-on-start --env-name esm --extensions .ts,.tsx --ignore '**/*.d.ts' && echo '{\"type\": \"module\"}' > lib/package.json",
+    "build:esm": "babel src --out-dir lib --delete-dir-on-start --env-name esm --extensions .ts,.tsx --ignore '**/*.d.ts'",
     "build:cjs": "babel src --out-dir cjs --env-name cjs --delete-dir-on-start --extensions .ts,.tsx --ignore '**/*.d.ts' && echo '{\"type\": \"commonjs\"}' > cjs/package.json",
     "build:esm:types": "tsc --emitDeclarationOnly",
     "build:cjs:types": "tsc --emitDeclarationOnly --outDir cjs",
@@ -70,7 +71,7 @@
     "release": "rollout",
     "start": "yarn --cwd www start",
     "tdd": "vitest",
-    "test": "npm run lint && npm run test-browser",
+    "test": "npm run lint && npm run test-browser -- --browser=chromium",
     "test-browser": "vitest --run",
     "prepare": "husky"
   },
@@ -83,10 +84,10 @@
   "dependencies": {
     "@babel/runtime": "^7.27.0",
     "@restart/hooks": "^0.6.2",
-    "@restart/ui": "^2.0.0-beta.3",
+    "@restart/ui": "^2.0.0-beta.6",
     "@types/react-transition-group": "^4.4.12",
     "clsx": "^2.1.1",
-    "dom-helpers": "^5.2.1",
+    "dom-helpers": "^6.0.1",
     "invariant": "^2.2.4",
     "react-transition-group": "^4.4.5",
     "uncontrollable": "^9.0.0",

src/AbstractModalHeader.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { useContext } from 'react';
 import useEventCallback from '@restart/hooks/useEventCallback';
-import CloseButton, { type CloseButtonVariant } from './CloseButton';
-import ModalContext from './ModalContext';
+import CloseButton, { type CloseButtonVariant } from './CloseButton.js';
+import ModalContext from './ModalContext.js';
 
 export interface AbstractModalHeaderProps
   extends React.HTMLAttributes<HTMLDivElement> {

src/Accordion.tsx

@@ -3,16 +3,16 @@ import * as React from 'react';
 import { useMemo } from 'react';
 import { useUncontrolled } from 'uncontrollable';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
-import AccordionBody from './AccordionBody';
-import AccordionButton from './AccordionButton';
-import AccordionCollapse from './AccordionCollapse';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import AccordionBody from './AccordionBody.js';
+import AccordionButton from './AccordionButton.js';
+import AccordionCollapse from './AccordionCollapse.js';
 import AccordionContext, {
   type AccordionSelectCallback,
   type AccordionEventKey,
-} from './AccordionContext';
-import AccordionHeader from './AccordionHeader';
-import AccordionItem from './AccordionItem';
+} from './AccordionContext.js';
+import AccordionHeader from './AccordionHeader.js';
+import AccordionItem from './AccordionItem.js';
 
 export interface AccordionProps
   extends Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> {

src/AccordionBody.tsx

@@ -2,10 +2,10 @@ import clsx from 'clsx';
 import * as React from 'react';
 import { useContext } from 'react';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
-import AccordionCollapse from './AccordionCollapse';
-import AccordionItemContext from './AccordionItemContext';
-import type { TransitionCallbacks } from './types';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import AccordionCollapse from './AccordionCollapse.js';
+import AccordionItemContext from './AccordionItemContext.js';
+import type { TransitionCallbacks } from './types.js';
 
 export interface AccordionBodyProps
   extends TransitionCallbacks,

src/AccordionButton.tsx

@@ -2,10 +2,12 @@ import * as React from 'react';
 import { useContext } from 'react';
 import clsx from 'clsx';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import AccordionContext, { isAccordionItemSelected } from './AccordionContext';
-import AccordionItemContext from './AccordionItemContext';
-import { useBootstrapPrefix } from './ThemeProvider';
-import useAccordionButton from './useAccordionButton';
+import AccordionContext, {
+  isAccordionItemSelected,
+} from './AccordionContext.js';
+import AccordionItemContext from './AccordionItemContext.js';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import useAccordionButton from './useAccordionButton.js';
 
 export interface AccordionButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement> {

src/AccordionCollapse.tsx

@@ -3,9 +3,11 @@ import * as React from 'react';
 import { useContext } from 'react';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
 import { Transition } from 'react-transition-group';
-import { useBootstrapPrefix } from './ThemeProvider';
-import Collapse, { type CollapseProps } from './Collapse';
-import AccordionContext, { isAccordionItemSelected } from './AccordionContext';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import Collapse, { type CollapseProps } from './Collapse.js';
+import AccordionContext, {
+  isAccordionItemSelected,
+} from './AccordionContext.js';
 
 export interface AccordionCollapseProps extends CollapseProps {
   /**

src/AccordionHeader.tsx

@@ -1,8 +1,8 @@
 import clsx from 'clsx';
 import * as React from 'react';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
-import AccordionButton from './AccordionButton';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import AccordionButton from './AccordionButton.js';
 
 export interface AccordionHeaderProps
   extends React.HTMLAttributes<HTMLElement> {

src/AccordionItem.tsx

@@ -2,10 +2,10 @@ import clsx from 'clsx';
 import * as React from 'react';
 import { useMemo } from 'react';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 import AccordionItemContext, {
   type AccordionItemContextValue,
-} from './AccordionItemContext';
+} from './AccordionItemContext.js';
 
 export interface AccordionItemProps extends React.HTMLAttributes<HTMLElement> {
   /**

src/Alert.tsx

@@ -2,13 +2,13 @@ import clsx from 'clsx';
 import * as React from 'react';
 import { useUncontrolled } from 'uncontrollable';
 import useEventCallback from '@restart/hooks/useEventCallback';
-import { useBootstrapPrefix } from './ThemeProvider';
-import AlertHeading from './AlertHeading';
-import AlertLink from './AlertLink';
-import Fade from './Fade';
-import CloseButton, { type CloseButtonVariant } from './CloseButton';
-import type { Variant } from './types';
-import type { TransitionType } from './helpers';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import AlertHeading from './AlertHeading.js';
+import AlertLink from './AlertLink.js';
+import Fade from './Fade.js';
+import CloseButton, { type CloseButtonVariant } from './CloseButton.js';
+import type { Variant } from './types.js';
+import type { TransitionType } from './helpers.js';
 
 export interface AlertProps extends React.HTMLAttributes<HTMLDivElement> {
   /**

src/AlertHeading.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import clsx from 'clsx';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
-import divWithClassName from './divWithClassName';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import divWithClassName from './divWithClassName.js';
 
 const DivStyledAsH4 = divWithClassName('h4');
 DivStyledAsH4.displayName = 'DivStyledAsH4';

src/AlertLink.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import clsx from 'clsx';
 import Anchor from '@restart/ui/Anchor';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 
 export interface AlertLinkProps
   extends React.AnchorHTMLAttributes<HTMLElement> {

src/Badge.tsx

@@ -1,8 +1,8 @@
 import clsx from 'clsx';
 import * as React from 'react';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
-import type { Color, Variant } from './types';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import type { Color, Variant } from './types.js';
 
 export interface BadgeProps extends React.HTMLAttributes<HTMLElement> {
   /**

src/Breadcrumb.tsx

@@ -1,8 +1,8 @@
 import clsx from 'clsx';
 import * as React from 'react';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
-import BreadcrumbItem from './BreadcrumbItem';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import BreadcrumbItem from './BreadcrumbItem.js';
 
 export interface BreadcrumbProps extends React.HTMLAttributes<HTMLElement> {
   /**

src/BreadcrumbItem.tsx

@@ -2,7 +2,7 @@ import clsx from 'clsx';
 import * as React from 'react';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
 import Anchor from '@restart/ui/Anchor';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 
 export interface BreadcrumbItemProps
   extends Omit<React.HTMLAttributes<HTMLElement>, 'title'> {

src/Button.tsx

@@ -5,8 +5,8 @@ import {
   type ButtonProps as BaseButtonProps,
 } from '@restart/ui/Button';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
-import type { ButtonVariant } from './types';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import type { ButtonVariant } from './types.js';
 
 export interface ButtonProps extends BaseButtonProps {
   /**

src/ButtonGroup.tsx

@@ -1,7 +1,7 @@
 import clsx from 'clsx';
 import * as React from 'react';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 
 export interface ButtonGroupProps extends React.HTMLAttributes<HTMLElement> {
   /**

src/ButtonToolbar.tsx

@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 import * as React from 'react';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 
 export interface ButtonToolbarProps extends React.HTMLAttributes<HTMLElement> {
   /**

src/Card.tsx

@@ -1,17 +1,17 @@
 import clsx from 'clsx';
 import * as React from 'react';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
-import CardBody from './CardBody';
-import CardFooter from './CardFooter';
-import CardHeader from './CardHeader';
-import CardImg from './CardImg';
-import CardImgOverlay from './CardImgOverlay';
-import CardLink from './CardLink';
-import CardSubtitle from './CardSubtitle';
-import CardText from './CardText';
-import CardTitle from './CardTitle';
-import type { Color, Variant } from './types';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import CardBody from './CardBody.js';
+import CardFooter from './CardFooter.js';
+import CardHeader from './CardHeader.js';
+import CardImg from './CardImg.js';
+import CardImgOverlay from './CardImgOverlay.js';
+import CardLink from './CardLink.js';
+import CardSubtitle from './CardSubtitle.js';
+import CardText from './CardText.js';
+import CardTitle from './CardTitle.js';
+import type { Color, Variant } from './types.js';
 
 export interface CardProps extends React.HTMLAttributes<HTMLElement> {
   /**

src/CardBody.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import clsx from 'clsx';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 
 export interface CardBodyProps extends React.HTMLAttributes<HTMLElement> {
   /**

src/CardFooter.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import clsx from 'clsx';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 
 export interface CardFooterProps extends React.HTMLAttributes<HTMLElement> {
   /**

src/CardGroup.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import clsx from 'clsx';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 
 export interface CardGroupProps extends React.HTMLAttributes<HTMLElement> {
   /**

src/CardHeader.tsx

@@ -2,8 +2,8 @@ import clsx from 'clsx';
 import * as React from 'react';
 import { useMemo } from 'react';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
-import CardHeaderContext from './CardHeaderContext';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import CardHeaderContext from './CardHeaderContext.js';
 
 export interface CardHeaderProps extends React.HTMLAttributes<HTMLElement> {
   /**

src/CardImg.tsx

@@ -1,7 +1,7 @@
 import clsx from 'clsx';
 import * as React from 'react';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 
 export interface CardImgProps
   extends React.ImgHTMLAttributes<HTMLImageElement> {

src/CardImgOverlay.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import clsx from 'clsx';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 
 export interface CardImgOverlayProps extends React.HTMLAttributes<HTMLElement> {
   /**

src/CardLink.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import clsx from 'clsx';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 
 export interface CardLinkProps extends React.AnchorHTMLAttributes<HTMLElement> {
   /**

src/CardSubtitle.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import clsx from 'clsx';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
-import divWithClassName from './divWithClassName';
+import { useBootstrapPrefix } from './ThemeProvider.js';
+import divWithClassName from './divWithClassName.js';
 
 const DivStyledAsH6 = divWithClassName('h6');
 

src/CardText.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import clsx from 'clsx';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 
 export interface CardTextProps extends React.HTMLAttributes<HTMLElement> {
   /**

src/CardTitle.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import clsx from 'clsx';
-import { useBootstrapPrefix } from './ThemeProvider';
+import { useBootstrapPrefix } from './ThemeProvider.js';
 import type { DynamicRefForwardingComponent } from '@restart/ui/types';
-import divWithClassName from './divWithClassName';
+import divWithClassName from './divWithClassName.js';
 
 const DivStyledAsH5 = divWithClassName('h5');