From 6cbc9fa8246b664b777d822d0592a695290d1d35 Mon Sep 17 00:00:00 2001 From: ADNY <66500121+ErKeLost@users.noreply.github.com> Date: Tue, 9 Apr 2024 15:01:11 +0800 Subject: [PATCH 1/6] fix: Inject the correct NODE_ENV when parsing the configuration file (#1147) --- .changeset/lemon-tomatoes-stare.md | 5 +++++ packages/core/src/config/index.ts | 3 ++- packages/core/src/index.ts | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .changeset/lemon-tomatoes-stare.md diff --git a/.changeset/lemon-tomatoes-stare.md b/.changeset/lemon-tomatoes-stare.md new file mode 100644 index 000000000..d4df7ca18 --- /dev/null +++ b/.changeset/lemon-tomatoes-stare.md @@ -0,0 +1,5 @@ +--- +'@farmfe/core': patch +--- + +resolve config file with set NODE_ENV diff --git a/packages/core/src/config/index.ts b/packages/core/src/config/index.ts index 350957583..b71a7f514 100644 --- a/packages/core/src/config/index.ts +++ b/packages/core/src/config/index.ts @@ -623,7 +623,8 @@ async function readConfigFile( progress: false } }, - logger + logger, + inlineOptions.mode as CompilationMode ); const compiler = new Compiler({ diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 7f28f8e18..090eb7930 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -72,6 +72,7 @@ export async function build( ): Promise { const logger = inlineConfig.logger ?? new Logger(); setProcessEnv('production'); + const resolvedUserConfig = await resolveConfig( inlineConfig, logger, From e1071eca72411a1e9272c380eb4863f8725e969d Mon Sep 17 00:00:00 2001 From: brightwu <1521488775@qq.com> Date: Tue, 9 Apr 2024 16:55:33 +0800 Subject: [PATCH 2/6] fix: static assets transform and sass import watch (#1145) * fix: static assets transform and sass import watch * chore: update transformHtml test case --- .changeset/calm-candles-kiss.md | 6 +++ crates/plugin_static_assets/src/lib.rs | 5 -- examples/public-dir/index.html | 24 +++++----- examples/public-dir/package.json | 3 +- examples/sass/src/style/dep.scss | 2 +- examples/static-assets/.eslintrc.json | 5 ++ examples/static-assets/.gitignore | 2 + examples/static-assets/farm.config.ts | 10 ++++ examples/static-assets/index.html | 12 +++++ examples/static-assets/package.json | 16 +++++++ examples/static-assets/src/index.ts | 3 ++ .../static-assets/src/style/dep/font.scss | 14 ++++++ .../static-assets/src/style/dep/iconfont.ttf | Bin 0 -> 3904 bytes .../static-assets/src/style/dep/iconfont.woff | Bin 0 -> 2484 bytes .../src/style/dep/iconfont.woff2 | Bin 0 -> 2016 bytes examples/static-assets/src/style/index.scss | 1 + js-plugins/sass/src/index.ts | 45 +++++++++++------- .../core/src/plugin/js/vite-plugin-adapter.ts | 12 +++-- packages/core/src/plugin/type.ts | 5 +- packages/core/src/server/error.ts | 12 ++++- .../transform-html/index.html | 3 +- .../__snapshots__/transform-html.spec.ts.snap | 9 ++++ .../js-plugin-hooks/transform-html.spec.ts | 36 +++++++++----- pnpm-lock.yaml | 12 +++++ 24 files changed, 182 insertions(+), 55 deletions(-) create mode 100644 .changeset/calm-candles-kiss.md create mode 100644 examples/static-assets/.eslintrc.json create mode 100644 examples/static-assets/.gitignore create mode 100644 examples/static-assets/farm.config.ts create mode 100644 examples/static-assets/index.html create mode 100644 examples/static-assets/package.json create mode 100644 examples/static-assets/src/index.ts create mode 100644 examples/static-assets/src/style/dep/font.scss create mode 100644 examples/static-assets/src/style/dep/iconfont.ttf create mode 100644 examples/static-assets/src/style/dep/iconfont.woff create mode 100644 examples/static-assets/src/style/dep/iconfont.woff2 create mode 100644 examples/static-assets/src/style/index.scss create mode 100644 packages/core/tests/js-plugin-hooks/__snapshots__/transform-html.spec.ts.snap diff --git a/.changeset/calm-candles-kiss.md b/.changeset/calm-candles-kiss.md new file mode 100644 index 000000000..a27694c9c --- /dev/null +++ b/.changeset/calm-candles-kiss.md @@ -0,0 +1,6 @@ +--- +'@farmfe/js-plugin-sass': patch +'@farmfe/core': patch +--- + +fix sass files watch and static assets transform diff --git a/crates/plugin_static_assets/src/lib.rs b/crates/plugin_static_assets/src/lib.rs index 86752b2f3..b69c27469 100644 --- a/crates/plugin_static_assets/src/lib.rs +++ b/crates/plugin_static_assets/src/lib.rs @@ -124,11 +124,6 @@ impl Plugin for FarmPluginStaticAssets { ) -> farmfe_core::error::Result> { let path = Path::new(param.resolved_path); let extension = path.extension().and_then(|s| s.to_str()); - let is_query_valid = param.query.is_empty() || is_asset_query(¶m.query); - // ignore invalid query - if !is_query_valid { - return Ok(None); - } if let Some(source) = param.resolved_path.strip_prefix(PUBLIC_ASSET_PREFIX) { return Ok(Some(farmfe_core::plugin::PluginLoadHookResult { diff --git a/examples/public-dir/index.html b/examples/public-dir/index.html index eecf0f05c..8c3282c86 100644 --- a/examples/public-dir/index.html +++ b/examples/public-dir/index.html @@ -1,17 +1,15 @@ - - - - - Document - - -
+ + + + + Document + + +
- - - - - + + + diff --git a/examples/public-dir/package.json b/examples/public-dir/package.json index 78a61c063..9f80d9ccf 100644 --- a/examples/public-dir/package.json +++ b/examples/public-dir/package.json @@ -1,6 +1,7 @@ { - "name": "public-dir", + "name": "@farmfe-examples/public-dir", "version": "1.0.0", + "private": true, "dependencies": { "clsx": "^1.2.1", "react": "18", diff --git a/examples/sass/src/style/dep.scss b/examples/sass/src/style/dep.scss index 8124e756e..7692b260f 100644 --- a/examples/sass/src/style/dep.scss +++ b/examples/sass/src/style/dep.scss @@ -5,4 +5,4 @@ color: red; width: 200px; height: 50px; -} \ No newline at end of file +} diff --git a/examples/static-assets/.eslintrc.json b/examples/static-assets/.eslintrc.json new file mode 100644 index 000000000..ae8f61347 --- /dev/null +++ b/examples/static-assets/.eslintrc.json @@ -0,0 +1,5 @@ +{ + "root": true, + "extends": "../../.eslintrc.base.json", + "rules": {} +} diff --git a/examples/static-assets/.gitignore b/examples/static-assets/.gitignore new file mode 100644 index 000000000..2cf1da454 --- /dev/null +++ b/examples/static-assets/.gitignore @@ -0,0 +1,2 @@ +dist +build \ No newline at end of file diff --git a/examples/static-assets/farm.config.ts b/examples/static-assets/farm.config.ts new file mode 100644 index 000000000..302ceb96f --- /dev/null +++ b/examples/static-assets/farm.config.ts @@ -0,0 +1,10 @@ +import { defineConfig } from '@farmfe/core'; +import sass from '@farmfe/js-plugin-sass'; + +export default defineConfig({ + plugins: [ + sass({ + legacy: true + }) + ] +}) \ No newline at end of file diff --git a/examples/static-assets/index.html b/examples/static-assets/index.html new file mode 100644 index 000000000..7927299ae --- /dev/null +++ b/examples/static-assets/index.html @@ -0,0 +1,12 @@ + + + + + + + Document + + + + + diff --git a/examples/static-assets/package.json b/examples/static-assets/package.json new file mode 100644 index 000000000..2ce33fa91 --- /dev/null +++ b/examples/static-assets/package.json @@ -0,0 +1,16 @@ +{ + "name": "@farmfe-examples/static-assets", + "version": "0.0.1", + "private": true, + "type": "module", + "devDependencies": { + "@farmfe/cli": "workspace:*", + "@farmfe/core": "workspace:*", + "@farmfe/js-plugin-sass": "workspace:*" + }, + "scripts": { + "start": "farm start", + "build": "farm build", + "preview": "farm preview" + } +} diff --git a/examples/static-assets/src/index.ts b/examples/static-assets/src/index.ts new file mode 100644 index 000000000..2ee4a4ef1 --- /dev/null +++ b/examples/static-assets/src/index.ts @@ -0,0 +1,3 @@ +import './style/index.scss'; + +document.body.innerHTML = '
Hello World
'; diff --git a/examples/static-assets/src/style/dep/font.scss b/examples/static-assets/src/style/dep/font.scss new file mode 100644 index 000000000..0c7669d9f --- /dev/null +++ b/examples/static-assets/src/style/dep/font.scss @@ -0,0 +1,14 @@ +@font-face { + font-family: 'iconfont'; /* Project id 2208059 */ + src: url('iconfont.woff2?t=1671895108120') format('woff2'), + url('iconfont.woff?t=1671895108120') format('woff'), + url('iconfont.ttf?t=1671895108120') format('truetype'); +} + +body { + font-family: 'iconfont'; +} + +body:before { + content: '\e620'; +} diff --git a/examples/static-assets/src/style/dep/iconfont.ttf b/examples/static-assets/src/style/dep/iconfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..82efcf8f7a34c697125264a48d96d149237662a8 GIT binary patch literal 3904 zcmd^CU2Ggz6~5=*`Q7>1UGMIUw~lw$yY)I7N4xf}cQ?(?Hi;cOKSh)@^;4_Van?>6 z+iN-7&>ut-C=w|BiJ%fitprlwfwxNKrwEWx1p-x}FAd2HDmoFt7n8hwK!Nz7DdiY@O^6=A)(Joj|eEy+Ib?@jA7y9$i zADdsETYck41DBxx1J7%VOHVEQ^+5Lp#>Dp-GyZ<2J$E|)<{zE|_Rn}4XJF9Z6JLY; z3q1FpS?)d=g8<(TFvONR^K1Fu80zI-k_v9)K@&e}jq32fSmfNwbdtYbFevL7{ zxY{}2ee5p>k1!ThFu#W(cX4s^B6~!tjA4|kx${y2i^O&6M@~lf-ey*a{nNGI{aOOU z_vW(-n4lVrODitPq;Q`_15H{ZxEb3F^l(1H##oE-sp$t!Fn4LLyTa~~Nd#Bme}_y< zXBX$dA9@mS5=pQS(|T3~>0V(f*7^;84YrrUH~o!O37(v(0@lyC9$Ywdn*Hil>Q*bL z2NQo}mjIJFd~$Ia@XiM+VxjYl?F^^rOwZ>OtkQcY-dHv43Tr?&!U`c$?pA9PwfIEB zY`7kYk*r)YkX+mU`(+0OnCO)O^}dw~A6ffbx$u#{dAC~O6Lx_(y{vo*UY7I}-{b2n ziH_9SarP)%W?l9iyUeb#pQFlNQX46xl3KpFj|y6GqOpgnzBfqHQr8MvnI>A~H~fi4 z)z=#n#k`jEs>7b|C3Tky`Qk{*1F~5!HmaVUYEiA~OOy^+qbVe7K1)UHv9-^f^r-Le=+CE}KD`#rjAgQAig-4z9sTjFMNYyYa{63~Wct!ZG+T~FGnMEg5yy#q z)60-+e&>=9&uml^`jhWW0@rm*u|^V*P?l zi+(Re*87SGHa&*TXT`U0O6A!h^q)~u*S79d(nl|=%|^3PpBO1_-Tr@u(1ditEeU)t zwqF0mgp=70=E+x~Y?NifNr>C};(#cY~UP%tc6K^N}&1`bxdVm~F7=b@877rde zUb|0RERUC}gZmB*w{{(znmszRV{~-K%+cAY$!2SKdhcMhG`G=X~92T`|IMqxgGlZfQ?xHH@qi~YM>i-<4h&cX#9VbzfDa!LIuc2&GYw@~V zEG#Zh$tuvh`TGye9QBiZG1rb5x~g*`Ju_f?1vBC&OM|<|?&ZohO?~{rwoFuipcK`0 zLAGfdgfp6iqT|iE6%mA6jTnM!pb*4OLl^*&DujYjRV+W=A04o`bkj5=0O_hBbZ%Q* z7lsWYN5!n6Dv79~*rjSZ?#C2MLjc{;xKKG4pyE1LI8^ZHq?*yblpVMFla6D6!PHb! zK|o}OQL_sNWWbo$Y-BS?4EN|g_gHyF=!r<}@Ch@f7-lk&h+={d7xaXweq3scsB5}$ zClnkUimYuqj)?(FZ+l)K3<c!|4HMaG)Q(jia}&s*t5Bim@X%B1C^o86I>8ud9}5Wpq^-b5s5CC~D_e zLG4fuSwsc33v?-K=vxE^T?<;w$&FdQp&Lq6lOTk}!7WHdYYFWlvMfW5#LRTDPjJIT z+ay(w5@@i?Fph|2QvJ5BXlMn;?++&|gEX`oOm1@D!@wrhNIYVrZ^*P?V9y+`L2|o|s&}~K2 z&YjaV#nx}gZo=)Hg`Yrq`|yj_4gD_49@4(;7}rC}>mFLXKxjFE`wKU9Tc`o4YUwwF zTyBP>fwFN8@E{dW(F}xFG@qc^}a|MOF$35XysRPq9=2vvw@y0V9)nt z1@exbtl|r*+LJZd_x0om8^zz!kkbO=s{HCzOvEX&ul8hOG4{ir%$du6){_P7zwOBi zu;$F@u}?UnZ07R~t!i`8y-A-AyBSonlX6Jj>=;hpn)MVC;TMKMwRFdx9;&bL~^J zcYDtQy~fT1CpmL$oR#r!)7_{UpjHCp-PxRH7Z9zA9J|OUhi45;%aEpf`L&VB6672j zDCZsr&pgm&b|&yzWxH7g_ttv0@a15g%km$q@RI-Eeb%L5n+lwyDpR_1r_L)&oyCq= JX@3#ee*y;q>;3=$ literal 0 HcmV?d00001 diff --git a/examples/static-assets/src/style/dep/iconfont.woff b/examples/static-assets/src/style/dep/iconfont.woff new file mode 100644 index 0000000000000000000000000000000000000000..0fdaa0a4174505d3116137ed761c9534b21b05f4 GIT binary patch literal 2484 zcmY*bc{tQtAOFo*W-!^hN|Kpt3E2r{yM)kU*UdT`W`r>^F|v&!W67NfSsU59SsR2z zOhj4YlI-SMO4cY#k~jC~eV_Zs`+c6z`JT_`e80~*=XuWad`_6%`SSn-07Kv@AasyL zO#jCZ=Kmj7PA=yF00IY9LlDlWWQCh{P8!;vW&!d8V2o63gzE>{Tx+r&IV+)YybXt5haUXyrZML=! zh7aObrHp{F5>0CHq@BMx98P3HftXS+y^t;d_0&%)UyB&tri^wLu~EQ zUAp3!RI$-bblgkb(zQ=^4F4vIEWoxp$-+3f; zBF;AsD#fz>%yj*2lqEW?n~J*5xI;onG7{m(h$LG+%&R5oyS``Lx_ye0-Z98~*P@a( zT%S8XCnz_|MgC}cC^Nad6C2gBdu8W_okFEV$^BfLo+pV8k|J}VNa@9yy2*-q&-G;! z8d`{x=&z;{@U2}_CeF^FWvy8S4`2Dit7NmJ-B=O6qTy}GZvB})AR-czwp!n;I*}rd zPKKTBNcQ+MW#IPTAGI#b1bS`El=Xc)#lJq>xFK-riqMfeiU~qM_xAUXMBU{NW3bq3 ztbo#Zj)K8@|LztY*@CPLEu+&6nimZ<#?7RSS9kuS*6k%2;9Q`VUvvAXFqW+8ck!!j z_AfrwMtR+O-(v@FAEmghA1(>}E>+_5wKBG=@j^V@mfEAV zVErbYp;mKDh1!|TihGA#3x5DetM?^DO~0+eD{DLR+Zn5G=U!YH^1sYK;8+)3`BS8J zV8%=N$xx-ZS&5WPdG|(OsOTD%%u2E}KZF5acb8SR)NKw{}dgRsKh;l2j zYN_AYQ`r*7kADj5C%(#_+BhC!k&*^Ozs;C^>{+PSzZ#H#2D^>!l#2H$P-kk~RbbCZ zR=hk+7URH zb>y{Dj+-g|%aL`5F)8B2oZYr_*7r9zLE&`)1sLNHX3`%2%Y4PJ#7q~phfb`MDvS@x zwmlGs-DB5?NT|J*vM-HE`K3+h?&p(%jIq7Mg7W9>@3mh@iuel*E4so?oy zOovul8=p#BD#N81@SCk=_XV2XV@icyEGqU#F+%uv$^2}%Wj52KTW6tIU_^XgXSH4M zaiXN3jl8n(o@>h2@6H2s9H+1(%)!ToZtJGAAC`xhd%Q3Gr^#T|ZcGMQHFwz8yYOi8 zecEY?#Ps>E)5CpLN!KzsA*xtGC~B6^?ooYFA$K;aJpyjn{g!|}Bb6{a z%?V{jn{_*0E%ZhE)h@a35H|EzP?+U01ECA~+~>qETVD1X!mW#*@)F3q+%JYhK*O9uT-@I-xsN{R=idgZ?k_l5P0&-`WSeYMGPMEiBi z*_#pTH66USlFC)F)r{qE#KkRj&FVVZDwOQmLpc?yQtp5ovj|cve&FOdg(_^{c`B}- z!@@|ro00cLIX=MaP&p^jO5@nkHpMkxR+;yLh1zv& z<24(*;=U*z@|X1culIny1>oi*o%*TKxla(2st6Q$zc*11z8hmK#1q29=y}QE73Tw# zY=mU~tv~P}(e^d~3O;X$1RDUX1fhYTk6|$wj9D81umLg98Nq-+A?du4z`uPMtT-MZBN;hzs- zwewc>BW@bjLuW6iG7f)$FA_tNtiwmmc`Td9$AY*m*(bVy&+LSRuT7uS$J!NY@2NcF z6p=G_)7W;=N2&@ES>y-1S0n1zEhYL(@_y0h81bp5v`i$&u?>CLbsWGcYk&V zwg(?6-51o?{8AO4OAMdkES0_s(VZxDAr8JN{!C5X!X36-Ej1d@LuWhRxZURr)1$lk?ccClsDD$6ydJL(rSy5oJs)ffH@KXthF*5KK~W*~3X9qhQpA1oy4pN5fivqhr-VkY97!yvS zIIyecWI*&8`V)ZyPj>fwXIQ2sN}~}XjY>%jkLTNaNf8YB{ZaQ1-4|I*Kyv3~b1<=gpf5dDC!l>m zF3iW@eEYfj|1b|t56Ogr$9yvTCX>U&;vS*UOyWX9R6~SNdF%8}EI^*-9zQLXMVN%= zl1X3VDh_;!K%;g0+WY6X53q47QUhDM#LU3y8@IU?Fx(nSLPDsQYta*ncvnMuNS}B! zem?%&42+~E6Sq1zKhyAa=35pjf&AsZya}{(LJcyOTjq+()KvfE??(DNCiz9FPwJg`#HygM1P~NSgOE@(Q71{+rGmgG9U%5y zIwl^!9CtoR)MduGRXipg5su1Z_uDrM{H6hZNfoKmsJ|*y*V+^mER;BJs&ls zM6%Nk+E=3qHwi_JAV!5To@`)nb{ zsA+^mD=C|3T7;Z+F`1xgi6nKJPzY9HSdC$1Hk~4!SVm=8ZCwOl1OEeF{+E)-*){1hrT95R!!&qv>0wyEq9ZGIdIX#3`YoyyZM8 z)>U=RLljdj(at>2v`5vE@3E{_I1C+3Iw5>-c9xXQs+;7Oi18?4KTI#^QT4Uft{!hQ zgyLJoJCX0=w~E#owzu)U*!ha_#5Tf+yoybV77ooUoVjHd^&D>4#%D_(X9Y6@*`KE4 z+VFGd3oo48!bg022*Hg=1OGhnkazI5ZSUFa){P%$eUkn`%7Z`nXsApW#1h;`Y+&C- zM-m*gDNU?HW6-53ONe*zC3tl@4tl?1hnt(7P21Ukl_=?DG#m9b_GSNLpP~l=`)MIP6N9DS*(^#>U_Ss2F=#MHiXvnDFaw$N;8#uQx;|TKh(mm zxca!ds+8K4E>l|J3h?@tf&YC{%hwNR>NBmF`^|rH-SVkT(`gh;3G6-XNm{Fo$$tKo zjlYyWUK-^$52>D9HvjQ+fsZD(j7qHeeAJ9MGj;{?;I*e@#zFFYIZ6rA`+mbWXs)acuD7-~ik2LzSW7%GeEiKzd3 z#!N#1=ve&;*K!Ue`Mlfr7eQOZvz98MAkPHN2n`D$7=Ajn(rKe0{P|&W=a+Afp&$jQ zz1w!|8Tg;6FnWSxYxegI89g@f_pFs-Ze0AQNYd|h#E*+zTlrID(`sp4Fz(ZUgoUto z!Ap3^y@`){>Hl8{H*mj#j7z{P_;{D!H6HhYD~|D~Ii0)PE@a?bI)=Xkjp~k&RrUw- zDyGDHlf0l`wuW#YWfTUlcZz*TpD2a!cd09l4;$A=$@7 zpb`=30hgt|^dyWWQSjMb5;(k_J6x&i3|qIpekZSzssfTV++Gt86H`gN-A3fJG&3#D zMB2gdN)2OiSGalQW#!QGeo9UbhU=|SDqPviP!T)(9DtJq$BB%eFb^hI)^61ClyJAgedYmXJkIqsbId!;N zUH7+LP(z`JL*k2Fr)1CsuJL?*JE|&17q}pm=2=Q^d$D#Nb;w+C4JQI3BrUUsr1z{j zg*A-to>eE^uoNoo^vrwP|L^ yMK>0RIu*}lIU1d93(1#3g?ar_ee*7YMnW&~cDquE8s$#N*sa)dr=eE>0000mD!%Oi literal 0 HcmV?d00001 diff --git a/examples/static-assets/src/style/index.scss b/examples/static-assets/src/style/index.scss new file mode 100644 index 000000000..1de5b5ca5 --- /dev/null +++ b/examples/static-assets/src/style/index.scss @@ -0,0 +1 @@ +@import './dep/font.scss'; diff --git a/js-plugins/sass/src/index.ts b/js-plugins/sass/src/index.ts index b4b6c9494..2e624b345 100644 --- a/js-plugins/sass/src/index.ts +++ b/js-plugins/sass/src/index.ts @@ -215,7 +215,9 @@ async function resolveDependency( ctx ); if (result) return result; - } catch (_error) {} + } catch (_error) { + /* do nothing */ + } } if (default_import_error) { @@ -259,7 +261,7 @@ async function compileScss(param: CompileCssParams) { root } = param; - const { css, sourceMap } = (await sassImpl.compileStringAsync( + const { css, sourceMap, loadedUrls } = (await sassImpl.compileStringAsync( `${additionContext}\n${transformParam.content}`, { ...(options?.sassOptions ?? {}), @@ -267,16 +269,21 @@ async function compileScss(param: CompileCssParams) { url: pathToFileURL(transformParam.resolvedPath), importers: [ { - canonicalize(url, _) { + async canonicalize(url, _) { // file:///xxxx // /xxx // ./xxx - return pathToFileURL(normalizePath(url, root)); + const normalizedPath = normalizePath(url, root); + const normalizedUrl = path.relative(root, normalizedPath); + const filePath = await resolveDependency( + normalizedUrl, + transformParam, + ctx + ); + return pathToFileURL(filePath); }, async load(canonicalUrl) { - const file = fileURLToPath(canonicalUrl); - const url = path.relative(root, file); - const filePath = await resolveDependency(url, transformParam, ctx); + const filePath = fileURLToPath(canonicalUrl); const { contents } = await rebaseUrls( filePath, transformParam.resolvedPath, @@ -302,6 +309,14 @@ async function compileScss(param: CompileCssParams) { } as StringOptions<'async'> )) as CompileResult; + for (const fileUrl of loadedUrls) { + const file = fileURLToPath(fileUrl); + + if (file === transformParam.resolvedPath) continue; + + ctx.addWatchFile(transformParam.resolvedPath, file); + } + return { css, sourceMap }; } @@ -323,15 +338,8 @@ async function compileScssLegacy(param: CompileCssParams) { sourceMap: options.sassOptions?.sourceMap ?? sourceMapEnabled, outFile: transformParam.resolvedPath, importer: [ - function (url, importer, done) { - resolveDependency( - url, - { - ...transformParam, - moduleId: importer - }, - ctx - ).then((resolvedPath) => { + function (url, _, done) { + resolveDependency(url, transformParam, ctx).then((resolvedPath) => { rebaseUrls( resolvedPath, transformParam.resolvedPath, @@ -359,6 +367,11 @@ async function compileScssLegacy(param: CompileCssParams) { return; } + result.stats.includedFiles.forEach((file) => { + if (file === transformParam.resolvedPath) return; + ctx.addWatchFile(transformParam.resolvedPath, file); + }); + resolve({ css: result.css.toString(), sourceMap: result.map }); } ); diff --git a/packages/core/src/plugin/js/vite-plugin-adapter.ts b/packages/core/src/plugin/js/vite-plugin-adapter.ts index 455b28924..a5d77f652 100644 --- a/packages/core/src/plugin/js/vite-plugin-adapter.ts +++ b/packages/core/src/plugin/js/vite-plugin-adapter.ts @@ -521,6 +521,11 @@ export class VitePluginAdapter implements JsPlugin { } private viteTransformToFarmTransform(): JsPlugin['transform'] { + // default module type and asset can be transformed by vite transform hook + const moduleTypesCouldTransform = [ + VITE_PLUGIN_DEFAULT_MODULE_TYPE, + 'asset' + ]; return { filters: { resolvedPaths: this.filters @@ -559,10 +564,9 @@ export class VitePluginAdapter implements JsPlugin { typeof result.map === 'object' && result.map !== null ? JSON.stringify(result.map) : undefined, - moduleType: - params.moduleType === VITE_PLUGIN_DEFAULT_MODULE_TYPE - ? formatTransformModuleType(id) - : params.moduleType + moduleType: moduleTypesCouldTransform.includes(params.moduleType) + ? formatTransformModuleType(id) + : params.moduleType // TODO support meta and sideEffects }; } diff --git a/packages/core/src/plugin/type.ts b/packages/core/src/plugin/type.ts index a3a2eb35f..92fb5a860 100644 --- a/packages/core/src/plugin/type.ts +++ b/packages/core/src/plugin/type.ts @@ -208,8 +208,9 @@ export interface JsPlugin { }; transformHtml?: { - order: 0 | 1 | 2; - executor: Callback<{ htmlResource: Resource }, string>; + /** 0: pre, 1: normal, 2: post */ + order?: 0 | 1 | 2; + executor: Callback<{ htmlResource: Resource }, Resource>; }; writeResources?: { diff --git a/packages/core/src/server/error.ts b/packages/core/src/server/error.ts index 74c7eb52c..1e96b829e 100644 --- a/packages/core/src/server/error.ts +++ b/packages/core/src/server/error.ts @@ -42,7 +42,17 @@ export function buildErrorMessage( } export function logError(err: Error) { - const errorMessages = JSON.parse(err.message); + let errorMessages: string[] = []; + try { + errorMessages = JSON.parse(err.message); + } catch (_) { + throw new Error(err.message); + } + + if (!Array.isArray(errorMessages) || errorMessages.length === 0) { + throw new Error(err.message); + } + const formattedErrorMessages = errorMessages.map((errorMsg: any) => { try { const parsedErrorMsg = JSON.parse(errorMsg); diff --git a/packages/core/tests/fixtures/js-plugins-hooks/transform-html/index.html b/packages/core/tests/fixtures/js-plugins-hooks/transform-html/index.html index 9eca1d1fe..c8e1fab80 100644 --- a/packages/core/tests/fixtures/js-plugins-hooks/transform-html/index.html +++ b/packages/core/tests/fixtures/js-plugins-hooks/transform-html/index.html @@ -3,9 +3,10 @@ + {head} {style} Document -
+
{ssr}
diff --git a/packages/core/tests/js-plugin-hooks/__snapshots__/transform-html.spec.ts.snap b/packages/core/tests/js-plugin-hooks/__snapshots__/transform-html.spec.ts.snap new file mode 100644 index 000000000..819bb522b --- /dev/null +++ b/packages/core/tests/js-plugin-hooks/__snapshots__/transform-html.spec.ts.snap @@ -0,0 +1,9 @@ +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`Js Plugin Execution - transformHtml 1`] = ` +"{head}{style}Document
{ssr}
" +`; diff --git a/packages/core/tests/js-plugin-hooks/transform-html.spec.ts b/packages/core/tests/js-plugin-hooks/transform-html.spec.ts index 3ac2e4a1a..be38aa8dd 100644 --- a/packages/core/tests/js-plugin-hooks/transform-html.spec.ts +++ b/packages/core/tests/js-plugin-hooks/transform-html.spec.ts @@ -8,20 +8,36 @@ test('Js Plugin Execution - transformHtml', async () => { '', [ { - name: 'test-transform-html', + name: 'test-transform-html-pre', transformHtml: { + order: 0, // 0 means call this hook before parse and generate resources executor: async ({ htmlResource }) => { - calledHooks.push('transformHtml'); - const html = Buffer.from(htmlResource.bytes).toString(); - expect(html).toContain('
'); + const code = Buffer.from(htmlResource.bytes as any).toString(); + calledHooks.push('transformHtmlPre'); + const replacedCode = code + .replace('{head}', '') + .replace('{style}', '') + .replace('{ssr}', ''); return { ...htmlResource, - bytes: [ - ...Buffer.from(html.replace('app-container', 'app-container2')) - ] + bytes: [...Buffer.from(replacedCode)] }; } } + }, + { + name: 'test-transform-html-post', + transformHtml: { + order: 2, // 2 means call this hook after parse and generate resources + executor: async ({ htmlResource }) => { + calledHooks.push('transformHtmlPost'); + const replacedCode = Buffer.from(htmlResource.bytes as any) + .toString() + .replace(//g, '{$1}'); + htmlResource.bytes = [...Buffer.from(replacedCode)]; + return htmlResource; + } + } } ], hookName, @@ -35,11 +51,9 @@ test('Js Plugin Execution - transformHtml', async () => { await compiler.compile(); - expect(calledHooks).toEqual(['transformHtml']); + expect(calledHooks).toEqual(['transformHtmlPre', 'transformHtmlPost']); const resourcesMap = compiler.resources(); const html = resourcesMap['index.html']; - expect(Buffer.from(html).toString()).toContain( - '
' - ); + expect(Buffer.from(html).toString()).matchSnapshot(); }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6cedd0a97..fcc7c22e1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -998,6 +998,18 @@ importers: specifier: ^2.7.0 version: 2.7.2(solid-js@1.8.5)(vite@4.5.0) + examples/static-assets: + devDependencies: + '@farmfe/cli': + specifier: workspace:* + version: link:../../packages/cli + '@farmfe/core': + specifier: workspace:* + version: link:../../packages/core + '@farmfe/js-plugin-sass': + specifier: workspace:* + version: link:../../js-plugins/sass + examples/tailwind: dependencies: clsx: From b7ab6ed623e277dd403a9823b0e7e7c7d5010c96 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 17:25:07 +0800 Subject: [PATCH 3/6] Version Packages (#1146) Co-authored-by: github-actions[bot] --- .changeset/calm-candles-kiss.md | 6 ------ .changeset/lemon-tomatoes-stare.md | 5 ----- .changeset/polite-nails-remember.md | 5 ----- js-plugins/sass/CHANGELOG.md | 10 ++++++++++ js-plugins/sass/package.json | 6 +++--- js-plugins/solid/package.json | 2 +- js-plugins/vue/package.json | 2 +- packages/core/CHANGELOG.md | 8 ++++++++ packages/core/package.json | 2 +- 9 files changed, 24 insertions(+), 22 deletions(-) delete mode 100644 .changeset/calm-candles-kiss.md delete mode 100644 .changeset/lemon-tomatoes-stare.md delete mode 100644 .changeset/polite-nails-remember.md diff --git a/.changeset/calm-candles-kiss.md b/.changeset/calm-candles-kiss.md deleted file mode 100644 index a27694c9c..000000000 --- a/.changeset/calm-candles-kiss.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@farmfe/js-plugin-sass': patch -'@farmfe/core': patch ---- - -fix sass files watch and static assets transform diff --git a/.changeset/lemon-tomatoes-stare.md b/.changeset/lemon-tomatoes-stare.md deleted file mode 100644 index d4df7ca18..000000000 --- a/.changeset/lemon-tomatoes-stare.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@farmfe/core': patch ---- - -resolve config file with set NODE_ENV diff --git a/.changeset/polite-nails-remember.md b/.changeset/polite-nails-remember.md deleted file mode 100644 index 3b058ee68..000000000 --- a/.changeset/polite-nails-remember.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@farmfe/core': patch ---- - -Add parsing in alias to node_modules diff --git a/js-plugins/sass/CHANGELOG.md b/js-plugins/sass/CHANGELOG.md index 4ac3ee747..2b60a2279 100644 --- a/js-plugins/sass/CHANGELOG.md +++ b/js-plugins/sass/CHANGELOG.md @@ -1,5 +1,15 @@ # @farmfe/js-plugin-sass +## 2.5.4 + +### Patch Changes + +- e1071eca: fix sass files watch and static assets transform +- Updated dependencies [e1071eca] +- Updated dependencies [6cbc9fa8] +- Updated dependencies [2ada5819] + - @farmfe/core@1.0.16 + ## 2.5.3 ### Patch Changes diff --git a/js-plugins/sass/package.json b/js-plugins/sass/package.json index ae9fbd53d..6a2931048 100644 --- a/js-plugins/sass/package.json +++ b/js-plugins/sass/package.json @@ -1,6 +1,6 @@ { "name": "@farmfe/js-plugin-sass", - "version": "2.5.3", + "version": "2.5.4", "description": "support scss compile for farm.", "main": "./build/cjs/index.cjs", "types": "./build/cjs/index.d.ts", @@ -46,13 +46,13 @@ "license": "MIT", "devDependencies": { "@farmfe/cli": "workspace:*", - "@farmfe/core": "workspace:^1.0.11", + "@farmfe/core": "workspace:^1.0.16", "@farmfe/js-plugin-dts": "workspace:*", "sass": "^1.62.1", "sass-embedded": "^1.62.0" }, "peerDependencies": { - "@farmfe/core": "workspace:^1.0.11", + "@farmfe/core": "workspace:^1.0.16", "sass": "^1.3.0", "sass-embedded": "*" } diff --git a/js-plugins/solid/package.json b/js-plugins/solid/package.json index 637c9aa0e..99845d91e 100644 --- a/js-plugins/solid/package.json +++ b/js-plugins/solid/package.json @@ -41,7 +41,7 @@ "solid-js": "^1.7.8" }, "peerDependencies": { - "@farmfe/core": "workspace:^1.0.15" + "@farmfe/core": "workspace:^1.0.16" }, "files": [ "build" diff --git a/js-plugins/vue/package.json b/js-plugins/vue/package.json index 06284d7ce..aacfb7db9 100644 --- a/js-plugins/vue/package.json +++ b/js-plugins/vue/package.json @@ -52,7 +52,7 @@ "source-map": "^0.7.4" }, "peerDependencies": { - "@farmfe/core": "workspace:^1.0.15", + "@farmfe/core": "workspace:^1.0.16", "less": "*", "sass": "*", "stylus": "*" diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index f5c814c5d..9f956c07d 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,5 +1,13 @@ # @farmfe/core +## 1.0.16 + +### Patch Changes + +- e1071eca: fix sass files watch and static assets transform +- 6cbc9fa8: resolve config file with set NODE_ENV +- 2ada5819: Add parsing in alias to node_modules + ## 1.0.15 ### Patch Changes diff --git a/packages/core/package.json b/packages/core/package.json index cf3eb7f60..358537b3e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@farmfe/core", - "version": "1.0.15", + "version": "1.0.16", "main": "dist/index.js", "types": "dist/index.d.ts", "type": "module", From 411cc588ed7fb798629c57cddff73675cb21fdab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 19:13:29 +0800 Subject: [PATCH 4/6] chore: release (#1148) Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- crates/compiler/CHANGELOG.md | 5 +++++ crates/compiler/Cargo.toml | 4 ++-- crates/plugin_static_assets/CHANGELOG.md | 5 +++++ crates/plugin_static_assets/Cargo.toml | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f7101558..653e4de10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1318,7 +1318,7 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "farmfe_compiler" -version = "0.0.4" +version = "0.0.5" dependencies = [ "farmfe_core", "farmfe_plugin_css", @@ -1566,7 +1566,7 @@ dependencies = [ [[package]] name = "farmfe_plugin_static_assets" -version = "0.0.4" +version = "0.0.5" dependencies = [ "base64 0.21.0", "farmfe_core", diff --git a/crates/compiler/CHANGELOG.md b/crates/compiler/CHANGELOG.md index 6aecfe385..c4adea6e6 100644 --- a/crates/compiler/CHANGELOG.md +++ b/crates/compiler/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.0.5](https://github.com/farm-fe/farm/compare/farmfe_compiler-v0.0.4...farmfe_compiler-v0.0.5) - 2024-04-09 + +### Other +- updated the following local packages: farmfe_plugin_static_assets + ## [0.0.4](https://github.com/farm-fe/farm/compare/farmfe_compiler-v0.0.3...farmfe_compiler-v0.0.4) - 2024-04-08 ### Added diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml index d0da415d6..206acba20 100644 --- a/crates/compiler/Cargo.toml +++ b/crates/compiler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "farmfe_compiler" -version = "0.0.4" +version = "0.0.5" edition = "2021" authors = ["brightwu(吴明亮) <1521488775@qq.com>"] license = "MIT" @@ -19,7 +19,7 @@ farmfe_plugin_html = { path = "../plugin_html", version = "0.0.4" } farmfe_plugin_tree_shake = { path = "../plugin_tree_shake", version = "0.0.4" } farmfe_plugin_css = { path = "../plugin_css", version = "0.0.5" } farmfe_plugin_lazy_compilation = { path = "../plugin_lazy_compilation", version = "0.0.4" } -farmfe_plugin_static_assets = { path = "../plugin_static_assets", version = "0.0.4" } +farmfe_plugin_static_assets = { path = "../plugin_static_assets", version = "0.0.5" } farmfe_plugin_minify = { path = "../plugin_minify", version = "0.0.4" } farmfe_toolkit = { path = "../toolkit", version = "0.0.6" } farmfe_utils = { path = "../utils", version = "0.1.4" } diff --git a/crates/plugin_static_assets/CHANGELOG.md b/crates/plugin_static_assets/CHANGELOG.md index 2f6d33c39..69ef8594e 100644 --- a/crates/plugin_static_assets/CHANGELOG.md +++ b/crates/plugin_static_assets/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.0.5](https://github.com/farm-fe/farm/compare/farmfe_plugin_static_assets-v0.0.4...farmfe_plugin_static_assets-v0.0.5) - 2024-04-09 + +### Fixed +- static assets transform and sass import watch ([#1145](https://github.com/farm-fe/farm/pull/1145)) + ## [0.0.4](https://github.com/farm-fe/farm/compare/farmfe_plugin_static_assets-v0.0.3...farmfe_plugin_static_assets-v0.0.4) - 2024-04-08 ### Other diff --git a/crates/plugin_static_assets/Cargo.toml b/crates/plugin_static_assets/Cargo.toml index c57c01fed..8f84575b0 100644 --- a/crates/plugin_static_assets/Cargo.toml +++ b/crates/plugin_static_assets/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "farmfe_plugin_static_assets" -version = "0.0.4" +version = "0.0.5" edition = "2021" authors = ["brightwu(吴明亮) <1521488775@qq.com>"] license = "MIT" From 28a3ab1426a38f644b37a46f3d8c63f527030d58 Mon Sep 17 00:00:00 2001 From: Liuqh233 <528851597@qq.com> Date: Wed, 10 Apr 2024 15:45:40 +0800 Subject: [PATCH 5/6] chore: update template version (#1149) * chore: update template version * chore: changeset * fix: runing commands for diffrent plugin --- .changeset/hot-ties-obey.md | 6 ++++++ packages/create-farm-plugin/index.ts | 3 ++- packages/create-farm-plugin/templates/js/package.json | 2 +- packages/create-farm/templates/lit/package.json | 4 ++-- packages/create-farm/templates/preact/package.json | 4 ++-- packages/create-farm/templates/react/package.json | 4 ++-- packages/create-farm/templates/solid/package.json | 4 ++-- packages/create-farm/templates/svelte/package.json | 4 ++-- packages/create-farm/templates/vanilla/package.json | 4 ++-- packages/create-farm/templates/vue/package.json | 4 ++-- 10 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 .changeset/hot-ties-obey.md diff --git a/.changeset/hot-ties-obey.md b/.changeset/hot-ties-obey.md new file mode 100644 index 000000000..c06779155 --- /dev/null +++ b/.changeset/hot-ties-obey.md @@ -0,0 +1,6 @@ +--- +'create-farm-plugin': patch +'create-farm': patch +--- + +chore: update template version diff --git a/packages/create-farm-plugin/index.ts b/packages/create-farm-plugin/index.ts index 3199ddcb4..456c3dc90 100644 --- a/packages/create-farm-plugin/index.ts +++ b/packages/create-farm-plugin/index.ts @@ -124,8 +124,9 @@ async function copyTemplate(targetDir: string, options: IResultType) { fs.copyFileSync(gitignore, path.join(dest, '.gitignore')); } + const runText = options.type === 'js' ? 'pnpm dev' : 'pnpm build'; console.log(colors.green('\n🎉 Plugin created successfully!\n')); - console.log(colors.cyan(`cd ${targetDir} && pnpm install && pnpm dev\n`)); + console.log(colors.cyan(`cd ${targetDir} && pnpm install && ${runText}\n`)); } function judgeNodeVersion() { diff --git a/packages/create-farm-plugin/templates/js/package.json b/packages/create-farm-plugin/templates/js/package.json index 99997f306..c7e70a2b7 100644 --- a/packages/create-farm-plugin/templates/js/package.json +++ b/packages/create-farm-plugin/templates/js/package.json @@ -25,7 +25,7 @@ "license": "ISC", "devDependencies": { "@farmfe/cli": "^1.0.0", - "@farmfe/core": "^1.0.5", + "@farmfe/core": "^1.0.16", "@farmfe/js-plugin-dts": "^0.5.0", "@types/node": "^20.11.16", "cross-env": "^7.0.3" diff --git a/packages/create-farm/templates/lit/package.json b/packages/create-farm/templates/lit/package.json index 47b7da976..4f92445c5 100644 --- a/packages/create-farm/templates/lit/package.json +++ b/packages/create-farm/templates/lit/package.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@farmfe/cli": "^1.0.0", - "@farmfe/core": "^1.0.11", + "@farmfe/core": "^1.0.16", "typescript": "^5.4.3" } -} \ No newline at end of file +} diff --git a/packages/create-farm/templates/preact/package.json b/packages/create-farm/templates/preact/package.json index 6213e93e8..91ea52b16 100644 --- a/packages/create-farm/templates/preact/package.json +++ b/packages/create-farm/templates/preact/package.json @@ -15,8 +15,8 @@ }, "devDependencies": { "@farmfe/cli": "^1.0.0", - "@farmfe/core": "^1.0.11", + "@farmfe/core": "^1.0.16", "@preact/preset-vite": "^2.8.1", "typescript": "^5.4.3" } -} \ No newline at end of file +} diff --git a/packages/create-farm/templates/react/package.json b/packages/create-farm/templates/react/package.json index 85a59e1a0..d4d1b43bd 100644 --- a/packages/create-farm/templates/react/package.json +++ b/packages/create-farm/templates/react/package.json @@ -15,11 +15,11 @@ }, "devDependencies": { "@farmfe/cli": "^1.0.0", - "@farmfe/core": "^1.0.11", + "@farmfe/core": "^1.0.16", "@farmfe/plugin-react": "^1.0.1", "@types/react": "18", "core-js": "^3.36.1", "@types/react-dom": "18", "react-refresh": "^0.14.0" } -} \ No newline at end of file +} diff --git a/packages/create-farm/templates/solid/package.json b/packages/create-farm/templates/solid/package.json index bb0373133..d7ff87ba2 100644 --- a/packages/create-farm/templates/solid/package.json +++ b/packages/create-farm/templates/solid/package.json @@ -13,8 +13,8 @@ }, "devDependencies": { "@farmfe/cli": "^1.0.0", - "@farmfe/core": "^1.0.11", + "@farmfe/core": "^1.0.16", "solid-refresh": "^0.7.5", "vite-plugin-solid": "^2.10.2" } -} \ No newline at end of file +} diff --git a/packages/create-farm/templates/svelte/package.json b/packages/create-farm/templates/svelte/package.json index 49943a982..624322671 100644 --- a/packages/create-farm/templates/svelte/package.json +++ b/packages/create-farm/templates/svelte/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@farmfe/cli": "^1.0.0", - "@farmfe/core": "^1.0.11", + "@farmfe/core": "^1.0.16", "@sveltejs/vite-plugin-svelte": "^3.0.2", "@tsconfig/svelte": "^5.0.4", "core-js": "^3.36.1", @@ -21,4 +21,4 @@ "tslib": "^2.6.2", "typescript": "^5.4.3" } -} \ No newline at end of file +} diff --git a/packages/create-farm/templates/vanilla/package.json b/packages/create-farm/templates/vanilla/package.json index 3a0ec46fb..438ced1a2 100644 --- a/packages/create-farm/templates/vanilla/package.json +++ b/packages/create-farm/templates/vanilla/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@farmfe/cli": "^1.0.0", - "@farmfe/core": "^1.0.11", + "@farmfe/core": "^1.0.16", "typescript": "^5.4.3" } -} \ No newline at end of file +} diff --git a/packages/create-farm/templates/vue/package.json b/packages/create-farm/templates/vue/package.json index 4d6b7284b..22f6a5e77 100644 --- a/packages/create-farm/templates/vue/package.json +++ b/packages/create-farm/templates/vue/package.json @@ -13,8 +13,8 @@ }, "devDependencies": { "@farmfe/cli": "^1.0.0", - "@farmfe/core": "^1.0.11", + "@farmfe/core": "^1.0.16", "@vitejs/plugin-vue": "^5.0.4", "core-js": "^3.30.1" } -} \ No newline at end of file +} From 49a7fe04d72dc07b13d6f72f422e9a0404167ab1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 17:22:28 +0800 Subject: [PATCH 6/6] Version Packages (#1151) Co-authored-by: github-actions[bot] --- .changeset/hot-ties-obey.md | 6 ------ packages/create-farm-plugin/CHANGELOG.md | 6 ++++++ packages/create-farm-plugin/package.json | 2 +- packages/create-farm/CHANGELOG.md | 6 ++++++ packages/create-farm/package.json | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 .changeset/hot-ties-obey.md diff --git a/.changeset/hot-ties-obey.md b/.changeset/hot-ties-obey.md deleted file mode 100644 index c06779155..000000000 --- a/.changeset/hot-ties-obey.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'create-farm-plugin': patch -'create-farm': patch ---- - -chore: update template version diff --git a/packages/create-farm-plugin/CHANGELOG.md b/packages/create-farm-plugin/CHANGELOG.md index 5a39ac5a3..eaf2ffd68 100644 --- a/packages/create-farm-plugin/CHANGELOG.md +++ b/packages/create-farm-plugin/CHANGELOG.md @@ -1,5 +1,11 @@ # create-farm-plugin +## 0.1.3 + +### Patch Changes + +- 28a3ab14: chore: update template version + ## 0.1.2 ### Patch Changes diff --git a/packages/create-farm-plugin/package.json b/packages/create-farm-plugin/package.json index f86a4dfef..1a280af00 100644 --- a/packages/create-farm-plugin/package.json +++ b/packages/create-farm-plugin/package.json @@ -1,6 +1,6 @@ { "name": "create-farm-plugin", - "version": "0.1.2", + "version": "0.1.3", "description": "use create-farm-plugin to create farm plugin", "exports": { ".": "./bin/create-farm-plugin.mjs" diff --git a/packages/create-farm/CHANGELOG.md b/packages/create-farm/CHANGELOG.md index 895fdc28c..4fcf57d32 100644 --- a/packages/create-farm/CHANGELOG.md +++ b/packages/create-farm/CHANGELOG.md @@ -1,5 +1,11 @@ # create-farm +## 1.6.5 + +### Patch Changes + +- 28a3ab14: chore: update template version + ## 1.6.4 ### Patch Changes diff --git a/packages/create-farm/package.json b/packages/create-farm/package.json index 71ea26811..f1fa19546 100644 --- a/packages/create-farm/package.json +++ b/packages/create-farm/package.json @@ -1,6 +1,6 @@ { "name": "create-farm", - "version": "1.6.4", + "version": "1.6.5", "description": "use create-farm to create farm project", "exports": { ".": "./bin/create-farm.mjs"