return to the original file structure to avoid breaking modularity

twbs · Oct 3, 2019 · 3d12b54 · 3d12b54
1 parent 393ddae
commit 3d12b54
Show file tree

Hide file tree

Showing 35 changed files with 172 additions and 186 deletions.
diff --git a/build/build-plugins.js b/build/build-plugins.js
@@ -32,19 +32,19 @@ const bsPlugins = {
   Manipulator: path.resolve(__dirname, '../js/src/dom/manipulator.js'),
   Polyfill: path.resolve(__dirname, '../js/src/dom/polyfill.js'),
   SelectorEngine: path.resolve(__dirname, '../js/src/dom/selector-engine.js'),
-  Alert: path.resolve(__dirname, '../js/src/alert/alert.js'),
-  Button: path.resolve(__dirname, '../js/src/button/button.js'),
-  Carousel: path.resolve(__dirname, '../js/src/carousel/carousel.js'),
-  Collapse: path.resolve(__dirname, '../js/src/collapse/collapse.js'),
-  Dropdown: path.resolve(__dirname, '../js/src/dropdown/dropdown.js'),
-  Modal: path.resolve(__dirname, '../js/src/modal/modal.js'),
-  Popover: path.resolve(__dirname, '../js/src/popover/popover.js'),
-  ScrollSpy: path.resolve(__dirname, '../js/src/scrollspy/scrollspy.js'),
-  Tab: path.resolve(__dirname, '../js/src/tab/tab.js'),
-  Toast: path.resolve(__dirname, '../js/src/toast/toast.js'),
-  Tooltip: path.resolve(__dirname, '../js/src/tooltip/tooltip.js')
+  Alert: path.resolve(__dirname, '../js/src/alert.js'),
+  Button: path.resolve(__dirname, '../js/src/button.js'),
+  Carousel: path.resolve(__dirname, '../js/src/carousel.js'),
+  Collapse: path.resolve(__dirname, '../js/src/collapse.js'),
+  Dropdown: path.resolve(__dirname, '../js/src/dropdown.js'),
+  Modal: path.resolve(__dirname, '../js/src/modal.js'),
+  Popover: path.resolve(__dirname, '../js/src/popover.js'),
+  ScrollSpy: path.resolve(__dirname, '../js/src/scrollspy.js'),
+  Tab: path.resolve(__dirname, '../js/src/tab.js'),
+  Toast: path.resolve(__dirname, '../js/src/toast.js'),
+  Tooltip: path.resolve(__dirname, '../js/src/tooltip.js')
 }
