Skip to content

Commit 67d193e

Browse files
author
Pooya Parsa
committed
upgrade to nuxt 0.10.0
1 parent 0fc410e commit 67d193e

File tree

7 files changed

+373
-304
lines changed

7 files changed

+373
-304
lines changed

.babelrc

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

.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ banner.png
88
.npmignore
99
.babelrc
1010
docs-dist
11-
nuxt.config.js
11+
build/nuxt.config.js
1212
examples

nuxt.config.js renamed to build/nuxt.config.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ const path = require('path');
22
const fs = require('fs');
33

44
module.exports = {
5-
srcDir: path.resolve(__dirname, 'docs', 'nuxt'),
5+
rootDir: path.resolve(__dirname, '..'),
6+
srcDir: path.resolve(__dirname, '..', 'docs', 'nuxt'),
67
dev: process.env.NODE_ENV !== 'production',
78

89
head: {
@@ -35,10 +36,10 @@ module.exports = {
3536

3637
generate: {
3738
dir: 'docs-dist',
38-
routeParams: {
39-
'/docs/components/:component': fs.readdirSync('docs/components').filter(c => c !== 'index.js').map(component => {
40-
return {component};
41-
})
39+
routes: () => {
40+
return fs.readdirSync('docs/components')
41+
.filter(c => c !== 'index.js')
42+
.map(component => '/docs/components/' + component);
4243
}
4344
},
4445

@@ -48,9 +49,9 @@ module.exports = {
4849
'~plugins/ga.js'
4950
],
5051
css: [
51-
path.resolve(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.css'),
52-
path.resolve(__dirname, 'node_modules/highlightjs/styles/github-gist.css'),
53-
path.resolve(__dirname, 'node_modules/codemirror/lib/codemirror.css'),
52+
path.resolve(__dirname, '../node_modules/bootstrap/dist/css/bootstrap.css'),
53+
path.resolve(__dirname, '../node_modules/highlightjs/styles/github-gist.css'),
54+
path.resolve(__dirname, '../node_modules/codemirror/lib/codemirror.css'),
5455
'~assets/css/docs.min.css',
5556
'~assets/css/styles.css'
5657
]

docs/nuxt/includes/footer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
Maintained by the <a href="https://github.com/orgs/bootstrap-vue/people">core team</a>
2020
With the help of
2121
<a href="https://github.com/bootstrap-vue/bootstrap-vue/graphs/contributors">our contributors</a>.
22-
docs generated by <a href="https://nuxtjs.org/">Nuxt.js</a>
22+
docs generated with <a href="https://nuxtjs.org/">NUXT.js</a>
2323
</p>
2424

2525
</div>

docs/nuxt/pages/docs/components/_component.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<componentdoc :component="meta.component" :events="meta.events" :slots="meta.slots"></componentdoc>
99

10-
<componentdoc :component="component" v-for="component in meta.components"></componentdoc>
10+
<componentdoc :component="component" :key="component" v-for="component in meta.components"></componentdoc>
1111
</div>
1212
</template>
1313

@@ -22,7 +22,7 @@
2222
components: {jsfiddle, componentdoc},
2323
layout: 'docs',
2424
25-
async data({params: {component}, redirect}) {
25+
asyncData({params: {component}, redirect}) {
2626
if (!component) {
2727
component = 'alert';
2828
}

package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@
2323
},
2424
"scripts": {
2525
"build": "node build/rollup",
26-
"docs-dev": "nuxt dev",
27-
"docs-gen": "nuxt generate",
26+
"docs-dev": "nuxt dev build",
27+
"docs-gen": "nuxt generate build",
2828
"docs-deploy": "cd scripts && ./gh-pages",
2929
"lint": "xo",
3030
"lint-fix": "xo --fix",
3131
"test": "yarn lint"
3232
},
3333
"dependencies": {
34-
"bootstrap": "^4.0.0-",
34+
"bootstrap": "^4.0.0-alpha.6",
3535
"tether": "latest",
36-
"vue": "^2.2.3"
36+
"vue": "^2.2.5"
3737
},
3838
"devDependencies": {
39-
"clean-css": "^4.0.9",
40-
"codemirror": "^5.24.2",
39+
"clean-css": "^4.0.10",
40+
"codemirror": "^5.25.0",
4141
"cross-env": "^3.2.4",
4242
"eslint-config-vue": "^2.0.2",
4343
"eslint-plugin-html": "^2.0.0",
@@ -48,16 +48,13 @@
4848
"lodash": "latest",
4949
"markdown-loader": "^2.0.0",
5050
"marked": "^0.3.6",
51-
"nuxt": "^0.9.9",
51+
"nuxt": "^0.10.0",
5252
"rollup": "^0.41.6",
5353
"rollup-plugin-buble": "^0.15.0",
5454
"rollup-plugin-commonjs": "^8.0.2",
5555
"rollup-plugin-node-resolve": "^2.0.0",
5656
"rollup-plugin-uglify": "^1.0.1",
5757
"rollup-plugin-vue": "^2.3.1",
58-
"vue-loader": "^11.1.4",
59-
"vue-style-loader": "^2.0.2",
60-
"vue-template-compiler": "^2.2.3",
6158
"xo": "^0.18.0"
6259
},
6360
"xo": {
@@ -86,6 +83,8 @@
8683
"keywords": [
8784
"Bootstrap",
8885
"Bootstrap 4",
86+
"Bootstrap for Vue",
87+
"SSR",
8988
"Web",
9089
"Components",
9190
"Polymer",
@@ -116,6 +115,8 @@
116115
"List",
117116
"Nav",
118117
"Modal",
118+
"Upload",
119+
"Dropzone",
119120
"Navbar",
120121
"Pagination",
121122
"Popover",

0 commit comments

Comments
 (0)