update deps + use rollup for dist build

Author: yyx990803

build/banner.js

@@ -0,0 +1,41 @@
+var fs = require('fs')
+var rollup = require('rollup')
+var uglify = require('uglify-js')
+var babel = require('rollup-plugin-babel')
+var version = process.env.VERSION || require('../package.json').version
+var banner =
+  '/*!\n' +
+  ' * vue-router v' + version + '\n' +
+  ' * (c) ' + new Date().getFullYear() + ' Evan You\n' +
+  ' * Released under the MIT License.\n' +
+  ' */'
+
+rollup.rollup({
+  entry: 'src/index.js',
+  plugins: [
+    babel({
+      exclude: 'node_modules/**',
+      loose: 'all',
+      sourceMap: true
+    })
+  ]
+}).then(function (bundle) {
+  bundle.write({
+    format: 'cjs',
+    dest: 'lib/index.js'
+  })
+  return bundle.write({
+    format: 'umd',
+    banner: banner,
+    moduleName: 'VueRouter',
+    sourceMap: true,
+    dest: 'dist/vue-router.js'
+  })
+}).then(function () {
+  fs.writeFile(
+    'dist/vue-router.min.js',
+    banner + '\n' + uglify.minify('dist/vue-router.js').code
+  )
+}).catch(function (e) {
+  console.log(e)
+})

build/build.js

