Skip to content

Using existing min file on Bundle file Update #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wschacker wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Using existing min file on Bundle file Update #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 57 additions & 2 deletions EditorExtensions/MenuItems/BundleFiles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,62 @@ private static void WriteBundleFile(string filePath, XmlDocument doc)

if (bundleNode.Attributes["minify"] != null || bundleNode.Attributes["minify"].InnerText == "true")
{
WriteMinFile(filePath, bundlePath, sb.ToString(), extension);
// WriteMinFile(filePath, bundlePath, sb.ToString(), extension);
//begin add by jackie
StringBuilder sbMin = new StringBuilder();

string minBundlePath = bundlePath.Replace(Path.GetExtension(bundlePath), ".min" + Path.GetExtension(bundlePath));
if (extension.Equals(".js", StringComparison.OrdinalIgnoreCase))
{
CodeSettings settings = new CodeSettings()
{
EvalTreatment = EvalTreatment.MakeImmediateSafe,
TermSemicolons = true,
PreserveImportantComments = WESettings.GetBoolean(WESettings.Keys.KeepImportantComments)
};
Minifier minifier = new Minifier();
foreach (string file in files.Keys)
{
string minFile = file.Insert(file.Length - 2, "min.");
if (File.Exists(minFile))
{
sbMin.AppendLine(File.ReadAllText(minFile));
}
else
{
minifier.FileName = Path.GetFileName(file);
string content = minifier.MinifyJavaScript(File.ReadAllText(file), settings);
sbMin.AppendLine(content);
}
}

}
else if (extension.Equals(".css", StringComparison.OrdinalIgnoreCase))
{
foreach (string file in files.Keys)
{
string minFile = file.Insert(file.Length - 3, "min.");
if (File.Exists(minFile))
{
sbMin.AppendLine(File.ReadAllText(minFile));
}
else
{
string minContent = MinifyFileMenu.MinifyString(extension, File.ReadAllText(file));
sbMin.AppendLine(minContent);
}
}
}

ProjectHelpers.CheckOutFileFromSourceControl(minBundlePath);

using (StreamWriter writer = new StreamWriter(minBundlePath, false, new UTF8Encoding(useBom)))
{
writer.Write(sbMin.ToString());
Logger.Log("Updating min bundle : " + Path.GetFileName(minBundlePath));
}
MarginBase.AddFileToProject(filePath, minBundlePath);
//end add by jackie
}
}
}
Expand Down Expand Up @@ -378,4 +433,4 @@ private static void WriteMinFile(string filePath, string bundlePath, string cont
}
}
}
}
}