|
|
@ -4,7 +4,8 @@ using System.Collections.Generic; |
|
|
using System.IO; |
|
|
using System.IO; |
|
|
using System.Linq; |
|
|
using System.Linq; |
|
|
using System.Text; |
|
|
using System.Text; |
|
|
using System.Xml; |
|
|
using System.Text.Json; |
|
|
|
|
|
using System.Text.Json.Nodes; |
|
|
using Volo.Abp.Bundling; |
|
|
using Volo.Abp.Bundling; |
|
|
using Volo.Abp.DependencyInjection; |
|
|
using Volo.Abp.DependencyInjection; |
|
|
using Volo.Abp.Minify; |
|
|
using Volo.Abp.Minify; |
|
|
@ -33,7 +34,7 @@ namespace Volo.Abp.Cli.Bundling |
|
|
$"{options.BundleName}{FileExtension}"); |
|
|
$"{options.BundleName}{FileExtension}"); |
|
|
var bundleFileDefinitions = context.BundleDefinitions.Where(t => t.ExcludeFromBundle == false).ToList(); |
|
|
var bundleFileDefinitions = context.BundleDefinitions.Where(t => t.ExcludeFromBundle == false).ToList(); |
|
|
var fileDefinitionsExcludingFromBundle = context.BundleDefinitions.Where(t => t.ExcludeFromBundle).ToList(); |
|
|
var fileDefinitionsExcludingFromBundle = context.BundleDefinitions.Where(t => t.ExcludeFromBundle).ToList(); |
|
|
|
|
|
|
|
|
var bundledContent = BundleFiles(options, bundleFileDefinitions); |
|
|
var bundledContent = BundleFiles(options, bundleFileDefinitions); |
|
|
File.WriteAllText(bundleFilePath, bundledContent); |
|
|
File.WriteAllText(bundleFilePath, bundledContent); |
|
|
|
|
|
|
|
|
@ -56,56 +57,61 @@ namespace Volo.Abp.Cli.Bundling |
|
|
private string BundleFiles(BundleOptions options, List<BundleDefinition> bundleDefinitions) |
|
|
private string BundleFiles(BundleOptions options, List<BundleDefinition> bundleDefinitions) |
|
|
{ |
|
|
{ |
|
|
var staticAssetsFilePath = Path.Combine(options.Directory, "bin", "Debug", options.FrameworkVersion, |
|
|
var staticAssetsFilePath = Path.Combine(options.Directory, "bin", "Debug", options.FrameworkVersion, |
|
|
$"{options.ProjectFileName}.StaticWebAssets.xml"); |
|
|
$"{options.ProjectFileName}.staticwebassets.runtime.json"); |
|
|
|
|
|
|
|
|
if (!File.Exists(staticAssetsFilePath)) |
|
|
if (!File.Exists(staticAssetsFilePath)) |
|
|
{ |
|
|
{ |
|
|
throw new BundlingException( |
|
|
throw new BundlingException( |
|
|
"Unable to find static web assets file. You need to build the project to generate static web assets file."); |
|
|
"Unable to find static web assets file. You need to build the project to generate static web assets file."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
var staticAssetsDefinitions = new XmlDocument(); |
|
|
using (var file = File.OpenRead(staticAssetsFilePath)) |
|
|
staticAssetsDefinitions.Load(staticAssetsFilePath); |
|
|
|
|
|
|
|
|
|
|
|
var builder = new StringBuilder(); |
|
|
|
|
|
foreach (var definition in bundleDefinitions) |
|
|
|
|
|
{ |
|
|
{ |
|
|
string content; |
|
|
var jsonDocument = JsonDocument.Parse(file); |
|
|
if (definition.Source.StartsWith("_content")) |
|
|
var contentRoots = jsonDocument.RootElement.GetProperty("ContentRoots").EnumerateArray() |
|
|
|
|
|
.Select(x => x.GetString()) |
|
|
|
|
|
.ToList(); |
|
|
|
|
|
|
|
|
|
|
|
var builder = new StringBuilder(); |
|
|
|
|
|
foreach (var definition in bundleDefinitions) |
|
|
{ |
|
|
{ |
|
|
var pathFragments = definition.Source.Split('/').ToList(); |
|
|
string content; |
|
|
var basePath = $"{pathFragments[0]}/{pathFragments[1]}"; |
|
|
if (definition.Source.StartsWith("_content")) |
|
|
var node = staticAssetsDefinitions.SelectSingleNode($"//ContentRoot[@BasePath='{basePath}']"); |
|
|
|
|
|
if (node?.Attributes == null) |
|
|
|
|
|
{ |
|
|
{ |
|
|
throw new AbpException("Not found: " + definition.Source); |
|
|
var pathFragments = definition.Source.Split('/').ToList(); |
|
|
|
|
|
var basePath = $"{pathFragments[0]}/{pathFragments[1]}"; |
|
|
|
|
|
var path = contentRoots.FirstOrDefault(x => x.IndexOf($"\\{pathFragments[1]}\\", StringComparison.OrdinalIgnoreCase) > 0); |
|
|
|
|
|
if (path == null) |
|
|
|
|
|
{ |
|
|
|
|
|
throw new AbpException("Not found: " + definition.Source); |
|
|
|
|
|
} |
|
|
|
|
|
var absolutePath = definition.Source.Replace(basePath, path); |
|
|
|
|
|
content = GetFileContent(absolutePath, options.Minify); |
|
|
} |
|
|
} |
|
|
|
|
|
else if (definition.Source.StartsWith("_framework")) |
|
|
var path = node.Attributes["Path"].Value; |
|
|
{ |
|
|
var absolutePath = definition.Source.Replace(basePath, path); |
|
|
var slashIndex = definition.Source.IndexOf('/'); |
|
|
content = GetFileContent(absolutePath, options.Minify); |
|
|
var fileName = |
|
|
} |
|
|
definition.Source.Substring(slashIndex + 1, definition.Source.Length - slashIndex - 1); |
|
|
else if (definition.Source.StartsWith("_framework")) |
|
|
var filePath = |
|
|
{ |
|
|
Path.Combine(PathHelper.GetFrameworkFolderPath(options.Directory, options.FrameworkVersion), |
|
|
var slashIndex = definition.Source.IndexOf('/'); |
|
|
fileName); |
|
|
var fileName = |
|
|
content = GetFileContent(filePath, false); |
|
|
definition.Source.Substring(slashIndex + 1, definition.Source.Length - slashIndex - 1); |
|
|
} |
|
|
var filePath = |
|
|
else |
|
|
Path.Combine(PathHelper.GetFrameworkFolderPath(options.Directory, options.FrameworkVersion), |
|
|
{ |
|
|
fileName); |
|
|
var filePath = Path.Combine(PathHelper.GetWwwRootPath(options.Directory), definition.Source); |
|
|
content = GetFileContent(filePath, false); |
|
|
content = GetFileContent(filePath, options.Minify); |
|
|
} |
|
|
} |
|
|
else |
|
|
|
|
|
{ |
|
|
content = ProcessBeforeAddingToTheBundle(definition.Source, Path.Combine(options.Directory, "wwwroot"), |
|
|
var filePath = Path.Combine(PathHelper.GetWwwRootPath(options.Directory), definition.Source); |
|
|
content); |
|
|
content = GetFileContent(filePath, options.Minify); |
|
|
|
|
|
|
|
|
builder.AppendLine(content); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
content = ProcessBeforeAddingToTheBundle(definition.Source, Path.Combine(options.Directory, "wwwroot"), |
|
|
return builder.ToString(); |
|
|
content); |
|
|
|
|
|
builder.AppendLine(content); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return builder.ToString(); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private string GetFileContent(string filePath, bool minify) |
|
|
private string GetFileContent(string filePath, bool minify) |
|
|
@ -134,4 +140,4 @@ namespace Volo.Abp.Cli.Bundling |
|
|
return fileContent; |
|
|
return fileContent; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
maliming
5 years ago