Skip to content

Commit ccdf285

Browse files
committed
bump deps
1 parent b3929c8 commit ccdf285

File tree

5 files changed

+426
-359
lines changed

5 files changed

+426
-359
lines changed

flow/declarations.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
declare var document: Document;
2+
13
declare module 'path-to-regexp' {
24
declare var exports: {
35
(path: string, keys: Array<?{ name: string }>): RegExp;

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
"eslint": "^3.0.1",
5454
"eslint-config-vue": "^2.0.1",
5555
"eslint-plugin-flow-vars": "^0.5.0",
56-
"eslint-plugin-vue": "^1.0.0",
56+
"eslint-plugin-vue": "^2.0.1",
5757
"express": "^4.14.0",
5858
"express-urlrewrite": "^1.2.0",
59-
"flow-bin": "^0.33.0",
59+
"flow-bin": "^0.40.0",
6060
"gitbook-plugin-edit-link": "^2.0.2",
61-
"gitbook-plugin-github": "^2.0.0",
61+
"gitbook-plugin-github": "^3.0.0",
6262
"jasmine": "2.5.3",
6363
"nightwatch": "^0.9.5",
6464
"nightwatch-helpers": "^1.0.0",
@@ -75,7 +75,7 @@
7575
"typescript": "^2.0.3",
7676
"uglify-js": "^2.7.0",
7777
"vue": "^2.1.0",
78-
"vue-loader": "^10.0.0",
78+
"vue-loader": "^11.0.0",
7979
"vue-template-compiler": "^2.1.0",
8080
"webpack": "^2.2.0",
8181
"webpack-dev-middleware": "^1.9.0"

src/history/base.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ export class History {
1717
readyCbs: Array<Function>;
1818

1919
// implemented by sub-classes
20-
go: (n: number) => void;
21-
push: (loc: RawLocation) => void;
22-
replace: (loc: RawLocation) => void;
23-
ensureURL: (push?: boolean) => void;
24-
getCurrentLocation: () => string;
20+
+go: (n: number) => void;
21+
+push: (loc: RawLocation) => void;
22+
+replace: (loc: RawLocation) => void;
23+
+ensureURL: (push?: boolean) => void;
24+
+getCurrentLocation: () => string;
2525

2626
constructor (router: Router, base: ?string) {
2727
this.router = router
@@ -150,7 +150,7 @@ function normalizeBase (base: ?string): string {
150150
if (inBrowser) {
151151
// respect <base> tag
152152
const baseEl = document.querySelector('base')
153-
base = baseEl ? baseEl.getAttribute('href') : '/'
153+
base = (baseEl && baseEl.getAttribute('href')) || '/'
154154
} else {
155155
base = '/'
156156
}

src/util/scroll.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ function getScrollPosition (): ?Object {
7777
}
7878

7979
function getElementPosition (el: Element): Object {
80-
const docRect = document.documentElement.getBoundingClientRect()
80+
const docEl: any = document.documentElement
81+
const docRect = docEl.getBoundingClientRect()
8182
const elRect = el.getBoundingClientRect()
8283
return {
8384
x: elRect.left - docRect.left,

0 commit comments

Comments
 (0)