🌐 AI搜索 & 代理 主页
Skip to content

Commit c97e06f

Browse files
renovate[bot]jacobmllr95
authored andcommitted
chore(deps): update all non-major dependencies (#4033)
* chore(deps): update all non-major dependencies * Update modal.js * Update bv-tooltip.js * Update bv-modal.js * Update pagination.js * Update pagination-nav.js * Update toast.js * Update mixin-provider.js * Update mixin-provider.js * Update mixin-provider.js * Update bv-modal.js * chore(nuxt.config.js): update `manifest` to `pwa.manifest` (#4028) * Update bv-modal.js * Update bv-modal.js * fix `eslint` dependency
1 parent 7eddce6 commit c97e06f

File tree

10 files changed

+303
-575
lines changed

10 files changed

+303
-575
lines changed

docs/nuxt.config.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,17 @@ module.exports = {
179179
height: '3px'
180180
},
181181

182-
manifest: {
183-
name: 'BootstrapVue',
184-
short_name: 'BootstrapVue',
185-
description: 'Quickly integrate Bootstrap v4 components with Vue.js',
186-
theme_color: '#563d7c'
182+
pwa: {
183+
icon: {
184+
// iconFileName: 'icon.png',
185+
iconSrc: '~/static/icon.png'
186+
},
187+
manifest: {
188+
name: 'BootstrapVue',
189+
short_name: 'BootstrapVue',
190+
description: 'Quickly integrate Bootstrap v4 components with Vue.js',
191+
theme_color: '#563d7c'
192+
}
187193
},
188194

189195
generate: {

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@
7878
"vue-functional-data-merge": "^3.1.0"
7979
},
8080
"devDependencies": {
81-
"@babel/cli": "^7.5.5",
82-
"@babel/core": "^7.5.5",
83-
"@babel/plugin-transform-modules-commonjs": "^7.5.0",
84-
"@babel/plugin-transform-runtime": "^7.5.5",
85-
"@babel/preset-env": "^7.5.5",
86-
"@babel/standalone": "^7.5.5",
81+
"@babel/cli": "^7.6.0",
82+
"@babel/core": "^7.6.0",
83+
"@babel/plugin-transform-modules-commonjs": "^7.6.0",
84+
"@babel/plugin-transform-runtime": "^7.6.0",
85+
"@babel/preset-env": "^7.6.0",
86+
"@babel/standalone": "^7.6.0",
8787
"@nuxtjs/google-analytics": "^2.2.0",
88-
"@nuxtjs/pwa": "^3.0.0-beta.16",
88+
"@nuxtjs/pwa": "^3.0.0-beta.17",
8989
"@vue/test-utils": "^1.0.0-beta.29",
9090
"autoprefixer": "^9.6.1",
9191
"babel-core": "^7.0.0-bridge.0",
@@ -123,15 +123,15 @@
123123
"nuxt": "^2.9.2",
124124
"postcss-cli": "^6.1.3",
125125
"prettier": "1.14.3",
126-
"rollup": "^1.20.3",
126+
"rollup": "^1.21.0",
127127
"rollup-plugin-babel": "^4.3.3",
128128
"rollup-plugin-commonjs": "^10.1.0",
129129
"rollup-plugin-node-resolve": "^5.2.0",
130130
"sass-loader": "^8.0.0",
131131
"standard-version": "^7.0.0",
132-
"terser": "^4.2.1",
132+
"terser": "^4.3.0",
133133
"vue": "^2.6.10",
134-
"vue-jest": "^3.0.4",
134+
"vue-jest": "^3.0.5",
135135
"vue-router": "^3.1.3",
136136
"vue-server-renderer": "^2.6.10",
137137
"vue-template-compiler": "^2.6.10"

src/components/modal/helpers/bv-modal.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,11 @@ const plugin = Vue => {
7979
// Self destruct after hidden
8080
this.$once('hidden', handleDestroy)
8181
// Self destruct on route change
82-
/* istanbul ignore next */
82+
/* istanbul ignore if */
8383
if (this.$router && this.$route) {
84-
const unwatch = this.$watch('$router', handleDestroy)
85-
this.$once('hook:beforeDestroy', unwatch)
84+
// Destroy ourselves if route changes
85+
/* istanbul ignore next */
86+
this.$once('hook:beforeDestroy', this.$watch('$router', handleDestroy))
8687
}
8788
// Show the `BMsgBox`
8889
this.show()

src/components/modal/modal.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ export const BModal = /*#__PURE__*/ Vue.extend({
453453
/* istanbul ignore next */
454454
return
455455
}
456+
/* istanbul ignore next */
456457
if (this.isClosing) {
457458
// If we are in the process of closing, wait until hidden before re-opening
458459
/* istanbul ignore next */

src/components/pagination-nav/pagination-nav.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ const props = {
2525
numberOfPages: {
2626
type: [Number, String],
2727
default: 1,
28-
validator(value) {
28+
validator(value) /* istanbul ignore next */ {
2929
const num = parseInt(value, 10)
30-
/* istanbul ignore next */
3130
if (isNaN(num) || num < 1) {
3231
warn('b-pagination: prop "number-of-pages" must be a number greater than 0')
3332
return false

src/components/table/helpers/mixin-provider.js

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,16 +153,18 @@ export default {
153153
} else if (isArray(data)) {
154154
// Provider returned Array data
155155
this._providerSetLocal(data)
156-
} else if (this.items.length !== 2) {
157-
// Check number of arguments provider function requested
158-
// Provider not using callback (didn't request second argument), so we clear
159-
// busy state as most likely there was an error in the provider function
160-
/* istanbul ignore next */
161-
warn(
162-
"b-table provider function didn't request callback and did not return a promise or data"
163-
)
164-
/* istanbul ignore next */
165-
this.localBusy = false
156+
} else {
157+
/* istanbul ignore if */
158+
if (this.items.length !== 2) {
159+
// Check number of arguments provider function requested
160+
// Provider not using callback (didn't request second argument), so we clear
161+
// busy state as most likely there was an error in the provider function
162+
/* istanbul ignore next */
163+
warn(
164+
"b-table provider function didn't request callback and did not return a promise or data"
165+
)
166+
this.localBusy = false
167+
}
166168
}
167169
} catch (e) /* istanbul ignore next */ {
168170
// Provider function borked on us, so we spew out a warning

src/components/toast/toast.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ export const BToast = /*#__PURE__*/ Vue.extend({
203203
// Make sure we hide when toaster is destroyed
204204
/* istanbul ignore next: difficult to test */
205205
this.listenOnRoot('bv::toaster::destroyed', toaster => {
206+
/* istanbul ignore next */
206207
if (toaster === this.computedToaster) {
207208
/* istanbul ignore next */
208209
this.hide()

src/components/tooltip/helpers/bv-tooltip.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ export const BVTooltip = /*#__PURE__*/ Vue.extend({
407407
/* istanbul ignore next: ignore for now */
408408
if (hideEvt.defaultPrevented) {
409409
// Don't hide if event cancelled
410+
/* istanbul ignore next */
410411
return
411412
}
412413

src/mixins/pagination.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ export const props = {
5353
value: {
5454
type: [Number, String],
5555
default: null,
56-
validator(value) {
56+
validator(value) /* istanbul ignore next */ {
5757
const num = parseInt(value, 10)
58-
/* istanbul ignore next */
5958
if (!isNull(value) && (isNaN(num) || num < 1)) {
6059
warn('pagination: v-model value must be a number greater than 0')
6160
return false
@@ -66,9 +65,8 @@ export const props = {
6665
limit: {
6766
type: [Number, String],
6867
default: DEFAULT_LIMIT,
69-
validator(value) {
68+
validator(value) /* istanbul ignore next */ {
7069
const num = parseInt(value, 10)
71-
/* istanbul ignore next */
7270
if (isNaN(num) || num < 1) {
7371
warn('pagination: prop "limit" must be a number greater than 0')
7472
return false

0 commit comments

Comments
 (0)