Skip to content

Commit 60f4cff

Browse files
author
pooya parsa
committed
Merge branch 'dev'
2 parents 8bc0037 + d220a78 commit 60f4cff

File tree

4 files changed

+251
-457
lines changed

4 files changed

+251
-457
lines changed

docs/components/nav.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242

4343
<b-navbar-nav>
4444
<b-nav-item-dropdown :text="`v${version}`" right>
45-
<b-dropdown-item href="http://dev.bootstrap-vue.netlify.com">
46-
Development
47-
</b-dropdown-item>
4845
<b-dropdown-item href="https://bootstrap-vue.js.org">
4946
Latest (v{{ version }})
5047
</b-dropdown-item>
48+
<b-dropdown-item href="https://bootstrap-vue.netlify.com">
49+
Development
50+
</b-dropdown-item>
5151
</b-nav-item-dropdown>
5252

5353
<b-nav-item href="https://github.com/bootstrap-vue/bootstrap-vue" target="_blank">

docs/nuxt.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ renderer.table = function renderTable(header, body) {
2424
module.exports = {
2525
srcDir: __dirname,
2626

27+
modern: 'client',
28+
2729
build: {
2830
extractCSS: true,
2931
cssSourceMap: true,

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@babel/preset-env": "^7.3.1",
8888
"@babel/standalone": "^7.3.2",
8989
"@nuxtjs/google-analytics": "^2.0.3",
90-
"@nuxtjs/pwa": "^2.6.0",
90+
"@nuxtjs/pwa": "^3.0.0-beta.6",
9191
"@vue/test-utils": "^1.0.0-beta.29",
9292
"autoprefixer": "^9.4.7",
9393
"babel-core": "^7.0.0-bridge.0",
@@ -118,7 +118,7 @@
118118
"node-sass": "^4.11.0",
119119
"nuxt": "^2.4.3",
120120
"postcss-cli": "^6.1.1",
121-
"prettier": "1.14.3",
121+
"prettier": "1.16.4",
122122
"rollup": "^1.1.2",
123123
"rollup-plugin-babel": "^4.3.2",
124124
"rollup-plugin-commonjs": "^9.2.0",

0 commit comments

Comments
 (0)