Skip to content

Commit 9f8c915

Browse files
committed
use es6
1 parent ece0e50 commit 9f8c915

File tree

8 files changed

+54
-6
lines changed

8 files changed

+54
-6
lines changed

.eslintrc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,21 @@
44
"node": true
55
},
66

7+
"ecmaFeatures": {
8+
"arrowFunctions": true,
9+
"destructuring": true,
10+
"classes": true,
11+
"defaultParams": true,
12+
"blockBindings": true,
13+
"modules": true,
14+
"objectLiteralComputedProperties": true,
15+
"objectLiteralShorthandMethods": true,
16+
"objectLiteralShorthandProperties": true,
17+
"restParams": true,
18+
"spread": true,
19+
"templateStrings": true
20+
},
21+
722
"rules": {
823
"accessor-pairs": 2,
924
"array-bracket-spacing": 0,

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ explorations
55
TODOS.md
66
*.log
77
docs/_book
8+
lib

build/karma.config.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,17 @@ module.exports = function (config) {
99
},
1010
webpack: {
1111
module: {
12+
loaders: [
13+
{
14+
test: /\.js$/,
15+
exclude: /test|node_modules|vue\/src/,
16+
loader: 'babel'
17+
}
18+
],
1219
postLoaders: [
1320
{
1421
test: /\.js$/,
15-
exclude: /(test|node_modules|vue\/src)\//,
22+
exclude: /test|node_modules|vue\/src/,
1623
loader: 'istanbul-instrumenter'
1724
}
1825
]

build/webpack.build.dev.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var webpack = require('webpack')
22
var banner = require('./banner')
33

44
module.exports = {
5-
entry: './src/index.js',
5+
entry: './lib/index.js',
66
output: {
77
path: './dist',
88
filename: 'vue-router.js',

build/webpack.build.min.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var webpack = require('webpack')
22
var banner = require('./banner')
33

44
module.exports = {
5-
entry: './src/index.js',
5+
entry: './lib/index.js',
66
output: {
77
path: './dist',
88
filename: 'vue-router.min.js',

example/advanced/webpack.config.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
var vue = require('vue-loader')
2+
13
module.exports = {
24
entry: {
35
app: ['webpack/hot/dev-server', './example/advanced/index.js']
@@ -8,7 +10,17 @@ module.exports = {
810
},
911
module: {
1012
loaders: [
11-
{ test: /\.vue$/, loader: 'vue' }
13+
{
14+
test: /\.vue$/,
15+
loader: vue.withLoaders({
16+
script: 'babel'
17+
})
18+
},
19+
{
20+
test: /\.js$/,
21+
exclude: /node_modules|vue\/src/,
22+
loader: 'babel'
23+
}
1224
]
1325
},
1426
devtool: 'source-map'

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vue-router",
33
"version": "0.5.0",
44
"description": "A router for Vue.js",
5-
"main": "src/index.js",
5+
"main": "lib/index.js",
66
"scripts": {
77
"dev": "npm run serve & npm run serve-test",
88
"lint": "eslint src build test/e2e test/unit/specs",
@@ -14,7 +14,8 @@
1414
"e2e-local": "bash ./build/e2e.sh",
1515
"release": "bash ./build/release.sh",
1616
"docs": "bash ./build/update-docs.sh",
17-
"test": "npm run lint && npm run unit && npm run e2e-local"
17+
"test": "npm run lint && npm run unit && npm run e2e-local",
18+
"prepublish": "babel ./src --optional runtime --out-dir lib"
1819
},
1920
"repository": {
2021
"type": "git",
@@ -33,6 +34,8 @@
3334
},
3435
"homepage": "https://github.com/vuejs/vue-router#readme",
3536
"devDependencies": {
37+
"babel": "^5.8.21",
38+
"babel-loader": "^5.3.2",
3639
"chromedriver": "2.16.0",
3740
"css-loader": "^0.15.4",
3841
"es6-promise": "^3.0.2",
@@ -57,6 +60,7 @@
5760
"webpack-dev-server": "^1.10.1"
5861
},
5962
"dependencies": {
63+
"babel-runtime": "^5.8.20",
6064
"route-recognizer": "0.1.9"
6165
}
6266
}

test/unit/webpack.config.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,14 @@ module.exports = {
33
output: {
44
path: './test/unit',
55
filename: 'specs.js'
6+
},
7+
module: {
8+
loaders: [
9+
{
10+
test: /\.js$/,
11+
exclude: /node_modules|vue\/src/,
12+
loader: 'babel'
13+
}
14+
]
615
}
716
}

0 commit comments

Comments
 (0)