Skip to content

Commit

Permalink
Bumping Vue+VueRouter versions, some minor fixes. (#986)
Browse files Browse the repository at this point in the history
* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0
  • Loading branch information
LinusBorg authored Oct 16, 2017
1 parent be3efc0 commit a355ee8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion template/build/dev-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ app.use(hotMiddleware)

// proxy api requests
Object.keys(proxyTable).forEach(function (context) {
const options = proxyTable[context]
let options = proxyTable[context]
if (typeof options === 'string') {
options = { target: options }
}
Expand Down
4 changes: 2 additions & 2 deletions template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"lint": "eslint --ext .js,.vue src{{#unit}} test/unit/specs{{/unit}}{{#e2e}} test/e2e/specs{{/e2e}}"{{/lint}}
},
"dependencies": {
"vue": "^2.4.2"{{#router}},
"vue-router": "^2.7.0"{{/router}}
"vue": "^2.5.2"{{#router}},
"vue-router": "^3.0.1"{{/router}}
},
"devDependencies": {
"autoprefixer": "^7.1.2",
Expand Down
2 changes: 1 addition & 1 deletion template/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{#router}}
<router-view/>
{{else}}
<hello-world/>
<HelloWorld/>
{{/router}}
</div>
</template>
Expand Down

0 comments on commit a355ee8

Please sign in to comment.