@@ -1,5 +1,3 @@
-var vue = require('vue-loader')
-
 module.exports = {
   entry: {
     app: ['webpack/hot/dev-server', './example/advanced/index.js']
@@ -12,9 +10,7 @@ module.exports = {
     loaders: [
       {
         test: /\.vue$/,
-        loader: vue.withLoaders({
-          js: 'babel?optional[]=runtime'
-        })
+        loader: 'vue'
       },
       {
         test: /\.js$/,

build/webpack.build.dev.config.js

@@ -5,11 +5,11 @@
   "main": "lib/index.js",
   "jsnext:main": "src/index.js",
   "scripts": {
-    "dev": "npm run serve & npm run serve-test & webpack --watch --config build/webpack.dev.config.js",
+    "dev": "npm run serve-test & webpack --watch --config build/webpack.dev.config.js",
     "lint": "eslint src build test/e2e test/unit/specs",
     "unit": "./node_modules/karma/bin/karma start build/karma.config.js",
-    "build": "babel ./src --loose all --optional runtime --out-dir lib && webpack --config build/webpack.build.dev.config.js && webpack --config build/webpack.build.min.config.js",
-    "serve": "webpack-dev-server --hot --config example/advanced/webpack.config.js --content-base example/advanced --history-api-fallback --host 0.0.0.0",
+    "build": "node build/build.js",
+    "serve-example": "webpack-dev-server --inline --hot --config example/advanced/webpack.config.js --content-base example/advanced --history-api-fallback --host 0.0.0.0",
     "serve-test": "webpack-dev-server --quiet --config test/unit/webpack.config.js --content-base test/unit --history-api-fallback --host 0.0.0.0 --port 8081",
     "e2e-sauce": "nightwatch -c build/nightwatch.sauce.json -e chrome,firefox,ie10,ie11",
     "e2e-local": "bash ./build/e2e.sh",
@@ -35,14 +35,14 @@
   },
   "homepage": "https://github.com/vuejs/vue-router#readme",
   "devDependencies": {
-    "babel": "^5.8.21",
-    "babel-loader": "^5.3.2",
+    "babel-core": "^5.8.33",
+    "babel-loader": "^5.3.3",
+    "babel-runtime": "^5.8.29",
     "chromedriver": "2.16.0",
-    "css-loader": "^0.16.0",
+    "css-loader": "^0.21.0",
     "es6-promise": "^3.0.2",
     "eslint": "^1.3.1",
     "express": "^4.12.3",
-    "html-loader": "^0.3.0",
     "istanbul-instrumenter-loader": "^0.1.3",
     "jasmine-core": "^2.3.2",
     "karma": "^0.13.8",
@@ -53,17 +53,18 @@
     "karma-webpack": "^1.7.0",
     "nightwatch": "^0.8.6",
     "phantomjs": "^1.9.18",
+    "rollup": "^0.20.3",
+    "rollup-plugin-babel": "^1.0.0",
     "selenium-server": "2.47.1",
-    "style-loader": "^0.12.3",
+    "style-loader": "^0.13.0",
+    "uglify-js": "^2.5.0",
     "vue": "yyx990803/vue#dev",
-    "vue-loader": "^3.0.3",
+    "vue-hot-reload-api": "^1.2.1",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^6.0.3",
     "webpack": "^1.11.0",
     "webpack-dev-server": "^1.10.1"
   },
-  "dependencies": {
-    "babel-runtime": "^5.8.20",
-    "route-recognizer": "0.1.9"
-  },
   "jspm": {
     "main": "src/index.js",
     "registry": "npm",

build/webpack.build.min.config.js

@@ -1,6 +1,6 @@
+import RouteRecognizer from '../vendor/route-recognizer'
 import util, { warn, mapParams } from './util'
 import applyOverride from './override'
-import Recognizer from 'route-recognizer'
 import Route from './route'
 import Transition from './transition'
 import View from './directives/view'
@@ -51,8 +51,8 @@ class Router {
     this._children = []
 
     // route recognizer
-    this._recognizer = new Recognizer()
-    this._guardRecognizer = new Recognizer()
+    this._recognizer = new RouteRecognizer()
+    this._guardRecognizer = new RouteRecognizer()
 
     // state
     this._started = false

example/advanced/webpack.config.js

@@ -1,4 +1,4 @@
-import RouteRecognizer from 'route-recognizer'
+import RouteRecognizer from '../vendor/route-recognizer'
 const genQuery = RouteRecognizer.prototype.generateQueryString
 
 // export default for holding the Vue reference

package.json

@@ -0,0 +1,99 @@
+function Target(path, matcher, delegate) {
+  this.path = path;
+  this.matcher = matcher;
+  this.delegate = delegate;
+}
+
+Target.prototype = {
+  to: function(target, callback) {
+    var delegate = this.delegate;
+
+    if (delegate && delegate.willAddRoute) {
+      target = delegate.willAddRoute(this.matcher.target, target);
+    }
+
+    this.matcher.add(this.path, target);
+
+    if (callback) {
+      if (callback.length === 0) { throw new Error("You must have an argument in the function passed to `to`"); }
+      this.matcher.addChild(this.path, target, callback, this.delegate);
+    }
+    return this;
+  }
+};
+
+function Matcher(target) {
+  this.routes = {};
+  this.children = {};
+  this.target = target;
+}
+
+Matcher.prototype = {
+  add: function(path, handler) {
+    this.routes[path] = handler;
+  },
+
+  addChild: function(path, target, callback, delegate) {
+    var matcher = new Matcher(target);
+    this.children[path] = matcher;
+
+    var match = generateMatch(path, matcher, delegate);
+
+    if (delegate && delegate.contextEntered) {
+      delegate.contextEntered(target, match);
+    }
+
+    callback(match);
+  }
+};
+
+function generateMatch(startingPath, matcher, delegate) {
+  return function(path, nestedCallback) {
+    var fullPath = startingPath + path;
+
+    if (nestedCallback) {
+      nestedCallback(generateMatch(fullPath, matcher, delegate));
+    } else {
+      return new Target(startingPath + path, matcher, delegate);
+    }
+  };
+}
+
+function addRoute(routeArray, path, handler) {
+  var len = 0;
+  for (var i=0, l=routeArray.length; i<l; i++) {
+    len += routeArray[i].path.length;
+  }
+
+  path = path.substr(len);
+  var route = { path: path, handler: handler };
+  routeArray.push(route);
+}
+
+function eachRoute(baseRoute, matcher, callback, binding) {
+  var routes = matcher.routes;
+
+  for (var path in routes) {
+    if (routes.hasOwnProperty(path)) {
+      var routeArray = baseRoute.slice();
+      addRoute(routeArray, path, routes[path]);
+
+      if (matcher.children[path]) {
+        eachRoute(routeArray, matcher.children[path], callback, binding);
+      } else {
+        callback.call(binding, routeArray);
+      }
+    }
+  }
+}
+
+export default function(callback, addRouteCallback) {
+  var matcher = new Matcher();
+
+  callback(generateMatch("", matcher, this.delegate));
+
+  eachRoute([], matcher, function(route) {
+    if (addRouteCallback) { addRouteCallback(this, route); }
+    else { this.add(route); }
+  }, this);
+}