diff --git a/bilibili-evolved.offline.user.js b/bilibili-evolved.offline.user.js index e0684029e..eec81dbe6 100644 --- a/bilibili-evolved.offline.user.js +++ b/bilibili-evolved.offline.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Offline) -// @version 377.11 +// @version 377.82 // @description Bilibili Evolved 的离线版, 所有功能都已内置于脚本中. // @author Grant Howard, Coulomb-G // @copyright 2019, Grant Howard (https://github.com/the1812) & Coulomb-G (https://github.com/Coulomb-G) diff --git a/bilibili-evolved.preview-offline.user.js b/bilibili-evolved.preview-offline.user.js index 7dff5d8ff..dbe1c6e4f 100644 --- a/bilibili-evolved.preview-offline.user.js +++ b/bilibili-evolved.preview-offline.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Preview Offline) -// @version 377.11 +// @version 377.82 // @description Bilibili Evolved 的预览离线版, 可以抢先体验新功能, 并且所有功能都已内置于脚本中. // @author Grant Howard, Coulomb-G // @copyright 2019, Grant Howard (https://github.com/the1812) & Coulomb-G (https://github.com/Coulomb-G) diff --git a/builder/dotnet/ResourceBuilder.cs b/builder/dotnet/ResourceBuilder.cs index 3799ba2eb..ecfc1d9b4 100644 --- a/builder/dotnet/ResourceBuilder.cs +++ b/builder/dotnet/ResourceBuilder.cs @@ -132,7 +132,9 @@ namespace BilibiliEvolved.Build { public override Predicate FileFilter { get; } = file => { - return file.FullName.Contains(@"src\") && file.Extension == ".js"; + return file.FullName.Contains("src" + Path.DirectorySeparatorChar) && + !file.FullName.Contains("client" + Path.DirectorySeparatorChar) && + file.Extension == ".js"; }; public override string ResourceType { get; } = "JavaScript"; diff --git a/builder/dotnet/TypeScriptBuilder.cs b/builder/dotnet/TypeScriptBuilder.cs index 42447110d..463afc629 100644 --- a/builder/dotnet/TypeScriptBuilder.cs +++ b/builder/dotnet/TypeScriptBuilder.cs @@ -30,7 +30,7 @@ namespace BilibiliEvolved.Build WriteInfo($"TypeScript build: {file}"); }); Console.Write(tsc.Run().Trim()); - Parallel.ForEach(changedFiles.Select(f => "ts-output/" + f.Replace(".ts", ".js")), file => { + Parallel.ForEach(changedFiles.Select(f => ".ts-output/" + f.Replace(".ts", ".js").Replace($"src{Path.DirectorySeparatorChar}", "")), file => { var min = uglifyJs.Minify(File.ReadAllText(file)); var minFile = ResourceMinifier.GetMinimizedFileName(file); File.WriteAllText(minFile, min); diff --git a/builder/dotnet/publish/build.dll b/builder/dotnet/publish/build.dll index 6389cff73..ad05ed2c0 100644 Binary files a/builder/dotnet/publish/build.dll and b/builder/dotnet/publish/build.dll differ