From 642fee28f929e8292c8404d6b5190d8f3232da3e Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Sat, 31 Jul 2021 18:20:11 +0800 Subject: [PATCH 1/4] fix: _JSXStyle import is not found create imports on program enter --- src/_utils.js | 20 +++++++++++++------- src/babel-external.js | 18 +++++++++++------- src/babel.js | 14 ++++++++------ src/macro.js | 6 +++--- test/babel6/snapshots/external.js.md | 10 +++++++--- test/babel6/snapshots/external.js.snap | Bin 1503 -> 1517 bytes test/babel6/snapshots/index.js.md | 8 ++++---- test/babel6/snapshots/index.js.snap | Bin 2522 -> 2529 bytes test/fixtures/class.js | 5 ++--- test/snapshots/external.js.md | 10 +++++++--- test/snapshots/external.js.snap | Bin 1819 -> 1822 bytes test/snapshots/index.js.md | 5 ++++- test/snapshots/index.js.snap | Bin 3216 -> 3245 bytes test/snapshots/plugins.js.snap | Bin 601 -> 603 bytes 14 files changed, 59 insertions(+), 37 deletions(-) diff --git a/src/_utils.js b/src/_utils.js index 007f1dc0..0c91d609 100644 --- a/src/_utils.js +++ b/src/_utils.js @@ -1,5 +1,5 @@ import path from 'path' -import { addDefault } from '@babel/helper-module-imports'; +import { addDefault } from '@babel/helper-module-imports' import * as t from '@babel/types' import _hashString from 'string-hash' import { SourceMapGenerator } from 'source-map' @@ -258,7 +258,7 @@ export const getJSXStyleInfo = (expr, scope) => { } } -export const computeClassNames = (styles, externalJsxId) => { +export const computeClassNames = (styles, externalJsxId, styleComponent) => { if (styles.length === 0) { return { className: externalJsxId @@ -297,7 +297,7 @@ export const computeClassNames = (styles, externalJsxId) => { // _JSXStyle.dynamic([ ['1234', [props.foo, bar, fn(props)]], ... ]) const dynamic = t.callExpression( // Callee: _JSXStyle.dynamic - t.memberExpression(t.identifier(STYLE_COMPONENT), t.identifier('dynamic')), + t.memberExpression(t.identifier(styleComponent), t.identifier('dynamic')), // Arguments [ t.arrayExpression( @@ -380,7 +380,12 @@ export const cssToBabelType = css => { return t.cloneDeep(css) } -export const makeStyledJsxTag = (id, transformedCss, expressions = []) => { +export const makeStyledJsxTag = ( + id, + transformedCss, + expressions = [], + styleComponent +) => { const css = cssToBabelType(transformedCss) const attributes = [ @@ -402,8 +407,8 @@ export const makeStyledJsxTag = (id, transformedCss, expressions = []) => { } return t.jSXElement( - t.jSXOpeningElement(t.jSXIdentifier(STYLE_COMPONENT), attributes), - t.jSXClosingElement(t.jSXIdentifier(STYLE_COMPONENT)), + t.jSXOpeningElement(t.jSXIdentifier(styleComponent), attributes), + t.jSXClosingElement(t.jSXIdentifier(styleComponent)), [t.jSXExpressionContainer(css)] ) } @@ -627,7 +632,7 @@ export const createReactComponentImportDeclaration = state => { typeof state.opts.styleModule === 'string' ? state.opts.styleModule : 'styled-jsx/style', - { nameHint: STYLE_COMPONENT} + { nameHint: state.styleComponent } ) } @@ -650,6 +655,7 @@ export const setStateOptions = state => { vendorPrefixes: state.opts.vendorPrefixes }) } + state.styleComponent = STYLE_COMPONENT } export function log(message) { diff --git a/src/babel-external.js b/src/babel-external.js index 71d68d14..3a15b4e5 100644 --- a/src/babel-external.js +++ b/src/babel-external.js @@ -1,7 +1,5 @@ import * as t from '@babel/types' -import { STYLE_COMPONENT } from './_constants' - import { getJSXStyleInfo, processCss, @@ -23,7 +21,8 @@ export function processTaggedTemplateExpression({ splitRules, plugins, vendorPrefixes, - sourceMaps + sourceMaps, + styleComponent }) { const templateLiteral = path.get('quasi') let scope @@ -39,7 +38,11 @@ export function processTaggedTemplateExpression({ const stylesInfo = getJSXStyleInfo(templateLiteral, scope) - const { staticClassName, className } = computeClassNames([stylesInfo]) + const { staticClassName, className } = computeClassNames( + [stylesInfo], + undefined, + styleComponent + ) const styles = processCss( { @@ -64,7 +67,7 @@ export function processTaggedTemplateExpression({ t.objectExpression([ t.objectProperty( t.identifier('styles'), - makeStyledJsxTag(hash, css, expressions) + makeStyledJsxTag(hash, css, expressions, styleComponent) ), t.objectProperty(t.identifier('className'), className) ]) @@ -212,7 +215,8 @@ export const visitor = { : process.env.NODE_ENV === 'production', plugins: state.plugins, vendorPrefixes, - sourceMaps + sourceMaps, + styleComponent: state.styleComponent }) }) ) @@ -223,7 +227,7 @@ export const visitor = { hasJSXStyle && taggedTemplateExpressions.resolve.length > 0 && !state.hasInjectedJSXStyle && - !path.scope.hasBinding(STYLE_COMPONENT) + !path.scope.hasBinding(state.styleComponent) ) { state.hasInjectedJSXStyle = true createReactComponentImportDeclaration(state) diff --git a/src/babel.js b/src/babel.js index 6f32f170..4911c1e7 100644 --- a/src/babel.js +++ b/src/babel.js @@ -172,7 +172,8 @@ export default function({ types: t }) { if (state.styles.length > 0 || externalJsxId) { const { staticClassName, className } = computeClassNames( state.styles, - externalJsxId + externalJsxId, + state.styleComponent ) state.className = className state.staticClassName = staticClassName @@ -224,7 +225,7 @@ export default function({ types: t }) { ) { const [id, css] = state.externalStyles.shift() - path.replaceWith(makeStyledJsxTag(id, css)) + path.replaceWith(makeStyledJsxTag(id, css, [], state.styleComponent)) return } @@ -247,7 +248,9 @@ export default function({ types: t }) { splitRules }) - path.replaceWith(makeStyledJsxTag(hash, css, expressions)) + path.replaceWith( + makeStyledJsxTag(hash, css, expressions, state.styleComponent) + ) } } } @@ -285,6 +288,7 @@ export default function({ types: t }) { state.file.hasJSXStyle = false setStateOptions(state) + createReactComponentImportDeclaration(state) // we need to beat the arrow function transform and // possibly others so we traverse from here or else @@ -299,14 +303,12 @@ export default function({ types: t }) { !( state.file.hasJSXStyle && !state.hasInjectedJSXStyle && - !scope.hasBinding(STYLE_COMPONENT) + !scope.hasBinding(state.styleComponent) ) ) { return } - state.hasInjectedJSXStyle = true - createReactComponentImportDeclaration(state) } } } diff --git a/src/macro.js b/src/macro.js index daf2aa8e..40c035b9 100644 --- a/src/macro.js +++ b/src/macro.js @@ -4,7 +4,6 @@ import { setStateOptions, createReactComponentImportDeclaration } from './_utils' -import { STYLE_COMPONENT } from './_constants' export default createMacro(styledJsxMacro) @@ -94,12 +93,13 @@ function styledJsxMacro({ references, state }) { : process.env.NODE_ENV === 'production', plugins: state.plugins, vendorPrefixes: state.opts.vendorPrefixes, - sourceMaps: state.opts.sourceMaps + sourceMaps: state.opts.sourceMaps, + styleComponent: state.styleComponent }) if ( !state.hasInjectedJSXStyle && - !path.scope.hasBinding(STYLE_COMPONENT) + !path.scope.hasBinding(state.styleComponent) ) { state.hasInjectedJSXStyle = true createReactComponentImportDeclaration(state) diff --git a/test/babel6/snapshots/external.js.md b/test/babel6/snapshots/external.js.md index 7e7ce819..4fc5da3a 100644 --- a/test/babel6/snapshots/external.js.md +++ b/test/babel6/snapshots/external.js.md @@ -53,7 +53,8 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `const _defaultExport = ['div.jsx-2292456818{font-size:3em;}'];␊ + `import _JSXStyle from 'styled-jsx/style';␊ + const _defaultExport = ['div.jsx-2292456818{font-size:3em;}'];␊ _defaultExport.__hash = '2292456818';␊ ␊ ␊ @@ -63,7 +64,8 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `import css from 'hell';␊ + `import _JSXStyle from 'styled-jsx/style';␊ + import css from 'hell';␊ ␊ const color = 'red';␊ ␊ @@ -157,7 +159,9 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `const _defaultExport = new String('div.jsx-2292456818{font-size:3em;}');␊ + `import _JSXStyle from 'styled-jsx/style';␊ + ␊ + const _defaultExport = new String('div.jsx-2292456818{font-size:3em;}');␊ ␊ _defaultExport.__hash = '2292456818';␊ ␊ diff --git a/test/babel6/snapshots/external.js.snap b/test/babel6/snapshots/external.js.snap index 484799805d446a45e3d915a0b6b0696fd2fc90b3..25b6ac9e73e49d373b7c7c64b6e53029aac157ff 100644 GIT binary patch literal 1517 zcmVZP@R8NalQ+}fzkYT6@Av*% zS)_?{87U0>`od=?b3c7|=52}kYU7DKO{CXur>G0zgBxF799p|}Df93f>5X-oNYCu2 zsPpPO^4A|{4ovndAO6z+CQTFRyLV93N0GIqTRrz(jn?9~-V&C6qlt96m!iHn_J=Qf zZ}j^4Pmex$<<*B?rirxoPKsJR@buENj~CCaPkjE|OD`^-rHS-VA4R?L!}9uS;Q9BT z8K3OEl6&kTO{6OaDeCTT`tKT1dw>7r!nxGib>ELPk?y;PqHd%1ldS0;s&C&aRVr6x zMFUfhOguTE&5IDsC~_IFDt=!WeoCDSlDBM%VVIe!l-EkK1T?5>{y|V<0Py1{0Em)0 z3evWtQemv-;}VHjbR-hvMtpjv<|~v=1(45STU^V_qO6Q6u#nPydOB#?XNHL5yeO#Z zaiI)H0qeA6(YijEVsuAFm%7O)FH0)YEWjC|Dr)0%#BdBq@HCjvl#(>-XRV02Bo~Rs z5}`zGMwYZ;wX^_7!?2vvSrh}~^bwevDhg^5xngZQ0%2J$R7DtoL`_8sPQ#QVm%}|> zE2@gx^(4FNK2%-d47 z_L~+KnmxC1wb0p>;B>@09Szj*i;ms#*qzYmEQSh_OoYS8mr(^^xUAx3lmpUt$Y*4^ zd9!*;B$FeF2p2b-c))no&25pTvk^>fv@@BSb~6(SbIBOWHy*_^V{K=Po!hB_Sp`BV zAeLr}8roZEtxYD3Z<;XoeA#v^gQu%rJCwrzBW5e)!n`DuOL-Kyu_YMGkQAH=wNEJ= z=Azhd1f^7WHdf0v$DgZbJT--*A^wIO?; z(Pq6)T!?IV6c|d`>?S)?fK$bQGJIELgIyAT#>S(d4vEe;*TvKR094FXmq#l+Gp7?J z4dFCqRJsr-hIq!Z!Hvf_{6|MBbEyXF`z2W`LZ$A6yrR=ggHnMvolJ{WnBv`eKOmz5 zNKnFuD*CF3<}}^tEA!|)s0gz#9dt;Y^%mOH+vl#g&#Jf4&(kp2D|5aB5( zqWD7Sd!&;|#zj~*V&{tkHKIo<1rTIfRgpltu3@$BSdGW+i%u%Cr+H%NJU9w`=z*RU zS=P`rk)i>Ru550rXX=CpjqTFGie>MdSf^#i{Op)EVwet^k!Mo)L~!8!XBYRUPI$M3 z+vow@)E?4iyd#8vi?CqX5-8~)iYnv6VzGO!F}&le7#?~-H3i{@OPP(2(Pw6VqCQjL z$!bY~{)VO<>g3bG@JCq literal 1503 zcmV<51t9uCRzVU7hF`pM}DuTbd@9_vS^MR#0#X9byR~cTJu&k>oDByKHUGLv)BO zs5n6p9Qt8XKPZR{)DMbCH_>U8?SuGDPy}%*2>PX~FVFMb+^e_i-)Et5A}25{oCY&m&;d94ZnQ;$VdbU(cfkC8vFI>&yMAP`tI2`1?uaKhl(_j z?zx_#&d6_x-+Y|iJ3A_U@XP4yG)<)5y%cre;OhC=E9viFy*T~%+kd^YOcUuUdYuj5 zwDHwB|Js)yX77D1y|GRc>FkXZ^-*MPKpvZZ#0qKK1@;jza70fC=dVs z$=TDXwM*U~X(Dax!-$WqJn>-V^!m)_C!c#}`4mm0kB(B*i$A=wz8ZM)-N&bAhcDzG zI7budzWo&S#o<4^xm%-`&U||4?h7y7^8!tzCvTys>!=$@*7OiHvS*d5)*GUvfWmz< z56>uzH3-U*SO<)ZKbIyRkryV(M<(U*c*;$os8mG(C{R{><3RNQ;KOeK5G8pEq%ELo zDWiJXL?RXqMq+Hxt7TPhsd_wsFefarS`=%dG$p}OO7m*zNz*>-C&0xTFUv>xI-CNG z-I77~wegfkvt@K(XcHM3sw4#24^$vmmmts#i@;=26l8@L6d5U#&$=qe00sq&5p?Ms zk7WWp0cI4bD$M&BGtp2a6pts_SVAp}f-->}Ood@Rr7AlC3Kd?iU`$Kd^f$*Z zbt3nGTIvtQ+krSc(3pxZ8iwOA9N!KWW0Pz$5e_3PxL}kFLpJeklmpVY$;+bH=}fN& zn@lEyi3l4v8b79AHN!2kYY z6y%%lu1%(r>zGRCOj>q~2Tx?HcPNGbN6co(rA2|SSBofc-6hCmNecFadZ!c)vr&v2 zK`FJsGHR|f{(LLrLIFoZ@Fom{2^rR4Q4ys<`Ma>~Q4L!?%v%8i#Fxu4Rwj%ebW0$g zAIAigBGogdzXZ#Cv!?XzI;wjx6k?;1q^;|g*txnJ&ifq;XJE4}W87>TUyke^U*_Df zWZpeX=DKoY-Yqxg`Y>XCdl)h2iU;%C#)G*{lM3etOg~~_^8XGS?tbLE!-=^qlA>M( zx5U_`CjS{`wAi6HHKG8x!Spz|@qPI5c}nkd!N_1*&!@*}53xcd8cT$_pZ4q+_VsPp zk#lxkEHzQh_0pkvb2zsL_*Aa|b8f;yT(culy+^n93RyO`hYGCKtSzA5#(-=%)Fl+Y zv9zqH0S+5amxtRF^I}MXr#qekt@+Tn&LMT>AAp8&*MVq;XXJFWs-Owa=wn|BR6?A` zw85*;W5bUI8w;s6>pKNesX(a(LawL>3KUA50Ww!>!W8Gs`z{eRK!5@s1@x?jNGsir zmA!uvH28U#p0r8rT|B&r!-1ixFK+Whpno;@S^X=ELXzOIW>tbdQ-{S%!~juA*Lc~` z54RmLOh9MTd`6PEYv%gSs5-I7BC%L9&aw%>fJ1=8GPJ$x;Ksyjpk3M$a$1)3INjJz zP^8WfBL?NkXj%L`ot|v$gext3LKNG;?VM|rzNMXQ32cnn+c4}j40kcy_J-&QA=s{w zc`a=6lY_oLSi<)G&pcx|?~?7z`GZ97IylSVG}EIUcP`PRsO{G3yyiM>bw+n)99>P` z&JNJ-&Wi5VPN;uw;`g=zgzA$2IQOj9OVvIOTbX}bEtctPtcBm*{@`xM=~Kp5jT{BQ zcbsF@*maiOwzlv++TwM##oK>G*{(CHf*L#yYp5L|ppDxfrKW4JuAf)9%9u*@$mtBA z)+tR%0O^*-z@bHy;6?xFT|#~F8sqME;9F08P Snapshot 1 - `const a = () =>
␊ + `import _JSXStyle from 'styled-jsx/style';␊ + const a = () =>
␊

hi

␊ ␊
;` @@ -87,16 +88,15 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `import _JSXStyle from "styled-jsx/style";␊ + `import _JSXStyle from 'styled-jsx/style';␊ + export const _StyleImport = '123';␊ export default class {␊ - ␊ render() {␊ return
␊

test

␊ <_JSXStyle id={"2101845350"}>{"p.jsx-2101845350{color:red;}"}␊
;␊ }␊ - ␊ }` ## works with css tagged template literals in the same file diff --git a/test/babel6/snapshots/index.js.snap b/test/babel6/snapshots/index.js.snap index 4e102f8b3bcb876f586f29fde5182a5efdcdab92..bb5d31165ab26863dc0e6dc34f62a0c69851718a 100644 GIT binary patch literal 2529 zcmV<72_E)ARzVK_NdWFLzN00000000B+ zS$&KfM-^Wu4W&n+R6s~*sRs8{-{oq1KfLztIlkuZLUX=4*IX{W&xE`6?wq}s^{&}n zpY3y&r~)Ar6%<4(Xn|6w2q3CfLPA1FRfPgl`J+(LivGce1QL|e{t<#efkX+jV|(pA z+Z+3umbPH&&g(aCW`6HC@4b05`+$!iZX%w2NqpDoZI24)!=E~EwDiJ{kPv;Q(O3U% zC;u7#<71Eh;gP`)oO^oWUp_4T);5CJ`1`3{r|wGK_ylf{)dG#A3(H&nqd%=gLKfjS6?)}-|R~Ejs zRX$7*=SMy#?%F-LGa8fE;}NFP9-y?JjX6B_2;aK1a`qNZ(CxnZX)A#Imt#h(wkyH`X_(ez;*N^#3? z?F~D5~hf1nEPjytL- zLrx#?u>?>Hiqfv>#0lW{57x7UjiUx>Ttn2TP&GlggJU+EQSsYdLvCoVV}UV{CQL3p zW^4R<>b2Pa23fl))niQ9n{=p3P)BA}@ccS73%c6DK#HWe2+Oce(&&_}n-yLAKwA@= zwVjOZ2tDn?)YE=HN59`U}yzhga?IuURE>r9Zn_e7#~JI z6!JV`IkPi_cvd?C4}ZKTF0H`2^(d4ZnY zNUr76Np)&nnx9--oT1Ex`LT^uF29jfNF$kJv+232&iqVKPS4$46b~qcMdqM&I5YN1k;x3fvQ$h?7?}l{ zH_}Wpnw*$a7RSf{Xn{8cXLF(g`WDi*~`HE4G^HXv*4f-z9l zrdXCm{t>Co>7jjWu&raigRJw6NQxvGh9hGX4yBcRsJ|LLR>)02EvEV_4QIBT${$J7 zYoXdND{if9F@#&D>oy@oNt)$pp2c<6%I36EH>oRN*KjC`=2$ky^L&lk4vhX+M{KyS zADtkoZk?!X^5g1c%ggq3I1L7Cnn439P&75&ncCH{O9)PYbcTQ97Pi$H%RX3$%h9dj&!2q=Egu8|pYZ!bW0< zzxEE%avBdxwT%RUXxUt>c(;1pV2e;Oo~2Mm>k?YqnZT;17X@81KvS!op_{Pw+R?sd z*o>x|5O41>PU3buZ|9tBvw=^7o{ro|t(}MJGG{oO#Wh7ZoQ8;E*dJvu} zrV^D3SYFPWIb|5&Vig_la)O?b)nP!!fwclGYozHF#hdUBE7?P$YJ2Pyv$7%~N9%Cz zT(JT6SMU%9+M=?8kwpR4j@nMDmHHG`r!aSS8L9p5WPd#qRkctUsjvuUOkGwp1A!W& zEEi)~mZV&a2JF7Bx$pts(Y4byjy=4y!4ld-QAKkY3ZfZmY(m`!rYCnj@MmUaBb3** zyb)@pa?5mjho`yq`{0iGtGa9-S76TO5mApOx81Ut!g}lG%K?fbNh(H1xR`x65WqJC z0Uf^+^h|e+ekkB-RTY5MNjx*3t7F9sc$<4?VoF zN*c{Fe2j~ceB+&7m21Zf+fm)<|b r(DWn@UX?ibjv@{=h>Q0awF3@yU5DvgkbtHDwc`H)f$0w&872S#6e#E) literal 2522 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

test

@@ -12,5 +12,4 @@ export default class {
) } - } diff --git a/test/snapshots/external.js.md b/test/snapshots/external.js.md index dbf9cc9f..4ea28fb3 100644 --- a/test/snapshots/external.js.md +++ b/test/snapshots/external.js.md @@ -45,7 +45,8 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `const _defaultExport = ["div.jsx-2292456818{font-size:3em;}"];␊ + `import _JSXStyle from "styled-jsx/style";␊ + const _defaultExport = ["div.jsx-2292456818{font-size:3em;}"];␊ _defaultExport.__hash = "2292456818";␊ module.exports = _defaultExport;` @@ -88,7 +89,8 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `import css from 'hell';␊ + `import _JSXStyle from "styled-jsx/style";␊ + import css from 'hell';␊ const color = 'red';␊ const bar = css`␊ div {␊ @@ -166,7 +168,9 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `const _defaultExport = new String("div.jsx-2292456818{font-size:3em;}");␊ + `import _JSXStyle from "styled-jsx/style";␊ + ␊ + const _defaultExport = new String("div.jsx-2292456818{font-size:3em;}");␊ ␊ _defaultExport.__hash = "2292456818";␊ module.exports = _defaultExport;` diff --git a/test/snapshots/external.js.snap b/test/snapshots/external.js.snap index fa632efa0e4e5549d643c4d8ed201803b71ce8d4..d4963fdd89f85b5c38e460ad59b073b7d124abd1 100644 GIT binary patch literal 1822 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 J=YVt@0049>c-H^` diff --git a/test/snapshots/index.js.md b/test/snapshots/index.js.md index 1184d75a..505964d7 100644 --- a/test/snapshots/index.js.md +++ b/test/snapshots/index.js.md @@ -63,7 +63,9 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `const a = () =>
␊ + `import _JSXStyle from "styled-jsx/style";␊ + ␊ + const a = () =>
␊

hi

␊ ␊
;` @@ -148,6 +150,7 @@ Generated by [AVA](https://ava.li). > Snapshot 1 `import _JSXStyle from "styled-jsx/style";␊ + export const _StyleImport = '123';␊ export default class {␊ render() {␊ return
␊ diff --git a/test/snapshots/index.js.snap b/test/snapshots/index.js.snap index 06ee7c453cfbedce68d9a6efe7b677649d7beb1f..1947d6f6bd46c2c12391c284240431afa7caefa7 100644 GIT binary patch literal 3245 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 CiYOrf diff --git a/test/snapshots/plugins.js.snap b/test/snapshots/plugins.js.snap index 0ecb63e064a6da88bf9d2052c81c445b32955a9c..5379cce32725f95b560ad8a7518ffdf3950b74ec 100644 GIT binary patch literal 603 zcmV-h0;K&xRzV56CbU+OqvHLbtR@Dzc~`>>{iOp()KYnbOEK)6GoRE@8mqUi=9j z_po^A-Kz(|1@R(y@*jvNk-a&YWVZ*X`9;8dVBMt{poaX zvix=bWdBh?i`RGgnnUAodGhefS?A5ULtcF?DDV4CP5b!Z$Jy@Wy!QF_#mm>H`n!Vi z{@jZ3Zm9agmUe67o90hvG~|HsV}cnNhja?cjb>t&jiO5f#(_%-4S@y9A@-ybFI0_( z$7oJCs8p)J>H*X9k9tKQmpSWk%(&T{rM80WMUJunkco{_q(B9TQYT2dbU`Vie1gMW z6*khSP+v!w3AH?K!ZsT-n=zTHk=yKtjdZiaCkM|D;?!inP?dT07i^IrK%;oQV*xHf zjP0W-wjxKish3jDjp1;D*hDyB8$kJNuede5;{Z*4x6<#!d+koA-MZV-cVG?lRofa^ zO=&O~RK?}!|4Og?@vi3SdsdW15FkaiqBT&W7r{mhC8@N7m(x%RCEz&V zT^mL=98+q;?idk0YY8GeHtVd<0#~5zz?weYs+*=VLpvB^c^8h9C*1D zUC-vUM4WRZlW6!f#AAPfS*A6k^U%e6XqI*Q>@lGuL@r%I*w7GAO7m()YiE`}p^Tz) pWouP^=fA4|IaNDshJvdr?oaBDZ@v7bC!A|m%x~Nb@fk@5006-JEy(}? literal 601 zcmV-f0;c^zRzVBs3qUkcMP;BT`flT7-HKl8~M3PRPn+C+I5V=pfl zIfwaNK!;HlKnoTE;wmGV>ll}e@QeyrES8|vfu`#nLWg3`_wj^Sp{>$X@?lI>9Sp{p zkEIQ_AX4Afsv}6mWQ7w-9KnJZ)6R!0 z25CrJnzd#AE9+VBzLV&e!_1nxr%uUOdoka@^}d6PJGwMKO{Zp|H3$`OIT08pMi^&l z!}b0Xuhjo&7CbeFgm>96|827${;$VBw;re(QT=Hxd_jEC?xC=UMvV1PdxR+`4izk9x^1l<`w=0gFvE&Nd^D_A2Jej From 0a517edad5758360bc36208f07d043274c208a66 Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Sun, 1 Aug 2021 17:39:58 +0800 Subject: [PATCH 2/4] leverage generated uid from addDefault --- src/_utils.js | 34 +++++++++++++++---------- src/babel-external.js | 13 ++++------ src/babel.js | 26 ++++++++++++------- src/macro.js | 9 +++---- test/babel6/snapshots/external.js.snap | Bin 1517 -> 1526 bytes test/babel6/snapshots/index.js.md | 3 +-- test/babel6/snapshots/index.js.snap | Bin 2529 -> 2513 bytes test/babel6/snapshots/plugins.js.snap | Bin 601 -> 601 bytes test/fixtures/class.js | 1 - test/fixtures/conflicts.js | 13 ++++++++++ test/index.js | 5 ++++ test/snapshots/external.js.snap | Bin 1822 -> 1828 bytes test/snapshots/index.js.md | 14 +++++++++- test/snapshots/index.js.snap | Bin 3245 -> 3310 bytes test/snapshots/plugins.js.snap | Bin 603 -> 601 bytes 15 files changed, 77 insertions(+), 41 deletions(-) create mode 100644 test/fixtures/conflicts.js diff --git a/src/_utils.js b/src/_utils.js index 0c91d609..c0807f99 100644 --- a/src/_utils.js +++ b/src/_utils.js @@ -9,8 +9,8 @@ import transform from './lib/style-transform' import { STYLE_ATTRIBUTE, GLOBAL_ATTRIBUTE, - STYLE_COMPONENT_ID, STYLE_COMPONENT, + STYLE_COMPONENT_ID, STYLE_COMPONENT_DYNAMIC } from './_constants' @@ -258,7 +258,11 @@ export const getJSXStyleInfo = (expr, scope) => { } } -export const computeClassNames = (styles, externalJsxId, styleComponent) => { +export const computeClassNames = ( + styles, + externalJsxId, + styleComponentImportName +) => { if (styles.length === 0) { return { className: externalJsxId @@ -297,7 +301,10 @@ export const computeClassNames = (styles, externalJsxId, styleComponent) => { // _JSXStyle.dynamic([ ['1234', [props.foo, bar, fn(props)]], ... ]) const dynamic = t.callExpression( // Callee: _JSXStyle.dynamic - t.memberExpression(t.identifier(styleComponent), t.identifier('dynamic')), + t.memberExpression( + t.identifier(styleComponentImportName), + t.identifier(STYLE_COMPONENT_DYNAMIC) + ), // Arguments [ t.arrayExpression( @@ -384,7 +391,7 @@ export const makeStyledJsxTag = ( id, transformedCss, expressions = [], - styleComponent + styleComponentImportName ) => { const css = cssToBabelType(transformedCss) @@ -407,8 +414,8 @@ export const makeStyledJsxTag = ( } return t.jSXElement( - t.jSXOpeningElement(t.jSXIdentifier(styleComponent), attributes), - t.jSXClosingElement(t.jSXIdentifier(styleComponent)), + t.jSXOpeningElement(t.jSXIdentifier(styleComponentImportName), attributes), + t.jSXClosingElement(t.jSXIdentifier(styleComponentImportName)), [t.jSXExpressionContainer(css)] ) } @@ -627,13 +634,9 @@ export const booleanOption = opts => { } export const createReactComponentImportDeclaration = state => { - addDefault( - state.file.path, - typeof state.opts.styleModule === 'string' - ? state.opts.styleModule - : 'styled-jsx/style', - { nameHint: state.styleComponent } - ) + return addDefault(state.file.path, state.styleModule, { + nameHint: STYLE_COMPONENT + }).name } export const setStateOptions = state => { @@ -655,7 +658,10 @@ export const setStateOptions = state => { vendorPrefixes: state.opts.vendorPrefixes }) } - state.styleComponent = STYLE_COMPONENT + state.styleModule = + typeof state.opts.styleModule === 'string' + ? state.opts.styleModule + : 'styled-jsx/style' } export function log(message) { diff --git a/src/babel-external.js b/src/babel-external.js index 3a15b4e5..9896a9dd 100644 --- a/src/babel-external.js +++ b/src/babel-external.js @@ -8,7 +8,6 @@ import { getScope, computeClassNames, makeStyledJsxTag, - createReactComponentImportDeclaration, setStateOptions } from './_utils' @@ -22,7 +21,7 @@ export function processTaggedTemplateExpression({ plugins, vendorPrefixes, sourceMaps, - styleComponent + styleComponentImportName }) { const templateLiteral = path.get('quasi') let scope @@ -41,7 +40,7 @@ export function processTaggedTemplateExpression({ const { staticClassName, className } = computeClassNames( [stylesInfo], undefined, - styleComponent + styleComponentImportName ) const styles = processCss( @@ -67,7 +66,7 @@ export function processTaggedTemplateExpression({ t.objectExpression([ t.objectProperty( t.identifier('styles'), - makeStyledJsxTag(hash, css, expressions, styleComponent) + makeStyledJsxTag(hash, css, expressions, styleComponentImportName) ), t.objectProperty(t.identifier('className'), className) ]) @@ -216,7 +215,7 @@ export const visitor = { plugins: state.plugins, vendorPrefixes, sourceMaps, - styleComponent: state.styleComponent + styleComponentImportName: state.styleComponentImportName }) }) ) @@ -226,11 +225,9 @@ export const visitor = { if ( hasJSXStyle && taggedTemplateExpressions.resolve.length > 0 && - !state.hasInjectedJSXStyle && - !path.scope.hasBinding(state.styleComponent) + !state.hasInjectedJSXStyle ) { state.hasInjectedJSXStyle = true - createReactComponentImportDeclaration(state) } }) diff --git a/src/babel.js b/src/babel.js index 4911c1e7..66b74030 100644 --- a/src/babel.js +++ b/src/babel.js @@ -17,8 +17,6 @@ import { setStateOptions } from './_utils' -import { STYLE_COMPONENT } from './_constants' - export default function({ types: t }) { const jsxVisitors = { JSXOpeningElement(path, state) { @@ -43,7 +41,7 @@ export default function({ types: t }) { if ( name && name !== 'style' && - name !== STYLE_COMPONENT && + name !== state.styleComponentImportName && (name.charAt(0) !== name.charAt(0).toUpperCase() || Object.values(path.scope.bindings).some(binding => binding.referencePaths.some(r => r === tag) @@ -173,7 +171,7 @@ export default function({ types: t }) { const { staticClassName, className } = computeClassNames( state.styles, externalJsxId, - state.styleComponent + state.styleComponentImportName ) state.className = className state.staticClassName = staticClassName @@ -225,7 +223,9 @@ export default function({ types: t }) { ) { const [id, css] = state.externalStyles.shift() - path.replaceWith(makeStyledJsxTag(id, css, [], state.styleComponent)) + path.replaceWith( + makeStyledJsxTag(id, css, [], state.styleComponentImportName) + ) return } @@ -249,7 +249,12 @@ export default function({ types: t }) { }) path.replaceWith( - makeStyledJsxTag(hash, css, expressions, state.styleComponent) + makeStyledJsxTag( + hash, + css, + expressions, + state.styleComponentImportName + ) ) } } @@ -286,9 +291,12 @@ export default function({ types: t }) { state.hasJSXStyle = null state.ignoreClosing = null state.file.hasJSXStyle = false - setStateOptions(state) - createReactComponentImportDeclaration(state) + + // `addDefault` will generate unique id for the scope + state.styleComponentImportName = createReactComponentImportDeclaration( + state + ) // we need to beat the arrow function transform and // possibly others so we traverse from here or else @@ -303,7 +311,7 @@ export default function({ types: t }) { !( state.file.hasJSXStyle && !state.hasInjectedJSXStyle && - !scope.hasBinding(state.styleComponent) + !scope.hasBinding(state.styleComponentImportName) ) ) { return diff --git a/src/macro.js b/src/macro.js index 40c035b9..c3580ae1 100644 --- a/src/macro.js +++ b/src/macro.js @@ -9,6 +9,7 @@ export default createMacro(styledJsxMacro) function styledJsxMacro({ references, state }) { setStateOptions(state) + state.styleComponentImportName = createReactComponentImportDeclaration(state) // Holds a reference to all the lines where strings are tagged using the `css` tag name. // We print a warning at the end of the macro in case there is any reference to css, @@ -94,15 +95,11 @@ function styledJsxMacro({ references, state }) { plugins: state.plugins, vendorPrefixes: state.opts.vendorPrefixes, sourceMaps: state.opts.sourceMaps, - styleComponent: state.styleComponent + styleComponentImportName: state.styleComponentImportName }) - if ( - !state.hasInjectedJSXStyle && - !path.scope.hasBinding(state.styleComponent) - ) { + if (!state.hasInjectedJSXStyle) { state.hasInjectedJSXStyle = true - createReactComponentImportDeclaration(state) } }) }) diff --git a/test/babel6/snapshots/external.js.snap b/test/babel6/snapshots/external.js.snap index 25b6ac9e73e49d373b7c7c64b6e53029aac157ff..08a52249d4dcfd1345e221d7e1433f1464fa5d3e 100644 GIT binary patch literal 1526 zcmV3*T*ZH9l((d>K1}bM9+cnvdGK|H zq0-;_061`P`Qr4o8Dr6P%xiI>eGB-v)vI&pJQ>=@5wJeEHMT$D?gAEUa!{h}*s-#T7 zqy7K?<(LlJJ=tEC&>LixBKV~$$lMqa8&@`Q{E3C*h|$4vY52nEhp1VuR_ zRM7-v?UpQluK5xk&F0ZSUk@G`s&os=2y8&5ynvu)Sop{ClBlSHs47^Qe%4iC3bJ^^ z1VNY12t<})P4@z!Kr|ZXBC$qM64g-xI}t?HgvMsE5mxu-awS125hP35TxCXBXySDM zSm+KQ5OdycKGYy@8Uf)6h|mfV;o@9877StpG-m{b0M*H3ykD$ulNTkaxrFX97mvrs zV<9eTBy>oB*Nnxme(Q3kHeQc1s1ttzK`tJ_zD2`?Kh}Dd+`gXTpOq03{gv`;NhOPq zKvr1af>MsnwsFqMILnar5WY2YgdO=m?cCgWVO|ufi3QqA9yv3140|as?C2F!l?rv79zDvK znvTWozMSj9mkzFE+&F*>*pBS~8^-h7&;|XsaQGcb}wNY9+Lz+YMgA#KS&%T zs-)LT zj@1kkdx^6vr;YEn@`TNjV|Z6-pFI|fy>nkjCv6%bp`aLoU`xYh#YfMY{++`)lhLty zSw_RA5=ZM&=P)*7`e!Nuo(aB(1afO0Xyv;cJ( zW_;T-%s3X?aIEod+gQ`{Y|w2k;QyV0W;ge|JEP1NCmHusOnWr`GeZo&@eH%^{IZqt zlAG+_}whD^XS!%>$KUrtj zx2;QQyWTBrdqSKIp|f(D*z}*E`U$awt!Lk?s?MkMEIa>2y7lJIaT6ZJX}1QPO~+}g c9Nif@x?h1qA#2H2Mt<8 literal 1517 zcmVZP@R8NalQ+}fzkYT6@Av*% zS)_?{87U0>`od=?b3c7|=52}kYU7DKO{CXur>G0zgBxF799p|}Df93f>5X-oNYCu2 zsPpPO^4A|{4ovndAO6z+CQTFRyLV93N0GIqTRrz(jn?9~-V&C6qlt96m!iHn_J=Qf zZ}j^4Pmex$<<*B?rirxoPKsJR@buENj~CCaPkjE|OD`^-rHS-VA4R?L!}9uS;Q9BT z8K3OEl6&kTO{6OaDeCTT`tKT1dw>7r!nxGib>ELPk?y;PqHd%1ldS0;s&C&aRVr6x zMFUfhOguTE&5IDsC~_IFDt=!WeoCDSlDBM%VVIe!l-EkK1T?5>{y|V<0Py1{0Em)0 z3evWtQemv-;}VHjbR-hvMtpjv<|~v=1(45STU^V_qO6Q6u#nPydOB#?XNHL5yeO#Z zaiI)H0qeA6(YijEVsuAFm%7O)FH0)YEWjC|Dr)0%#BdBq@HCjvl#(>-XRV02Bo~Rs z5}`zGMwYZ;wX^_7!?2vvSrh}~^bwevDhg^5xngZQ0%2J$R7DtoL`_8sPQ#QVm%}|> zE2@gx^(4FNK2%-d47 z_L~+KnmxC1wb0p>;B>@09Szj*i;ms#*qzYmEQSh_OoYS8mr(^^xUAx3lmpUt$Y*4^ zd9!*;B$FeF2p2b-c))no&25pTvk^>fv@@BSb~6(SbIBOWHy*_^V{K=Po!hB_Sp`BV zAeLr}8roZEtxYD3Z<;XoeA#v^gQu%rJCwrzBW5e)!n`DuOL-Kyu_YMGkQAH=wNEJ= z=Azhd1f^7WHdf0v$DgZbJT--*A^wIO?; z(Pq6)T!?IV6c|d`>?S)?fK$bQGJIELgIyAT#>S(d4vEe;*TvKR094FXmq#l+Gp7?J z4dFCqRJsr-hIq!Z!Hvf_{6|MBbEyXF`z2W`LZ$A6yrR=ggHnMvolJ{WnBv`eKOmz5 zNKnFuD*CF3<}}^tEA!|)s0gz#9dt;Y^%mOH+vl#g&#Jf4&(kp2D|5aB5( zqWD7Sd!&;|#zj~*V&{tkHKIo<1rTIfRgpltu3@$BSdGW+i%u%Cr+H%NJU9w`=z*RU zS=P`rk)i>Ru550rXX=CpjqTFGie>MdSf^#i{Op)EVwet^k!Mo)L~!8!XBYRUPI$M3 z+vow@)E?4iyd#8vi?CqX5-8~)iYnv6VzGO!F}&le7#?~-H3i{@OPP(2(Pw6VqCQjL z$!bY~{)VO<>g3bG@JCq diff --git a/test/babel6/snapshots/index.js.md b/test/babel6/snapshots/index.js.md index a2d09d16..a7a153f2 100644 --- a/test/babel6/snapshots/index.js.md +++ b/test/babel6/snapshots/index.js.md @@ -88,8 +88,7 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `import _JSXStyle from 'styled-jsx/style';␊ - export const _StyleImport = '123';␊ + `import _JSXStyle from "styled-jsx/style";␊ export default class {␊ render() {␊ return
␊ diff --git a/test/babel6/snapshots/index.js.snap b/test/babel6/snapshots/index.js.snap index bb5d31165ab26863dc0e6dc34f62a0c69851718a..6d5ff43dbdca7b2528343dda8cedb3a2776383aa 100644 GIT binary patch literal 2513 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 literal 2529 zcmV<72_E)ARzVK_NdWFLzN00000000B+ zS$&KfM-^Wu4W&n+R6s~*sRs8{-{oq1KfLztIlkuZLUX=4*IX{W&xE`6?wq}s^{&}n zpY3y&r~)Ar6%<4(Xn|6w2q3CfLPA1FRfPgl`J+(LivGce1QL|e{t<#efkX+jV|(pA z+Z+3umbPH&&g(aCW`6HC@4b05`+$!iZX%w2NqpDoZI24)!=E~EwDiJ{kPv;Q(O3U% zC;u7#<71Eh;gP`)oO^oWUp_4T);5CJ`1`3{r|wGK_ylf{)dG#A3(H&nqd%=gLKfjS6?)}-|R~Ejs zRX$7*=SMy#?%F-LGa8fE;}NFP9-y?JjX6B_2;aK1a`qNZ(CxnZX)A#Imt#h(wkyH`X_(ez;*N^#3? z?F~D5~hf1nEPjytL- zLrx#?u>?>Hiqfv>#0lW{57x7UjiUx>Ttn2TP&GlggJU+EQSsYdLvCoVV}UV{CQL3p zW^4R<>b2Pa23fl))niQ9n{=p3P)BA}@ccS73%c6DK#HWe2+Oce(&&_}n-yLAKwA@= zwVjOZ2tDn?)YE=HN59`U}yzhga?IuURE>r9Zn_e7#~JI z6!JV`IkPi_cvd?C4}ZKTF0H`2^(d4ZnY zNUr76Np)&nnx9--oT1Ex`LT^uF29jfNF$kJv+232&iqVKPS4$46b~qcMdqM&I5YN1k;x3fvQ$h?7?}l{ zH_}Wpnw*$a7RSf{Xn{8cXLF(g`WDi*~`HE4G^HXv*4f-z9l zrdXCm{t>Co>7jjWu&raigRJw6NQxvGh9hGX4yBcRsJ|LLR>)02EvEV_4QIBT${$J7 zYoXdND{if9F@#&D>oy@oNt)$pp2c<6%I36EH>oRN*KjC`=2$ky^L&lk4vhX+M{KyS zADtkoZk?!X^5g1c%ggq3I1L7Cnn439P&75&ncCH{O9)PYbcTQ97Pi$H%RX3$%h9dj&!2q=Egu8|pYZ!bW0< zzxEE%avBdxwT%RUXxUt>c(;1pV2e;Oo~2Mm>k?YqnZT;17X@81KvS!op_{Pw+R?sd z*o>x|5O41>PU3buZ|9tBvw=^7o{ro|t(}MJGG{oO#Wh7ZoQ8;E*dJvu} zrV^D3SYFPWIb|5&Vig_la)O?b)nP!!fwclGYozHF#hdUBE7?P$YJ2Pyv$7%~N9%Cz zT(JT6SMU%9+M=?8kwpR4j@nMDmHHG`r!aSS8L9p5WPd#qRkctUsjvuUOkGwp1A!W& zEEi)~mZV&a2JF7Bx$pts(Y4byjy=4y!4ld-QAKkY3ZfZmY(m`!rYCnj@MmUaBb3** zyb)@pa?5mjho`yq`{0iGtGa9-S76TO5mApOx81Ut!g}lG%K?fbNh(H1xR`x65WqJC z0Uf^+^h|e+ekkB-RTY5MNjx*3t7F9sc$<4?VoF zN*c{Fe2j~ceB+&7m21Zf+fm)<|b r(DWn@UX?ibjv@{=h>Q0awF3@yU5DvgkbtHDwc`H)f$0w&872S#6e#E) diff --git a/test/babel6/snapshots/plugins.js.snap b/test/babel6/snapshots/plugins.js.snap index d19eae955c538f95f4b403986eca0139881c9fe0..721c5abf9f1d8c9075c17e81d5fcbd8d87fffc22 100644 GIT binary patch literal 601 zcmV-f0;c^zRzV@Ml00000000B+ zQp<`HK@_b-f)H2!fLxkDCrlnj$b=-_5gAkvW)Q}Okc6btT_G)%uC}W(W@rjr&c;u0 zIg7zX_I`mlAZ|o=eu7J#oz<0|yclq!;=<}h-^aP<-a2)kAcU?VtKWJ)Ke_+utnvDM zKwo}Iq4<1GBlP~>x3j(RdGX_|ix;m>t8Y^}n#~|Ix8K~jsDC)!AJ4zvJvn%g($OE8 znD4r-Pi4@}^t-e-30Nqg|LE}Pp*W@lMj@Mk$z$6sJ>#>AHqBNxL28#Lu<|0yRoY=b z7vM0;La@OMiK~KHGSfva8R01vkk1#uZiD4|N8nJ*`2n5~I~u4yrChY&D);+i%*S#7 zJ7B7BXEj{eJ@)a$bMl>zd8giJ)N8kE)m^g)9o@GGOpHmm7u&sFuOQo5P{#`XN-sgU zuqr{)b0w(f+L5thFeD_*c60@mY)3{prc$HDlj=E3NkxehN*uw$NU1G|FPdE=>KY@) zx<+$^DJR9QF~mbcm9G+%IaqkiUwB;LP$UV@C(5cTxEf(Pi4oOZsa)c_8<1*s9aEDr z=1759_&6jZZ$|i9YtE*jL-uj79`yJ_%7&O;hNSEoEon%rvef8G%{E`Co%q{jRz>Yn zyU^NL>)ijf{`b~;zys`;bCFKUU#+*oG;`64LAK=JPp-^Y^qUvq@{zU#)O<<|?Exs@ nQWA)gAS~K6VN-x4EA>AXgRcpZ@Gfu6w{QCsJ(95COa=e|_{Arm literal 601 zcmV-f0;c^zRzVgjYv^JXc6i`NJ28%osgBuPP#LxDa(MzUi=9j zdng`q_ZNr-@gjKhCwSD}oSkg*QHoxQcyRWx@5l2#@5jvh93ixUK0f?@x-&d0e7=4D z>di^zeG0|rej1^f^X}$(?bFHbaQ5TD@!sQt2NIYfCkf{#x$N*2MfLtyQP7`d;KLnRz&iC+$I8jgKDQ2TNSE<__Vm_2T z*aB01Tg&1~-cf)@zME^c%zL$Zy;i+jt!$eGXz9EKU}8wZomlR4I(ga5fI9a0ujCSh z3%fi{axMqzdro9584L*tvlCrGC7V%?k8x1SM%pP=iE+ic-eMA2sjxw|r-q?500mr(1fs+U^E3@u zA3)-j`X3L2uM8sLU3AQU+wF({3-a$Rh*65E{2pHSAv^ui=%+pwf@%}e|X&oGsKOa=e|bPOqT diff --git a/test/fixtures/class.js b/test/fixtures/class.js index ed209483..7488d661 100644 --- a/test/fixtures/class.js +++ b/test/fixtures/class.js @@ -1,4 +1,3 @@ -export const _StyleImport = '123' export default class { render() { return ( diff --git a/test/fixtures/conflicts.js b/test/fixtures/conflicts.js new file mode 100644 index 00000000..61d2ef52 --- /dev/null +++ b/test/fixtures/conflicts.js @@ -0,0 +1,13 @@ +export const _JSXStyle = '_JSXStyle-literal' +export default function() { + return ( +
+

test

+ +
+ ) +} diff --git a/test/index.js b/test/index.js index 5ec8e90d..046c3b77 100644 --- a/test/index.js +++ b/test/index.js @@ -112,6 +112,11 @@ test('works with dynamic element in class', async t => { t.snapshot(code) }) +test('works with existing identifier for _JSXStyle', async t => { + const { code } = await transform('./fixtures/conflicts.js') + t.snapshot(code) +}) + test('does not transpile nested style tags', async t => { const { message } = await t.throwsAsync(() => transform('./fixtures/nested-style-tags.js') diff --git a/test/snapshots/external.js.snap b/test/snapshots/external.js.snap index d4963fdd89f85b5c38e460ad59b073b7d124abd1..5cc432753824077a82522ac1e841fcdb631bad6d 100644 GIT binary patch literal 1828 zcmV+<2iy2TRzV>rB=00000000Bc zSY2!sRTQ29iL#hR2x`iMxsDCpmUg#0`_tX-c1e+%Kte$Z2C~`g4!gJA!QGiVrl!s4-Dv6fgp!!3Se_G4Urcpe82z0*!j_oxh#g-FB81OOtjw z=iYP9J>NO^e0Oe=rl?z~-!dPrlDoehyL_jy);dvM;235#~)9f*^|EX<1=px)OXVl`?st1?E?pNZ-DbqP|-9H{lYg1G$1_$DatbdBK!LL2?E+N~0ABnD05V4& z013+upC7C;Y&04P_k|*CAEPF#OrGECLneDIaWy9vMQK2S`MAoc3BReI>>-A8MNXDS zxDp%yj9rsK<7!vjquK)6Lo*c_qV-68PQi=b%Sj+ZmInqwh8GkliRGD2Fjbn zd<89hEs+nPX?aa+fC$t$P-`4)v$CRFOCY?H1V;Rm&|vWCHb{bSScU+3EO2rG<*8PR zb7Ipo3?}^8x)c8)S}&+7KqvxE1{wTR^|F#6ms9*Wky1ra_!6!w_Z65E1z7<@C=WPD zqvrhG_hd3#wr?HIWV-#>o7Xhe1GMtw^Qe5-el{5Hi^d`WMz5^`U(8ETKx1ZMnsfBR z9G4&zP-&84!)kQ}X<7BCaSxmz!5A2u$=M*};lvhh9NIIqadh*D4;QO2&W}xchwAFN zeTjQ`^qFMgG725Y{C;Ra-|6!c_&7n4I}IqwR0L-y+JB~S7l%ax+y_RE!Q~r;MS_A&9UEZ z+$E!St1US{DR3n|hZe561cONuf<2(-Aq9hM7~2h@kPKsk)l~iZ(?-M@+<1D4ydzqr)ZP$+prXu|;A| zb2|Wx#H!gkR&?bZfU-X7Fla7LbH9yO$k|SV$5#ksJ*EoYHXfV#a9?>MZYd85qEdj8 zVS_wTo)jqLv$~C4#R`l&p}1E>$O}-wWrG+UwUSsX1OJ3Eulp7J&Ehao*CblTH+)vrKGPFrH&gL_PQqW-RqQolpPba+ZTa;WmjPXN zDAu)3aLu656Ro|oCd@&WgLPSzEIHB8wex>}ctgd&kxKg&h|1J(c= zj6nk$;64v?HHxM)M2SIRGS2+Xt1C6RPZVb<4%S&6tg}3tC!jjjss`qt0FmWqD8 zYHO%m>z{@V8!FqV{o!*$5$=UWR8s+TinJfPhKsPIeePrn9aS<9f7n@9&BlaT>BcG- z38BlV=6$j&sxpp-P;+P2$2IOOjI+LSe3k7Wu&HasyT=s+xh1vcOl9mb$DYF@&eAO} Scq5-n=lc(-^qKMV8vp>@2YDR; literal 1822 zcmV+(2jTcZRzVmI=6R*gfCa`Qh)p|v>%HI00000000Bc zS#N9;Wf;E`iBilW1~BmH^;}pxwsyV#S-W;6LuLXAe`H`F%hDe0yS3QfmAfl!G^bHx zGK?DepfQn%1k?{2(V#}7#wcJEM1voU^2J0kF`yix}p(@`m*Nr>Uj8m&+ghzWh~m2U|b5 zoncOd?wb1MRM&;CKTd6YB{_ACCDsE=7^eM?r@q`ba^`> zIgC8_vFP|8p#{zPp-X7BROGrr5>IvRgi53Z=3n zt028;XxETBQG{SrmP&wA@aJ6jUS&K$K5_|vn8~T>7k@epmCaJF zf+oI>*!$419QEoW1}y=!ngBbjs_1A*#CM9&h<}ol2EUF$3WU=#3@Bn=Q1YlwwN_jc zo1X!g3}AF8{{yVvP*s3f1cCz6_^Rn`B|{;r25=$eil`P!xUbxIU{(?p6%3#{;3SQn z3v}L_PH)?}eK4Kw4B%*96RHc)_AKO3`|!PdDAE&)M}wT+TlqpUCqoh4GaJ(!qc`T5 z455fxlQbK4t7}LL)uSamaGWG#aBLQ5qnLx^+k`P_uh6EUty}!KS;eu!=!AEmuAi4I zc2AE!l1yAdsRN~O5E|5X_ydGKK~$9vgGw?K(b<94pK079VAHV0NiZDj?Tz!%Sannq z)ozU17lI|k%1FY4M(d4(oH%PNXTcpb;2QfMoZer+-Wj`hdlg?ajFCYYLM=j+kMr?Z zD8!k?pg0wL8_m{X9+e~`0L_+<$KyS*FyE_pKs&u^G!z1Llel2khJ z+=M8U3RyIL8W;4ZNFw&MnkN~-t9 z3uMa9G4-oy#=_S`Mw7Pb;>i{sTxdt6^;`#O<~D^xk`azXW5I?BXLq!(e%%cPDUq$( zPkB}Fqk_%NKKoS*rRpL)0EWnR<8`C&KG*v00B(%rLg{O8rqO)gTxh-{)Qsxyn=AEi zSwpAO&&>a#`wKbcg;D%j3ch=>uV>??(fZ8HQa`iI&qn1hv90T*qUh3?hsB~BO++3U zG%b{?-al4~0OyE_^kiC57K}*XXxKhr(4l4OP6)1|15noQIsnbd(eOJ8Dmmv;di?od z#$&qRX7kwKBR%EugylRSN@^a;1_rsJ{Y-^oE~8`YDOO;@NyU8u(=J=uN|gX(C<8&lW{mV2k{;FU~ZmMam~;1sQBZI~T<^PS~K}F<@pGur4C3^4Y*xebn2~_47$N456vAzPRCFK$2l(uO~`zUQnyE% z*yQaN)k4cytMcal>AY*aU~tKUlLn_7ovqKYMDeR3Yjxf*O|xy$`RPVijW@sjv#_nA zzlpO6>QoEoqZtI%o%&_mYg)6R_HLL>_uHuWu$6b*P0or9&rQuwjd*{VhhyVp>yJZ} zr!H69oZFqVc|#c0c9as|ajuW@g6|e{)?mVomc>y5zR_aCk9|eB9~MzPg6RBaKlBV1 zVTnF@W%BJ+G7djuTK@qs2F$qpENPZeT{z8r&F^aI8b>oo! Snapshot 1 `import _JSXStyle from "styled-jsx/style";␊ - export const _StyleImport = '123';␊ export default class {␊ render() {␊ return
␊ @@ -242,6 +241,19 @@ Generated by [AVA](https://ava.li). ␊ };` +## works with existing identifier for \_JSXStyle + +> Snapshot 1 + + `import _JSXStyle2 from "styled-jsx/style";␊ + export const _JSXStyle = '_JSXStyle-literal';␊ + export default function () {␊ + return
␊ +

test

␊ + <_JSXStyle2 id={"319553417"}>{"p.jsx-319553417{color:red;}"}␊ +
;␊ + }` + ## works with expressions in template literals > Snapshot 1 diff --git a/test/snapshots/index.js.snap b/test/snapshots/index.js.snap index 1947d6f6bd46c2c12391c284240431afa7caefa7..de06f282a855b6cbee8c0917769fabefdabbb8a3 100644 GIT binary patch literal 3310 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 literal 3245 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 literal 603 zcmV-h0;K&xRzV56CbU+OqvHLbtR@Dzc~`>>{iOp()KYnbOEK)6GoRE@8mqUi=9j z_po^A-Kz(|1@R(y@*jvNk-a&YWVZ*X`9;8dVBMt{poaX zvix=bWdBh?i`RGgnnUAodGhefS?A5ULtcF?DDV4CP5b!Z$Jy@Wy!QF_#mm>H`n!Vi z{@jZ3Zm9agmUe67o90hvG~|HsV}cnNhja?cjb>t&jiO5f#(_%-4S@y9A@-ybFI0_( z$7oJCs8p)J>H*X9k9tKQmpSWk%(&T{rM80WMUJunkco{_q(B9TQYT2dbU`Vie1gMW z6*khSP+v!w3AH?K!ZsT-n=zTHk=yKtjdZiaCkM|D;?!inP?dT07i^IrK%;oQV*xHf zjP0W-wjxKish3jDjp1;D*hDyB8$kJNuede5;{Z*4x6<#!d+koA-MZV-cVG?lRofa^ zO=&O~RK?}!|4Og?@vi3SdsdW15FkaiqBT&W7r{mhC8@N7m(x%RCEz&V zT^mL=98+q;?idk0YY8GeHtVd<0#~5zz?weYs+*=VLpvB^c^8h9C*1D zUC-vUM4WRZlW6!f#AAPfS*A6k^U%e6XqI*Q>@lGuL@r%I*w7GAO7m()YiE`}p^Tz) pWouP^=fA4|IaNDshJvdr?oaBDZ@v7bC!A|m%x~Nb@fk@5006-JEy(}? From d27184ec5d39eff8b1d364b328ed45fdc9f5e1fb Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Sun, 1 Aug 2021 20:21:29 +0800 Subject: [PATCH 3/4] remove unused imports --- src/babel-external.js | 2 ++ src/babel.js | 17 +++++++++++++++-- test/babel6/snapshots/external.js.md | 3 +-- test/babel6/snapshots/external.js.snap | Bin 1526 -> 1520 bytes test/babel6/snapshots/index.js.md | 3 +-- test/babel6/snapshots/index.js.snap | Bin 2513 -> 2524 bytes test/babel6/snapshots/plugins.js.snap | Bin 601 -> 601 bytes test/snapshots/external.js.md | 3 +-- test/snapshots/external.js.snap | Bin 1828 -> 1831 bytes test/snapshots/index.js.md | 4 +--- test/snapshots/index.js.snap | Bin 3310 -> 3304 bytes test/snapshots/plugins.js.snap | Bin 601 -> 602 bytes 12 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/babel-external.js b/src/babel-external.js index 9896a9dd..d7aeb0c8 100644 --- a/src/babel-external.js +++ b/src/babel-external.js @@ -154,6 +154,8 @@ export const visitor = { return } + state.file.hasCssImports = true + // Produces an object containing all the TaggedTemplateExpression paths detected. // The object contains { scoped, global, resolve } const taggedTemplateExpressions = binding.referencePaths diff --git a/src/babel.js b/src/babel.js index 66b74030..f1916263 100644 --- a/src/babel.js +++ b/src/babel.js @@ -291,6 +291,7 @@ export default function({ types: t }) { state.hasJSXStyle = null state.ignoreClosing = null state.file.hasJSXStyle = false + state.file.hasCssImports = false setStateOptions(state) // `addDefault` will generate unique id for the scope @@ -306,12 +307,24 @@ export default function({ types: t }) { // Transpile external styles path.traverse(externalStylesVisitor, state) }, - exit({ scope }, state) { + exit(path, state) { + // For source that didn't really use styled-jsx imports, + // remove the injected import at the beginning + if (!state.file.hasJSXStyle && !state.file.hasCssImports) { + path.traverse({ + ImportDeclaration(importPath) { + if (importPath.node.source.value === state.styleModule) { + importPath.remove() + } + } + }) + } + if ( !( state.file.hasJSXStyle && !state.hasInjectedJSXStyle && - !scope.hasBinding(state.styleComponentImportName) + !path.scope.hasBinding(state.styleComponentImportName) ) ) { return diff --git a/test/babel6/snapshots/external.js.md b/test/babel6/snapshots/external.js.md index 4fc5da3a..19aaed25 100644 --- a/test/babel6/snapshots/external.js.md +++ b/test/babel6/snapshots/external.js.md @@ -64,8 +64,7 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `import _JSXStyle from 'styled-jsx/style';␊ - import css from 'hell';␊ + `import css from 'hell';␊ ␊ const color = 'red';␊ ␊ diff --git a/test/babel6/snapshots/external.js.snap b/test/babel6/snapshots/external.js.snap index 08a52249d4dcfd1345e221d7e1433f1464fa5d3e..ae556ec0bfaad3de95b3e30557af3735fb9cff15 100644 GIT binary patch literal 1520 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 c9Nif@x?h1qA#2H2Mt<8 diff --git a/test/babel6/snapshots/index.js.md b/test/babel6/snapshots/index.js.md index a7a153f2..a8ede4b3 100644 --- a/test/babel6/snapshots/index.js.md +++ b/test/babel6/snapshots/index.js.md @@ -19,8 +19,7 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `import _JSXStyle from 'styled-jsx/style';␊ - const a = () =>
␊ + `const a = () =>
␊

hi

␊ ␊
;` diff --git a/test/babel6/snapshots/index.js.snap b/test/babel6/snapshots/index.js.snap index 6d5ff43dbdca7b2528343dda8cedb3a2776383aa..cadcf441c64ed7fce71db35bb5f771a17fd6ee88 100644 GIT binary patch literal 2524 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 literal 2513 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 diff --git a/test/babel6/snapshots/plugins.js.snap b/test/babel6/snapshots/plugins.js.snap index 721c5abf9f1d8c9075c17e81d5fcbd8d87fffc22..d19eae955c538f95f4b403986eca0139881c9fe0 100644 GIT binary patch literal 601 zcmV-f0;c^zRzVgjYv^JXc6i`NJ28%osgBuPP#LxDa(MzUi=9j zdng`q_ZNr-@gjKhCwSD}oSkg*QHoxQcyRWx@5l2#@5jvh93ixUK0f?@x-&d0e7=4D z>di^zeG0|rej1^f^X}$(?bFHbaQ5TD@!sQt2NIYfCkf{#x$N*2MfLtyQP7`d;KLnRz&iC+$I8jgKDQ2TNSE<__Vm_2T z*aB01Tg&1~-cf)@zME^c%zL$Zy;i+jt!$eGXz9EKU}8wZomlR4I(ga5fI9a0ujCSh z3%fi{axMqzdro9584L*tvlCrGC7V%?k8x1SM%pP=iE+ic-eMA2sjxw|r-q?500mr(1fs+U^E3@u zA3)-j`X3L2uM8sLU3AQU+wF({3-a$Rh*65E{2pHSAv^ui=%+pwf@%}e|X&oGsKOa=e|bPOqT literal 601 zcmV-f0;c^zRzV@Ml00000000B+ zQp<`HK@_b-f)H2!fLxkDCrlnj$b=-_5gAkvW)Q}Okc6btT_G)%uC}W(W@rjr&c;u0 zIg7zX_I`mlAZ|o=eu7J#oz<0|yclq!;=<}h-^aP<-a2)kAcU?VtKWJ)Ke_+utnvDM zKwo}Iq4<1GBlP~>x3j(RdGX_|ix;m>t8Y^}n#~|Ix8K~jsDC)!AJ4zvJvn%g($OE8 znD4r-Pi4@}^t-e-30Nqg|LE}Pp*W@lMj@Mk$z$6sJ>#>AHqBNxL28#Lu<|0yRoY=b z7vM0;La@OMiK~KHGSfva8R01vkk1#uZiD4|N8nJ*`2n5~I~u4yrChY&D);+i%*S#7 zJ7B7BXEj{eJ@)a$bMl>zd8giJ)N8kE)m^g)9o@GGOpHmm7u&sFuOQo5P{#`XN-sgU zuqr{)b0w(f+L5thFeD_*c60@mY)3{prc$HDlj=E3NkxehN*uw$NU1G|FPdE=>KY@) zx<+$^DJR9QF~mbcm9G+%IaqkiUwB;LP$UV@C(5cTxEf(Pi4oOZsa)c_8<1*s9aEDr z=1759_&6jZZ$|i9YtE*jL-uj79`yJ_%7&O;hNSEoEon%rvef8G%{E`Co%q{jRz>Yn zyU^NL>)ijf{`b~;zys`;bCFKUU#+*oG;`64LAK=JPp-^Y^qUvq@{zU#)O<<|?Exs@ nQWA)gAS~K6VN-x4EA>AXgRcpZ@Gfu6w{QCsJ(95COa=e|_{Arm diff --git a/test/snapshots/external.js.md b/test/snapshots/external.js.md index 4ea28fb3..f43280d5 100644 --- a/test/snapshots/external.js.md +++ b/test/snapshots/external.js.md @@ -89,8 +89,7 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `import _JSXStyle from "styled-jsx/style";␊ - import css from 'hell';␊ + `import css from 'hell';␊ const color = 'red';␊ const bar = css`␊ div {␊ diff --git a/test/snapshots/external.js.snap b/test/snapshots/external.js.snap index 5cc432753824077a82522ac1e841fcdb631bad6d..cbc56f5f9778067d781f709178357c4236f946dd 100644 GIT binary patch literal 1831 zcmV+?2iW*QRzV7_P`I<@SH zgHLTMzHxo{{L?SLIB|$3(#v;I)KTSq>CzYJWxLwtPyc9t2U&onH`*!c{;pG}cU?_g zK74NI-{b#$FhLXPnH3cE&HBHY%*yD+qhGJxaOSm#UZIIJdM`zN9=UMv#*%gCqP4yo z@A3!#qKWj{eH8WTuWw#I6?o>OCx>>moyl%JNfYVwt0-zQbvua^y@Xo6=u1i{S0q^l zxlO}6ht=^C1S7Ik28@FLFZAqD#)9NuCh7ByRK>h1NFq?7qWU{Q%?E%V{{eukQTjp3 z#t{kwHHMAHW6|D7jO}H#bd4zp`vM5E#}?P}Qc05gWmrgRjFt*o`sr>0oG$hOTS{t%a(zdk=~vkfBmIPYe29MZTG0;*d-f0p>{FBnd5HK)Eg0Ner0PR@hl_JVhy%guf zp=Sc7f*9Q$|3TUyR1Kgg0$u?*{HYnVk|Cd0gE*0LRaAvC=9PB_<|R>4!63>5cGBcr zuow3(4Ht>N);O0mNrbgnOIGht_bq#-L7>z?{d_7i- zO|Xf0ILuh7(h;lpG4jAA9+9NRt@K#1iA16|9%1_ormWUKHGNa0Sih~c813t?C$GC; zhQe$jhMet-;(}@IW{aJ>DFH&zKuH)as%UGz`D#*LxrXxU=5pQUK3rOjw7JgPt!pwW zx4OxNagi?zd1Sc0B^XE(7n}~Yb}1ZYqZl`WTr$B1YMDm+v!=&6TzGm2UXP*Bqrei( ztCBpO{~mN(M8gpe>rub}@ngWARX9oy#VDPDSS_H`LH3 zWpZ@~^oT0Bb#SOTtzSR$DzE3os_pvM4(kNy-&wS;*_&94*bdy6Sl2Wzap;=XpM~qL z3k%Z43O~BS(0Rhmg`FY92yz@_kytFz$Fgz2fVF_bGE|OrY_q`t^-@#FX?kOks>~%Q zTFww92DyodiaXa-ureQ8Y3covR0r-nFGlF?9?K9oINw?^>{bjnQJnLH=nh#;WJBS% zut{^TA8=b(U%ISI!Tr?iuRO-V9R|0WZf&RQ7RQ}2ItjDo?QAJJKWy|wy!qwN!cxT; zL>vWmat7DIGzHaL_2azPv{p-r3SLKrCNa5XW(B)0v>q0a z0o?Qh!}N)tVq*AYCa*qQj0{a*lC&NkaNj)-(*sY>&1J_nyX|mZOK=}7AtOTQ)H@H! zPzjcyh(o~@SJ%iojZ4LNBGTXxK5icL+G0}#V2O{@?_fj%r*GR2%=4jf4cYXx zI{+2qsSD6D&S&UD9f}7f6nRl+oY9EYL!~#5g9<+iQ$dH+nZAjeJucmzre&`KcY#Lo1A%5a+ VvnvZebk3$v{ST;{X#dF@005h!fSdpT literal 1828 zcmV+<2iy2TRzV>rB=00000000Bc zSY2!sRTQ29iL#hR2x`iMxsDCpmUg#0`_tX-c1e+%Kte$Z2C~`g4!gJA!QGiVrl!s4-Dv6fgp!!3Se_G4Urcpe82z0*!j_oxh#g-FB81OOtjw z=iYP9J>NO^e0Oe=rl?z~-!dPrlDoehyL_jy);dvM;235#~)9f*^|EX<1=px)OXVl`?st1?E?pNZ-DbqP|-9H{lYg1G$1_$DatbdBK!LL2?E+N~0ABnD05V4& z013+upC7C;Y&04P_k|*CAEPF#OrGECLneDIaWy9vMQK2S`MAoc3BReI>>-A8MNXDS zxDp%yj9rsK<7!vjquK)6Lo*c_qV-68PQi=b%Sj+ZmInqwh8GkliRGD2Fjbn zd<89hEs+nPX?aa+fC$t$P-`4)v$CRFOCY?H1V;Rm&|vWCHb{bSScU+3EO2rG<*8PR zb7Ipo3?}^8x)c8)S}&+7KqvxE1{wTR^|F#6ms9*Wky1ra_!6!w_Z65E1z7<@C=WPD zqvrhG_hd3#wr?HIWV-#>o7Xhe1GMtw^Qe5-el{5Hi^d`WMz5^`U(8ETKx1ZMnsfBR z9G4&zP-&84!)kQ}X<7BCaSxmz!5A2u$=M*};lvhh9NIIqadh*D4;QO2&W}xchwAFN zeTjQ`^qFMgG725Y{C;Ra-|6!c_&7n4I}IqwR0L-y+JB~S7l%ax+y_RE!Q~r;MS_A&9UEZ z+$E!St1US{DR3n|hZe561cONuf<2(-Aq9hM7~2h@kPKsk)l~iZ(?-M@+<1D4ydzqr)ZP$+prXu|;A| zb2|Wx#H!gkR&?bZfU-X7Fla7LbH9yO$k|SV$5#ksJ*EoYHXfV#a9?>MZYd85qEdj8 zVS_wTo)jqLv$~C4#R`l&p}1E>$O}-wWrG+UwUSsX1OJ3Eulp7J&Ehao*CblTH+)vrKGPFrH&gL_PQqW-RqQolpPba+ZTa;WmjPXN zDAu)3aLu656Ro|oCd@&WgLPSzEIHB8wex>}ctgd&kxKg&h|1J(c= zj6nk$;64v?HHxM)M2SIRGS2+Xt1C6RPZVb<4%S&6tg}3tC!jjjss`qt0FmWqD8 zYHO%m>z{@V8!FqV{o!*$5$=UWR8s+TinJfPhKsPIeePrn9aS<9f7n@9&BlaT>BcG- z38BlV=6$j&sxpp-P;+P2$2IOOjI+LSe3k7Wu&HasyT=s+xh1vcOl9mb$DYF@&eAO} Scq5-n=lc(-^qKMV8vp>@2YDR; diff --git a/test/snapshots/index.js.md b/test/snapshots/index.js.md index 03f12770..a2e6e6ea 100644 --- a/test/snapshots/index.js.md +++ b/test/snapshots/index.js.md @@ -63,9 +63,7 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `import _JSXStyle from "styled-jsx/style";␊ - ␊ - const a = () =>
␊ + `const a = () =>
␊

hi

␊ ␊
;` diff --git a/test/snapshots/index.js.snap b/test/snapshots/index.js.snap index de06f282a855b6cbee8c0917769fabefdabbb8a3..b494f353a20ff91c059e9ed7aea59b775abbb640 100644 GIT binary patch literal 3304 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 literal 3310 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 diff --git a/test/snapshots/plugins.js.snap b/test/snapshots/plugins.js.snap index 0ecb63e064a6da88bf9d2052c81c445b32955a9c..dd9e66af575dbbb541d3a8167c37b91908d82df4 100644 GIT binary patch literal 602 zcmV-g0;T;yRzV3YjYv^JXc6i`NJ28%osgBuPTZN)lx4tUFa89N zJrobQ`v(LI;zjY~U+^T-o3pdqd{OYC;=$R&z8}x~yze~oJ^=u10jp;|pP$_Sbk=x% z-ls3Wq(F2&rvZ3>@7vkl=)Cmt=EaLwr`5M99lf3bU~a$JzNmjV-5WxOdcDq*HMJ3qQZA*}e5efDpyW8y+Wh)ESu_k|| zmmpkNl}XZbsi)`K;VOfK39}tuK_y!uG9oH9S~RJivz%0vIibW6EC`j@g7~7@L170C z8S9|t5K~S{9W=lLLY1!)lsQ;<%#S@Ta3GR|=M!bs6)BEO;D{p*JIZr8Q^Mz#;p1vKsXGL&^r2UWTOXAX6e~RTdgusoDAqwGw}`%&Mqe zY8B13t-kettN*#J?(+%uja;ac@>kofFwI=JWRRxp|H+N{3V!b%T)xqUewt2cp*;u{ oaG?kclOT+{G~xRFldRPLNDIEAL&CebFyFlFPY-@S-bn@k06)Pc9smFU literal 601 zcmV-f0;c^zRzVBs3qUkcMP;BT`flT7-HKl8~M3PRPn+C+I5V=pfl zIfwaNK!;HlKnoTE;wmGV>ll}e@QeyrES8|vfu`#nLWg3`_wj^Sp{>$X@?lI>9Sp{p zkEIQ_AX4Afsv}6mWQ7w-9KnJZ)6R!0 z25CrJnzd#AE9+VBzLV&e!_1nxr%uUOdoka@^}d6PJGwMKO{Zp|H3$`OIT08pMi^&l z!}b0Xuhjo&7CbeFgm>96|827${;$VBw;re(QT=Hxd_jEC?xC=UMvV1PdxR+`4izk9x^1l<`w=0gFvE&Nd^D_A2Jej From d3d0a47ced0041775609a05cd6bacb2a295d91b3 Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Mon, 2 Aug 2021 02:19:25 +0800 Subject: [PATCH 4/4] remove imports for non css.resolve cases --- src/babel-external.js | 12 +++++------- src/babel.js | 6 +++--- test/babel6/snapshots/external.js.md | 7 ++----- test/babel6/snapshots/external.js.snap | Bin 1520 -> 1503 bytes test/babel6/snapshots/index.js.snap | Bin 2524 -> 2526 bytes test/babel6/snapshots/plugins.js.snap | Bin 601 -> 601 bytes test/snapshots/external.js.md | 7 ++----- test/snapshots/external.js.snap | Bin 1831 -> 1815 bytes test/snapshots/index.js.snap | Bin 3304 -> 3325 bytes test/snapshots/plugins.js.snap | Bin 602 -> 599 bytes 10 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/babel-external.js b/src/babel-external.js index d7aeb0c8..932f90b9 100644 --- a/src/babel-external.js +++ b/src/babel-external.js @@ -154,8 +154,6 @@ export const visitor = { return } - state.file.hasCssImports = true - // Produces an object containing all the TaggedTemplateExpression paths detected. // The object contains { scoped, global, resolve } const taggedTemplateExpressions = binding.referencePaths @@ -224,11 +222,11 @@ export const visitor = { // When using the `resolve` helper we need to add an import // for the _JSXStyle component `styled-jsx/style` - if ( - hasJSXStyle && - taggedTemplateExpressions.resolve.length > 0 && - !state.hasInjectedJSXStyle - ) { + const useResolve = + hasJSXStyle && taggedTemplateExpressions.resolve.length > 0 + + if (useResolve) { + state.file.hasCssResolve = true state.hasInjectedJSXStyle = true } }) diff --git a/src/babel.js b/src/babel.js index f1916263..0f9dc188 100644 --- a/src/babel.js +++ b/src/babel.js @@ -291,7 +291,7 @@ export default function({ types: t }) { state.hasJSXStyle = null state.ignoreClosing = null state.file.hasJSXStyle = false - state.file.hasCssImports = false + state.file.hasCssResolve = false setStateOptions(state) // `addDefault` will generate unique id for the scope @@ -308,9 +308,9 @@ export default function({ types: t }) { path.traverse(externalStylesVisitor, state) }, exit(path, state) { - // For source that didn't really use styled-jsx imports, + // For source that didn't really need styled-jsx/style imports, // remove the injected import at the beginning - if (!state.file.hasJSXStyle && !state.file.hasCssImports) { + if (!state.file.hasJSXStyle && !state.file.hasCssResolve) { path.traverse({ ImportDeclaration(importPath) { if (importPath.node.source.value === state.styleModule) { diff --git a/test/babel6/snapshots/external.js.md b/test/babel6/snapshots/external.js.md index 19aaed25..7e7ce819 100644 --- a/test/babel6/snapshots/external.js.md +++ b/test/babel6/snapshots/external.js.md @@ -53,8 +53,7 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `import _JSXStyle from 'styled-jsx/style';␊ - const _defaultExport = ['div.jsx-2292456818{font-size:3em;}'];␊ + `const _defaultExport = ['div.jsx-2292456818{font-size:3em;}'];␊ _defaultExport.__hash = '2292456818';␊ ␊ ␊ @@ -158,9 +157,7 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `import _JSXStyle from 'styled-jsx/style';␊ - ␊ - const _defaultExport = new String('div.jsx-2292456818{font-size:3em;}');␊ + `const _defaultExport = new String('div.jsx-2292456818{font-size:3em;}');␊ ␊ _defaultExport.__hash = '2292456818';␊ ␊ diff --git a/test/babel6/snapshots/external.js.snap b/test/babel6/snapshots/external.js.snap index ae556ec0bfaad3de95b3e30557af3735fb9cff15..484799805d446a45e3d915a0b6b0696fd2fc90b3 100644 GIT binary patch literal 1503 zcmV<51t9uCRzVU7hF`pM}DuTbd@9_vS^MR#0#X9byR~cTJu&k>oDByKHUGLv)BO zs5n6p9Qt8XKPZR{)DMbCH_>U8?SuGDPy}%*2>PX~FVFMb+^e_i-)Et5A}25{oCY&m&;d94ZnQ;$VdbU(cfkC8vFI>&yMAP`tI2`1?uaKhl(_j z?zx_#&d6_x-+Y|iJ3A_U@XP4yG)<)5y%cre;OhC=E9viFy*T~%+kd^YOcUuUdYuj5 zwDHwB|Js)yX77D1y|GRc>FkXZ^-*MPKpvZZ#0qKK1@;jza70fC=dVs z$=TDXwM*U~X(Dax!-$WqJn>-V^!m)_C!c#}`4mm0kB(B*i$A=wz8ZM)-N&bAhcDzG zI7budzWo&S#o<4^xm%-`&U||4?h7y7^8!tzCvTys>!=$@*7OiHvS*d5)*GUvfWmz< z56>uzH3-U*SO<)ZKbIyRkryV(M<(U*c*;$os8mG(C{R{><3RNQ;KOeK5G8pEq%ELo zDWiJXL?RXqMq+Hxt7TPhsd_wsFefarS`=%dG$p}OO7m*zNz*>-C&0xTFUv>xI-CNG z-I77~wegfkvt@K(XcHM3sw4#24^$vmmmts#i@;=26l8@L6d5U#&$=qe00sq&5p?Ms zk7WWp0cI4bD$M&BGtp2a6pts_SVAp}f-->}Ood@Rr7AlC3Kd?iU`$Kd^f$*Z zbt3nGTIvtQ+krSc(3pxZ8iwOA9N!KWW0Pz$5e_3PxL}kFLpJeklmpVY$;+bH=}fN& zn@lEyi3l4v8b79AHN!2kYY z6y%%lu1%(r>zGRCOj>q~2Tx?HcPNGbN6co(rA2|SSBofc-6hCmNecFadZ!c)vr&v2 zK`FJsGHR|f{(LLrLIFoZ@Fom{2^rR4Q4ys<`Ma>~Q4L!?%v%8i#Fxu4Rwj%ebW0$g zAIAigBGogdzXZ#Cv!?XzI;wjx6k?;1q^;|g*txnJ&ifq;XJE4}W87>TUyke^U*_Df zWZpeX=DKoY-Yqxg`Y>XCdl)h2iU;%C#)G*{lM3etOg~~_^8XGS?tbLE!-=^qlA>M( zx5U_`CjS{`wAi6HHKG8x!Spz|@qPI5c}nkd!N_1*&!@*}53xcd8cT$_pZ4q+_VsPp zk#lxkEHzQh_0pkvb2zsL_*Aa|b8f;yT(culy+^n93RyO`hYGCKtSzA5#(-=%)Fl+Y zv9zqH0S+5amxtRF^I}MXr#qekt@+Tn&LMT>AAp8&*MVq;XXJFWs-Owa=wn|BR6?A` zw85*;W5bUI8w;s6>pKNesX(a(LawL>3KUA50Ww!>!W8Gs`z{eRK!5@s1@x?jNGsir zmA!uvH28U#p0r8rT|B&r!-1ixFK+Whpno;@S^X=ELXzOIW>tbdQ-{S%!~juA*Lc~` z54RmLOh9MTd`6PEYv%gSs5-I7BC%L9&aw%>fJ1=8GPJ$x;Ksyjpk3M$a$1)3INjJz zP^8WfBL?NkXj%L`ot|v$gext3LKNG;?VM|rzNMXQ32cnn+c4}j40kcy_J-&QA=s{w zc`a=6lY_oLSi<)G&pcx|?~?7z`GZ97IylSVG}EIUcP`PRsO{G3yyiM>bw+n)99>P` z&JNJ-&Wi5VPN;uw;`g=zgzA$2IQOj9OVvIOTbX}bEtctPtcBm*{@`xM=~Kp5jT{BQ zcbsF@*maiOwzlv++TwM##oK>G*{(CHf*L#yYp5L|ppDxfrKW4JuAf)9%9u*@$mtBA z)+tR%0O^*-z@bHy;6?xFT|#~F8sqME;9F08P_zi)eDFFBS?sTE~CFQ;oCO8Ip<&f`h4brH_{vH zG?BiD6b65N_KRb=pRPXtwnTlqaWqd8>8CeQ)M@n{`N}7m-l+lQqhAKzq-i3(+DlRU z53F36x|aU_^-B|fzxUVKC7MXzy@jGaj;tnzUw-P5 z;;Hq?FQ0zlxuugdkv?%NMeX};;Pz3q@AuEnoJy^(`F^B{bZvm5UjE^=^_9Rg?>{*) z)ps%X@Hv`Di~A_*t3!YIvUf(;PJe#zzKgHi{}N54SMH#w8>yQ~)^rcmf5Qq@DpzDh z1Je&qK02u_h!D&wav88H{=YEtm^vRM|FS8DVP>mRUMtBG(4eXf4FjD4UuqM)jW zg)$ritkaT3>$Tw&Q*&f=wu_ANvZNx#0-P19qBb#4?8ZTswZi0*TqGJxgcAC!ENLTZ zX%UWvVL4S}b1BAY7?_?e3ThGAv$h#2TUjntMHqlYO+^Y$!;~Zb{XJbEVyco7s(zpY z93ZHf7J(p1P>?j$N|vbN7*WBo2SYj|V3`C@fJsd$NpnMX1wxTfJf7rYjTJzpXOQ9M zye(yGzZqe%(Q^w|i|t(rPDi}c(V&jsYS%IEx~w(q~J`b zbxPqd7sY-fD5biyaXs4@f3BYK^fZo!_!}_|MpP)mye2E1^7mldq8g5RSW5xZ$xt@S z+L^F^&@6#mZWt42id4_+ev_BlqK@i58VYgINYa72Ep|_L#l7AzI32;ZjWO5`zU<#S zzRY@I$((nV%r@o5oL6qlwqeBF&M;!u6A$Kgj0dw_lM3$#Y&&9MbN>z-?tSEY!-?5# zlA=)suf*7-CjS{`wArCGHKG9c&h*$B_%{4_zMC6jW9N9hfrX zXXbRIq#-27jb1DSiXon{Z189>4*${7%6w{*^*xfT6`@jhLf#Pu8k7pW>10N%!W8e$ z`(7CVAVCRt1$qEPOp@O0EA!9-s0ec~9dt;YDE`?+N1B?(#97C*@sVw;@sJr4F0wTv z<2sKU79EGg%&TEorz>7m@e^-4STRkUgYQ(%n4cX(i_FqN6jf%}S&Ktm++I4= z!T`wl$RT(Xc&u7d;E<)m;lVVW=%j-M)zlAfx&w7vT;t@4MPjjJoZ}LJ1qXqnis5=? zfOilCT8#E33=3;UUM1(P`x~F_50{Isjv&}=rrL6yw%en-(~h1xZ+9DLZ+peq)=8*K z^cD%#?~N0^v1}XatYhx#0leZaWo6HqWyj7rp#>~HH!QyP=N#AcT+)FEk3$i`5dyVg z=kv{k2+PKOg)a{3M33Cg0D?}dDiTQ7H9Fn`&=~m8FM3rFEv~$a6#BxU6Kk*i6cN$S1o|lb z{p{|u52o&V9z6N(l^4yUK1_WM{a$~*>&boJI$l~m{LXg=Bip}y@v;w7-`qhEk3ROomo9xW z{Nun&V)`lNXV-n0I{smTkbON@(obC7m42Mwe(w9zgb!0s+(i%%|FZ9!vtQr-?Dwud z2X?*s%BOvp`u?W~;?m$(#NB)P=Eu+fCVTFSF9dytn)r~mX+-zVOCaTM)iQ}4Nt zAg=7a_>G^W-ro0@^YV{&6(8;MVd{Y%g4jmvz_|Oi6L)tF`{Zm+(@n52HaRnC78MAV zbS(==!+w?mE5=#~Ka%loxQ00;xFqBi6ZH1>fy5x#FUhMwR0P8q7qT!>_M<5QCK_g$ zFdd1oervEBpr8G@)=VZe%>AKUd&~t*+bVNiPgz3T9?r5q7xYdqi<+Y813HxAmfzYR za%S7B?GGW<2m9h~Kz&J3Qw80|vCb8E-yf*~$v#+Ip&{!nidr38oOR zz3k*58gIj}@opEAOdZNiJgE7~UW@*^>wiD;wjN9;)X={BfT87e5grk8IaytPbTq&tgMl#D~($f{5naP5jo_?qx9#Zmi>=F54 zd2D#%5k;Ml*U;zqO6s90^m#-^YiEV&H3jV>iwsYT*>NQ`O=rZ>BY8o^F7q>&-*@Z=DGR36f14uzMK2iHysGqe5pd1Pq$ z=;%;CnqQI*7FNZBoS2q}Yj*jq!qsm&|=0$T$(x_t0O%8uvWS9G4Q7R-y zjpbQ}H_~h}k{lgV=0=A3F_wy@*l`LX9jbF?-8gcj==f0Tn%&me8vgax@Yk#%n5J$ZbCl7NvNQllTW_-4@+3ui zlk`gjUC8#5{%6NYrnt5Gqq99Gtu`tJSPJz-aLfwp>2yLjMo7)L5huBg- zyk1pD0IY7y6KB_nPUEbND(!|?`9I|49yGpuXQyX?Bddo8(DDfK*QN$K-4s) zUXRx0NUzv=64c5~K&BN2Q>M0L)i_>%~Czoji#sB*Vt&NR$in%mxOuCR1TzV=RS^89ExlOjXey zbaX)4*yS@>;ifr`L#I->x@QaSlYI@3)7wb9mURG4Q7jvyqBK6h7jwa$O7K`gF96k$ z>M7Tq*>dhdh?-srR=-(sYjKN(!-nnJEkhy{!|@Ey;f%1jzL=@0)Rtg3a4DLJaa@$= z`6{$c5dE*NSa)APs&OiAohYyKCD5`LwP*Pz5Oq#l^F87jEM7da$S7o?{ zG9EgAjzK{*gY{c&`<;cB*mZ!PnURfPPS2l;j10=@fvuQ0#~7e(50(x zW#d$_+UFFQwP8$v#Y|5b^I41W?(RB@HIDUBOEVnHM`KZnuQ%xYI*Q(U%ceoByJlH~ z)k6@#$`&pVH&*JdX=Q)V-Y4i?udRM-sHzPD+3Krj&w5KHr4>-t6%70C-x4^uDRA(% z0uI)Jb3(ofrrp&fk>}QrhDIIF@853 oZ|ZorIxtKPnfU+zo8x8{avyI3Xd4IaZTrUK-|RqNvCJg^0Heq0K>z>% literal 2524 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 diff --git a/test/babel6/snapshots/plugins.js.snap b/test/babel6/snapshots/plugins.js.snap index d19eae955c538f95f4b403986eca0139881c9fe0..1f3946f9d4430e085b7cfc4c5bfd5e86b11119eb 100644 GIT binary patch literal 601 zcmV-f0;c^zRzVfD}Vu5;i|Z$%Z5|5m{6ab`jQtkc6Z&(;*|B>2bQVW*Hhh?!`y& zxQE3 z^7U!;T?)nLZW+9Pp*W@lMj@Mk$z$0qJ?FEE7R^>RL28vJu=2vomD^!H z7vM0;La@OMiK~oRGSfjW8R01vkk1#uZiD4|N8nJ*`2n5~I~u4wrChY&D);+i%*S#7 zJ7B7BXH{I;J@)a$bMl>zd8giJ)N8kE)m^g)9i6ubOpHmm7t6g~uOQo5P{#`XN-jaT zuqr{4b9JGfYe&Y4!H|$J+tC$NvK>ib94tKMFElQ2C=!R~6D8FZT$M1L#E9yyR4Vb^4M?@Rj;YBQbEH5l zd=iq8HzRy4HD}Y%A^SL3H+uXLWkXCaO;UD^mNfq4Sbs&oc~~z8Y3q?SpW1P)0Vv>d n(;-TXut?K{&Am>%Qvc%}=W7>{@Gd*%+ui;In8#Y5Oa=e|C@~;s literal 601 zcmV-f0;c^zRzVgjYv^JXc6i`NJ28%osgBuPP#LxDa(MzUi=9j zdng`q_ZNr-@gjKhCwSD}oSkg*QHoxQcyRWx@5l2#@5jvh93ixUK0f?@x-&d0e7=4D z>di^zeG0|rej1^f^X}$(?bFHbaQ5TD@!sQt2NIYfCkf{#x$N*2MfLtyQP7`d;KLnRz&iC+$I8jgKDQ2TNSE<__Vm_2T z*aB01Tg&1~-cf)@zME^c%zL$Zy;i+jt!$eGXz9EKU}8wZomlR4I(ga5fI9a0ujCSh z3%fi{axMqzdro9584L*tvlCrGC7V%?k8x1SM%pP=iE+ic-eMA2sjxw|r-q?500mr(1fs+U^E3@u zA3)-j`X3L2uM8sLU3AQU+wF({3-a$Rh*65E{2pHSAv^ui=%+pwf@%}e|X&oGsKOa=e|bPOqT diff --git a/test/snapshots/external.js.md b/test/snapshots/external.js.md index f43280d5..dbf9cc9f 100644 --- a/test/snapshots/external.js.md +++ b/test/snapshots/external.js.md @@ -45,8 +45,7 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `import _JSXStyle from "styled-jsx/style";␊ - const _defaultExport = ["div.jsx-2292456818{font-size:3em;}"];␊ + `const _defaultExport = ["div.jsx-2292456818{font-size:3em;}"];␊ _defaultExport.__hash = "2292456818";␊ module.exports = _defaultExport;` @@ -167,9 +166,7 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `import _JSXStyle from "styled-jsx/style";␊ - ␊ - const _defaultExport = new String("div.jsx-2292456818{font-size:3em;}");␊ + `const _defaultExport = new String("div.jsx-2292456818{font-size:3em;}");␊ ␊ _defaultExport.__hash = "2292456818";␊ module.exports = _defaultExport;` diff --git a/test/snapshots/external.js.snap b/test/snapshots/external.js.snap index cbc56f5f9778067d781f709178357c4236f946dd..1e9fb3a76524b269e7435f7ebb488b696ea0341e 100644 GIT binary patch literal 1815 zcmV+y2k7`gRzV7pGU|TXejken00000000Bc zSZ!!qRTw^ZbLcXuPU>{~b-b1}?b@Wd`DoLm8J(-J!9H9!*$5%IOHP~24fRYrxy7IAN;%7nqK5(_0VW{=^VgTCyc<#d9)YTtfcuN4^PClAtsP)1f z06frn=IpL(@t=-e9Qya2f8L#7s5QS7fD`iD;&-1WmhEblKKi}&4U9&tPqqMXGI-DA zSEsu!fBA7@!|UkPHF-UYxXq05JEELnRoTxcINaAw&Pho0V=KYD%m(ldvj zpE$x$>-qZu_+s7PY;tAz%8Ad{tUvei!!I(_8d(LvVsJZUidh1dFZv7=N@Y<}V0z>5 z&S7P|h~S7MmLMyW|8w1Yx+bYLJ_WqRTEVynklmKKniY$p)Gwi2Ol8%$-}Fy(QQ&Nmm*vfT3H3wP z?#bf!YDdhY+7jB!uoW5Mc%(vBAwlosC77n+!2y^q2nv$K@;0=$QjpMkG{RSkidWJ; zdh4_9=rAA#%Vie;K0hAk)7a3QP12gUio5q!M$(zJn1qZ&C z+WYaaoaWU}4QdRkH4|*Ns-mOCG2aPFBl(GIH28E3S|E~^VZbxyc{z{kRBI(QvH2N* zaX&$K@;}Jv4ONAhMaauAO`fXWRubZ~ik}oxst8JGake+lJEVPCuE=YeIEFtvw4l+&)|{7Yz6GMI!-L@2z~Hn3Irz-;d1IK=P3t@NG8p~S12kL^N;z@=ys{2BYz{SP?GD zMf-w5)-08VSRt=*1`hLxDArGz~v_XBv!f0N>Q}c~SQ+dtQ$*Z%MYbN&)Y1PZ-SZ}v($XIT* zkaOb#Un*pA;M$aMAVE{GC)7NpV2}$F+z?L502`<#>*G%u8K;TxbW^-;-Jx4XMU+)U zX}bJf_%>m~#)tXJr-OKt$=Xc1V50<5sScuTG0L7py{4)<=DjBn;KHG(t?HK9xv4gt`VWc{FlUl8@;8w32aB|BCwxtWr6&nYTnO?Q0FZ>j;eXyBqC*6oOUdZ#H)u)Uj zOjee4(aob`(T&<-j|?UNhpu<66)_|slfrp2Gf^~xNa3_;`=PrYVH_x zItCj!&Urz!gv<+>y8YS2rWa+J>{`a!ZN=QWoo|i13YR=MX>ht}(RMhND7j^_R_Cl~ zy4e<;pKf&3c=Ovo3)?FCrJhYtCzx3ZYL_cTbStvWmD8xXqX)qnEjyN=Nw`H>)x2kS#jJ6RLfUjD$+M)H5Uoc}uJ}7*{{eQu5(sn~ F005mhq>lgq literal 1831 zcmV+?2iW*QRzV7_P`I<@SH zgHLTMzHxo{{L?SLIB|$3(#v;I)KTSq>CzYJWxLwtPyc9t2U&onH`*!c{;pG}cU?_g zK74NI-{b#$FhLXPnH3cE&HBHY%*yD+qhGJxaOSm#UZIIJdM`zN9=UMv#*%gCqP4yo z@A3!#qKWj{eH8WTuWw#I6?o>OCx>>moyl%JNfYVwt0-zQbvua^y@Xo6=u1i{S0q^l zxlO}6ht=^C1S7Ik28@FLFZAqD#)9NuCh7ByRK>h1NFq?7qWU{Q%?E%V{{eukQTjp3 z#t{kwHHMAHW6|D7jO}H#bd4zp`vM5E#}?P}Qc05gWmrgRjFt*o`sr>0oG$hOTS{t%a(zdk=~vkfBmIPYe29MZTG0;*d-f0p>{FBnd5HK)Eg0Ner0PR@hl_JVhy%guf zp=Sc7f*9Q$|3TUyR1Kgg0$u?*{HYnVk|Cd0gE*0LRaAvC=9PB_<|R>4!63>5cGBcr zuow3(4Ht>N);O0mNrbgnOIGht_bq#-L7>z?{d_7i- zO|Xf0ILuh7(h;lpG4jAA9+9NRt@K#1iA16|9%1_ormWUKHGNa0Sih~c813t?C$GC; zhQe$jhMet-;(}@IW{aJ>DFH&zKuH)as%UGz`D#*LxrXxU=5pQUK3rOjw7JgPt!pwW zx4OxNagi?zd1Sc0B^XE(7n}~Yb}1ZYqZl`WTr$B1YMDm+v!=&6TzGm2UXP*Bqrei( ztCBpO{~mN(M8gpe>rub}@ngWARX9oy#VDPDSS_H`LH3 zWpZ@~^oT0Bb#SOTtzSR$DzE3os_pvM4(kNy-&wS;*_&94*bdy6Sl2Wzap;=XpM~qL z3k%Z43O~BS(0Rhmg`FY92yz@_kytFz$Fgz2fVF_bGE|OrY_q`t^-@#FX?kOks>~%Q zTFww92DyodiaXa-ureQ8Y3covR0r-nFGlF?9?K9oINw?^>{bjnQJnLH=nh#;WJBS% zut{^TA8=b(U%ISI!Tr?iuRO-V9R|0WZf&RQ7RQ}2ItjDo?QAJJKWy|wy!qwN!cxT; zL>vWmat7DIGzHaL_2azPv{p-r3SLKrCNa5XW(B)0v>q0a z0o?Qh!}N)tVq*AYCa*qQj0{a*lC&NkaNj)-(*sY>&1J_nyX|mZOK=}7AtOTQ)H@H! zPzjcyh(o~@SJ%iojZ4LNBGTXxK5icL+G0}#V2O{@?_fj%r*GR2%=4jf4cYXx zI{+2qsSD6D&S&UD9f}7f6nRl+oY9EYL!~#5g9<+iQ$dH+nZAjeJucmzre&`KcY#Lo1A%5a+ VvnvZebk3$v{ST;{X#dF@005h!fSdpT diff --git a/test/snapshots/index.js.snap b/test/snapshots/index.js.snap index b494f353a20ff91c059e9ed7aea59b775abbb640..35d8a0cfec9290d93793245c9c49e75811735099 100644 GIT binary patch literal 3325 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 HFEaoDQW0%v literal 3304 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 diff --git a/test/snapshots/plugins.js.snap b/test/snapshots/plugins.js.snap index dd9e66af575dbbb541d3a8167c37b91908d82df4..3ddf9d2242641e2460a07bb34aaca4c9f13105ee 100644 GIT binary patch literal 599 zcmV-d0;v5#RzVAJAbev}OCl3fFb-@=Xb4PD4zVMXc%gb6 z?4mj0pi-#hMO z#`ckq&B&5t>ZMe3V?3TBHWe1w22kGHD{T$uI6%Hh#MS(@dh*+6+>&cs>zEJ!9rMpQ1~y`3YjYv^JXc6i`NJ28%osgBuPTZN)lx4tUFa89N zJrobQ`v(LI;zjY~U+^T-o3pdqd{OYC;=$R&z8}x~yze~oJ^=u10jp;|pP$_Sbk=x% z-ls3Wq(F2&rvZ3>@7vkl=)Cmt=EaLwr`5M99lf3bU~a$JzNmjV-5WxOdcDq*HMJ3qQZA*}e5efDpyW8y+Wh)ESu_k|| zmmpkNl}XZbsi)`K;VOfK39}tuK_y!uG9oH9S~RJivz%0vIibW6EC`j@g7~7@L170C z8S9|t5K~S{9W=lLLY1!)lsQ;<%#S@Ta3GR|=M!bs6)BEO;D{p*JIZr8Q^Mz#;p1vKsXGL&^r2UWTOXAX6e~RTdgusoDAqwGw}`%&Mqe zY8B13t-kettN*#J?(+%uja;ac@>kofFwI=JWRRxp|H+N{3V!b%T)xqUewt2cp*;u{ oaG?kclOT+{G~xRFldRPLNDIEAL&CebFyFlFPY-@S-bn@k06)Pc9smFU