build: adjust test build setup for easier requires

yyx990803 · yyx990803 · commit f7a91fc9f4be · 2015-12-26T20:02:57.000-05:00
diff --git a/build/karma.base.config.js b/build/karma.base.config.js
@@ -1,3 +1,7 @@
+var webpackConfig = require('./webpack.test.config')
+delete webpackConfig.entry
+delete webpackConfig.devtool
+
 // shared config for all unit tests
 module.exports = {
   frameworks: ['jasmine'],
@@ -8,17 +12,7 @@ module.exports = {
   preprocessors: {
     '../test/unit/specs/index.js': ['webpack']
   },
-  webpack: {
-    module: {
-      loaders: [
-        {
-          test: /\.js$/,
-          exclude: /test|node_modules/,
-          loader: 'babel?optional[]=runtime&loose=all'
-        }
-      ]
-    }
-  },
+  webpack: webpackConfig,
   webpackMiddleware: {
     noInfo: true
   },
diff --git a/build/webpack.dev.config.js b/build/webpack.dev.config.js
@@ -1,9 +1,10 @@
+var path = require('path')
 var webpack = require('webpack')
 
 module.exports = {
   entry: './src/index',
   output: {
-    path: './dist',
+    path: path.resolve(__dirname, '../dist'),
     filename: 'vue.js',
     library: 'Vue',
     libraryTarget: 'umd'
diff --git a/build/webpack.test.config.js b/build/webpack.test.config.js
@@ -1,18 +1,29 @@
+var path = require('path')
 var webpack = require('webpack')
 
 module.exports = {
   entry: './test/unit/specs/index.js',
   output: {
-    path: './test/unit',
+    path: path.resolve(__dirname, '../test/unit'),
     filename: 'specs.js'
   },
+  resolve: {
+    alias: {
+      src: path.resolve(__dirname, '../src')
+    }
+  },
   module: {
     loaders: [
-      { test: /\.js$/, loader: 'babel', exclude: /test\/unit/ }
+      {
+        test: /\.js$/,
+        loader: 'babel',
+        exclude: /test\/unit|node_modules/
+      }
     ]
   },
   babel: {
-    loose: 'all'
+    loose: 'all',
+    optional: ['runtime']
   },
   plugins: [
     new webpack.DefinePlugin({
@@ -22,7 +33,8 @@ module.exports = {
     })
   ],
   devServer: {
-    contentBase: './test/unit'
+    contentBase: './test/unit',
+    noInfo: true
   },
   devtool: '#source-map'
 }
diff --git a/test/unit/specs/api/data_spec.js b/test/unit/specs/api/data_spec.js
@@ -1,5 +1,5 @@
-var Vue = require('../../../../src/index')
-var _ = require('../../../../src/util')
+var Vue = require('src')
+var _ = require('src/util')
 var nextTick = _.nextTick
 
 describe('Data API', function () {
diff --git a/test/unit/specs/api/dom_spec.js b/test/unit/specs/api/dom_spec.js
@@ -3,8 +3,8 @@
 * those are tested in transition_spec.js.
 */
 
-var Vue = require('../../../../src/index')
-var _ = require('../../../../src/util')
+var Vue = require('src')
+var _ = require('src/util')
 
 describe('DOM API', function () {
 
diff --git a/test/unit/specs/api/events_spec.js b/test/unit/specs/api/events_spec.js
@@ -1,4 +1,4 @@
-var Vue = require('../../../../src/index')
+var Vue = require('src')
 
 describe('Events API', function () {
 
diff --git a/test/unit/specs/api/global_spec.js b/test/unit/specs/api/global_spec.js
@@ -1,6 +1,6 @@
-var Vue = require('../../../../src/index')
-var _ = require('../../../../src/util')
-var config = require('../../../../src/config')
+var Vue = require('src')
+var _ = require('src/util')
+var config = require('src/config')
 
 describe('Global API', function () {
 
diff --git a/test/unit/specs/api/lifecycle_spec.js b/test/unit/specs/api/lifecycle_spec.js
@@ -1,5 +1,5 @@
-var Vue = require('../../../../src/index')
-var compiler = require('../../../../src/compiler')
+var Vue = require('src')
+var compiler = require('src/compiler')
 
 describe('Lifecycle API', function () {
 
diff --git a/test/unit/specs/async_component_spec.js b/test/unit/specs/async_component_spec.js
@@ -1,4 +1,4 @@
-var Vue = require('../../../src/index')
+var Vue = require('src')
 var _ = Vue.util
 
 describe('Async components', function () {
diff --git a/test/unit/specs/batcher_spec.js b/test/unit/specs/batcher_spec.js
@@ -1,6 +1,6 @@
-var config = require('../../../src/config')
-var batcher = require('../../../src/batcher')
-var nextTick = require('../../../src/util').nextTick
+var config = require('src/config')
+var batcher = require('src/batcher')
+var nextTick = require('src/util').nextTick
 
 describe('Batcher', function () {
 
diff --git a/test/unit/specs/cache_spec.js b/test/unit/specs/cache_spec.js
@@ -1,4 +1,4 @@
-var Cache = require('../../../src/cache')
+var Cache = require('src/cache')
 
 /**
  * Debug function to assert cache state
diff --git a/test/unit/specs/compiler/compile_spec.js b/test/unit/specs/compiler/compile_spec.js
@@ -1,9 +1,9 @@
-var Vue = require('../../../../src/index')
-var _ = require('../../../../src/util')
-var compiler = require('../../../../src/compiler')
+var Vue = require('src')
+var _ = require('src/util')
+var compiler = require('src/compiler')
 var compile = compiler.compile
-var publicDirectives = require('../../../../src/directives/public')
-var internalDirectives = require('../../../../src/directives/internal')
+var publicDirectives = require('src/directives/public')
+var internalDirectives = require('src/directives/internal')
 
 describe('Compile', function () {
 
diff --git a/test/unit/specs/compiler/transclude_spec.js b/test/unit/specs/compiler/transclude_spec.js
@@ -1,6 +1,6 @@
-var transclude = require('../../../../src/compiler').transclude
-var Vue = require('../../../../src/index')
-var _ = require('../../../../src/util')
+var transclude = require('src/compiler').transclude
+var Vue = require('src')
+var _ = require('src/util')
 
 describe('Transclude', function () {
 
diff --git a/test/unit/specs/directive_spec.js b/test/unit/specs/directive_spec.js
@@ -1,5 +1,5 @@
-var Vue = require('../../../src/index')
-var Directive = require('../../../src/directive')
+var Vue = require('src')
+var Directive = require('src/directive')
 var nextTick = Vue.nextTick
 
 describe('Directive', function () {
diff --git a/test/unit/specs/directives/element/partial_spec.js b/test/unit/specs/directives/element/partial_spec.js
@@ -1,6 +1,6 @@
-var Vue = require('../../../../../src/index')
-var _ = require('../../../../../src/util')
-var compiler = require('../../../../../src/compiler')
+var Vue = require('src')
+var _ = require('src/util')
+var compiler = require('src/compiler')
 
 describe('Partial', function () {
 
diff --git a/test/unit/specs/directives/element/slot_spec.js b/test/unit/specs/directives/element/slot_spec.js
@@ -1,5 +1,5 @@
-var Vue = require('../../../../../src/index')
-var _ = require('../../../../../src/util')
+var Vue = require('src')
+var _ = require('src/util')
 
 describe('Slot Distribution', function () {
 
diff --git a/test/unit/specs/directives/internal/class_spec.js b/test/unit/specs/directives/internal/class_spec.js
@@ -1,5 +1,5 @@
-var _ = require('../../../../../src/util')
-var def = require('../../../../../src/directives/internal/class')
+var _ = require('src/util')
+var def = require('src/directives/internal/class')
 
 describe(':class', function () {
 
diff --git a/test/unit/specs/directives/internal/component_spec.js b/test/unit/specs/directives/internal/component_spec.js
@@ -1,5 +1,5 @@
-var _ = require('../../../../../src/util')
-var Vue = require('../../../../../src/index')
+var _ = require('src/util')
+var Vue = require('src')
 
 describe('Component', function () {
 
diff --git a/test/unit/specs/directives/internal/prop_spec.js b/test/unit/specs/directives/internal/prop_spec.js
@@ -1,4 +1,4 @@
-var Vue = require('../../../../../src/index')
+var Vue = require('src')
 
 describe('prop', function () {
 
diff --git a/test/unit/specs/directives/internal/style_spec.js b/test/unit/specs/directives/internal/style_spec.js
@@ -1,6 +1,6 @@
-var _ = require('../../../../../src/util')
-var def = require('../../../../../src/directives/internal/style')
-var Vue = require('../../../../../src/index')
+var _ = require('src/util')
+var def = require('src/directives/internal/style')
+var Vue = require('src')
 
 function checkPrefixedProp (prop) {
   var el = document.createElement('div')
diff --git a/test/unit/specs/directives/internal/transition_spec.js b/test/unit/specs/directives/internal/transition_spec.js
@@ -1,7 +1,7 @@
-var _ = require('../../../../../src/util')
-var Vue = require('../../../../../src/index')
-var Directive = require('../../../../../src/directive')
-var def = require('../../../../../src/directives/internal/transition')
+var _ = require('src/util')
+var Vue = require('src')
+var Directive = require('src/directive')
+var def = require('src/directives/internal/transition')
 
 describe('transition', function () {
 
diff --git a/test/unit/specs/directives/public/bind_spec.js b/test/unit/specs/directives/public/bind_spec.js
@@ -1,5 +1,5 @@
-var _ = require('../../../../../src/util')
-var def = require('../../../../../src/directives/public/bind')
+var _ = require('src/util')
+var def = require('src/directives/public/bind')
 var xlinkNS = 'http://www.w3.org/1999/xlink'
 
 describe('v-bind', function () {
diff --git a/test/unit/specs/directives/public/cloak_spec.js b/test/unit/specs/directives/public/cloak_spec.js
@@ -1,5 +1,5 @@
-var compile = require('../../../../../src/compiler').compile
-var Vue = require('../../../../../src/index')
+var compile = require('src/compiler').compile
+var Vue = require('src')
 
 describe('v-cloak', function () {
 
diff --git a/test/unit/specs/directives/public/el_spec.js b/test/unit/specs/directives/public/el_spec.js
@@ -1,5 +1,5 @@
-var _ = require('../../../../../src/util')
-var Vue = require('../../../../../src/index')
+var _ = require('src/util')
+var Vue = require('src')
 
 describe('el', function () {
 
diff --git a/test/unit/specs/directives/public/for/for_ref_spec.js b/test/unit/specs/directives/public/for/for_ref_spec.js
@@ -1,4 +1,4 @@
-var Vue = require('../../../../../../src/index')
+var Vue = require('src')
 var _ = Vue.util
 
 describe('v-for + ref', function () {
diff --git a/test/unit/specs/directives/public/for/for_spec.js b/test/unit/specs/directives/public/for/for_spec.js
@@ -1,6 +1,6 @@
-var _ = require('../../../../../../src/util')
-var Vue = require('../../../../../../src/index')
-var config = require('../../../../../../src/config')
+var _ = require('src/util')
+var Vue = require('src')
+var config = require('src/config')
 
 describe('v-for', function () {
 
diff --git a/test/unit/specs/directives/public/for/for_stagger_spec.js b/test/unit/specs/directives/public/for/for_stagger_spec.js
@@ -1,4 +1,4 @@
-var Vue = require('../../../../../../src/index')
+var Vue = require('src')
 var _ = Vue.util
 
 describe('v-for staggering transitions', function () {
diff --git a/test/unit/specs/directives/public/html_spec.js b/test/unit/specs/directives/public/html_spec.js
@@ -1,5 +1,5 @@
-var _ = require('../../../../../src/util')
-var def = require('../../../../../src/directives/public/html')
+var _ = require('src/util')
+var def = require('src/directives/public/html')
 
 describe('v-html', function () {
 
diff --git a/test/unit/specs/directives/public/if_spec.js b/test/unit/specs/directives/public/if_spec.js
@@ -1,5 +1,5 @@
-var _ = require('../../../../../src/util')
-var Vue = require('../../../../../src/index')
+var _ = require('src/util')
+var Vue = require('src')
 
 describe('v-if', function () {
 
diff --git a/test/unit/specs/directives/public/model_spec.js b/test/unit/specs/directives/public/model_spec.js
@@ -1,5 +1,5 @@
-var _ = require('../../../../../src/util')
-var Vue = require('../../../../../src/index')
+var _ = require('src/util')
+var Vue = require('src')
 
 // unset jQuery to bypass jQuery check for normal test cases
 jQuery = null
diff --git a/test/unit/specs/directives/public/on_spec.js b/test/unit/specs/directives/public/on_spec.js
@@ -1,5 +1,5 @@
-var _ = require('../../../../../src/util')
-var Vue = require('../../../../../src/index')
+var _ = require('src/util')
+var Vue = require('src')
 
 function trigger (target, event, process) {
   var e = document.createEvent('HTMLEvents')
diff --git a/test/unit/specs/directives/public/pre_spec.js b/test/unit/specs/directives/public/pre_spec.js
@@ -1,4 +1,4 @@
-var Vue = require('../../../../../src/index')
+var Vue = require('src')
 
 describe('v-pre', function () {
 
diff --git a/test/unit/specs/directives/public/ref_spec.js b/test/unit/specs/directives/public/ref_spec.js
@@ -1,5 +1,5 @@
-var _ = require('../../../../../src/util')
-var Vue = require('../../../../../src/index')
+var _ = require('src/util')
+var Vue = require('src')
 
 describe('ref', function () {
 
diff --git a/test/unit/specs/directives/public/show_spec.js b/test/unit/specs/directives/public/show_spec.js
@@ -1,6 +1,6 @@
-var Vue = require('../../../../../src/index')
-var transition = require('../../../../../src/transition')
-var def = require('../../../../../src/directives/public/show')
+var Vue = require('src')
+var transition = require('src/transition')
+var def = require('src/directives/public/show')
 
 describe('v-show', function () {
 
diff --git a/test/unit/specs/directives/public/text_spec.js b/test/unit/specs/directives/public/text_spec.js
@@ -1,5 +1,5 @@
-var _ = require('../../../../../src/util')
-var def = require('../../../../../src/directives/public/text')
+var _ = require('src/util')
+var def = require('src/directives/public/text')
 
 describe('v-text', function () {
 
diff --git a/test/unit/specs/filters/filters_spec.js b/test/unit/specs/filters/filters_spec.js
@@ -1,4 +1,4 @@
-var filters = require('../../../../src/filters')
+var filters = require('src/filters')
 
 describe('Filters', function () {
 
diff --git a/test/unit/specs/index.js b/test/unit/specs/index.js
@@ -1,5 +1,5 @@
 // set some global Vue options
-var Vue = require('../../../src/index')
+var Vue = require('src')
 Vue.options.replace = false
 Vue.config.silent = true
 
@@ -10,8 +10,8 @@ Vue.config.silent = true
  * utility functions.
  */
 
-var _ = require('../../../src/util')
-var __ = require('../../../src/util/debug')
+var _ = require('src/util')
+var __ = require('src/util/debug')
 var scope = typeof window === 'undefined'
   ? global
   : window
diff --git a/test/unit/specs/instance/events_spec.js b/test/unit/specs/instance/events_spec.js
@@ -1,5 +1,5 @@
-var Vue = require('../../../../src/index')
-var _ = require('../../../../src/util')
+var Vue = require('src')
+var _ = require('src/util')
 
 describe('Instance Events', function () {
 
diff --git a/test/unit/specs/instance/init_spec.js b/test/unit/specs/instance/init_spec.js
@@ -1,4 +1,4 @@
-var Vue = require('../../../../src/index')
+var Vue = require('src')
 var init = Vue.prototype._init
 
 describe('Instance Init', function () {
diff --git a/test/unit/specs/instance/misc_spec.js b/test/unit/specs/instance/misc_spec.js
@@ -1,4 +1,4 @@
-var Vue = require('../../../../src/index')
+var Vue = require('src')
 
 describe('misc', function () {
 
diff --git a/test/unit/specs/instance/state_spec.js b/test/unit/specs/instance/state_spec.js
diff --git a/test/unit/specs/misc_spec.js b/test/unit/specs/misc_spec.js
diff --git a/test/unit/specs/observer/dep_spec.js b/test/unit/specs/observer/dep_spec.js
diff --git a/test/unit/specs/observer/observer_spec.js b/test/unit/specs/observer/observer_spec.js
diff --git a/test/unit/specs/parsers/directive_spec.js b/test/unit/specs/parsers/directive_spec.js
diff --git a/test/unit/specs/parsers/expression_spec.js b/test/unit/specs/parsers/expression_spec.js
diff --git a/test/unit/specs/parsers/path_spec.js b/test/unit/specs/parsers/path_spec.js
diff --git a/test/unit/specs/parsers/template_spec.js b/test/unit/specs/parsers/template_spec.js
diff --git a/test/unit/specs/parsers/text_spec.js b/test/unit/specs/parsers/text_spec.js
diff --git a/test/unit/specs/transition/transition_spec.js b/test/unit/specs/transition/transition_spec.js
diff --git a/test/unit/specs/util/component_spec.js b/test/unit/specs/util/component_spec.js
diff --git a/test/unit/specs/util/debug_spec.js b/test/unit/specs/util/debug_spec.js
diff --git a/test/unit/specs/util/dom_spec.js b/test/unit/specs/util/dom_spec.js
diff --git a/test/unit/specs/util/env_spec.js b/test/unit/specs/util/env_spec.js
diff --git a/test/unit/specs/util/lang_spec.js b/test/unit/specs/util/lang_spec.js
diff --git a/test/unit/specs/util/options_spec.js b/test/unit/specs/util/options_spec.js
diff --git a/test/unit/specs/watcher_spec.js b/test/unit/specs/watcher_spec.js
