8000 Merge branch 'dev' · vuejs/vue-router@5e720df · GitHub
[go: up one dir, main page]
Skip to content

Commit 5e720df

Browse files
yyx990803yyx990803
committed
Merge branch 'dev'
2 parents 4148e2e + dadf737 commit 5e720df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1126
-673
lines changed

‎.bithoundrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"**/dist/**",
66
"**/examples/**",
77
"**/docs/**",
8-
"**/test/unit/lib/**"
8+
"**/test/unit/lib/**",
9+
"**/lib/**"
910
],
1011
"test": [
1112
"**/test/**"

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ npm install
2727
npm run build
2828

2929
# serve example app at localhost:8080
30+
npm run serve-example
31+
3032
# and unit tests at localhost:8081
3133
npm run dev
3234

‎build/karma.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ module.exports = function (config) {
55
frameworks: ['jasmine'],
66
files: ['../test/unit/specs/index.js'],
77
preprocessors: {
8-
'../test/unit/specs/index.js': ['webpack']
8+
'../test/unit/specs/index.js': ['webpack', 'sourcemap']
99
},
1010
webpack: {
11+
devtool: '#inline-source-map',
1112
module: {
1213
loaders: [
1314
{

‎build/nightwatch.local.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
"selenium" : {
66
"start_process" : true,
7-
"server_path" : "node_modules/selenium-server/lib/runner/selenium-server-standalone-2.47.1.jar",
7+
"server_path" : "node_modules/selenium-server/lib/runner/selenium-server-standalone-2.49.1.jar",
88
"host" : "127.0.0.1",
99
"port" : 4444,
1010
"cli_args" : {

‎circle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
machine:
22
node:
3-
version: 4
3+
version: 5
44

55
general:
66
branches:

0 commit comments

Comments
 (0)
0