Merge pull request #9 from vuejs/2.0

2.0

Author: dingyiming

Makefile

@@ -4,19 +4,13 @@ deploy:
 	rm -f db.json
 	hexo generate
 	cp -R ./todomvc public/examples
-	mkdir -p public/unit
-	cp -R ../vue/test/unit/lib/ public/unit/lib
-	cp ../vue/test/unit/index.html public/unit/index.html
-	cp ../vue/test/unit/specs.js public/unit/specs.js
-	cp ../vue/test/unit/specs.js.map public/unit/specs.js.map
 	hexo deploy
 
 update:
 	cd ../vue && \
 		git checkout -- dist && \
-		git checkout master && \
-		npm run build && \
-		npm run build-test > /dev/null
+		git checkout next && \
+		npm run build
 	cp ../vue/dist/vue.min.js themes/vue/source/js/vue.min.js
 	cp ../vue/dist/vue.js themes/vue/source/js/vue.js
 	node update.js

_config.yml

@@ -97,7 +97,7 @@ markdown:
 ## Docs: http://zespia.tw/hexo/docs/deployment.html
 deploy:
   type: git
-  repository: git@github.com:vuejs/vuejs.org.git
+  repository: git@github.com:vuejs/rc.vuejs.org.git
 
 feed:
   type: atom

package.json

@@ -3,7 +3,7 @@
   "version": "1.0.18",
   "private": true,
   "hexo": {
-    "version": "3.2.0"
+    "version": "3.2.2"
   },
   "dependencies": {
     "hexo": "^3.2.0",
@@ -18,4 +18,4 @@
     "hexo-renderer-stylus": "^0.3.1",
     "hexo-server": "^0.2.0"
   }
-}
+}

src/CNAME

@@ -1 +1 @@
-vuejs.org
+rc.vuejs.org