bootstrap-vue · tmorehouse · Aug 13, 2019 · Jul 1, 2019 · Jul 1, 2019 · Jul 1, 2019
diff --git a/docs/components/importdoc.vue b/docs/components/importdoc.vue
@@ -125,14 +125,13 @@
 
     <aside class="alert alert-warning my-4">
       <p class="mb-0">
-        <b-badge variant="warning" tag="strong">Deprecation Warning as of v2.0.0-rc.22:</b-badge>
+        <b-badge variant="warning" tag="strong">CHANGED as of v2.0.0:</b-badge>
         Importing components, directives and plugins from
         <code class="notranslate" translate="no">bootstrap-vue/es/*</code>
-        has been deprecated. All components, directives and plugins are now available as top-level named
+        has been removed. All components, directives and plugins are now available as top-level named
         exports in the <code class="notranslate" translate="no">ESM</code> and
         <code class="notranslate" translate="no">CommonJS</code> builds. The
-        <code class="notranslate" translate="no">es/</code> directory build will be removed in a future
-        release.
+        <code class="notranslate" translate="no">es/</code> directory build has been removed.
       </p>
     </aside>
   </section>
@@ -144,6 +143,8 @@ import kebabCase from 'lodash/kebabCase'
 import startCase from 'lodash/startCase'
 import AnchoredHeading from './anchored-heading'
 
+const importPath = 'bootstrap-vue'
+
 export default {
   name: 'BDVImportdoc',
   components: { AnchoredHeading },
@@ -212,9 +213,8 @@ export default {
     },
     directiveImportCode() {
       const firstDirective = this.directives[0]
-      const firstDirectiveImport = this.directiveImports[0]
       return [
-        `import { ${firstDirective} } from '${firstDirectiveImport.importPath}'`,
+        `import { ${firstDirective} } from '${importPath}'`,
         "// Note: Vue automatically prefixes the directive name with 'v-'",
         `Vue.directive('${this.directiveName(firstDirective)}', ${firstDirective})`
       ].join('\n')

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -13,28 +13,20 @@ echo 'Done.'
 echo ''
 
 # Cleanup
-rm -rf dist es esm
+rm -rf dist esm
 
 echo 'Compile JS...'
 rollup -c scripts/rollup.config.js
 echo 'Done.'
 echo ''
 
-echo 'Build ESM modules...'
+echo 'Compiling ESM modular build...'
 NODE_ENV=esm babel src --out-dir esm --ignore 'src/**/*.spec.js'
-rm -f esm/legacy-es.js esm/browser.js
+rm -f esm/browser.js
 echo "${BV_BANNER}" | cat - esm/index.js > esm/tmp.js && mv -f esm/tmp.js esm/index.js
 echo 'Done.'
 echo ''
 
-echo 'Build ES modules (deprecated)...'
-NODE_ENV=es babel src --out-dir es --ignore 'src/**/*.spec.js'
-rm -f es/index.js es/browser.js
-echo "${BV_BANNER}" | cat - es/legacy-es.js > es/index.js
-rm -f es/legacy-es.js
-echo 'Done.'
-echo ''
-
 echo 'Minify JS...'
 terser dist/bootstrap-vue.js \
        --compress typeofs=false \
@@ -78,29 +70,16 @@ echo 'Done.'
 echo ''
 
 echo 'Copying types from src/ to esm/ ...'
-# There must be a better way to do this
+# This may no longer be needed, as all exports are at top level now.
 #
-# The following does not preserve the paths
-#   shopt -s globstar
-#   cp src/**/*.d.ts es
-#
-# So we resort to a find with exec
-cd src
-find . -type f -name '*.d.ts' -exec cp {} ../esm/{} ';'
-cd ..
-echo 'Done.'
-echo ''
-
-echo 'Copying types from src/ to es/ ...'
 # There must be a better way to do this
-#
 # The following does not preserve the paths
 #   shopt -s globstar
 #   cp src/**/*.d.ts es
 #
 # So we resort to a find with exec
 cd src
-find . -type f -name '*.d.ts' -exec cp {} ../es/{} ';'
+find . -type f -name '*.d.ts' -exec cp {} ../esm/{} ';'
 cd ..
 echo 'Done.'
 echo ''

