From 324d1eb1a11926b1abd4ccb5654ab8e66c281ae9 Mon Sep 17 00:00:00 2001 From: "Zhenfei.Li" Date: Mon, 14 Mar 2022 11:23:19 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-10608=20refactor:=20=E4=B8=8D=E9=A2=9D?= =?UTF-8?q?=E5=A4=96=E6=94=BE=E5=9B=BE=E7=89=87=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .npmignore | 1 + dist/images/1x/icon/auto_normal.png | Bin 1379 -> 0 bytes dist/images/1x/icon/auto_select.png | Bin 1361 -> 0 bytes dist/images/1x/icon/dark/trans_disable.png | Bin 200 -> 0 bytes dist/images/2x/background/trans_disable.png | Bin 200 -> 0 bytes dist/images/2x/icon/dark/trans_disable.png | Bin 200 -> 0 bytes lib/prepublish/prepublish.js | 8 +++++--- 7 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 dist/images/1x/icon/auto_normal.png delete mode 100644 dist/images/1x/icon/auto_select.png delete mode 100644 dist/images/1x/icon/dark/trans_disable.png delete mode 100644 dist/images/2x/background/trans_disable.png delete mode 100644 dist/images/2x/icon/dark/trans_disable.png diff --git a/.npmignore b/.npmignore index f52935001..54bd43012 100644 --- a/.npmignore +++ b/.npmignore @@ -1,4 +1,5 @@ * +!src/less/**/*.less !dist/lib/*.d.ts !dist/lib/**/*.d.ts !dist/font.css diff --git a/dist/images/1x/icon/auto_normal.png b/dist/images/1x/icon/auto_normal.png deleted file mode 100644 index 527212c100a53b3b6e4f8feb1586a1148713320a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1379 zcmV-p1)TbcP)Px)9Z5t%R9FecS50VKRTMtw&7>KjHDF`u4_IgmL0!4A5sgp@idu=%O2K_5W{QiX zO=2R-ppr?3G+Ag;lM3!CM8#$!{(;blKc(1BskX(UVB1CGPtqVsXXYKxckjC|?@eYV zr3kr@++Wv2HjzENcqgLxc9}X~&Fv}`{5D_cc_My@ zL^j2EnQs!wIgja7qRyK+KGc6DhOcs2(|}Cx@co5CF(*WARb*5ItKgZsx@7-EzVGLX z1Oc$B0qM!fI{)IIBP4WKUzPwpGZpp!tnOd>#J?w*t^-~a+UAk$6rm@Twng_O;7VH} zrg5)n^UKeUgk(M&T z)EkD0>9oi72d0i4or_beiRAz&7g_#6U$GlFCjK~;qRczFfg9ztweGL<58k`9L=!@C z(8yu>mASsT+=!R~*6nj&+n2LGg0fSi{ckbr`zx$$_M7C~zh}0*oA0|;0j&-YPIu>C zSLUpSM&F{IXliVYhQo_81~E5ohw>9+18-JS4&hhlzyEfrP`ujFojVkjKV z)sPw;jzIU&0A#yOIO}%2JVLkXm_9Q6h`M(#5GC?6s|X?h<3$an0clbjT>(Bc0HtQK zT@wy5ul8~$m&t$0oz=UKBIe<}>;PGisbz#-k+8Zfkud;G#??8peXWF>o}Nx9{fjGl zB(b#2&#l~7pCA*mfq^dQ#Mu~7yd~P*)b(2DC^ejGt*?H((yBSI1vJVNl$N|uiw8K! zw!K8drd<^1q-5N$Y5kju7%?D{R(v0DuC}afo(0~v^e_pvx9dWO z!(MA;vmc~{*uIwKL$&5pLobvnE-XAR9ag7jtPVabXs>Gt_~YjF{jS3$JUV$| zbl{RE*#+?VWJ6g?MyNw|LbvBWsbF%wy_NtLvDwdj{=Jdc&VyD%XuP1k<5@JbTKrKR z&~0*{7DE)5?i*^*l6wX)jsM9I$DT1j6SF}s{ryA;zl}o@!^Exme+((UYPEQzAP4ld z^@fJ|r_SEtrhtC2DE^#&KN?AVZy= z*M{}qDn!5Ml~<-Gzm-Y$RmMi3B3obX$u&nH zv7_(PQx;%#8Ur+*GXby#-}4wpa4GnOLu#O<_q@&|CHF@Ev=Z7JpL)QSsRIOiAiD)u zjBeP?tplW@N@y}>l8Gde_=WvWP{NCpp92PaBAGO9#g&VtFrSc=kZBtjm#i+! z6dGWrR~;Y$)|VW_Bx6a`O~RM8g=!O{GspA&-#K{sKAG=3tNEn8o=ZAUU37Rm71_~D zWsFBB<QB6W!t+3-+=X#qXVC9;QC!UPCd5PoUo%|PwQPN+6Er*8X0aP zG9#Jlh^$rhx~@a1Gi+VQ^3aI&{9)pZz`kxj&7wx&j2RB2n^uT+yy`zr(N)pdT%DK8 lDZj5u!g7LY_y6nX`G2ogeysT~Jx~Au002ovPDHLkV1l(Jr@#OJ diff --git a/dist/images/1x/icon/auto_select.png b/dist/images/1x/icon/auto_select.png deleted file mode 100644 index 49423cac0919bd14571a9255a836b548e2934920..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1361 zcmV-X1+MyuP)Px)3rR#lR9FecSKVtIRTRHxcA8z~0R+lLBmLDYxZ7qe}evXwG6RK}1D1vVlG-C21S_DH9o3w~gEcFYEg0>H>U)^ms-QAhv`Q1BrcDk9_ zgd*fZa?d^AbM86ko+WjMt1!md#=p0=K-}$2Uzr-9%AKg9)e7w`Ep4m$jXtILAQA6k zR=KDwkt#FOf>Jcm;kc8tLz&A_dJ?>%1No8i1Kdz0RxHL>zev#}xoT+sSnm6FQi%>c z|2D7t_Rq>G5guUX6qJb4hWwk6D4b<-esdIG1>RS*nb^NiI3821dc|2+^AmZpkL|oC zd-RPFY%E&50d?SlZqE5=7DlRZ8668+VxBzoTc7T?WFm40zzuz5{1 zy*|x{rjFiqJ<1DsnFGeSnitx3%|JBXp;Z6OaPAt;t6jY(%Je10hVItd(SxbOwL^$Uv|zdW|#N*rB`Q@&JrMTCzlf#rLr zAMVN)qu1d?1Kt~^_Bcz@(ewyPmPb2)CS&Uy*}hW39r-|)2j#2~MZvB4wW>Ji8G(4nBi`jdooeXHu4I6+>R}CESIp}iIWLBzk z2>YI|!!M!#)o~cjN=eNW@jd`fT3WYmWZ+=^(K-ThMZ1g;pG^|B_`-Xfkx-ehW#@gD zJ3adbM)E@~0G^nH|pjBuREjQ(5V+YNx~6 zfDYJp?2`&1+uPeJU}dtO=;FDTa~HuY%5)S2dJ4^~oqW^=Z0jp%ClI9-PjaV(|4HB^ zgl8;`9LG4os`IzParqZ%$s^j)qE4t3en@hSex1bhiFo>$uNQU zyj29}YF){L!-n6X7gMg=9sP4C)o0~AZkRH)h+q$N_nIS3VAqq2OYTICYi~*|yBH<} z|At|T{tv=WbS;z5zB{$wbhIc(_lfc)3IBsZpBRkN0P8^|n65B40;j(S1EjP_jSwdW zTOXD^qf6W6ZXbbwOa>pu83)alqwG6+PL>}6&MxSLZk%Du4z1b&jg$dW8j6PoAvJ+X zCQKx+-Z)?tMa$3P?7q%*bXak&d(C`;E~8WBU<1Rdl?fdPrq?kLMBp$c8OtOo`?L7% zi$@pchH~dZd`QENJs-tNR2jpf#fHT_{? zoxr|kKh2^}0LBc5(GAlRh6$8wln1?Ca&7@#6^+f-d6Xv(UY3M$OmVpX>*x7@dy;K diff --git a/dist/images/1x/icon/dark/trans_disable.png b/dist/images/1x/icon/dark/trans_disable.png deleted file mode 100644 index c070eb9bbf73cf6d9c7e43efb127d4786fdb1e3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|nmk<`Lo5W7 z_Y^$6R?o)8!0oZVu}?}_Gc9Ic-R+0(?b||m{{Qbbnz%@C$+t^iZ+}xb>*K?-P{GcV zt-<8~@8cV!mPGmoe^u~gOStT_g>i?8a4Lh{Sr%S}C6enIk7OLnWY{=sqm)Be8V|F_ x)t)2<%UKWECajjsW2pMX;wiu_p?UTk!yNZCNh4i%W1wpoJYD@<);T3K0RU^qMF9W+ diff --git a/dist/images/2x/background/trans_disable.png b/dist/images/2x/background/trans_disable.png deleted file mode 100644 index c070eb9bbf73cf6d9c7e43efb127d4786fdb1e3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|nmk<`Lo5W7 z_Y^$6R?o)8!0oZVu}?}_Gc9Ic-R+0(?b||m{{Qbbnz%@C$+t^iZ+}xb>*K?-P{GcV zt-<8~@8cV!mPGmoe^u~gOStT_g>i?8a4Lh{Sr%S}C6enIk7OLnWY{=sqm)Be8V|F_ x)t)2<%UKWECajjsW2pMX;wiu_p?UTk!yNZCNh4i%W1wpoJYD@<);T3K0RU^qMF9W+ diff --git a/dist/images/2x/icon/dark/trans_disable.png b/dist/images/2x/icon/dark/trans_disable.png deleted file mode 100644 index c070eb9bbf73cf6d9c7e43efb127d4786fdb1e3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|nmk<`Lo5W7 z_Y^$6R?o)8!0oZVu}?}_Gc9Ic-R+0(?b||m{{Qbbnz%@C$+t^iZ+}xb>*K?-P{GcV zt-<8~@8cV!mPGmoe^u~gOStT_g>i?8a4Lh{Sr%S}C6enIk7OLnWY{=sqm)Be8V|F_ x)t)2<%UKWECajjsW2pMX;wiu_p?UTk!yNZCNh4i%W1wpoJYD@<);T3K0RU^qMF9W+ diff --git a/lib/prepublish/prepublish.js b/lib/prepublish/prepublish.js index 5cc1d3d84..badead82f 100644 --- a/lib/prepublish/prepublish.js +++ b/lib/prepublish/prepublish.js @@ -57,7 +57,9 @@ function readDirSync(directoryPath) { } function finalizeCompile() { - const componentsLessContent = readDirSync(lessPath); + let componentsLessContent = readDirSync(lessPath); + + componentsLessContent += `@import "./public.less";\n`; writeFileSync( join(lessPath, 'fineui.less'), @@ -65,11 +67,11 @@ function finalizeCompile() { ); } -removeFiles(`${lessPath}/images`); removeFiles(`${lessPath}/font`); +removeFiles(`${lessPath}/public.less`); removeFiles(`${lessPath}/fineui.less`); finalizeCompile(); -copyFiles(`${process.cwd()}/dist/images`, lessPath); copyFiles(`${process.cwd()}/dist/font`, lessPath); +copyFiles(`${process.cwd()}/public/less/var.less`, `${lessPath}/public.less`);