kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Encode sourceMappingURL as a url

Browse Source 
sourceMappingURL must be encoded as a url. Before Haxe 4.0.0 the filename was directly copied, so if we're using Haxe < 4.0.0, we should manually encode it to avoid an error in the closure compiler.
This commit is contained in:
Justin Espedal
2018-02-26 20:45:30 -08:00
committed by Joshua Granick
parent 48e556b20c
commit 8943587122
4 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lime/tools/helpers/FileHelper.hx
View File

@@ -481,6 +481,26 @@ class FileHelper {
}
public static function replaceText (source:String, replaceString:String, replacement:String) {
if (FileSystem.exists (source)) {
var output = File.getContent (source);
var index = output.indexOf (replaceString);
if (index > -1) {
output = output.substr (0, index) + replacement + output.substr (index + replaceString.length);
File.saveContent (source, output);
}
}
}
public static function isNewer (source:String, destination:String):Bool {
if (source == null || !FileSystem.exists (source)) {

28
lime/tools/helpers/HTML5Helper.hx
View File

@@ -12,6 +12,7 @@ import lime.project.Asset;
import lime.project.Haxelib;
import lime.project.HXProject;
import lime.project.Platform;
import lime.project.Version;
import sys.FileSystem;
import sys.io.File;
@@ -25,6 +26,31 @@ import cpp.vm.Thread;
class HTML5Helper {
public static function encodeSourceMappingURL (sourceFile:String) {
// This is only required for projects with url-unsafe characters built with a Haxe version prior to 4.0.0
var filename = Path.withoutDirectory (sourceFile);
if (filename != StringTools.urlEncode (filename)) {
var output = ProcessHelper.runProcess ("", "haxe", [ "-version" ], true, true, true, false, true);
var haxeVer:Version = StringTools.trim (output);
if (haxeVer < ("4.0.0" : Version)) {
var replaceString = "//# sourceMappingURL=" + filename + ".map";
var replacement = "//# sourceMappingURL=" + StringTools.urlEncode (filename) + ".map";
FileHelper.replaceText (sourceFile, replaceString, replacement);
}
}
}
public static function generateFontData (project:HXProject, font:Asset):String {
var sourcePath = font.sourcePath;
@@ -216,7 +242,7 @@ class HTML5Helper {
// closure does not include a sourceMappingURL in the created .js, we do it here
#if !nodejs
var f = File.append (tempFile);
f.writeString ("//# sourceMappingURL=" + Path.withoutDirectory (sourceFile) + ".map");
f.writeString ("//# sourceMappingURL=" + StringTools.urlEncode (Path.withoutDirectory (sourceFile)) + ".map");
f.close ();
#end

19
lime/tools/helpers/ModuleHelper.hx
View File

@@ -203,21 +203,10 @@ class ModuleHelper {
public static function patchFile (outputPath:String):Void {
if (FileSystem.exists (outputPath)) {
var output = File.getContent (outputPath);
var replaceString = "var $hxClasses = {}";
var index = output.indexOf (replaceString);
if (index > -1) {
output = output.substr (0, index) + "if (!$hx_exports.$hxClasses) $hx_exports.$hxClasses = {};\nvar $hxClasses = $hx_exports.$hxClasses" + output.substr (index + replaceString.length);
File.saveContent (outputPath, output);
}
}
var replaceString = "var $hxClasses = {}";
var replacement = "if (!$hx_exports.$hxClasses) $hx_exports.$hxClasses = {};\nvar $hxClasses = $hx_exports.$hxClasses";
FileHelper.replaceText (outputPath, replaceString, replacement);
}

2
lime/tools/platforms/HTML5Platform.hx
View File

@@ -60,6 +60,8 @@ class HTML5Platform extends PlatformTarget {
if (noOutput) return;
HTML5Helper.encodeSourceMappingURL (targetDirectory + "/bin/" + project.app.file + ".js");
if (project.targetFlags.exists ("webgl")) {
FileHelper.copyFile (targetDirectory + "/obj/ApplicationMain.js", outputFile);