Skip to content

Commit 47fa27c

Browse files
committed
Change course, push standard build output into bin on all builds (NPM or not)
1 parent 6cd5fa3 commit 47fa27c

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

tools/platforms/HTML5Platform.hx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,8 @@ class HTML5Platform extends PlatformTarget
275275
catch (e:Dynamic) {}
276276

277277
finalRelease = (!project.debug && project.targetFlags.exists("final"));
278-
assetsDirectory = targetDirectory + (npm ? "/public" : "/bin");
279-
outputDirectory = targetDirectory + (npm ? "/build" : "/bin");
278+
outputDirectory = targetDirectory + "/bin";
279+
assetsDirectory = outputDirectory;
280280
outputFile = outputDirectory + "/" + project.app.file + ".js";
281281
}
282282

@@ -311,7 +311,8 @@ class HTML5Platform extends PlatformTarget
311311

312312
if (needsInstall)
313313
{
314-
runNPMCommand(["install"]);
314+
// Show output, even when !verbose
315+
System.runCommand(targetDirectory, "npm", ["install"]);
315316
}
316317
}
317318

@@ -453,6 +454,7 @@ class HTML5Platform extends PlatformTarget
453454

454455
if (npm)
455456
{
457+
// Ensure all HXML paths are absolute
456458
var path:String;
457459
for (i in 0...project.sources.length)
458460
{

0 commit comments

Comments
 (0)