Skip to content

chore: release v2.0.0-rc.18 #3049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,29 @@
> [standard-version](https://github.com/conventional-changelog/standard-version) for commit
> guidelines.

<a name="2.0.0-rc.18"></a>

## [v2.0.0-rc.18](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.0.0-rc.17...v2.0.0-rc.18)

Released 2019-04-08

### Bug Fixes v2.0.0-rc.18

- **build:** enable babel option to interop default (fixes
[#3038](https://github.com/bootstrap-vue/bootstrap-vue/issues/3038))
([#3046](https://github.com/bootstrap-vue/bootstrap-vue/issues/3046)
[4e981c2](https://github.com/bootstrap-vue/bootstrap-vue/commit/4e981c2))
- **typescript:** replaced invalid `mixed` keyword with `any` (fixes
[#3041](https://github.com/bootstrap-vue/bootstrap-vue/issues/3041))
([#3043](https://github.com/bootstrap-vue/bootstrap-vue/issues/3043)
[36e8246](https://github.com/bootstrap-vue/bootstrap-vue/commit/36e8246))

### Features v2.0.0-rc.18

- **nuxt:** add `usePretranspiled` option
([#3048](https://github.com/bootstrap-vue/bootstrap-vue/issues/3048)
[8022481](https://github.com/bootstrap-vue/bootstrap-vue/commit/8022481))

<a name="2.0.0-rc.17"></a>

## [v2.0.0-rc.17](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.0.0-rc.16...v2.0.0-rc.17)
Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = api => {
presets,
env: {
es: {
plugins: [['@babel/plugin-transform-modules-commonjs', { noInterop: true, loose: true }]]
plugins: [['@babel/plugin-transform-modules-commonjs', { loose: true }]]
},
test: {
presets: [['@babel/env', { targets: { node: 'current' } }]]
Expand Down
10 changes: 9 additions & 1 deletion docs/markdown/intro/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ _after_ Bootstrap SCSS to ensure variables are set up correctly.
**Note**: _Requires webpack configuration to load CSS/SCSS files
([official guide](https://webpack.js.org/guides/asset-management/#loading-css))_.

## Nuxt.js plugin module
## Nuxt.js Module

[Nuxt.js](https://nuxtjs.org) version {{ nuxtVersion }} (or greater) is recommended.

Expand Down Expand Up @@ -153,6 +153,14 @@ module.exports = {
}
```

### Using pretranspiled version of BootstrapVue for Nuxt.js

Nuxt module uses precompiled version of BootstrapVue for faster development builds and source of
BootstrapVue for higher quality production builds.

You can override this option using `usePretranspiled` option. Setting to `true` uses `es/` instead
of `src/`. By default is enabled for development mode only.

## Vue CLI 2

BootstrapVue has two Vue CLI templates available:
Expand Down
9 changes: 7 additions & 2 deletions nuxt/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,15 @@ module.exports = function nuxtBootstrapVue(moduleOptions = {}) {
this.options.css.unshift('bootstrap/dist/css/bootstrap.css')
}

// Transpile src
// Transpile src/
this.options.build.transpile.push('bootstrap-vue/src')

const templateOptions = {}
// Use es/ or src/
const usePretranspiled = pickFirst(options.usePretranspiled, this.options.dev)

const templateOptions = {
dist: usePretranspiled ? 'es' : 'src'
}

// TODO: Also add support for individual components & directives
for (const type of ['componentPlugins', 'directivePlugins']) {
Expand Down
8 changes: 4 additions & 4 deletions nuxt/plugin.template.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import Vue from 'vue'
<% if (options.componentPlugins.length || options.directivePlugins.length) { %><%=
options.componentPlugins.reduce((acc, p) => (acc += `import ${p[0]} from 'bootstrap-vue/es/components/${p[1]}'\n` ), '') %><%=
options.directivePlugins.reduce((acc, p) => (acc += `import ${p[0]} from 'bootstrap-vue/es/directives/${p[1]}'\n` ), '') %>
options.componentPlugins.reduce((acc, p) => (acc += `import ${p[0]} from 'bootstrap-vue/${options.dist}/components/${p[1]}'\n` ), '') %><%=
options.directivePlugins.reduce((acc, p) => (acc += `import ${p[0]} from 'bootstrap-vue/${options.dist}/directives/${p[1]}'\n` ), '') %>

<% if (options.config) { %>
import BVConfigPlugin from 'bootstrap-vue/es/bv-config'
import BVConfigPlugin from 'bootstrap-vue/<%= options.dist %>/bv-config'

Vue.use(BVConfigPlugin, <%= JSON.stringify(options.config, undefined, 2) %>)
<% } %>
Expand All @@ -13,7 +13,7 @@ Vue.use(BVConfigPlugin, <%= JSON.stringify(options.config, undefined, 2) %>)
options.componentPlugins.reduce((acc, p) => (acc += `Vue.use(${p[0]})\n` ), '') %><%=
options.directivePlugins.reduce((acc, p) => (acc += `Vue.use(${p[0]})\n` ), '') %>
<% } else { %>
import BootstrapVue from 'bootstrap-vue/es'
import BootstrapVue from 'bootstrap-vue/<%= options.dist %>'

Vue.use(BootstrapVue, <%= JSON.stringify(options.config || {}, undefined, 2) %>)
<% } %>
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-vue",
"version": "2.0.0-rc.17",
"version": "2.0.0-rc.18",
"description": "BootstrapVue provides one of the most comprehensive implementations of Bootstrap 4 components and grid system for Vue.js and with extensive and automated WAI-ARIA accessibility markup.",
"main": "dist/bootstrap-vue.common.js",
"types": "src/index.d.ts",
Expand Down Expand Up @@ -129,7 +129,7 @@
"terser": "^3.17.0",
"vue": "^2.6.10",
"vue-jest": "^3.0.4",
"vue-router": "^3.0.2",
"vue-router": "^3.0.3",
"vue-server-renderer": "^2.6.10",
"vue-template-compiler": "^2.6.10"
},
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ echo 'Done.'
echo ''

echo 'Build ES modules...'
NODE_ENV=es babel src --out-dir es --ignore 'src/**/*/fixtures,src/**/*.spec.js'
NODE_ENV=es babel src --out-dir es --ignore 'src/**/*.spec.js'
echo 'Done.'
echo ''

Expand Down
34 changes: 0 additions & 34 deletions scripts/rollup.config.esm.js

This file was deleted.

8 changes: 4 additions & 4 deletions scripts/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ const externals = ['vue', ...Object.keys(dependencies)]

// Libs in `external` will not be bundled to dist,
// since they are expected to be provided later.
// We want to include some of them in the build, so we exclude it here.
// In some cases, wee want to include some of them in the build, so we
// exclude the external here.
const externalExcludes = ['popper.js', 'vue-functional-data-merge']

// The base rollup configuration
const baseConfig = {
input: path.resolve(src, 'index.js'),
external: Object.keys(dependencies),
external: externals,
plugins: [resolve({ external: ['vue'] }), commonjs(), babel({ exclude: 'node_modules/**' })]
}

Expand Down Expand Up @@ -57,10 +58,9 @@ export default [
}
},

// ES
// ESM
{
...baseConfig,
external: ['vue'],
output: {
format: 'es',
file: path.resolve(dist, `${name}.esm.js`),
Expand Down
6 changes: 3 additions & 3 deletions src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ declare module 'bootstrap-vue' {
| 'light'
| 'dark'
type SortDirection = 'asc' | 'desc' | 'last'
type FormatterCallback = ((value: mixed, key: string, item: mixed) => any)
type FormatterCallback = ((value: any, key: string, item: any) => any)

export interface TableField {
label?: string
Expand All @@ -37,9 +37,9 @@ declare module 'bootstrap-vue' {
sortDirection?: SortDirection
tdClass?: string | string[] | FormatterCallback
thClass?: string | string[]
thStyle?: mixed
thStyle?: any
variant?: TableVariant | string
tdAttr?: mixed | ((value: mixed, key: string, item: mixed) => mixed)
tdAttr?: any | ((value: any, key: string, item: any) => any)
isRowHeader?: boolean
}
export interface TableFieldObject {
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11353,6 +11353,11 @@ vue-router@^3.0.2:
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.2.tgz#dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be"
integrity sha512-opKtsxjp9eOcFWdp6xLQPLmRGgfM932Tl56U9chYTnoWqKxQ8M20N7AkdEbM5beUh6wICoFGYugAX9vQjyJLFg==

vue-router@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.3.tgz#370ca607475c45a1cfab2d9d2ac846feab1c534c"
integrity sha512-62rB6GjJuyklnLL+yKST469yCYj93SXEn8rpYjxgLwv0aH/Fd6OApD8Hgi9RlraZ1OOwv3jPQvZTtf1GixYW+g==

vue-server-renderer@^2.6.10:
version "2.6.10"
resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.10.tgz#cb2558842ead360ae2ec1f3719b75564a805b375"
Expand Down