8000 build: adjust test build setup for easier requires · Hsinwe/vue@f7a91fc · GitHub
[go: up one dir, main page]
Skip to content

Commit f7a91fc

Browse files
yyx990803yyx990803
committed
build: adjust test build setup for easier requires
1 parent 599e38e commit f7a91fc

Some content is hidden

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

57 files changed

+132
-125
lines changed

‎build/karma.base.config.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
var webpackConfig = require('./webpack.test.config')
2+
delete webpackConfig.entry
3+
delete webpackConfig.devtool
4+
15
// shared config for all unit tests
26
module.exports = {
37
frameworks: ['jasmine'],
@@ -8,17 +12,7 @@ module.exports = {
812
preprocessors: {
913
'../test/unit/specs/index.js': ['webpack']
1014
},
11-
webpack: {
12-
module: {
13-
loaders: [
14-
{
15-
test: /\.js$/,
16-
exclude: /test|node_modules/,
17-
loader: 'babel?optional[]=runtime&loose=all'
18-
}
19-
]
20-
}
21-
},
15+
webpack: webpackConfig,
2216
webpackMiddleware: {
2317
noInfo: true
2418
},

‎build/webpack.dev.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
var path = require('path')
12
var webpack = require('webpack')
23

34
module.exports = {
45
entry: './src/index',
56
output: {
6-
path: './dist',
7+
path: path.resolve(__dirname, '../dist'),
78
filename: 'vue.js',
89
library: 'Vue',
910
libraryTarget: 'umd'

‎build/webpack.test.config.js

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
1+
var path = require('path')
12
var webpack = require('webpack')
23

34
module.exports = {
45
entry: './test/unit/specs/index.js',
56
output: {
6-
path: './test/unit',
7+
path: path.resolve(__dirname, '../test/unit'),
78
filename: 'specs.js'
89
},
10+
resolve: {
11+
alias: {
12+
src: path.resolve(__dirname, '../src')
13+
}
14+
},
915
module: {
1016
loaders: [
11-
{ test: /\.js$/, loader: 'babel', exclude: /test\/unit/ }
17+
{
18+
test: /\.js$/,
19+
loader: 'babel',
20+
exclude: /test\/unit|node_modules/
21+
}
1222
]
1323
},
1424
babel: {
15-
loose: 'all'
25+
loose: 'all',
26+
optional: ['runtime']
1627
},
1728
plugins: [
1829
new webpack.DefinePlugin({
@@ -22,7 +33,8 @@ module.exports = {
2233
})
2334
],
2435
devServer: {
25-
contentBase: './test/unit'
36+
contentBase: './test/unit',
37+
noInfo: true
2638
},
2739
devtool: '#source-map'
2840
}

‎test/unit/specs/api/data_spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var Vue = require('../../../../src/index')
2-
var _ = require('../../../../src/util')
1+
var Vue = require('src')
2+
var _ = require('src/util')
33
var nextTick = _.nextTick
44

55
describe('Data API', function () {

‎test/unit/specs/api/dom_spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* those are tested in transition_spec.js.
44
*/
55

6-
var Vue = require('../../../../src/index')
7-
var _ = require('../../../../src/util')
6+
var Vue = require('src')
7+
var _ = require('src/util')
88

99
describe('DOM API', function () {
1010

‎test/unit/specs/api/events_spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var Vue = require('../../../../src/index')
1+
var Vue = require('src')
22

33
describe('Events API', function () {
44

‎test/unit/specs/api/global_spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var Vue = require('../../../../src/index')
2-
var _ = require('../../../../src/util')
3-
var config = require('../../../../src/config')
1+
var Vue = require('src')
2+
var _ = require('src/util')
3+
var config = require('src/config')
44

55
describe('Global API', function () {
66

‎test/unit/specs/api/lifecycle_spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var Vue = require('../../../../src/index')
2-
var compiler = require('../../../../src/compiler')
1+
var Vue = require('src')
2+
var compiler = require('src/compiler')
33

44
describe('Lifecycle API', function () {
55

‎test/unit/specs/async_component_spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var Vue = require('../../../src/index')
1+
var Vue = require('src')
22
var _ = Vue.util
33

44
describe('Async components', function () {

‎test/unit/specs/batcher_spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var config = require('../../../src/config')
2-
var batcher = require('../../../src/batcher')
3-
var nextTick = require('../../../src/util').nextTick
1+
var config = require('src/config')
2+
var batcher = require('src/batcher')
3+
var nextTick = require('src/util').nextTick
44

55
describe('Batcher', function () {
66

0 commit comments

Comments
 (0)
0