[BUILD] Fix task order in gulpfile, improve webpack config

route4me · Mar 11, 2017 · 89a14b8 · 89a14b8
1 parent fdd4822
commit 89a14b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -226,7 +226,11 @@ gulp.task("build:browser:test", function taskBuildBrowserTest() {  // eslint-dis
 // SUPERTASKS
 
 gulp.task("doc", ["watch:doc"])
-gulp.task("build", ["build:node", "build:browser", "build:browser:test"])
+gulp.task("build", (done) => {
+	gulpSequence(["build:node", "build:browser"], "build:browser:test", done)
+	return undefined
+})
+
 gulp.task("default", (done) => {
 	gulpSequence("lint", "build", "test", done)
 	return undefined

diff --git a/test/index.js → test/webpack-index.js b/test/index.js → test/webpack-index.js
diff --git a/webpack/test.config.js b/webpack/test.config.js
@@ -14,7 +14,7 @@ const config = _.merge({
 		sinon: "sinon"
 	},
 	entry: {
-		"test": "./test/index.js",
+		"test": "./test/webpack-index.js",
 	},
 	output: {
 		path: path.join(testDir, "browser"),