Skip to content

Commit cb53cc5

Browse files
author
benholloway
committed
parametised test glob to options.testGlob, parametised vendor.js entry path to options.appDir
1 parent 1328ad7 commit cb53cc5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

config/add/common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var webpack = require('webpack'),
1717
*/
1818
function common(loaderRoot, options) {
1919
/* jshint validthis:true */
20-
var vendorEntry = path.resolve(options.appDir, 'test.js');
20+
var vendorEntry = path.resolve(options.appDir, 'vendor.js');
2121

2222
return this
2323
.merge({

config/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ function app(options) {
2626
addConditionals: require('./add/conditionals'),
2727
addMinification: require('./add/minification')
2828
})
29-
.addCommon(path.resolve(__dirname, '..', 'node_modules'), options)
3029
.addClean(buildDir)
30+
.addCommon(path.resolve(__dirname, '..', 'node_modules'), options)
3131
.addComposition(composition)
3232
.addConditionals({
3333
TEST : false,
@@ -36,7 +36,7 @@ function app(options) {
3636
})
3737
.addMinification(!options.unminified)
3838
.merge({
39-
name : ['app', composition.namespace].join('::'),
39+
name : ['app', composition.namespace].filter(Boolean).join('::'),
4040
output: {
4141
path: path.resolve(buildDir)
4242
}

0 commit comments

Comments
 (0)