Skip to content

Commit f7a91fc

Browse files
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

+5-11
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

+2-1
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

+16-4
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

+2-2
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

+2-2
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

+1-1
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

+3-3
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

+2-2
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

+1-1
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

+3-3
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

test/unit/specs/cache_spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var Cache = require('../../../src/cache')
1+
var Cache = require('src/cache')
22

33
/**
44
* Debug function to assert cache state

test/unit/specs/compiler/compile_spec.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
var Vue = require('../../../../src/index')
2-
var _ = require('../../../../src/util')
3-
var compiler = require('../../../../src/compiler')
1+
var Vue = require('src')
2+
var _ = require('src/util')
3+
var compiler = require('src/compiler')
44
var compile = compiler.compile
5-
var publicDirectives = require('../../../../src/directives/public')
6-
var internalDirectives = require('../../../../src/directives/internal')
5+
var publicDirectives = require('src/directives/public')
6+
var internalDirectives = require('src/directives/internal')
77

88
describe('Compile', function () {
99

test/unit/specs/compiler/transclude_spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var transclude = require('../../../../src/compiler').transclude
2-
var Vue = require('../../../../src/index')
3-
var _ = require('../../../../src/util')
1+
var transclude = require('src/compiler').transclude
2+
var Vue = require('src')
3+
var _ = require('src/util')
44

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

test/unit/specs/directive_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var Vue = require('../../../src/index')
2-
var Directive = require('../../../src/directive')
1+
var Vue = require('src')
2+
var Directive = require('src/directive')
33
var nextTick = Vue.nextTick
44

55
describe('Directive', function () {

test/unit/specs/directives/element/partial_spec.js

+3-3
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 compiler = require('../../../../../src/compiler')
1+
var Vue = require('src')
2+
var _ = require('src/util')
3+
var compiler = require('src/compiler')
44

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

test/unit/specs/directives/element/slot_spec.js

+2-2
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

44
describe('Slot Distribution', function () {
55

test/unit/specs/directives/internal/class_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var _ = require('../../../../../src/util')
2-
var def = require('../../../../../src/directives/internal/class')
1+
var _ = require('src/util')
2+
var def = require('src/directives/internal/class')
33

44
describe(':class', function () {
55

test/unit/specs/directives/internal/component_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var _ = require('../../../../../src/util')
2-
var Vue = require('../../../../../src/index')
1+
var _ = require('src/util')
2+
var Vue = require('src')
33

44
describe('Component', function () {
55

test/unit/specs/directives/internal/prop_spec.js

+1-1
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('prop', function () {
44

test/unit/specs/directives/internal/style_spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var _ = require('../../../../../src/util')
2-
var def = require('../../../../../src/directives/internal/style')
3-
var Vue = require('../../../../../src/index')
1+
var _ = require('src/util')
2+
var def = require('src/directives/internal/style')
3+
var Vue = require('src')
44

55
function checkPrefixedProp (prop) {
66
var el = document.createElement('div')

test/unit/specs/directives/internal/transition_spec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
var _ = require('../../../../../src/util')
2-
var Vue = require('../../../../../src/index')
3-
var Directive = require('../../../../../src/directive')
4-
var def = require('../../../../../src/directives/internal/transition')
1+
var _ = require('src/util')
2+
var Vue = require('src')
3+
var Directive = require('src/directive')
4+
var def = require('src/directives/internal/transition')
55

66
describe('transition', function () {
77

test/unit/specs/directives/public/bind_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var _ = require('../../../../../src/util')
2-
var def = require('../../../../../src/directives/public/bind')
1+
var _ = require('src/util')
2+
var def = require('src/directives/public/bind')
33
var xlinkNS = 'http://www.w3.org/1999/xlink'
44

55
describe('v-bind', function () {

test/unit/specs/directives/public/cloak_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var compile = require('../../../../../src/compiler').compile
2-
var Vue = require('../../../../../src/index')
1+
var compile = require('src/compiler').compile
2+
var Vue = require('src')
33

44
describe('v-cloak', function () {
55

test/unit/specs/directives/public/el_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var _ = require('../../../../../src/util')
2-
var Vue = require('../../../../../src/index')
1+
var _ = require('src/util')
2+
var Vue = require('src')
33

44
describe('el', function () {
55

test/unit/specs/directives/public/for/for_ref_spec.js

+1-1
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('v-for + ref', function () {

test/unit/specs/directives/public/for/for_spec.js

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

55
describe('v-for', function () {
66

test/unit/specs/directives/public/for/for_stagger_spec.js

+1-1
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('v-for staggering transitions', function () {

test/unit/specs/directives/public/html_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var _ = require('../../../../../src/util')
2-
var def = require('../../../../../src/directives/public/html')
1+
var _ = require('src/util')
2+
var def = require('src/directives/public/html')
33

44
describe('v-html', function () {
55

test/unit/specs/directives/public/if_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var _ = require('../../../../../src/util')
2-
var Vue = require('../../../../../src/index')
1+
var _ = require('src/util')
2+
var Vue = require('src')
33

44
describe('v-if', function () {
55

test/unit/specs/directives/public/model_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var _ = require('../../../../../src/util')
2-
var Vue = require('../../../../../src/index')
1+
var _ = require('src/util')
2+
var Vue = require('src')
33

44
// unset jQuery to bypass jQuery check for normal test cases
55
jQuery = null

test/unit/specs/directives/public/on_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var _ = require('../../../../../src/util')
2-
var Vue = require('../../../../../src/index')
1+
var _ = require('src/util')
2+
var Vue = require('src')
33

44
function trigger (target, event, process) {
55
var e = document.createEvent('HTMLEvents')

test/unit/specs/directives/public/pre_spec.js

+1-1
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('v-pre', function () {
44

test/unit/specs/directives/public/ref_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var _ = require('../../../../../src/util')
2-
var Vue = require('../../../../../src/index')
1+
var _ = require('src/util')
2+
var Vue = require('src')
33

44
describe('ref', function () {
55

test/unit/specs/directives/public/show_spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var Vue = require('../../../../../src/index')
2-
var transition = require('../../../../../src/transition')
3-
var def = require('../../../../../src/directives/public/show')
1+
var Vue = require('src')
2+
var transition = require('src/transition')
3+
var def = require('src/directives/public/show')
44

55
describe('v-show', function () {
66

test/unit/specs/directives/public/text_spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var _ = require('../../../../../src/util')
2-
var def = require('../../../../../src/directives/public/text')
1+
var _ = require('src/util')
2+
var def = require('src/directives/public/text')
33

44
describe('v-text', function () {
55

test/unit/specs/filters/filters_spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var filters = require('../../../../src/filters')
1+
var filters = require('src/filters')
22

33
describe('Filters', function () {
44

test/unit/specs/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// set some global Vue options
2-
var Vue = require('../../../src/index')
2+
var Vue = require('src')
33
Vue.options.replace = false
44
Vue.config.silent = true
55

@@ -10,8 +10,8 @@ Vue.config.silent = true
1010
* utility functions.
1111
*/
1212

13-
var _ = require('../../../src/util')
14-
var __ = require('../../../src/util/debug')
13+
var _ = require('src/util')
14+
var __ = require('src/util/debug')
1515
var scope = typeof window === 'undefined'
1616
? global
1717
: window

test/unit/specs/instance/events_spec.js

+2-2
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

44
describe('Instance Events', function () {
55

test/unit/specs/instance/init_spec.js

+1-1
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 init = Vue.prototype._init
33

44
describe('Instance Init', function () {

test/unit/specs/instance/misc_spec.js

+1-1
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('misc', function () {
44

0 commit comments

Comments
 (0)