Skip to content

Commit 472a5d7

Browse files
tmorehousetmorehouse
authored
Merge pull request #3049 from bootstrap-vue/dev
chore: release v2.0.0-rc.18
2 parents bf85236 + ba78e40 commit 472a5d7

File tree

11 files changed

+59
-52
lines changed

11 files changed

+59
-52
lines changed

‎CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,29 @@
44
> [standard-version](https://github.com/conventional-changelog/standard-version) for commit
55
> guidelines.
66
7+
<a name="2.0.0-rc.18"></a>
8+
9+
## [v2.0.0-rc.18](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.0.0-rc.17...v2.0.0-rc.18)
10+
11+
Released 2019-04-08
12+
13+
### Bug Fixes v2.0.0-rc.18
14+
15+
- **build:** enable babel option to interop default (fixes
16+
[#3038](https://github.com/bootstrap-vue/bootstrap-vue/issues/3038))
17+
([#3046](https://github.com/bootstrap-vue/bootstrap-vue/issues/3046)
18+
[4e981c2](https://github.com/bootstrap-vue/bootstrap-vue/commit/4e981c2))
19+
- **typescript:** replaced invalid `mixed` keyword with `any` (fixes
20+
[#3041](https://github.com/bootstrap-vue/bootstrap-vue/issues/3041))
21+
([#3043](https://github.com/bootstrap-vue/bootstrap-vue/issues/3043)
22+
[36e8246](https://github.com/bootstrap-vue/bootstrap-vue/commit/36e8246))
23+
24+
### Features v2.0.0-rc.18
25+
26+
- **nuxt:** add `usePretranspiled` option
27+
([#3048](https://github.com/bootstrap-vue/bootstrap-vue/issues/3048)
28+
[8022481](https://github.com/bootstrap-vue/bootstrap-vue/commit/8022481))
29+
730
<a name="2.0.0-rc.17"></a>
831

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

‎babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = api => {
1010
presets,
1111
env: {
1212
es: {
13-
plugins: [['@babel/plugin-transform-modules-commonjs', { noInterop: true, loose: true }]]
13+
plugins: [['@babel/plugin-transform-modules-commonjs', { loose: true }]]
1414
},
1515
test: {
1616
presets: [['@babel/env', { targets: { node: 'current' } }]]

‎docs/markdown/intro/README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ _after_ Bootstrap SCSS to ensure variables are set up correctly.
5656
**Note**: _Requires webpack configuration to load CSS/SCSS files
5757
([official guide](https://webpack.js.org/guides/asset-management/#loading-css))_.
5858

59-
## Nuxt.js plugin module
59+
## Nuxt.js Module
6060

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

@@ -153,6 +153,14 @@ module.exports = {
153153
}
154154
```
155155

156+
### Using pretranspiled version of BootstrapVue for Nuxt.js
157+
158+
Nuxt module uses precompiled version of BootstrapVue for faster development builds and source of
159+
BootstrapVue for higher quality production builds.
160+
161+
You can override this option using `usePretranspiled` option. Setting to `true` uses `es/` instead
162+
of `src/`. By default is enabled for development mode only.
163+
156164
## Vue CLI 2
157165

158166
BootstrapVue has two Vue CLI templates available:

‎nuxt/index.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,15 @@ module.exports = function nuxtBootstrapVue(moduleOptions = {}) {
4747
this.options.css.unshift('bootstrap/dist/css/bootstrap.css')
4848
}
4949

50-
// Transpile src
50+
// Transpile src/
5151
this.options.build.transpile.push('bootstrap-vue/src')
5252

53-
const templateOptions = {}
53+
// Use es/ or src/
54+
const usePretranspiled = pickFirst(options.usePretranspiled, this.options.dev)
55+
56+
const templateOptions = {
57+
dist: usePretranspiled ? 'es' : 'src'
58+
}
5459

5560
// TODO: Also add support for individual components & directives
5661
for (const type of ['componentPlugins', 'directivePlugins']) {

‎nuxt/plugin.template.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import Vue from 'vue'
22
<% if (options.componentPlugins.length || options.directivePlugins.length) { %><%=
3-
options.componentPlugins.reduce((acc, p) => (acc += `import ${p[0]} from 'bootstrap-vue/es/components/${p[1]}'\n` ), '') %><%=
4-
options.directivePlugins.reduce((acc, p) => (acc += `import ${p[0]} from 'bootstrap-vue/es/directives/${p[1]}'\n` ), '') %>
3+
options.componentPlugins.reduce((acc, p) => (acc += `import ${p[0]} from 'bootstrap-vue/${options.dist}/components/${p[1]}'\n` ), '') %><%=
4+
options.directivePlugins.reduce((acc, p) => (acc += `import ${p[0]} from 'bootstrap-vue/${options.dist}/directives/${p[1]}'\n` ), '') %>
55

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

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

1818
Vue.use(BootstrapVue, <%= JSON.stringify(options.config || {}, undefined, 2) %>)
1919
<% } %>

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-vue",
3-
"version": "2.0.0-rc.17",
3+
"version": "2.0.0-rc.18",
44
"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.",
55
"main": "dist/bootstrap-vue.common.js",
66
"types": "src/index.d.ts",
@@ -129,7 +129,7 @@
129129
"terser": "^3.17.0",
130130
"vue": "^2.6.10",
131131
"vue-jest": "^3.0.4",
132-
"vue-router": "^3.0.2",
132+
"vue-router": "^3.0.3",
133133
"vue-server-renderer": "^2.6.10",
134134
"vue-template-compiler": "^2.6.10"
135135
},

‎scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ echo 'Done.'
1515
echo ''
1616

1717
echo 'Build ES modules...'
18-
NODE_ENV=es babel src --out-dir es --ignore 'src/**/*/fixtures,src/**/*.spec.js'
18+
NODE_ENV=es babel src --out-dir es --ignore 'src/**/*.spec.js'
1919
echo 'Done.'
2020
echo ''
2121

‎scripts/rollup.config.esm.js

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎scripts/rollup.config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ const externals = ['vue', ...Object.keys(dependencies)]
1414

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

2021
// The base rollup configuration
2122
const baseConfig = {
2223
input: path.resolve(src, 'index.js'),
23-
external: Object.keys(dependencies),
24+
external: externals,
2425
plugins: [resolve({ external: ['vue'] }), commonjs(), babel({ exclude: 'node_modules/**' })]
2526
}
2627

@@ -57,10 +58,9 @@ export default [
5758
}
5859
},
5960

60-
// ES
61+
// ESM
6162
{
6263
...baseConfig,
63-
external: ['vue'],
6464
output: {
6565
format: 'es',
6666
file: path.resolve(dist, `${name}.esm.js`),

‎src/index.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ declare module 'bootstrap-vue' {
2525
| 'light'
2626
| 'dark'
2727
type SortDirection = 'asc' | 'desc' | 'last'
28-
type FormatterCallback = ((value: mixed, key: string, item: mixed) => any)
28+
type FormatterCallback = ((value: any, key: string, item: any) => any)
2929

3030
export interface TableField {
3131
label?: string
@@ -37,9 +37,9 @@ declare module 'bootstrap-vue' {
3737
sortDirection?: SortDirection
3838
tdClass?: string | string[] | FormatterCallback
3939
thClass?: string | string[]
40-
thStyle?: mixed
40+
thStyle?: any
4141
variant?: TableVariant | string
42-
tdAttr?: mixed | ((value: mixed, key: string, item: mixed) => mixed)
42+
tdAttr?: any | ((value: any, key: string, item: any) => any)
4343
isRowHeader?: boolean
4444
}
4545
export interface TableFieldObject {

‎yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11353,6 +11353,11 @@ vue-router@^3.0.2:
1135311353
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.2.tgz#dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be"
1135411354
integrity sha512-opKtsxjp9eOcFWdp6xLQPLmRGgfM932Tl56U9chYTnoWqKxQ8M20N7AkdEbM5beUh6wICoFGYugAX9vQjyJLFg==
1135511355

11356+
vue-router@^3.0.3:
11357+
version "3.0.3"
11358+
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.3.tgz#370ca607475c45a1cfab2d9d2ac846feab1c534c"
11359+
integrity sha512-62rB6GjJuyklnLL+yKST469yCYj93SXEn8rpYjxgLwv0aH/Fd6OApD8Hgi9RlraZ1OOwv3jPQvZTtf1GixYW+g==
11360+
1135611361
vue-server-renderer@^2.6.10:
1135711362
version "2.6.10"
1135811363
resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.10.tgz#cb2558842ead360ae2ec1f3719b75564a805b375"

0 commit comments

Comments
 (0)