From 9881ac0b75add3e7c52a242b88bf68219ef4a4d4 Mon Sep 17 00:00:00 2001 From: the1812 Date: Mon, 29 Jul 2019 11:30:19 +0800 Subject: [PATCH] Fix bug in compiler --- bilibili-evolved.offline.user.js | 2 +- bilibili-evolved.preview-offline.user.js | 2 +- builder/dotnet/ResourceBuilder.cs | 4 +++- builder/dotnet/TypeScriptBuilder.cs | 2 +- builder/dotnet/publish/build.dll | Bin 33792 -> 33792 bytes 5 files changed, 6 insertions(+), 4 deletions(-) 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 6389cff73e9b5b38d6f5a5d2a744b49b77d66788..ad05ed2c057a3b8f9eb0bb8c4bf483ec36c57004 100644 GIT binary patch delta 7914 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 ORkw$hd?DJ(-Tx0;zS{Hv delta 7893 zcmb_hcX$1T(S@~0wxRyM!=H*B1kii z#s*T9RhC@KjaNaDBG@jjm8-G~3Xkri5?RF#D|p}Uok>V`*~k53=XvT76K zGBN<1g8rpZp%i(O7}N_(HT0^B!6-e`*r3D)^HHnUAk<+hXPSN==WiSPl!Ty7K(QRb zGA-x4&G?%Vr~Drmnc=aevs|Od)|1UNCfiD{P-43+F1$|cUij=~9>hj6O0lpWGEUoi zhp(3YrK`Wwb-U5eK7t)EmfBNUyRp?CWJ$(z_Vk1wt`MA2h{>HeC+F=Ga!O^Wck4?L z)%XoLIJ0R%{Y7Lu(t6l;q{Zk5NRD;vNQ=WMxYd!(-ZyqS`t}wToP*JrD7z%liu1}C zq`T07fy$1wSg(yor5ntd(dVDk`Q#Vxwd;dX(#v^1TwUjmv;=*$F~wOJRfQ_AOiHh$ zZ!#Ws4rCd|ap#jt8=vY*V}mO$xZ2h^J8nK3C4Aym8!x%yA}wgrIbwxTvM0|%!Fx@4?W-(=Zsm7ZOUjWI4n4NO|$g!)E4NWHHMC44v} z{T438a_N9^jkcGi8=5y>o#MtxnaL+f(W~2vy#kBWpsF#RJ2s(|QIAHwnM-_e8WYfv z6{kOs3cUT5-+BreL;2jt>FuUAq;}J0avG;k?5^GBAuV=vIRlP3-q;%*WUm_UM9&j0 zd5l56be3gY?^}^j8HJNn7r`D()Tg1Mu90_lU7O^W7`w5}5m?38dShcSkKJn=2$o#4 zg9lww3~X;<9=c{sL`h?!e!?{15!20}|AKl^U#8*S+l)ZlS8wH%H)_&-#`qqC*a>4} zkN#!fqKQ8@*Ldl<(F4)^9;+YYcV}G3Gr7TMy0r#Ox1%wp+ayDdX%qgQWV{d)X0mZQ zX8jmfGImf`fz8I$4M(iQ)6=QPqqa*6{Q0G)Ap_UL`40_dRfu)C^Y{t0H#Q{_!qB?= zkq0j^G?@=vSRwFy_V;D)a;lGjF}1J*qugeLjV5P@x90AG^fxS)?f_I*vzY^ zTAGQS8m~1QON_Y00;LJ{`Z{A$VkmtJ`nx(0?oDXGy@Y3PjJ}2BSUQ5=HZ~{bsodA8 zzlM4RkMiS*IT2dJMy^%@eVk$srS487xV!P~DZq5ToOu0*R)ChUvN(X$+wtX(_fr9sCoa-!Z@yt6@9%YdE~OOIO`ZsEP5{tQ zmpXj%$YFRtf!u8rCS9#!9T4%~wfHaAXiCbAq^bNf0-s-a*OBd2pxVi?jc|j*>-E8O z+!hM#aSXt>*F(;qR0YxrKXY)Ik=#VMoir$bCK&cSj@zGNTUogD@;m8yyE1#oef>w{x>VatUHjSf?*AeASK#o%@ESH6@xX(aE)4VB zE2J#=+;+;Nz;f4o)dNBM3aJk)QhC=$qvxwxpoynEVMzD$M3-=UII_SBDF_ZvZFCU+ zOc-|5Ml0}+wkNtD{G_G0dO|u5rU(+$c5e}E_O;{e_QHxO@Px&IW^VtfEO-6J$D*_ z@-~z!lX3B3b<7!!;fQ8-G7Z_hPBvH;;3Z;Bu*5Z77U6q~)woVF2@*np*J^m!#&G|x z3K`?lQt%6AL0V?-5-kjNcmdBkbg-9e8nVL{iw=ar0Y@#?(|9GVe7Msc#s}b%rR(9= zkl9kr=w4`3A?(8CYWeDiTiqv#cuOVkiBqi*t9)qydCZxnIZdNQKlKY-#!*6Q^RixJ_YB9 zwOTAIz-z-4C=Na*ZIgYTUqkk}<@1y)jK{;*mTkXFL-w;}8-cT!0FX^R*{9$vCV<;yu+z`* zxt?LMO`b(^B5bpm+owSi?6%k|5nRe-c+R31(HMe*78`?;n*v{0tP&?a1^j(@!6ul% zmLe-8)*SPVc88n_vxv38D%Vp%uE`FnZ%CRd73cHu^3MihPlMdZ65~ym5e1U&)d3rHg)q{d)YIBY3}akdVe?9 zt(RTV^AFuT|Ertl9%3zUr~0rQhV^}UGiGb)a4)eIkZjxKbZ)@wRkf$~q-<==jJfLO zz)6+`$1JCE`&#G?{(ju41vYx0m$P9Ou~*qg$}4gXQ6oZ04 z6#-VlTf$Pg7)ps@Y9qIId@0{|r7)#KhX+L|%(DCk!dbLEZLxazP96X+TP#jEZ`{#4 zC-RHMCH9>>1a8G&)VxxGbdn8)yNH>C7zX!PwqJ4I4}-QYwsP2K*(OUGzOUu0cos9R z0#srv;bWmxsDPdpYZWyZ4kIF6Tt`5qW!xfuCy#)`#LQV632%4t90?y**6MGN-j4u8io*C2`^(aqhV4B{vze$ZN_fKz+cE{790zocL^K|-&le7 z;5?0ma{L=n#|XzkC9#$8gK$5CQDj{Y7@cJv^f8Zpm zgfcR&gzK?H6+GT0a00Y-37h~gTAqJ^U*!pK)M6iC++@thV1fHGKIXbC$J@DVBEGOt zj(qRrw|^ha)bDvNCw&cN0j|fAA}p{`0V?@hIW^p?jS-us39weVl7B6wZOq$jc4dO~W*m6Qe9w>H05XHfJt@na9L2=FH&& znHPhbY1l9Nc*S_T09WCP@ectnq71PlhY+367g0ky$H9an39AUF5>^v7NASjAFgt@I z8Ofdu#N&&Mhq*~#OIXEb+ru!GJz~#-wWRSQ_J?YAmv12AgupbYW$V?suz)@8T>=g4 z0oQVrt9`2wPx;qk=6me%=+o@mi0@=GHreqA^nwT{yC`Y4Wf&Fs6CS2qUkgj|6<5nv zs9{X>m0xB9NbiR6ju>3S-v@FLtJFeP%MJ$yum)D(VA%RmX*e53o=p((PGMt6oJ(( zp=N;NID3#S#Sg{pY@_!_HiruED7)|s{z&u)r=dOCFYIDfYMii_opIvtJ2;`G3ya`= zUy)GDzII1Sg+uH)f0?iVc<*np0&SY`F1t~yMqFdRL3o4R@0%wqqtw;xp1>N^&vV=$ z9A~RshOi2z1&R>QIG+^OQ|fyu^=5d(c1-vZmsNvvhzzmV&gCKaJ#&t|>ueX!vBCcK z2;O#UoZRJa7aT0k{|#cU|GeO3CF-vN6Xr>>=*1K+(IL!pXy6cbxfo&}Y}dh-_yb}r zdB&PP>_IIcdWFxFFpOmH*w#Xlum=0(6Fxe zzVa+a`D=HBSS^_Q=4X^^ne4g?@q%-c_!!1AcnsFqo)MeiChv=4YlJ54S!+Fhc9#nK ztf~IMb5=Y;);Gy|3?_-=rDNcfCQ7wf;3V!0w`~<}-oGhRq*|60T`E+uX4xSjA(!h?tr?3c)4!c&Bw z5`xGJi-gI9sf1;OLkVXQ&L&(*xSjA(!b60I2~QJ#O2{P2%rT;bh@=t@CM=V=c@|+K z;Wom9gr^8W;XcWPWrVW`8wt0WXyZPoY%ot6Pc{J6~N#89532A{z!PWo69AHKtAs&8fvz?{fHkCmfN_`Q+|#wyEslK z|945Q@Nvy=$bW4qXKmF&#T}Yp9v-x;gmy!r%XwujNup zTmDsN9MZ6wc{OcuLzlRXyT>Q7!nQr*+ml$7(OQ>Vpe}?((17or8hp!vx(Mp<^qCDe z61xR$wP;&NY%$7n(67!oT^G}qRA0{$U477V5zI#)fQK*rdCM2At424C9&%>)+T+D- zM;6SL+VU6g6as7K|NJztv6TY4@z2=2`|+P~_SPQqQz$)UI2uy5Z|xs$zUk(Q;p=xi z{n88i@}tIp2ECu9T+*TBiO%%i+7KCd{=)aWa@sFpc*hm<07}Wtp&)a%{nQX8w0V|Y RkcI5xHt&kBS#zH4{{e!t-kksd