parametised test glob to options.testGlob, parametised vendor.js entry path to options.appDir

Author: benholloway

config/add/common.js

@@ -12,18 +12,20 @@ var webpack              = require('webpack'),
  * Add common features.
  * @this {Config} A webpack-configurator instance
  * @param {string} loaderRoot The base path in which to locate loaders
- * @param {object} globals A hash of globals
+ * @param {{appDir:string, globals:object} globals A hash of options
  * @returns {Config} The given webpack-configurator instance
  */
-function common(loaderRoot, globals) {
+function common(loaderRoot, options) {
   /* jshint validthis:true */
+  var vendorEntry = path.resolve(options.appDir, 'test.js');
+
   return this
     .merge({
       context      : process.cwd(),
       cache        : true,
       devtool      : 'source-map',
       entry        : {
-        vendor: './app/vendor.js'
+        vendor: vendorEntry
       },
       output       : {
         filename                             : '[name].[chunkhash].js',
@@ -117,7 +119,7 @@ function common(loaderRoot, globals) {
 
     // bower
     .plugin('generate-vendor', EntryGeneratorPlugin, [
-      './app/vendor.js',
+      vendorEntry,
       EntryGeneratorPlugin.bowerDependenciesSource()
     ])
     .plugin('omit-tilde', OmitTildePlugin, [{
@@ -130,7 +132,7 @@ function common(loaderRoot, globals) {
     }])
 
     // globals
-    .plugin('provide', webpack.ProvidePlugin, [globals])
+    .plugin('provide', webpack.ProvidePlugin, [options.globals])
 
     // output, chunking, optimisation
     .plugin('extract-text', ExtractTextPlugin, [

config/app.js

@@ -26,7 +26,7 @@ function app(options) {
           addConditionals: require('./add/conditionals'),
           addMinification: require('./add/minification')
         })
-          .addCommon(path.resolve(__dirname, '..', 'node_modules'), options.globals)
+          .addCommon(path.resolve(__dirname, '..', 'node_modules'), options)
           .addClean(buildDir)
           .addComposition(composition)
           .addConditionals({

config/release.js

@@ -25,7 +25,7 @@ function release(options) {
     .addBrowserSync(options.releaseDir, options.port)
     .addClean(options.releaseDir)
     .addComposition(composition)
-    .addCommon(path.resolve(__dirname, '..', 'node_modules'), options.globals)
+    .addCommon(path.resolve(__dirname, '..', 'node_modules'), options)
     .addConditionals({
       TEST   : false,
       DEBUG  : false,

config/test.js

@@ -6,7 +6,7 @@ var createConfigurator = require('../lib/create-configurator');
 
 /**
  * Create a single webpack configurator for test.
- * @param {{appDir:string, testDir:string, globals:object}} options An options hash
+ * @param {{appDir:string, testDir:string, globals:object, testGlob:string}} options An options hash
  * @returns {Config} A webpack configurator
  */
 function test(options) {
@@ -17,13 +17,13 @@ function test(options) {
     addConditionals       : require('./add/conditionals'),
     addTestSuiteGeneration: require('./add/test-suite-generation')
   })
-    .addCommon(path.resolve(__dirname, '..', 'node_modules'), options.globals)
+    .addCommon(path.resolve(__dirname, '..', 'node_modules'), options)
     .addConditionals({
       TEST   : true,
       DEBUG  : true,
       RELEASE: false
     })
-    .addTestSuiteGeneration(testEntry, '**/*.spec.js')
+    .addTestSuiteGeneration(testEntry, options.testGlob)
     .merge({
       name  : 'test',
       entry : {

lib/default-options.js

@@ -2,8 +2,8 @@ function defaultOptions() {
   return {
     appDir    : './app',
     buildDir  : './app-build',
-    releaseDir: './app-release',
     testDir   : './app-test',
+    releaseDir: './app-release',
     testGlob  : '**/*.spec.js',
     port      : 55555,
     unminified: false,