-const rootPath = '../js/dist/'
+const rootPath = path.resolve(__dirname, '../js/dist/')
 
 const defaultPluginConfig = {
   external: [
@@ -172,7 +172,7 @@ function build(plugin) {
       name: plugin,
       sourcemap: true,
       globals,
-      file: path.resolve(__dirname, `${pluginPath}${pluginFilename}`)
+      file: path.resolve(__dirname, `${pluginPath}/${pluginFilename}`)
     })
       .then(() => console.log(`Building ${plugin} plugin... Done!`))
       .catch(error => console.error(`${plugin}: ${error}`))

diff --git a/js/index.esm.js b/js/index.esm.js
@@ -5,17 +5,17 @@
  * --------------------------------------------------------------------------
  */
 
-import Alert from './src/alert/alert'
-import Button from './src/button/button'
-import Carousel from './src/carousel/carousel'
-import Collapse from './src/collapse/collapse'
-import Dropdown from './src/dropdown/dropdown'
-import Modal from './src/modal/modal'
-import Popover from './src/popover/popover'
-import ScrollSpy from './src/scrollspy/scrollspy'
-import Tab from './src/tab/tab'
-import Toast from './src/toast/toast'
-import Tooltip from './src/tooltip/tooltip'
+import Alert from './src/alert'
+import Button from './src/button'
+import Carousel from './src/carousel'
+import Collapse from './src/collapse'
+import Dropdown from './src/dropdown'
+import Modal from './src/modal'
+import Popover from './src/popover'
+import ScrollSpy from './src/scrollspy'
+import Tab from './src/tab'
+import Toast from './src/toast'
+import Tooltip from './src/tooltip'
 
 export {
   Alert,

diff --git a/js/index.umd.js b/js/index.umd.js
@@ -5,17 +5,17 @@
  * --------------------------------------------------------------------------
  */
 
-import Alert from './src/alert/alert'
-import Button from './src/button/button'
-import Carousel from './src/carousel/carousel'
-import Collapse from './src/collapse/collapse'
-import Dropdown from './src/dropdown/dropdown'
-import Modal from './src/modal/modal'
-import Popover from './src/popover/popover'
-import ScrollSpy from './src/scrollspy/scrollspy'
-import Tab from './src/tab/tab'
-import Toast from './src/toast/toast'
-import Tooltip from './src/tooltip/tooltip'
+import Alert from './src/alert'
+import Button from './src/button'
+import Carousel from './src/carousel'
+import Collapse from './src/collapse'
+import Dropdown from './src/dropdown'
+import Modal from './src/modal'
+import Popover from './src/popover'
+import ScrollSpy from './src/scrollspy'
+import Tab from './src/tab'
+import Toast from './src/toast'
+import Tooltip from './src/tooltip'
 
 export default {
   Alert,

diff --git a/js/src/alert/alert.js → js/src/alert.js b/js/src/alert/alert.js → js/src/alert.js
@@ -11,10 +11,10 @@ import {
   emulateTransitionEnd,
   getElementFromSelector,
   getTransitionDurationFromElement
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import SelectorEngine from '../dom/selector-engine'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/button/button.js → js/src/button.js b/js/src/button/button.js → js/src/button.js
@@ -5,10 +5,10 @@
  * --------------------------------------------------------------------------
  */
 
-import { getjQuery } from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import SelectorEngine from '../dom/selector-engine'
+import { getjQuery } from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/carousel/carousel.js → js/src/carousel.js b/js/src/carousel/carousel.js → js/src/carousel.js
@@ -16,11 +16,11 @@ import {
   reflow,
   triggerTransitionEnd,
   typeCheckConfig
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
-import SelectorEngine from '../dom/selector-engine'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/collapse/collapse.js → js/src/collapse.js b/js/src/collapse/collapse.js → js/src/collapse.js
@@ -16,11 +16,11 @@ import {
   makeArray,
   reflow,
   typeCheckConfig
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
-import SelectorEngine from '../dom/selector-engine'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/dropdown/dropdown.js → js/src/dropdown.js b/js/src/dropdown/dropdown.js → js/src/dropdown.js
@@ -12,12 +12,12 @@ import {
   makeArray,
   noop,
   typeCheckConfig
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
 import Popper from 'popper.js'
-import SelectorEngine from '../dom/selector-engine'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/modal/modal.js → js/src/modal.js b/js/src/modal/modal.js → js/src/modal.js
@@ -15,11 +15,11 @@ import {
   makeArray,
   reflow,
   typeCheckConfig
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
-import SelectorEngine from '../dom/selector-engine'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/popover/popover.js → js/src/popover.js b/js/src/popover/popover.js → js/src/popover.js
@@ -5,10 +5,10 @@
  * --------------------------------------------------------------------------
  */
 
-import { getjQuery } from '../util/index'
-import Data from '../dom/data'
-import SelectorEngine from '../dom/selector-engine'
-import Tooltip from '../tooltip/tooltip'
+import { getjQuery } from './util/index'
+import Data from './dom/data'
+import SelectorEngine from './dom/selector-engine'
+import Tooltip from './tooltip'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/scrollspy/scrollspy.js → js/src/scrollspy.js b/js/src/scrollspy/scrollspy.js → js/src/scrollspy.js
@@ -11,11 +11,11 @@ import {
   getUID,
   makeArray,
   typeCheckConfig
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
-import SelectorEngine from '../dom/selector-engine'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/tab/tab.js → js/src/tab.js b/js/src/tab/tab.js → js/src/tab.js
@@ -13,10 +13,10 @@ import {
   getTransitionDurationFromElement,
   makeArray,
   reflow
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import SelectorEngine from '../dom/selector-engine'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/toast/toast.js → js/src/toast.js b/js/src/toast/toast.js → js/src/toast.js
@@ -12,10 +12,10 @@ import {
   getTransitionDurationFromElement,
   reflow,
   typeCheckConfig
-} from '../util/index'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
+} from './util/index'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/src/tooltip/tooltip.js → js/src/tooltip.js b/js/src/tooltip/tooltip.js → js/src/tooltip.js
@@ -16,16 +16,16 @@ import {
   makeArray,
   noop,
   typeCheckConfig
-} from '../util/index'
+} from './util/index'
 import {
   DefaultWhitelist,
   sanitizeHtml
-} from '../util/sanitizer'
-import Data from '../dom/data'
-import EventHandler from '../dom/event-handler'
-import Manipulator from '../dom/manipulator'
+} from './util/sanitizer'
+import Data from './dom/data'
+import EventHandler from './dom/event-handler'
+import Manipulator from './dom/manipulator'
 import Popper from 'popper.js'
-import SelectorEngine from '../dom/selector-engine'
+import SelectorEngine from './dom/selector-engine'
 
 /**
  * ------------------------------------------------------------------------

diff --git a/js/tests/README.md b/js/tests/README.md
@@ -1,6 +1,6 @@
 ## How does Bootstrap's test suite work?
 
-Bootstrap uses [Jasmine](https://jasmine.github.io/). Each plugin has a file dedicated to its tests in `src/<plugin-name>/<plugin-name>.spec.js`.
+Bootstrap uses [Jasmine](https://jasmine.github.io/). Each plugin has a file dedicated to its tests in `tests/units/<plugin-name>.spec.js`.
 
 * `visual/` contains "visual" tests which are run interactively in real browsers and require manual verification by humans.
 
@@ -9,7 +9,7 @@ To run the unit test suite via [Karma](https://karma-runner.github.io/) and debu
 
 ## How do I add a new unit test?
 
-1. Locate and open the file dedicated to the plugin which you need to add tests to (`src/<plugin-name>/<plugin-name>.spec.js`).
+1. Locate and open the file dedicated to the plugin which you need to add tests to (`tests/units/<plugin-name>.spec.js`).
 2. Review the [Jasmine API Documentation](https://jasmine.github.io/pages/docs_home.html) and use the existing tests as references for how to structure your new tests.
 3. Write the necessary unit test(s) for the new or revised functionality.
 4. Run `npm run js-test` to see the results of your newly-added test(s).
@@ -26,7 +26,7 @@ To run the unit test suite via [Karma](https://karma-runner.github.io/) and debu
 
 ## Code coverage
 
-Currently we're aiming for at least 90% test coverage for our code. To ensure your changes meet or exceed this limit, run `npm run js-compile && npm run js-test` and open the file in `js/coverage/lcov-report/index.html` to see the code coverage for each plugin. See more details when you select a plugin and ensure your change is fully covered by unit tests.
+Currently we're aiming for at least 90% test coverage for our code. To ensure your changes meet or exceed this limit, run `npm run js-test-karma` and open the file in `js/coverage/lcov-report/index.html` to see the code coverage for each plugin. See more details when you select a plugin and ensure your change is fully covered by unit tests.
 
 ### Example tests