vuejs · Oct 13, 2017 · Oct 18, 2017 · Oct 18, 2017 · Oct 18, 2017 · Oct 22, 2017
Showing 345 changed files with 18,101 additions and 10,277 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,4 @@
 {
-  "presets": ["es2015", "flow-vue"],
+  "presets": ["env", "flow-vue"],
   "plugins": ["syntax-dynamic-import"]
 }
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,71 @@
+version: 2
+
+defaults: &defaults
+  working_directory: ~/project/vue-router
+  docker:
+    - image: circleci/node:8-browsers
+
+jobs:
+  install:
+    <<: *defaults
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-vue-{{ .Branch }}-{{ checksum "yarn.lock" }}
+            - v1-vue-{{ .Branch }}-
+            - v1-vue-
+      - run: yarn install
+      - save_cache:
+          key: v1-vue-{{ .Branch }}-{{ checksum "yarn.lock" }}
+          paths:
+            - node_modules/
+      - persist_to_workspace:
+          root: ~/project
+          paths:
+            - vue-router
+
+  lint-flow-types:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: npm run lint
+      - run: npm run flow
+      - run: npm run test:types
+
+  test-unit:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: npm run test:unit
+      # add codecov once it is actually ran
+      # - run:
+      #    name: report coverage stats for non-PRs
+      #    command: |
+      #      if [[ -z $CI_PULL_REQUEST ]]; then
+      #        ./node_modules/.bin/codecov
+      #      fi
+
+  test-e2e:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - run: npm run test:e2e
+
+workflows:
+  version: 2
+  install-and-parallel-test:
+    jobs:
+      - install
+      - test-unit:
+          requires:
+            - install
+      - lint-flow-types:
+          requires:
+            - install
+      - test-e2e:
+          requires:
+            - install
diff --git a/.flowconfig b/.flowconfig
@@ -11,5 +11,5 @@
 flow
 
 [options]
-unsafe.enable_getters_and_setters=true
+#unsafe.enable_getters_and_setters=true
 suppress_comment= \\(.\\|\n\\)*\\$flow-disable-line
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ selenium-debug.log
 dist/*.gz
 dist/*.map
 explorations
-docs/_book
+docs/.vuepress/dist
+yarn-error.log
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2013-2016 Evan You
+Copyright (c) 2013-present Evan You
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# vue-router [![Build Status](https://img.shields.io/circleci/project/vuejs/vue-router/dev.svg)](https://circleci.com/gh/vuejs/vue-router)
+# vue-router [![Build Status](https://img.shields.io/circleci/project/github/vuejs/vue-router/dev.svg)](https://circleci.com/gh/vuejs/vue-router)
 
 > This is vue-router 2.0 which works only with Vue 2.0. For the 1.x router see the [1.0 branch](https://github.com/vuejs/vue-router/tree/1.0).
 
@@ -32,7 +32,7 @@ npm run dev
 # lint & run all tests
 npm test
 
-# serve docs at localhost:4000 (requires global gitbook-cli)
+# serve docs at localhost:8080
 npm run docs
 ```
 
@@ -60,6 +60,6 @@ Details changes for each release are documented in the [release notes](https://g
 
 [MIT](http://opensource.org/licenses/MIT)
 
-Copyright (c) 2013-2017 Evan You
+Copyright (c) 2013-present Evan You
 
 
diff --git a/bower.json b/bower.json
diff --git a/build/build.js b/build/build.js
@@ -9,7 +9,7 @@ if (!fs.existsSync('dist')) {
   fs.mkdirSync('dist')
 }
 
-build(Object.keys(configs).map(key => configs[key]))
+build(configs)
 
 function build (builds) {
   let built = 0
@@ -32,7 +32,7 @@ function buildEntry ({ input, output }) {
     .then(bundle => bundle.generate(output))
     .then(({ code }) => {
       if (isProd) {
-        var minified = uglify.minify(code, {
+        const minified = uglify.minify(code, {
           output: {
             preamble: output.banner,
             /* eslint-disable camelcase */

diff --git a/build/configs.js b/build/configs.js
@@ -6,7 +6,7 @@ const node = require('rollup-plugin-node-resolve')
 const replace = require('rollup-plugin-replace')
 const version = process.env.VERSION || require('../package.json').version
 const banner =
-`/**
+`/*!
   * vue-router v${version}
   * (c) ${new Date().getFullYear()} Evan You
   * @license MIT

diff --git a/build/update-docs.sh b/build/update-docs.sh
diff --git a/circle.yml b/circle.yml