Revert "tools: Move NPM build to after Haxe build. Allow <define name='npm' /> to force NPM build for a project. Do not force 'dist' directory (use <assets /> tags to populate the appropriate dist/ or public/ folder)"

This reverts commit 175bf95.

Author: jgranick

tools/platforms/HTML5Platform.hx

@@ -103,6 +103,19 @@ class HTML5Platform extends PlatformTarget
 
 	public override function build():Void
 	{
+		if (npm)
+		{
+			if (command == "build")
+			{
+				var buildCommand = "build:" + (project.targetFlags.exists("final") ? "prod" : "dev");
+				System.runCommand(targetDirectory + "/bin", "npm", ["run", buildCommand, "-s"]);
+			}
+			else
+			{
+				return;
+			}
+		}
+
 		ModuleHelper.buildModules(project, targetDirectory + "/obj", targetDirectory + "/bin");
 
 		if (project.app.main != null)
@@ -162,19 +175,6 @@ class HTML5Platform extends PlatformTarget
 				HTML5Helper.minify(project, targetDirectory + "/bin/" + project.app.file + ".js");
 			}
 		}
-
-		if (npm)
-		{
-			if (command == "build")
-			{
-				var buildCommand = "build:" + (project.targetFlags.exists("final") ? "prod" : "dev");
-				System.runCommand(targetDirectory + "/bin", "npm", ["run", buildCommand, "-s"]);
-			}
-			else
-			{
-				return;
-			}
-		}
 	}
 
 	public override function clean():Void
@@ -254,10 +254,10 @@ class HTML5Platform extends PlatformTarget
 
 		try
 		{
-			if (project.defines.exists("npm") || targetFlags.exists("npm") || (FileSystem.exists(targetDirectory + "/bin/package.json") && !targetFlags.exists("electron")))
+			if (targetFlags.exists("npm") || (FileSystem.exists(targetDirectory + "/bin/package.json") && !targetFlags.exists("electron")))
 			{
 				npm = true;
-				// outputFile = project.app.file + ".js";
+				outputFile = project.app.file + ".js";
 			}
 		}
 		catch (e:Dynamic) {}
@@ -288,6 +288,7 @@ class HTML5Platform extends PlatformTarget
 		// project = project.clone ();
 
 		var destination = targetDirectory + "/bin/";
+		if (npm) destination += "dist/";
 		System.mkdir(destination);
 
 		var webfontDirectory = targetDirectory + "/obj/webfont";