diff --git a/src/bv-config.d.ts b/src/bv-config.d.ts
@@ -2,4 +2,3 @@ import Vue, { PluginFunction, PluginObject } from 'vue'
 import { BvPlugin } from './'
 
 export declare const BVConfigPlugin: BvPlugin
-export default BVConfigPlugin
diff --git a/src/bv-config.js b/src/bv-config.js
@@ -3,6 +3,4 @@
 //
 import { pluginFactory } from './utils/plugins'
 
-const BVConfigPlugin = /*#__PURE__*/ pluginFactory()
-
-export default BVConfigPlugin
+export const BVConfigPlugin = /*#__PURE__*/ pluginFactory()
diff --git a/src/components/alert/index.d.ts b/src/components/alert/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const AlertPlugin: BvPlugin
-export default AlertPlugin
 
 // Component: b-alert
 export declare class BAlert extends BvComponent {

diff --git a/src/components/alert/index.js b/src/components/alert/index.js
@@ -6,5 +6,3 @@ const AlertPlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { AlertPlugin, BAlert }
-
-export default AlertPlugin
diff --git a/src/components/badge/index.d.ts b/src/components/badge/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const BadgePlugin: BvPlugin
-export default BadgePlugin
 
 // Component: b-badge
 export declare class BBadge extends BvComponent {}
diff --git a/src/components/badge/index.js b/src/components/badge/index.js
@@ -6,5 +6,3 @@ const BadgePlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { BadgePlugin, BBadge }
-
-export default BadgePlugin
diff --git a/src/components/breadcrumb/index.d.ts b/src/components/breadcrumb/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const BreadcrumbPlugin: BvPlugin
-export default BreadcrumbPlugin
 
 // Component: b-breadcrumb
 export declare class BBreadcrumb extends BvComponent {}

diff --git a/src/components/breadcrumb/index.js b/src/components/breadcrumb/index.js
@@ -8,5 +8,3 @@ const BreadcrumbPlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { BreadcrumbPlugin, BBreadcrumb, BBreadcrumbItem, BBreadcrumbLink }
-
-export default BreadcrumbPlugin
diff --git a/src/components/button-group/index.d.ts b/src/components/button-group/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const ButtonGroupPlugin: BvPlugin
-export default ButtonGroupPlugin
 
 // Component: b-button-group
 export declare class BButtonGroup extends BvComponent {}
diff --git a/src/components/button-group/index.js b/src/components/button-group/index.js
@@ -9,5 +9,3 @@ const ButtonGroupPlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { ButtonGroupPlugin, BButtonGroup }
-
-export default ButtonGroupPlugin
diff --git a/src/components/button-toolbar/index.d.ts b/src/components/button-toolbar/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const ButtonToolbarPlugin: BvPlugin
-export default ButtonToolbarPlugin
 
 // Component: b-button-toolbar
 export declare class BButtonToolbar extends BvComponent {}
diff --git a/src/components/button-toolbar/index.js b/src/components/button-toolbar/index.js
@@ -9,5 +9,3 @@ const ButtonToolbarPlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { ButtonToolbarPlugin, BButtonToolbar }
-
-export default ButtonToolbarPlugin
diff --git a/src/components/button/index.d.ts b/src/components/button/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const ButtonPlugin: BvPlugin
-export default ButtonPlugin
 
 // Component: b-button
 export declare class BButton extends BvComponent {}

diff --git a/src/components/button/index.js b/src/components/button/index.js
@@ -12,5 +12,3 @@ const ButtonPlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { ButtonPlugin, BButton, BButtonClose }
-
-export default ButtonPlugin
diff --git a/src/components/card/index.d.ts b/src/components/card/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const CardPlugin: BvPlugin
-export default CardPlugin
 
 // Component: b-card
 export declare class BCard extends BvComponent {}

diff --git a/src/components/card/index.js b/src/components/card/index.js
@@ -38,5 +38,3 @@ export {
   BCardText,
   BCardGroup
 }
-
-export default CardPlugin
diff --git a/src/components/carousel/index.d.ts b/src/components/carousel/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const CarouselPlugin: BvPlugin
-export default CarouselPlugin
 
 // Component: b-carousel
 export declare class BCarousel extends BvComponent {

diff --git a/src/components/carousel/index.js b/src/components/carousel/index.js
@@ -10,5 +10,3 @@ const CarouselPlugin = /*#__PURE*/ pluginFactory({
 })
 
 export { CarouselPlugin, BCarousel, BCarouselSlide }
-
-export default CarouselPlugin
diff --git a/src/components/collapse/index.d.ts b/src/components/collapse/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const CollapsePlugin: BvPlugin
-export default CollapsePlugin
 
 // Component: b-collapse
 export declare class BCollapse extends BvComponent {

diff --git a/src/components/collapse/index.js b/src/components/collapse/index.js
@@ -8,5 +8,3 @@ const CollapsePlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { CollapsePlugin, BCollapse }
-
-export default CollapsePlugin
diff --git a/src/components/dropdown/index.d.ts b/src/components/dropdown/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const DropdownPlugin: BvPlugin
-export default DropdownPlugin
 
 // Component: b-dropdown
 export declare class BDropdown extends BvComponent {

diff --git a/src/components/dropdown/index.js b/src/components/dropdown/index.js
@@ -42,5 +42,3 @@ export {
   BDropdownText,
   BDropdownGroup
 }
-
-export default DropdownPlugin
diff --git a/src/components/embed/index.d.ts b/src/components/embed/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const EmbedPlugin: BvPlugin
-export default EmbedPlugin
 
 // Component: b-embed
 export declare class BEmbed extends BvComponent {}
diff --git a/src/components/embed/index.js b/src/components/embed/index.js
@@ -6,5 +6,3 @@ const EmbedPlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { EmbedPlugin, BEmbed }
-
-export default EmbedPlugin
diff --git a/src/components/form-checkbox/index.d.ts b/src/components/form-checkbox/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const FormCheckboxPlugin: BvPlugin
-export default FormCheckboxPlugin
 
 // Component: b-form-checkbox
 export declare class BFormCheckbox extends BvComponent {}

diff --git a/src/components/form-checkbox/index.js b/src/components/form-checkbox/index.js
@@ -14,5 +14,3 @@ const FormCheckboxPlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { FormCheckboxPlugin, BFormCheckbox, BFormCheckboxGroup }
-
-export default FormCheckboxPlugin
diff --git a/src/components/form-file/index.d.ts b/src/components/form-file/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const FormFilePlugin: BvPlugin
-export default FormFilePlugin
 
 // Component: b-form-file
 export declare class BFormFile extends BvComponent {

diff --git a/src/components/form-file/index.js b/src/components/form-file/index.js
@@ -9,5 +9,3 @@ const FormFilePlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { FormFilePlugin, BFormFile }
-
-export default FormFilePlugin
diff --git a/src/components/form-group/index.d.ts b/src/components/form-group/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const FormGroupPlugin: BvPlugin
-export default FormGroupPlugin
 
 // Component: b-form-group
 export declare class BFormGroup extends BvComponent {}
diff --git a/src/components/form-group/index.js b/src/components/form-group/index.js
@@ -9,5 +9,3 @@ const FormGroupPlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { FormGroupPlugin, BFormGroup }
-
-export default FormGroupPlugin
diff --git a/src/components/form-input/index.d.ts b/src/components/form-input/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const FormInputPlugin: BvPlugin
-export default FormInputPlugin
 
 // Component: b-form-input
 export declare class BFormInput extends BvComponent {

diff --git a/src/components/form-input/index.js b/src/components/form-input/index.js
@@ -9,5 +9,3 @@ const FormInputPlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { FormInputPlugin, BFormInput }
-
-export default FormInputPlugin
diff --git a/src/components/form-radio/index.d.ts b/src/components/form-radio/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const FormRadioPlugin: BvPlugin
-export default FormRadioPlugin
 
 // Component: b-form-radio
 export declare class BFormRadio extends BvComponent {}

diff --git a/src/components/form-radio/index.js b/src/components/form-radio/index.js
@@ -12,5 +12,3 @@ const FormRadioPlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { FormRadioPlugin, BFormRadio, BFormRadioGroup }
-
-export default FormRadioPlugin
diff --git a/src/components/form-select/index.d.ts b/src/components/form-select/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const FormSelectPlugin: BvPlugin
-export default FormSelectPlugin
 
 // Component: b-form-select
 export declare class BFormSelect extends BvComponent {}
diff --git a/src/components/form-select/index.js b/src/components/form-select/index.js
@@ -9,5 +9,3 @@ const FormSelectPlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { FormSelectPlugin, BFormSelect }
-
-export default FormSelectPlugin
diff --git a/src/components/form-textarea/index.d.ts b/src/components/form-textarea/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const FormTextareaPlugin: BvPlugin
-export default FormTextareaPlugin
 
 // Component: b-form-textarea
 export declare class BFormTextarea extends BvComponent {

diff --git a/src/components/form-textarea/index.js b/src/components/form-textarea/index.js
@@ -9,5 +9,3 @@ const FormTextareaPlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { FormTextareaPlugin, BFormTextarea }
-
-export default FormTextareaPlugin
diff --git a/src/components/form/index.d.ts b/src/components/form/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const FormPlugin: BvPlugin
-export default FormPlugin
 
 // Component: b-form
 export declare class BForm extends BvComponent {}

diff --git a/src/components/form/index.js b/src/components/form/index.js
@@ -22,5 +22,3 @@ const FormPlugin = /*#__PURE__*/ pluginFactory({
 
 // BFormRow is not exported here as a named export, as it is exported by Layout
 export { FormPlugin, BForm, BFormDatalist, BFormText, BFormInvalidFeedback, BFormValidFeedback }
-
-export default FormPlugin
diff --git a/src/components/image/index.d.ts b/src/components/image/index.d.ts
@@ -6,7 +6,6 @@ import { BvPlugin, BvComponent } from '../../'
 
 // Plugin
 export declare const ImagePlugin: BvPlugin
-export default ImagePlugin
 
 // Component: b-img
 export declare class BImg extends BvComponent {}

diff --git a/src/components/image/index.js b/src/components/image/index.js
@@ -10,5 +10,3 @@ const ImagePlugin = /*#__PURE__*/ pluginFactory({
 })
 
 export { ImagePlugin, BImg, BImgLazy }
-
-export default ImagePlugin
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@ import Vue, { PluginFunction, PluginObject } from 'vue'
		import { BvPlugin } from './'

		export declare const BVConfigPlugin: BvPlugin
		export default BVConfigPlugin
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,5 +6,3 @@ const AlertPlugin = /#__PURE__/ pluginFactory({
		})

		export { AlertPlugin, BAlert }

		export default AlertPlugin
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,5 +6,3 @@ const BadgePlugin = /#__PURE__/ pluginFactory({
		})

		export { BadgePlugin, BBadge }

		export default BadgePlugin
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,5 +8,3 @@ const BreadcrumbPlugin = /#__PURE__/ pluginFactory({
		})

		export { BreadcrumbPlugin, BBreadcrumb, BBreadcrumbItem, BBreadcrumbLink }

		export default BreadcrumbPlugin
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,5 +9,3 @@ const ButtonGroupPlugin = /#__PURE__/ pluginFactory({
		})

		export { ButtonGroupPlugin, BButtonGroup }

		export default ButtonGroupPlugin
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,5 +9,3 @@ const ButtonToolbarPlugin = /#__PURE__/ pluginFactory({
		})

		export { ButtonToolbarPlugin, BButtonToolbar }

		export default ButtonToolbarPlugin
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,5 +12,3 @@ const ButtonPlugin = /#__PURE__/ pluginFactory({
		})

		export { ButtonPlugin, BButton, BButtonClose }

		export default ButtonPlugin
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,5 +10,3 @@ const CarouselPlugin = /#__PURE/ pluginFactory({
		})

		export { CarouselPlugin, BCarousel, BCarouselSlide }

		export default CarouselPlugin
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,5 +8,3 @@ const CollapsePlugin = /#__PURE__/ pluginFactory({
		})

		export { CollapsePlugin, BCollapse }

		export default CollapsePlugin
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,5 +6,3 @@ const EmbedPlugin = /#__PURE__/ pluginFactory({
		})

		export { EmbedPlugin, BEmbed }

		export default EmbedPlugin