chore: move utils to top level (react-bootstrap#4619)

jquense · web-flow · commit c68ee15ab17d · 2019-10-07T16:47:33.000-04:00
diff --git a/src/Alert.js b/src/Alert.js
@@ -5,8 +5,8 @@ import { elementType } from 'prop-types-extra';
 import { useUncontrolled } from 'uncontrollable';
 import useEventCallback from '@restart/hooks/useEventCallback';
 
-import createWithBsPrefix from './utils/createWithBsPrefix';
-import divWithClassName from './utils/divWithClassName';
+import createWithBsPrefix from './createWithBsPrefix';
+import divWithClassName from './divWithClassName';
 import { useBootstrapPrefix } from './ThemeProvider';
 import Fade from './Fade';
 import CloseButton from './CloseButton';
diff --git a/src/BootstrapModalManager.js b/src/BootstrapModalManager.js
diff --git a/src/Card.js b/src/Card.js
@@ -3,8 +3,8 @@ import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 
 import { useBootstrapPrefix } from './ThemeProvider';
-import createWithBsPrefix from './utils/createWithBsPrefix';
-import divWithClassName from './utils/divWithClassName';
+import createWithBsPrefix from './createWithBsPrefix';
+import divWithClassName from './divWithClassName';
 import CardContext from './CardContext';
 import CardImg from './CardImg';
 
diff --git a/src/CardColumns.js b/src/CardColumns.js
@@ -1,3 +1,3 @@
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 
 export default createWithBsPrefix('card-columns');
diff --git a/src/CardDeck.js b/src/CardDeck.js
@@ -1,3 +1,3 @@
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 
 export default createWithBsPrefix('card-deck');
diff --git a/src/CardGroup.js b/src/CardGroup.js
@@ -1,3 +1,3 @@
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 
 export default createWithBsPrefix('card-group');
diff --git a/src/Carousel.js b/src/Carousel.js
@@ -8,8 +8,8 @@ import { uncontrollable } from 'uncontrollable';
 import CarouselCaption from './CarouselCaption';
 import CarouselItem from './CarouselItem';
 import SafeAnchor from './SafeAnchor';
-import { map, forEach } from './utils/ElementChildren';
-import triggerBrowserReflow from './utils/triggerBrowserReflow';
+import { map, forEach } from './ElementChildren';
+import triggerBrowserReflow from './triggerBrowserReflow';
 import { createBootstrapComponent } from './ThemeProvider';
 
 const countChildren = c =>
diff --git a/src/CarouselCaption.js b/src/CarouselCaption.js
@@ -1,4 +1,4 @@
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 
 export default createWithBsPrefix('carousel-caption', {
   Component: 'div',
diff --git a/src/CarouselItem.js b/src/CarouselItem.js
@@ -1,3 +1,3 @@
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 
 export default createWithBsPrefix('carousel-item');
diff --git a/src/Collapse.js b/src/Collapse.js
@@ -1,17 +1,16 @@
 import classNames from 'classnames';
 import css from 'dom-helpers/style';
-import React from 'react';
-import PropTypes from 'prop-types';
 import onEnd from 'dom-helpers/transition/end';
+import PropTypes from 'prop-types';
+import React from 'react';
 import Transition, {
-  EXITED,
   ENTERED,
   ENTERING,
+  EXITED,
   EXITING,
 } from 'react-transition-group/Transition';
-
-import triggerBrowserReflow from './utils/triggerBrowserReflow';
-import createChainedFunction from './utils/createChainedFunction';
+import createChainedFunction from './createChainedFunction';
+import triggerBrowserReflow from './triggerBrowserReflow';
 
 const MARGINS = {
   height: ['marginTop', 'marginBottom'],
diff --git a/src/Dropdown.js b/src/Dropdown.js
@@ -10,7 +10,7 @@ import DropdownMenu from './DropdownMenu';
 import DropdownToggle from './DropdownToggle';
 import DropdownItem from './DropdownItem';
 import SelectableContext from './SelectableContext';
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 
 const propTypes = {
   /** @default 'dropdown' */
diff --git a/src/ElementChildren.js b/src/ElementChildren.js
diff --git a/src/Fade.js b/src/Fade.js
@@ -6,7 +6,7 @@ import Transition, {
   ENTERING,
 } from 'react-transition-group/Transition';
 import onEnd from 'dom-helpers/transition/end';
-import triggerBrowserReflow from './utils/triggerBrowserReflow';
+import triggerBrowserReflow from './triggerBrowserReflow';
 
 const propTypes = {
   /**
diff --git a/src/Figure.js b/src/Figure.js
@@ -1,4 +1,4 @@
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 
 import FigureImage from './FigureImage';
 import FigureCaption from './FigureCaption';
diff --git a/src/FigureCaption.js b/src/FigureCaption.js
@@ -1,4 +1,4 @@
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 
 const FigureCaption = createWithBsPrefix('figure-caption', {
   Component: 'figcaption',
diff --git a/src/Form.js b/src/Form.js
@@ -8,7 +8,7 @@ import FormLabel from './FormLabel';
 import FormText from './FormText';
 import Switch from './Switch';
 import { useBootstrapPrefix } from './ThemeProvider';
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 
 const propTypes = {
   /**
diff --git a/src/InputGroup.js b/src/InputGroup.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import React from 'react';
 
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 import { useBootstrapPrefix } from './ThemeProvider';
 
 const propTypes = {
diff --git a/src/Media.js b/src/Media.js
@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
 
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 import { useBootstrapPrefix } from './ThemeProvider';
 
 const propTypes = {
diff --git a/src/Modal.js b/src/Modal.js
@@ -14,7 +14,7 @@ import ModalDialog from './ModalDialog';
 import Footer from './ModalFooter';
 import Header from './ModalHeader';
 import Title from './ModalTitle';
-import BootstrapModalManager from './utils/BootstrapModalManager';
+import BootstrapModalManager from './BootstrapModalManager';
 import { createBootstrapComponent } from './ThemeProvider';
 import ModalContext from './ModalContext';
 
diff --git a/src/ModalBody.js b/src/ModalBody.js
@@ -1,3 +1,3 @@
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 
 export default createWithBsPrefix('modal-body');
diff --git a/src/ModalFooter.js b/src/ModalFooter.js
@@ -1,3 +1,3 @@
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 
 export default createWithBsPrefix('modal-footer');
diff --git a/src/ModalTitle.js b/src/ModalTitle.js
@@ -1,5 +1,5 @@
-import createWithBsPrefix from './utils/createWithBsPrefix';
-import divWithClassName from './utils/divWithClassName';
+import createWithBsPrefix from './createWithBsPrefix';
+import divWithClassName from './divWithClassName';
 
 const DivStyledAsH4 = divWithClassName('h4');
 
diff --git a/src/Navbar.js b/src/Navbar.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 
 import { useUncontrolled } from 'uncontrollable';
 
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 import NavbarBrand from './NavbarBrand';
 import NavbarCollapse from './NavbarCollapse';
 import NavbarToggle from './NavbarToggle';
diff --git a/src/ProgressBar.js b/src/ProgressBar.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 
 import { useBootstrapPrefix } from './ThemeProvider';
 
-import { map } from './utils/ElementChildren';
+import { map } from './ElementChildren';
 
 const ROUND_PRECISION = 1000;
 
diff --git a/src/SafeAnchor.js b/src/SafeAnchor.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import createChainedFunction from './utils/createChainedFunction';
+import createChainedFunction from './createChainedFunction';
 
 const propTypes = {
   href: PropTypes.string,
diff --git a/src/Tabs.js b/src/Tabs.js
@@ -11,7 +11,7 @@ import TabContainer from './TabContainer';
 import TabContent from './TabContent';
 import TabPane from './TabPane';
 
-import { forEach, map } from './utils/ElementChildren';
+import { forEach, map } from './ElementChildren';
 
 const propTypes = {
   /**
diff --git a/src/ToastBody.js b/src/ToastBody.js
@@ -1,3 +1,3 @@
-import createWithBsPrefix from './utils/createWithBsPrefix';
+import createWithBsPrefix from './createWithBsPrefix';
 
 export default createWithBsPrefix('toast-body');
diff --git a/src/ToggleButtonGroup.js b/src/ToggleButtonGroup.js
@@ -3,8 +3,8 @@ import React from 'react';
 import invariant from 'invariant';
 import { useUncontrolled } from 'uncontrollable';
 
-import chainFunction from './utils/createChainedFunction';
-import { map } from './utils/ElementChildren';
+import chainFunction from './createChainedFunction';
+import { map } from './ElementChildren';
 import ButtonGroup from './ButtonGroup';
 import ToggleButton from './ToggleButton';
 
diff --git a/src/createChainedFunction.js b/src/createChainedFunction.js
diff --git a/src/createWithBsPrefix.js b/src/createWithBsPrefix.js
@@ -1,8 +1,7 @@
 import classNames from 'classnames';
-import React from 'react';
-
 import camelize from 'dom-helpers/util/camelize';
-import { useBootstrapPrefix } from '../ThemeProvider';
+import React from 'react';
+import { useBootstrapPrefix } from './ThemeProvider';
 
 const pascalCase = str => str[0].toUpperCase() + camelize(str).slice(1);
 
diff --git a/src/divWithClassName.js b/src/divWithClassName.js
diff --git a/src/triggerBrowserReflow.js b/src/triggerBrowserReflow.js
diff --git a/test/createChainedFunctionSpec.js b/test/createChainedFunctionSpec.js
@@ -1,5 +1,5 @@
 /* eslint no-new-func: 0 */
-import createChainedFunction from '../../src/utils/createChainedFunction';
+import createChainedFunction from '../src/createChainedFunction';
 
 describe('createChainedFunction', () => {
   it('returns null with no arguments', () => {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-import createWithBsPrefix from './utils/createWithBsPrefix';`
	`1`	`+import createWithBsPrefix from './createWithBsPrefix';`
`2`	`2`
`3`	`3`	`export default createWithBsPrefix('card-columns');`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import createWithBsPrefix from './utils/createWithBsPrefix';`
	`1`	`+import createWithBsPrefix from './createWithBsPrefix';`
`2`	`2`
`3`	`3`	`export default createWithBsPrefix('carousel-caption', {`
`4`	`4`	`Component: 'div',`