@tamagui/static 1.84.2 → 1.85.0
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/cjs/extractor/bundle.js.map +1 -1
- package/dist/cjs/extractor/bundle.native.js.map +1 -1
- package/dist/cjs/extractor/bundleConfig.js +38 -37
- package/dist/cjs/extractor/bundleConfig.js.map +1 -1
- package/dist/cjs/extractor/bundleConfig.native.js +38 -37
- package/dist/cjs/extractor/bundleConfig.native.js.map +1 -1
- package/dist/cjs/extractor/createExtractor.js +48 -8
- package/dist/cjs/extractor/createExtractor.js.map +1 -1
- package/dist/cjs/extractor/createExtractor.native.js +48 -8
- package/dist/cjs/extractor/createExtractor.native.js.map +1 -1
- package/dist/cjs/extractor/evaluateAstNode.js.map +1 -1
- package/dist/cjs/extractor/evaluateAstNode.native.js.map +1 -1
- package/dist/cjs/extractor/extractHelpers.js.map +1 -1
- package/dist/cjs/extractor/extractHelpers.native.js.map +1 -1
- package/dist/cjs/extractor/extractToClassNames.js +3 -1
- package/dist/cjs/extractor/extractToClassNames.js.map +1 -1
- package/dist/cjs/extractor/extractToClassNames.native.js +3 -1
- package/dist/cjs/extractor/extractToClassNames.native.js.map +1 -1
- package/dist/cjs/extractor/getStaticBindingsForScope.js.map +1 -1
- package/dist/cjs/extractor/getStaticBindingsForScope.native.js.map +1 -1
- package/dist/cjs/extractor/literalToAst.js.map +1 -1
- package/dist/cjs/extractor/literalToAst.native.js.map +1 -1
- package/dist/cjs/extractor/loadTamagui.js +12 -3
- package/dist/cjs/extractor/loadTamagui.js.map +1 -1
- package/dist/cjs/extractor/loadTamagui.native.js +12 -3
- package/dist/cjs/extractor/loadTamagui.native.js.map +1 -1
- package/dist/cjs/extractor/removeUnusedHooks.js +10 -11
- package/dist/cjs/extractor/removeUnusedHooks.js.map +1 -1
- package/dist/cjs/extractor/removeUnusedHooks.native.js +10 -11
- package/dist/cjs/extractor/removeUnusedHooks.native.js.map +1 -1
- package/dist/cjs/registerRequire.js +1 -1
- package/dist/cjs/registerRequire.js.map +1 -1
- package/dist/cjs/registerRequire.native.js +1 -1
- package/dist/cjs/registerRequire.native.js.map +1 -1
- package/dist/cjs/server.js +62 -0
- package/dist/cjs/server.js.map +6 -0
- package/dist/cjs/server.native.js +63 -0
- package/dist/cjs/server.native.js.map +6 -0
- package/dist/esm/extractor/bundle.js.map +1 -1
- package/dist/esm/extractor/bundle.native.js.map +1 -1
- package/dist/esm/extractor/bundleConfig.js +38 -37
- package/dist/esm/extractor/bundleConfig.js.map +1 -1
- package/dist/esm/extractor/bundleConfig.native.js +38 -37
- package/dist/esm/extractor/bundleConfig.native.js.map +1 -1
- package/dist/esm/extractor/createExtractor.js +48 -8
- package/dist/esm/extractor/createExtractor.js.map +1 -1
- package/dist/esm/extractor/createExtractor.native.js +48 -8
- package/dist/esm/extractor/createExtractor.native.js.map +1 -1
- package/dist/esm/extractor/evaluateAstNode.js.map +1 -1
- package/dist/esm/extractor/evaluateAstNode.native.js.map +1 -1
- package/dist/esm/extractor/extractHelpers.js.map +1 -1
- package/dist/esm/extractor/extractHelpers.native.js.map +1 -1
- package/dist/esm/extractor/extractToClassNames.js +3 -1
- package/dist/esm/extractor/extractToClassNames.js.map +1 -1
- package/dist/esm/extractor/extractToClassNames.native.js +3 -1
- package/dist/esm/extractor/extractToClassNames.native.js.map +1 -1
- package/dist/esm/extractor/getStaticBindingsForScope.js.map +1 -1
- package/dist/esm/extractor/getStaticBindingsForScope.native.js.map +1 -1
- package/dist/esm/extractor/literalToAst.js.map +1 -1
- package/dist/esm/extractor/literalToAst.native.js.map +1 -1
- package/dist/esm/extractor/loadTamagui.js +13 -2
- package/dist/esm/extractor/loadTamagui.js.map +1 -1
- package/dist/esm/extractor/loadTamagui.native.js +13 -2
- package/dist/esm/extractor/loadTamagui.native.js.map +1 -1
- package/dist/esm/extractor/removeUnusedHooks.js +10 -11
- package/dist/esm/extractor/removeUnusedHooks.js.map +1 -1
- package/dist/esm/extractor/removeUnusedHooks.native.js +10 -11
- package/dist/esm/extractor/removeUnusedHooks.native.js.map +1 -1
- package/dist/esm/registerRequire.js +1 -1
- package/dist/esm/registerRequire.js.map +1 -1
- package/dist/esm/registerRequire.native.js +1 -1
- package/dist/esm/registerRequire.native.js.map +1 -1
- package/dist/esm/server.js +34 -0
- package/dist/esm/server.js.map +6 -0
- package/dist/esm/server.native.js +34 -0
- package/dist/esm/server.native.js.map +6 -0
- package/package.json +15 -25
- package/src/extractor/bundle.ts +1 -2
- package/src/extractor/bundleConfig.ts +38 -36
- package/src/extractor/createExtractor.ts +59 -20
- package/src/extractor/evaluateAstNode.ts +6 -3
- package/src/extractor/extractHelpers.ts +9 -9
- package/src/extractor/extractToClassNames.ts +3 -1
- package/src/extractor/getStaticBindingsForScope.ts +1 -3
- package/src/extractor/literalToAst.ts +2 -1
- package/src/extractor/loadTamagui.ts +14 -2
- package/src/extractor/removeUnusedHooks.ts +2 -1
- package/src/registerRequire.ts +1 -1
- package/src/server.ts +43 -0
- package/types/extractor/bundleConfig.d.ts.map +1 -1
- package/types/extractor/createExtractor.d.ts.map +1 -1
- package/types/extractor/evaluateAstNode.d.ts.map +1 -1
- package/types/extractor/extractToClassNames.d.ts.map +1 -1
- package/types/extractor/getStaticBindingsForScope.d.ts.map +1 -1
- package/types/extractor/loadTamagui.d.ts.map +1 -1
- package/types/extractor/removeUnusedHooks.d.ts.map +1 -1
- package/types/server.d.ts +3 -0
- package/types/server.d.ts.map +1 -0
@@ -30,17 +30,16 @@ function removeUnusedHooks(compFn, shouldPrintDebug) {
|
|
30
30
|
if (t.isIdentifier(id.node)) {
|
31
31
|
const name = id.node.name;
|
32
32
|
return !isBindingReferenced(name);
|
33
|
-
}
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
return !1;
|
33
|
+
}
|
34
|
+
return t.isObjectPattern(id.node) ? id.get("properties").every((prop) => {
|
35
|
+
if (!prop.isObjectProperty())
|
36
|
+
return !1;
|
37
|
+
const value = prop.get("value");
|
38
|
+
if (Array.isArray(value) || !value.isIdentifier())
|
39
|
+
return !1;
|
40
|
+
const name = value.node.name;
|
41
|
+
return !isBindingReferenced(name);
|
42
|
+
}) : !1;
|
44
43
|
})() && (declarator.remove(), shouldPrintDebug && console.info(` [\u{1FA9D}] removed ${id.node.name ?? ""}`));
|
45
44
|
}
|
46
45
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/extractor/removeUnusedHooks.ts"],
|
4
|
-
"mappings": "AACA,YAAY,OAAO;AAEnB,MAAM,QAAQ;AAAA,EACZ,UAAU;AAAA,EACV,UAAU;AACZ;AAEO,SAAS,kBACd,QACA,kBACA;AACA,SAAO,MAAM,MAAM;AAEnB,MAAI,iBAAiB,QAAQ,IAAI,MAAM;AACvC,MAAI,CAAC,gBAAgB;AACnB,YAAQ,KAAK,sBAAsB,MAAM;AACzC;AAAA,EACF;AAQA,MAPK,MAAM,QAAQ,cAAc,MAC3B,eAAe,qBAAqB,IACtC,iBAAiB,eAAe,MAAM,KAAK,IAAI,MAAM,IAErD,iBAAiB,eAAe,IAAI,MAAM,IAG1C,CAAC,kBAAkB,CAAC,MAAM,QAAQ,cAAc;AAClD;AAEF,QAAM,aAAa;AACnB,aAAW,aAAa,YAAY;AAClC,QAAI,CAAC,UAAU,sBAAsB;AACnC;AAEF,UAAM,eAAe,UAAU,IAAI,cAAc;AACjD,QAAI,CAAC,MAAM,QAAQ,YAAY;AAC7B;AAEF,UAAM,sBAAsB,CAAC,SACpB,CAAC,CAAC,UAAU,MAAM,WAAW,IAAI,GAAG;AAE7C,eAAW,cAAc,cAAc;AACrC,YAAM,KAAK,WAAW,IAAI,IAAI,GACxB,OAAO,WAAW,KAAK;AAC7B,UAAI,MAAM,QAAQ,EAAE,KAAK,MAAM,QAAQ,IAAI;AACzC;
|
4
|
+
"mappings": "AACA,YAAY,OAAO;AAEnB,MAAM,QAAQ;AAAA,EACZ,UAAU;AAAA,EACV,UAAU;AACZ;AAEO,SAAS,kBACd,QACA,kBACA;AACA,SAAO,MAAM,MAAM;AAEnB,MAAI,iBAAiB,QAAQ,IAAI,MAAM;AACvC,MAAI,CAAC,gBAAgB;AACnB,YAAQ,KAAK,sBAAsB,MAAM;AACzC;AAAA,EACF;AAQA,MAPK,MAAM,QAAQ,cAAc,MAC3B,eAAe,qBAAqB,IACtC,iBAAiB,eAAe,MAAM,KAAK,IAAI,MAAM,IAErD,iBAAiB,eAAe,IAAI,MAAM,IAG1C,CAAC,kBAAkB,CAAC,MAAM,QAAQ,cAAc;AAClD;AAEF,QAAM,aAAa;AACnB,aAAW,aAAa,YAAY;AAClC,QAAI,CAAC,UAAU,sBAAsB;AACnC;AAEF,UAAM,eAAe,UAAU,IAAI,cAAc;AACjD,QAAI,CAAC,MAAM,QAAQ,YAAY;AAC7B;AAEF,UAAM,sBAAsB,CAAC,SACpB,CAAC,CAAC,UAAU,MAAM,WAAW,IAAI,GAAG;AAE7C,eAAW,cAAc,cAAc;AACrC,YAAM,KAAK,WAAW,IAAI,IAAI,GACxB,OAAO,WAAW,KAAK;AAC7B,UAAI,MAAM,QAAQ,EAAE,KAAK,MAAM,QAAQ,IAAI;AACzC;AA6BF,OA3BsB,MAAM;AAM1B,YAAI,EAJF,QACA,EAAE,iBAAiB,IAAI,KACvB,EAAE,aAAa,KAAK,MAAM,KAC1B,MAAM,KAAK,OAAO,IAAI;AAEtB,iBAAO;AAET,YAAI,EAAE,aAAa,GAAG,IAAI,GAAG;AAE3B,gBAAM,OAAO,GAAG,KAAK;AACrB,iBAAO,CAAC,oBAAoB,IAAI;AAAA,QAClC;AACA,eAAI,EAAE,gBAAgB,GAAG,IAAI,IAET,GAAG,IAAI,YAAY,EACpB,MAAM,CAAC,SAAS;AAC/B,cAAI,CAAC,KAAK,iBAAiB;AAAG,mBAAO;AACrC,gBAAM,QAAQ,KAAK,IAAI,OAAO;AAC9B,cAAI,MAAM,QAAQ,KAAK,KAAK,CAAC,MAAM,aAAa;AAAG,mBAAO;AAC1D,gBAAM,OAAO,MAAM,KAAK;AACxB,iBAAO,CAAC,oBAAoB,IAAI;AAAA,QAClC,CAAC,IAEI;AAAA,MACT,GAAG,MAED,WAAW,OAAO,GACd,oBACF,QAAQ,KAAK,yBAAkB,GAAG,KAAK,QAAW,EAAE,EAAE;AAAA,IAG5D;AAAA,EACF;AACF;",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -30,17 +30,16 @@ function removeUnusedHooks(compFn, shouldPrintDebug) {
|
|
30
30
|
if (t.isIdentifier(id.node)) {
|
31
31
|
const name = id.node.name;
|
32
32
|
return !isBindingReferenced(name);
|
33
|
-
}
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
return !1;
|
33
|
+
}
|
34
|
+
return t.isObjectPattern(id.node) ? id.get("properties").every((prop) => {
|
35
|
+
if (!prop.isObjectProperty())
|
36
|
+
return !1;
|
37
|
+
const value = prop.get("value");
|
38
|
+
if (Array.isArray(value) || !value.isIdentifier())
|
39
|
+
return !1;
|
40
|
+
const name = value.node.name;
|
41
|
+
return !isBindingReferenced(name);
|
42
|
+
}) : !1;
|
44
43
|
})() && (declarator.remove(), shouldPrintDebug && console.info(` [\u{1FA9D}] removed ${id.node.name ?? ""}`));
|
45
44
|
}
|
46
45
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/extractor/removeUnusedHooks.ts"],
|
4
|
-
"mappings": "AACA,YAAY,OAAO;AAEnB,MAAM,QAAQ;AAAA,EACZ,UAAU;AAAA,EACV,UAAU;AACZ;AAEO,SAAS,kBACd,QACA,kBACA;AACA,SAAO,MAAM,MAAM;AAEnB,MAAI,iBAAiB,QAAQ,IAAI,MAAM;AACvC,MAAI,CAAC,gBAAgB;AACnB,YAAQ,KAAK,sBAAsB,MAAM;AACzC;AAAA,EACF;AAQA,MAPK,MAAM,QAAQ,cAAc,MAC3B,eAAe,qBAAqB,IACtC,iBAAiB,eAAe,MAAM,KAAK,IAAI,MAAM,IAErD,iBAAiB,eAAe,IAAI,MAAM,IAG1C,CAAC,kBAAkB,CAAC,MAAM,QAAQ,cAAc;AAClD;AAEF,QAAM,aAAa;AACnB,aAAW,aAAa,YAAY;AAClC,QAAI,CAAC,UAAU,sBAAsB;AACnC;AAEF,UAAM,eAAe,UAAU,IAAI,cAAc;AACjD,QAAI,CAAC,MAAM,QAAQ,YAAY;AAC7B;AAEF,UAAM,sBAAsB,CAAC,SACpB,CAAC,CAAC,UAAU,MAAM,WAAW,IAAI,GAAG;AAE7C,eAAW,cAAc,cAAc;AACrC,YAAM,KAAK,WAAW,IAAI,IAAI,GACxB,OAAO,WAAW,KAAK;AAC7B,UAAI,MAAM,QAAQ,EAAE,KAAK,MAAM,QAAQ,IAAI;AACzC;
|
4
|
+
"mappings": "AACA,YAAY,OAAO;AAEnB,MAAM,QAAQ;AAAA,EACZ,UAAU;AAAA,EACV,UAAU;AACZ;AAEO,SAAS,kBACd,QACA,kBACA;AACA,SAAO,MAAM,MAAM;AAEnB,MAAI,iBAAiB,QAAQ,IAAI,MAAM;AACvC,MAAI,CAAC,gBAAgB;AACnB,YAAQ,KAAK,sBAAsB,MAAM;AACzC;AAAA,EACF;AAQA,MAPK,MAAM,QAAQ,cAAc,MAC3B,eAAe,qBAAqB,IACtC,iBAAiB,eAAe,MAAM,KAAK,IAAI,MAAM,IAErD,iBAAiB,eAAe,IAAI,MAAM,IAG1C,CAAC,kBAAkB,CAAC,MAAM,QAAQ,cAAc;AAClD;AAEF,QAAM,aAAa;AACnB,aAAW,aAAa,YAAY;AAClC,QAAI,CAAC,UAAU,sBAAsB;AACnC;AAEF,UAAM,eAAe,UAAU,IAAI,cAAc;AACjD,QAAI,CAAC,MAAM,QAAQ,YAAY;AAC7B;AAEF,UAAM,sBAAsB,CAAC,SACpB,CAAC,CAAC,UAAU,MAAM,WAAW,IAAI,GAAG;AAE7C,eAAW,cAAc,cAAc;AACrC,YAAM,KAAK,WAAW,IAAI,IAAI,GACxB,OAAO,WAAW,KAAK;AAC7B,UAAI,MAAM,QAAQ,EAAE,KAAK,MAAM,QAAQ,IAAI;AACzC;AA6BF,OA3BsB,MAAM;AAM1B,YAAI,EAJF,QACA,EAAE,iBAAiB,IAAI,KACvB,EAAE,aAAa,KAAK,MAAM,KAC1B,MAAM,KAAK,OAAO,IAAI;AAEtB,iBAAO;AAET,YAAI,EAAE,aAAa,GAAG,IAAI,GAAG;AAE3B,gBAAM,OAAO,GAAG,KAAK;AACrB,iBAAO,CAAC,oBAAoB,IAAI;AAAA,QAClC;AACA,eAAI,EAAE,gBAAgB,GAAG,IAAI,IAET,GAAG,IAAI,YAAY,EACpB,MAAM,CAAC,SAAS;AAC/B,cAAI,CAAC,KAAK,iBAAiB;AAAG,mBAAO;AACrC,gBAAM,QAAQ,KAAK,IAAI,OAAO;AAC9B,cAAI,MAAM,QAAQ,KAAK,KAAK,CAAC,MAAM,aAAa;AAAG,mBAAO;AAC1D,gBAAM,OAAO,MAAM,KAAK;AACxB,iBAAO,CAAC,oBAAoB,IAAI;AAAA,QAClC,CAAC,IAEI;AAAA,MACT,GAAG,MAED,WAAW,OAAO,GACd,oBACF,QAAQ,KAAK,yBAAkB,GAAG,KAAK,QAAW,EAAE,EAAE;AAAA,IAG5D;AAAA,EACF;AACF;",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -22,7 +22,7 @@ function registerRequire(platform, { proxyWormImports } = {
|
|
22
22
|
});
|
23
23
|
og || (og = Module.prototype.require), isRegistered = !0, Module.prototype.require = tamaguiRequire;
|
24
24
|
function tamaguiRequire(path) {
|
25
|
-
if (path === "tamagui")
|
25
|
+
if (path === "tamagui" && platform === "native")
|
26
26
|
return og.apply(this, ["tamagui/native"]);
|
27
27
|
if (path === "@tamagui/core" || path === "@tamagui/web")
|
28
28
|
return requireTamaguiCore(platform, (path2) => og.apply(this, [path2]));
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/registerRequire.ts"],
|
4
|
-
"mappings": "AAAA,SAAS,gBAAgB;AAEzB,SAAS,0BAA0B;AAGnC,MAAM,cAAc,CAAC,GACf,SAAS,QAAQ,QAAQ,GAElB,iBAAiB,MAAM,aAE9B,YAAY,QAAQ,qBAAqB,GAEzC,MAAM,QAAQ,kBAAkB;AAEtC,IAAI,eAAe,IACf;AAEJ,MAAM,cAAc;AAAA,EAClB,OAAO;AACT,GAEM,WAAW,CAAC;AACX,SAAS,iBAAiB,MAAc,QAAa;AAC1D,WAAS,IAAI,IAAI;AACnB;AAEO,SAAS,gBACd,UACA,EAAE,iBAAiB,IAAI;AAAA,EACrB,kBAAkB;AACpB,GACA;AAEA,MAAI;AACF,WAAO;AAAA,MACL,gBAAgB;AAAA,MAChB,YAAY,MAAM;AAAA,MAAC;AAAA,IACrB;AAGF,QAAM,EAAE,WAAW,IAAI,SAAS;AAAA,IAC9B,uBAAuB;AAAA,EACzB,CAAC;AAED,EAAK,OACH,KAAK,OAAO,UAAU,UAGxB,eAAe,IAEf,OAAO,UAAU,UAAU;AAE3B,WAAS,eAA0B,MAAc;AAC/C,QAAI,SAAS;
|
4
|
+
"mappings": "AAAA,SAAS,gBAAgB;AAEzB,SAAS,0BAA0B;AAGnC,MAAM,cAAc,CAAC,GACf,SAAS,QAAQ,QAAQ,GAElB,iBAAiB,MAAM,aAE9B,YAAY,QAAQ,qBAAqB,GAEzC,MAAM,QAAQ,kBAAkB;AAEtC,IAAI,eAAe,IACf;AAEJ,MAAM,cAAc;AAAA,EAClB,OAAO;AACT,GAEM,WAAW,CAAC;AACX,SAAS,iBAAiB,MAAc,QAAa;AAC1D,WAAS,IAAI,IAAI;AACnB;AAEO,SAAS,gBACd,UACA,EAAE,iBAAiB,IAAI;AAAA,EACrB,kBAAkB;AACpB,GACA;AAEA,MAAI;AACF,WAAO;AAAA,MACL,gBAAgB;AAAA,MAChB,YAAY,MAAM;AAAA,MAAC;AAAA,IACrB;AAGF,QAAM,EAAE,WAAW,IAAI,SAAS;AAAA,IAC9B,uBAAuB;AAAA,EACzB,CAAC;AAED,EAAK,OACH,KAAK,OAAO,UAAU,UAGxB,eAAe,IAEf,OAAO,UAAU,UAAU;AAE3B,WAAS,eAA0B,MAAc;AAC/C,QAAI,SAAS,aAAa,aAAa;AACrC,aAAO,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC;AAG1C,QAAI,SAAS,mBAAmB,SAAS;AACvC,aAAO,mBAAmB,UAAU,CAACA,UAC5B,GAAG,MAAM,MAAM,CAACA,KAAI,CAAC,CAC7B;AAGH,QAAI,QAAQ;AACV,aAAO,SAAS,IAAI;AAGtB,QAAI,kDAAkD,KAAK,IAAI;AAC7D,aAAO,CAAC;AAGV,QACE,SAAS,0BACT,KAAK,WAAW,yBAAyB,KACzC,SAAS,0BACT,SAAS,wBACT,SAAS,6BACT,SAAS;AAET,aAAO;AAET,QAAI,SAAS;AACX,aAAO;AAGT,QAAI,SAAS,2BAA2B,KAAK,WAAW,cAAc;AACpE,aAAO;AAGT,QAAI,QAAQ;AACV,aAAO;AAGT,QAAI,CAAC,YAAY,IAAI,KACf,oBAAoB,CAAC,KAAK,SAAS,uBAAuB;AAC5D,aAAI,SAAS,YACJ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAEvB;AAIX,QAAI;AAyBF,aAxBY,GAAG,MAAM,MAAM,SAAS;AAAA,IAyBtC,SAAS,KAAU;AACjB,aACE,CAAC,QAAQ,IAAI,oCACb,KAAK,SAAS,sBAAsB,IAGpC,UAEE,eAAe,IAAI,KAAK,YAAY,WAE5B,QAAQ,IAAI,kCAetB,QAAQ;AAAA,QACN,2BAA2B,IAAI;AAAA;AAAA,IAErC,IAAI,OAAO;AAAA,IACX,IAAI,KAAK;AAAA;AAAA;AAAA,MAGL,IArBI,oBAAoB,IAAI,IAAI,MAG9B,oBAAoB,IAAI,IAAI,GAC5B,QAAQ;AAAA,QACN;AAAA,uDAAgD,IAAI;AAAA,gBAA0C,IAAI,OAAO;AAAA;AAAA;AAAA;AAAA;AAAA,MAC3G,KAkBG;AAAA,IACT;AAAA,EACF;AAEA,SAAO;AAAA,IACL;AAAA,IACA,YAAY,MAAM;AAChB,iBAAW,GACX,eAAe,IACf,OAAO,UAAU,UAAU;AAAA,IAC7B;AAAA,EACF;AACF;AAEA,MAAM,cAAc,QAAQ,+BAA+B,GACrD,UAAU,QAAQ,IAAI,8BACtB,eACJ,YAAY,SAAS,CAAC,IAAI,QAAQ,IAAI,8BAA8B,MAAM,GAAG,GACzE,wBAAwB;AAAA,EAC5B,gBAAgB;AAAA,EAChB,QAAQ;AAAA,EACR,GAAG,OAAO,YAAY,cAAc,IAAI,CAAC,MAAM,CAAC,GAAG,EAAI,CAAC,KAAK,CAAC,CAAC;AACjE,GAEM,sBAAsB,oBAAI,IAAY,GAEtC,iBAAiB;AAAA,EACrB,kBAAkB;AAAA,EAClB,iBAAiB;AAAA,EACjB,mBAAmB;AACrB;",
|
5
5
|
"names": ["path"]
|
6
6
|
}
|
@@ -22,7 +22,7 @@ function registerRequire(platform, { proxyWormImports } = {
|
|
22
22
|
});
|
23
23
|
og || (og = Module.prototype.require), isRegistered = !0, Module.prototype.require = tamaguiRequire;
|
24
24
|
function tamaguiRequire(path) {
|
25
|
-
if (path === "tamagui")
|
25
|
+
if (path === "tamagui" && platform === "native")
|
26
26
|
return og.apply(this, ["tamagui/native"]);
|
27
27
|
if (path === "@tamagui/core" || path === "@tamagui/web")
|
28
28
|
return requireTamaguiCore(platform, (path2) => og.apply(this, [path2]));
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/registerRequire.ts"],
|
4
|
-
"mappings": "AAAA,SAAS,gBAAgB;AAEzB,SAAS,0BAA0B;AAGnC,MAAM,cAAc,CAAC,GACf,SAAS,QAAQ,QAAQ,GAElB,iBAAiB,MAAM,aAE9B,YAAY,QAAQ,qBAAqB,GAEzC,MAAM,QAAQ,kBAAkB;AAEtC,IAAI,eAAe,IACf;AAEJ,MAAM,cAAc;AAAA,EAClB,OAAO;AACT,GAEM,WAAW,CAAC;AACX,SAAS,iBAAiB,MAAc,QAAa;AAC1D,WAAS,IAAI,IAAI;AACnB;AAEO,SAAS,gBACd,UACA,EAAE,iBAAiB,IAAI;AAAA,EACrB,kBAAkB;AACpB,GACA;AAEA,MAAI;AACF,WAAO;AAAA,MACL,gBAAgB;AAAA,MAChB,YAAY,MAAM;AAAA,MAAC;AAAA,IACrB;AAGF,QAAM,EAAE,WAAW,IAAI,SAAS;AAAA,IAC9B,uBAAuB;AAAA,EACzB,CAAC;AAED,EAAK,OACH,KAAK,OAAO,UAAU,UAGxB,eAAe,IAEf,OAAO,UAAU,UAAU;AAE3B,WAAS,eAA0B,MAAc;AAC/C,QAAI,SAAS;
|
4
|
+
"mappings": "AAAA,SAAS,gBAAgB;AAEzB,SAAS,0BAA0B;AAGnC,MAAM,cAAc,CAAC,GACf,SAAS,QAAQ,QAAQ,GAElB,iBAAiB,MAAM,aAE9B,YAAY,QAAQ,qBAAqB,GAEzC,MAAM,QAAQ,kBAAkB;AAEtC,IAAI,eAAe,IACf;AAEJ,MAAM,cAAc;AAAA,EAClB,OAAO;AACT,GAEM,WAAW,CAAC;AACX,SAAS,iBAAiB,MAAc,QAAa;AAC1D,WAAS,IAAI,IAAI;AACnB;AAEO,SAAS,gBACd,UACA,EAAE,iBAAiB,IAAI;AAAA,EACrB,kBAAkB;AACpB,GACA;AAEA,MAAI;AACF,WAAO;AAAA,MACL,gBAAgB;AAAA,MAChB,YAAY,MAAM;AAAA,MAAC;AAAA,IACrB;AAGF,QAAM,EAAE,WAAW,IAAI,SAAS;AAAA,IAC9B,uBAAuB;AAAA,EACzB,CAAC;AAED,EAAK,OACH,KAAK,OAAO,UAAU,UAGxB,eAAe,IAEf,OAAO,UAAU,UAAU;AAE3B,WAAS,eAA0B,MAAc;AAC/C,QAAI,SAAS,aAAa,aAAa;AACrC,aAAO,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC;AAG1C,QAAI,SAAS,mBAAmB,SAAS;AACvC,aAAO,mBAAmB,UAAU,CAACA,UAC5B,GAAG,MAAM,MAAM,CAACA,KAAI,CAAC,CAC7B;AAGH,QAAI,QAAQ;AACV,aAAO,SAAS,IAAI;AAGtB,QAAI,kDAAkD,KAAK,IAAI;AAC7D,aAAO,CAAC;AAGV,QACE,SAAS,0BACT,KAAK,WAAW,yBAAyB,KACzC,SAAS,0BACT,SAAS,wBACT,SAAS,6BACT,SAAS;AAET,aAAO;AAET,QAAI,SAAS;AACX,aAAO;AAGT,QAAI,SAAS,2BAA2B,KAAK,WAAW,cAAc;AACpE,aAAO;AAGT,QAAI,QAAQ;AACV,aAAO;AAGT,QAAI,CAAC,YAAY,IAAI,KACf,oBAAoB,CAAC,KAAK,SAAS,uBAAuB;AAC5D,aAAI,SAAS,YACJ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAEvB;AAIX,QAAI;AAyBF,aAxBY,GAAG,MAAM,MAAM,SAAS;AAAA,IAyBtC,SAAS,KAAU;AACjB,aACE,CAAC,QAAQ,IAAI,oCACb,KAAK,SAAS,sBAAsB,IAGpC,UAEE,eAAe,IAAI,KAAK,YAAY,WAE5B,QAAQ,IAAI,kCAetB,QAAQ;AAAA,QACN,2BAA2B,IAAI;AAAA;AAAA,IAErC,IAAI,OAAO;AAAA,IACX,IAAI,KAAK;AAAA;AAAA;AAAA,MAGL,IArBI,oBAAoB,IAAI,IAAI,MAG9B,oBAAoB,IAAI,IAAI,GAC5B,QAAQ;AAAA,QACN;AAAA,uDAAgD,IAAI;AAAA,gBAA0C,IAAI,OAAO;AAAA;AAAA;AAAA;AAAA;AAAA,MAC3G,KAkBG;AAAA,IACT;AAAA,EACF;AAEA,SAAO;AAAA,IACL;AAAA,IACA,YAAY,MAAM;AAChB,iBAAW,GACX,eAAe,IACf,OAAO,UAAU,UAAU;AAAA,IAC7B;AAAA,EACF;AACF;AAEA,MAAM,cAAc,QAAQ,+BAA+B,GACrD,UAAU,QAAQ,IAAI,8BACtB,eACJ,YAAY,SAAS,CAAC,IAAI,QAAQ,IAAI,8BAA8B,MAAM,GAAG,GACzE,wBAAwB;AAAA,EAC5B,gBAAgB;AAAA,EAChB,QAAQ;AAAA,EACR,GAAG,OAAO,YAAY,cAAc,IAAI,CAAC,MAAM,CAAC,GAAG,EAAI,CAAC,KAAK,CAAC,CAAC;AACjE,GAEM,sBAAsB,oBAAI,IAAY,GAEtC,iBAAiB;AAAA,EACrB,kBAAkB;AAAA,EAClB,iBAAiB;AAAA,EACjB,mBAAmB;AACrB;",
|
5
5
|
"names": ["path"]
|
6
6
|
}
|
@@ -0,0 +1,34 @@
|
|
1
|
+
import net from "node:net";
|
2
|
+
async function startServer(options) {
|
3
|
+
const port = await getAvailablePort(), server = net.createServer();
|
4
|
+
server.unref(), await new Promise((resolve, reject) => {
|
5
|
+
server.on("error", reject), server.on("connection", (conn) => {
|
6
|
+
conn.on("data", (data) => {
|
7
|
+
console.info("got", data.toString());
|
8
|
+
});
|
9
|
+
}), server.listen({ port }, () => {
|
10
|
+
const { port: port2 } = server.address();
|
11
|
+
server.close(() => {
|
12
|
+
resolve(port2);
|
13
|
+
});
|
14
|
+
});
|
15
|
+
});
|
16
|
+
}
|
17
|
+
async function getAvailablePort(port = 8089) {
|
18
|
+
return checkAvailablePort(port).catch(() => getAvailablePort(port + 1));
|
19
|
+
}
|
20
|
+
function checkAvailablePort(port) {
|
21
|
+
return new Promise((resolve, reject) => {
|
22
|
+
const server = net.createServer();
|
23
|
+
server.unref(), server.on("error", reject), server.listen({ port }, () => {
|
24
|
+
const { port: port2 } = server.address();
|
25
|
+
server.close(() => {
|
26
|
+
resolve(port2);
|
27
|
+
});
|
28
|
+
});
|
29
|
+
});
|
30
|
+
}
|
31
|
+
export {
|
32
|
+
startServer
|
33
|
+
};
|
34
|
+
//# sourceMappingURL=server.js.map
|
@@ -0,0 +1,6 @@
|
|
1
|
+
{
|
2
|
+
"version": 3,
|
3
|
+
"sources": ["../../src/server.ts"],
|
4
|
+
"mappings": "AAEA,OAAO,SAAS;AAEhB,eAAsB,YAAY,SAAyB;AACzD,QAAM,OAAO,MAAM,iBAAiB,GAC9B,SAAS,IAAI,aAAa;AAChC,SAAO,MAAM,GAEb,MAAM,IAAI,QAAQ,CAAC,SAAS,WAAW;AACrC,WAAO,GAAG,SAAS,MAAM,GACzB,OAAO,GAAG,cAAc,CAAC,SAAS;AAChC,WAAK,GAAG,QAAQ,CAAC,SAAS;AACxB,gBAAQ,KAAK,OAAO,KAAK,SAAS,CAAC;AAAA,MACrC,CAAC;AAAA,IACH,CAAC,GACD,OAAO,OAAO,EAAE,KAAK,GAAG,MAAM;AAC5B,YAAM,EAAE,MAAAA,MAAK,IAAI,OAAO,QAAQ;AAChC,aAAO,MAAM,MAAM;AACjB,gBAAQA,KAAI;AAAA,MACd,CAAC;AAAA,IACH,CAAC;AAAA,EACH,CAAC;AACH;AAEA,eAAe,iBAAiB,OAAO,MAAuB;AAC5D,SAAO,mBAAmB,IAAI,EAAE,MAAM,MAAM,iBAAiB,OAAO,CAAC,CAAC;AACxE;AAEA,SAAS,mBAAmB,MAAc;AACxC,SAAO,IAAI,QAAgB,CAAC,SAAS,WAAW;AAC9C,UAAM,SAAS,IAAI,aAAa;AAChC,WAAO,MAAM,GACb,OAAO,GAAG,SAAS,MAAM,GAEzB,OAAO,OAAO,EAAE,KAAK,GAAG,MAAM;AAC5B,YAAM,EAAE,MAAAA,MAAK,IAAI,OAAO,QAAQ;AAChC,aAAO,MAAM,MAAM;AACjB,gBAAQA,KAAI;AAAA,MACd,CAAC;AAAA,IACH,CAAC;AAAA,EACH,CAAC;AACH;",
|
5
|
+
"names": ["port"]
|
6
|
+
}
|
@@ -0,0 +1,34 @@
|
|
1
|
+
import net from "node:net";
|
2
|
+
async function startServer(options) {
|
3
|
+
const port = await getAvailablePort(), server = net.createServer();
|
4
|
+
server.unref(), await new Promise((resolve, reject) => {
|
5
|
+
server.on("error", reject), server.on("connection", (conn) => {
|
6
|
+
conn.on("data", (data) => {
|
7
|
+
console.info("got", data.toString());
|
8
|
+
});
|
9
|
+
}), server.listen({ port }, () => {
|
10
|
+
const { port: port2 } = server.address();
|
11
|
+
server.close(() => {
|
12
|
+
resolve(port2);
|
13
|
+
});
|
14
|
+
});
|
15
|
+
});
|
16
|
+
}
|
17
|
+
async function getAvailablePort(port = 8089) {
|
18
|
+
return checkAvailablePort(port).catch(() => getAvailablePort(port + 1));
|
19
|
+
}
|
20
|
+
function checkAvailablePort(port) {
|
21
|
+
return new Promise((resolve, reject) => {
|
22
|
+
const server = net.createServer();
|
23
|
+
server.unref(), server.on("error", reject), server.listen({ port }, () => {
|
24
|
+
const { port: port2 } = server.address();
|
25
|
+
server.close(() => {
|
26
|
+
resolve(port2);
|
27
|
+
});
|
28
|
+
});
|
29
|
+
});
|
30
|
+
}
|
31
|
+
export {
|
32
|
+
startServer
|
33
|
+
};
|
34
|
+
//# sourceMappingURL=server.js.map
|
@@ -0,0 +1,6 @@
|
|
1
|
+
{
|
2
|
+
"version": 3,
|
3
|
+
"sources": ["../../src/server.ts"],
|
4
|
+
"mappings": "AAEA,OAAO,SAAS;AAEhB,eAAsB,YAAY,SAAyB;AACzD,QAAM,OAAO,MAAM,iBAAiB,GAC9B,SAAS,IAAI,aAAa;AAChC,SAAO,MAAM,GAEb,MAAM,IAAI,QAAQ,CAAC,SAAS,WAAW;AACrC,WAAO,GAAG,SAAS,MAAM,GACzB,OAAO,GAAG,cAAc,CAAC,SAAS;AAChC,WAAK,GAAG,QAAQ,CAAC,SAAS;AACxB,gBAAQ,KAAK,OAAO,KAAK,SAAS,CAAC;AAAA,MACrC,CAAC;AAAA,IACH,CAAC,GACD,OAAO,OAAO,EAAE,KAAK,GAAG,MAAM;AAC5B,YAAM,EAAE,MAAAA,MAAK,IAAI,OAAO,QAAQ;AAChC,aAAO,MAAM,MAAM;AACjB,gBAAQA,KAAI;AAAA,MACd,CAAC;AAAA,IACH,CAAC;AAAA,EACH,CAAC;AACH;AAEA,eAAe,iBAAiB,OAAO,MAAuB;AAC5D,SAAO,mBAAmB,IAAI,EAAE,MAAM,MAAM,iBAAiB,OAAO,CAAC,CAAC;AACxE;AAEA,SAAS,mBAAmB,MAAc;AACxC,SAAO,IAAI,QAAgB,CAAC,SAAS,WAAW;AAC9C,UAAM,SAAS,IAAI,aAAa;AAChC,WAAO,MAAM,GACb,OAAO,GAAG,SAAS,MAAM,GAEzB,OAAO,OAAO,EAAE,KAAK,GAAG,MAAM;AAC5B,YAAM,EAAE,MAAAA,MAAK,IAAI,OAAO,QAAQ;AAChC,aAAO,MAAM,MAAM;AACjB,gBAAQA,KAAI;AAAA,MACd,CAAC;AAAA,IACH,CAAC;AAAA,EACH,CAAC;AACH;",
|
5
|
+
"names": ["port"]
|
6
|
+
}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@tamagui/static",
|
3
|
-
"version": "1.
|
3
|
+
"version": "1.85.0",
|
4
4
|
"source": "src/index.ts",
|
5
5
|
"types": "./types/index.d.ts",
|
6
6
|
"main": "dist/cjs/index.js",
|
@@ -35,17 +35,17 @@
|
|
35
35
|
"@babel/runtime": "^7.23.2",
|
36
36
|
"@babel/traverse": "^7.23.3",
|
37
37
|
"@babel/types": "^7.23.3",
|
38
|
-
"@tamagui/build": "1.
|
39
|
-
"@tamagui/cli-color": "1.
|
40
|
-
"@tamagui/config-default": "1.
|
41
|
-
"@tamagui/core": "1.
|
42
|
-
"@tamagui/fake-react-native": "1.
|
43
|
-
"@tamagui/generate-themes": "1.
|
44
|
-
"@tamagui/helpers": "1.
|
45
|
-
"@tamagui/helpers-node": "1.
|
46
|
-
"@tamagui/proxy-worm": "1.
|
47
|
-
"@tamagui/shorthands": "1.
|
48
|
-
"@tamagui/types": "1.
|
38
|
+
"@tamagui/build": "1.85.0",
|
39
|
+
"@tamagui/cli-color": "1.85.0",
|
40
|
+
"@tamagui/config-default": "1.85.0",
|
41
|
+
"@tamagui/core": "1.85.0",
|
42
|
+
"@tamagui/fake-react-native": "1.85.0",
|
43
|
+
"@tamagui/generate-themes": "1.85.0",
|
44
|
+
"@tamagui/helpers": "1.85.0",
|
45
|
+
"@tamagui/helpers-node": "1.85.0",
|
46
|
+
"@tamagui/proxy-worm": "1.85.0",
|
47
|
+
"@tamagui/shorthands": "1.85.0",
|
48
|
+
"@tamagui/types": "1.85.0",
|
49
49
|
"babel-literal-to-ast": "^2.1.0",
|
50
50
|
"browserslist": "^4.22.2",
|
51
51
|
"esbuild": "^0.19.11",
|
@@ -57,30 +57,20 @@
|
|
57
57
|
"lightningcss": "^1.22.1",
|
58
58
|
"lodash": "^4.17.21",
|
59
59
|
"react-native-web": "^0.19.9",
|
60
|
-
"react-native-web-internals": "1.
|
61
|
-
"react-native-web-lite": "1.
|
60
|
+
"react-native-web-internals": "1.85.0",
|
61
|
+
"react-native-web-lite": "1.85.0"
|
62
62
|
},
|
63
63
|
"devDependencies": {
|
64
64
|
"@babel/plugin-syntax-typescript": "^7.23.3",
|
65
65
|
"@expo/match-media": "^0.4.0",
|
66
|
-
"@tamagui/test-design-system": "1.84.2",
|
67
|
-
"@testing-library/react": "^14.0.0",
|
68
|
-
"@types/babel__generator": "^7.6.4",
|
69
|
-
"@types/babel__traverse": "^7.18.2",
|
70
66
|
"@types/find-root": "^1.1.2",
|
71
67
|
"@types/node": "^16.11.9",
|
72
68
|
"@types/webpack": "^4.41.26",
|
73
69
|
"babel-loader": "^9.1.2",
|
74
|
-
"css-loader": "^6.7.4",
|
75
|
-
"dedent": "^0.7.0",
|
76
70
|
"esbuild-loader": "^3.0.1",
|
77
71
|
"null-loader": "^4.0.1",
|
78
72
|
"react": "^18.2.0",
|
79
|
-
"
|
80
|
-
"style-loader": "^3.3.3",
|
81
|
-
"typescript": "^5.2.2",
|
82
|
-
"vitest": "^0.34.3",
|
83
|
-
"webpack": "^5.88.2"
|
73
|
+
"typescript": "^5.2.2"
|
84
74
|
},
|
85
75
|
"gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14"
|
86
76
|
}
|
package/src/extractor/bundle.ts
CHANGED
@@ -134,9 +134,8 @@ async function asyncLock(props: Props) {
|
|
134
134
|
while (tries--) {
|
135
135
|
if (await pathExists(props.outfile)) {
|
136
136
|
return
|
137
|
-
} else {
|
138
|
-
await new Promise((res) => setTimeout(res, 50))
|
139
137
|
}
|
138
|
+
await new Promise((res) => setTimeout(res, 50))
|
140
139
|
}
|
141
140
|
}
|
142
141
|
void writeFile(lockFile, '')
|
@@ -112,57 +112,59 @@ export async function bundleConfig(props: TamaguiOptions) {
|
|
112
112
|
console.info(`Building config entry`, configEntry)
|
113
113
|
}
|
114
114
|
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
const start = Date.now()
|
115
|
+
if (!props.disableInitialBuild) {
|
116
|
+
// build them to node-compat versions
|
117
|
+
try {
|
118
|
+
await ensureDir(tmpDir)
|
119
|
+
} catch {
|
120
|
+
//
|
121
|
+
}
|
123
122
|
|
124
|
-
|
125
|
-
|
126
|
-
|
123
|
+
const start = Date.now()
|
124
|
+
|
125
|
+
await Promise.all([
|
126
|
+
props.config
|
127
|
+
? bundle(
|
128
|
+
{
|
129
|
+
entryPoints: [configEntry],
|
130
|
+
external,
|
131
|
+
outfile: configOutPath,
|
132
|
+
target: 'node16',
|
133
|
+
...esbuildExtraOptions,
|
134
|
+
},
|
135
|
+
props.platform
|
136
|
+
)
|
137
|
+
: null,
|
138
|
+
...baseComponents.map((componentModule, i) => {
|
139
|
+
return bundle(
|
127
140
|
{
|
128
|
-
entryPoints: [
|
141
|
+
entryPoints: [componentModule],
|
142
|
+
resolvePlatformSpecificEntries: true,
|
129
143
|
external,
|
130
|
-
outfile:
|
144
|
+
outfile: componentOutPaths[i],
|
131
145
|
target: 'node16',
|
132
146
|
...esbuildExtraOptions,
|
133
147
|
},
|
134
148
|
props.platform
|
135
149
|
)
|
136
|
-
|
137
|
-
|
138
|
-
return bundle(
|
139
|
-
{
|
140
|
-
entryPoints: [componentModule],
|
141
|
-
resolvePlatformSpecificEntries: true,
|
142
|
-
external,
|
143
|
-
outfile: componentOutPaths[i],
|
144
|
-
target: 'node16',
|
145
|
-
...esbuildExtraOptions,
|
146
|
-
},
|
147
|
-
props.platform
|
148
|
-
)
|
149
|
-
}),
|
150
|
-
])
|
150
|
+
}),
|
151
|
+
])
|
151
152
|
|
152
|
-
|
153
|
-
|
154
|
-
|
153
|
+
colorLog(
|
154
|
+
Color.FgYellow,
|
155
|
+
`
|
155
156
|
➡ [tamagui] built config and components (${Date.now() - start}ms):`
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
157
|
+
)
|
158
|
+
colorLog(
|
159
|
+
Color.Dim,
|
160
|
+
`
|
160
161
|
Config .${sep}${relative(process.cwd(), configOutPath)}
|
161
162
|
Components ${[
|
162
163
|
...componentOutPaths.map((p) => `.${sep}${relative(process.cwd(), p)}`),
|
163
164
|
].join('\n ')}
|
164
165
|
`
|
165
|
-
|
166
|
+
)
|
167
|
+
}
|
166
168
|
|
167
169
|
let out
|
168
170
|
const { unregister } = registerRequire(props.platform)
|
@@ -759,7 +759,14 @@ export function createExtractor(
|
|
759
759
|
`${componentName} | ${codePosition} -------------------`
|
760
760
|
)
|
761
761
|
// prettier-ignore
|
762
|
-
logger.info(
|
762
|
+
logger.info(
|
763
|
+
[
|
764
|
+
'\x1b[1m',
|
765
|
+
'\x1b[32m',
|
766
|
+
`<${originalNodeName} />`,
|
767
|
+
disableDebugAttr ? '' : '🐛',
|
768
|
+
].join(' ')
|
769
|
+
)
|
763
770
|
}
|
764
771
|
|
765
772
|
// add data-* debug attributes
|
@@ -970,9 +977,9 @@ export function createExtractor(
|
|
970
977
|
? // <YStack {...isSmall ? { color: 'red } : { color: 'blue }}
|
971
978
|
([arg.test, arg.consequent, arg.alternate] as const)
|
972
979
|
: t.isLogicalExpression(arg) && arg.operator === '&&'
|
973
|
-
|
974
|
-
|
975
|
-
|
980
|
+
? // <YStack {...isSmall && { color: 'red }}
|
981
|
+
([arg.left, arg.right, null] as const)
|
982
|
+
: null
|
976
983
|
|
977
984
|
if (conditional) {
|
978
985
|
const [test, alt, cons] = conditional
|
@@ -1080,9 +1087,8 @@ export function createExtractor(
|
|
1080
1087
|
const [value, valuePath] = (() => {
|
1081
1088
|
if (t.isJSXExpressionContainer(attribute?.value)) {
|
1082
1089
|
return [attribute.value.expression!, path.get('value')!] as const
|
1083
|
-
} else {
|
1084
|
-
return [attribute.value!, path.get('value')!] as const
|
1085
1090
|
}
|
1091
|
+
return [attribute.value!, path.get('value')!] as const
|
1086
1092
|
})()
|
1087
1093
|
|
1088
1094
|
const remove = () => {
|
@@ -1229,13 +1235,12 @@ export function createExtractor(
|
|
1229
1235
|
name,
|
1230
1236
|
attr: path.node,
|
1231
1237
|
}
|
1232
|
-
} else {
|
1233
|
-
if (variants[name]) {
|
1234
|
-
variantValues.set(name, styleValue)
|
1235
|
-
}
|
1236
|
-
inlined.set(name, true)
|
1237
|
-
return attr
|
1238
1238
|
}
|
1239
|
+
if (variants[name]) {
|
1240
|
+
variantValues.set(name, styleValue)
|
1241
|
+
}
|
1242
|
+
inlined.set(name, true)
|
1243
|
+
return attr
|
1239
1244
|
}
|
1240
1245
|
|
1241
1246
|
// ternaries!
|
@@ -1451,9 +1456,8 @@ export function createExtractor(
|
|
1451
1456
|
// ensure media query test stays on left side (see getMediaQueryTernary)
|
1452
1457
|
test: t.logicalExpression('&&', value.test, test),
|
1453
1458
|
}))
|
1454
|
-
} else {
|
1455
|
-
logger.info(['⚠️ no ternaries?', property].join(' '))
|
1456
1459
|
}
|
1460
|
+
logger.info(['⚠️ no ternaries?', property].join(' '))
|
1457
1461
|
} else {
|
1458
1462
|
logger.info(['⚠️ not expression', property].join(' '))
|
1459
1463
|
}
|
@@ -1734,7 +1738,22 @@ export function createExtractor(
|
|
1734
1738
|
if (shouldPrintDebug) {
|
1735
1739
|
try {
|
1736
1740
|
// prettier-ignore
|
1737
|
-
logger.info(
|
1741
|
+
logger.info(
|
1742
|
+
[
|
1743
|
+
' flatten?',
|
1744
|
+
shouldFlatten,
|
1745
|
+
objToStr({
|
1746
|
+
hasSpread,
|
1747
|
+
shouldDeopt,
|
1748
|
+
canFlattenProps,
|
1749
|
+
shouldWrapTheme,
|
1750
|
+
hasOnlyStringChildren,
|
1751
|
+
}),
|
1752
|
+
'inlined',
|
1753
|
+
inlined.size,
|
1754
|
+
[...inlined],
|
1755
|
+
].join(' ')
|
1756
|
+
)
|
1738
1757
|
} catch {
|
1739
1758
|
// ok
|
1740
1759
|
}
|
@@ -2018,7 +2037,9 @@ export function createExtractor(
|
|
2018
2037
|
// prettier-ignore
|
2019
2038
|
logger.info(`\n getProps (props in): ${logLines(objToStr(props))}`)
|
2020
2039
|
// prettier-ignore
|
2021
|
-
logger.info(
|
2040
|
+
logger.info(
|
2041
|
+
`\n getProps (outProps): ${logLines(objToStr(outProps))}`
|
2042
|
+
)
|
2022
2043
|
}
|
2023
2044
|
|
2024
2045
|
if (out.fontFamily) {
|
@@ -2123,9 +2144,15 @@ export function createExtractor(
|
|
2123
2144
|
attr.value = styles
|
2124
2145
|
}
|
2125
2146
|
// prettier-ignore
|
2126
|
-
if (shouldPrintDebug)
|
2147
|
+
if (shouldPrintDebug)
|
2148
|
+
logger.info(
|
2149
|
+
[' * styles (in)', logLines(objToStr(attr.value))].join(' ')
|
2150
|
+
)
|
2127
2151
|
// prettier-ignore
|
2128
|
-
if (shouldPrintDebug)
|
2152
|
+
if (shouldPrintDebug)
|
2153
|
+
logger.info(
|
2154
|
+
[' * styles (out)', logLines(objToStr(styles))].join(' ')
|
2155
|
+
)
|
2129
2156
|
continue
|
2130
2157
|
}
|
2131
2158
|
case 'attr': {
|
@@ -2170,7 +2197,12 @@ export function createExtractor(
|
|
2170
2197
|
|
2171
2198
|
if (shouldPrintDebug) {
|
2172
2199
|
// prettier-ignore
|
2173
|
-
logger.info(
|
2200
|
+
logger.info(
|
2201
|
+
[
|
2202
|
+
' - attrs (ternaries/combined):\n',
|
2203
|
+
logLines(attrs.map(attrStr).join(', ')),
|
2204
|
+
].join(' ')
|
2205
|
+
)
|
2174
2206
|
}
|
2175
2207
|
|
2176
2208
|
tm.mark('jsx-element-styles', !!shouldPrintDebug)
|
@@ -2295,7 +2327,14 @@ export function createExtractor(
|
|
2295
2327
|
|
2296
2328
|
if (shouldPrintDebug) {
|
2297
2329
|
// prettier-ignore
|
2298
|
-
logger.info(
|
2330
|
+
logger.info(
|
2331
|
+
[
|
2332
|
+
` - inlined props (${inlined.size}):`,
|
2333
|
+
shouldDeopt ? ' deopted' : '',
|
2334
|
+
hasSpread ? ' has spread' : '',
|
2335
|
+
staticConfig.neverFlatten ? 'neverFlatten' : '',
|
2336
|
+
].join(' ')
|
2337
|
+
)
|
2299
2338
|
logger.info(` - shouldFlatten/isFlattened: ${shouldFlatten}`)
|
2300
2339
|
logger.info(` - attrs (end):\n ${logLines(attrs.map(attrStr).join(', '))}`)
|
2301
2340
|
}
|
@@ -107,15 +107,18 @@ export function evaluateAstNode(
|
|
107
107
|
return (
|
108
108
|
evaluateAstNode(exprNode.left, evalFn) + evaluateAstNode(exprNode.right, evalFn)
|
109
109
|
)
|
110
|
-
}
|
110
|
+
}
|
111
|
+
if (exprNode.operator === '-') {
|
111
112
|
return (
|
112
113
|
evaluateAstNode(exprNode.left, evalFn) - evaluateAstNode(exprNode.right, evalFn)
|
113
114
|
)
|
114
|
-
}
|
115
|
+
}
|
116
|
+
if (exprNode.operator === '*') {
|
115
117
|
return (
|
116
118
|
evaluateAstNode(exprNode.left, evalFn) * evaluateAstNode(exprNode.right, evalFn)
|
117
119
|
)
|
118
|
-
}
|
120
|
+
}
|
121
|
+
if (exprNode.operator === '/') {
|
119
122
|
return (
|
120
123
|
evaluateAstNode(exprNode.left, evalFn) / evaluateAstNode(exprNode.right, evalFn)
|
121
124
|
)
|
@@ -24,10 +24,10 @@ export const attrStr = (attr?: ExtractedAttr) => {
|
|
24
24
|
return !attr
|
25
25
|
? ''
|
26
26
|
: attr.type === 'attr'
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
27
|
+
? getNameAttr(attr.value)
|
28
|
+
: attr.type === 'ternary'
|
29
|
+
? `...${ternaryStr(attr.value)}`
|
30
|
+
: `${attr.type}(${objToStr(attr.value)})`
|
31
31
|
}
|
32
32
|
|
33
33
|
export const objToStr = (obj: any, spacer = ', ') => {
|
@@ -41,8 +41,8 @@ export const objToStr = (obj: any, spacer = ', ') => {
|
|
41
41
|
Array.isArray(v)
|
42
42
|
? `[...]`
|
43
43
|
: v && typeof v === 'object'
|
44
|
-
|
45
|
-
|
44
|
+
? `${objToStr(v, ',')}`
|
45
|
+
: JSON.stringify(v)
|
46
46
|
}`
|
47
47
|
)
|
48
48
|
.join(spacer)}}`
|
@@ -59,9 +59,9 @@ export const ternaryStr = (x: Ternary) => {
|
|
59
59
|
const conditional = t.isIdentifier(x.test)
|
60
60
|
? x.test.name
|
61
61
|
: t.isMemberExpression(x.test)
|
62
|
-
|
63
|
-
|
64
|
-
|
62
|
+
? [x.test.object['name'], x.test.property['name']]
|
63
|
+
: // @ts-ignore
|
64
|
+
generate(x.test as any).code
|
65
65
|
return [
|
66
66
|
'ternary(',
|
67
67
|
conditional,
|
@@ -66,7 +66,9 @@ export async function extractToClassNames({
|
|
66
66
|
throw new Error('`source` must be a string of javascript')
|
67
67
|
}
|
68
68
|
if (sourcePath && !path.isAbsolute(sourcePath)) {
|
69
|
-
throw new Error(
|
69
|
+
throw new Error(
|
70
|
+
'`sourcePath` must be an absolute path to a .js file, got: ' + sourcePath
|
71
|
+
)
|
70
72
|
}
|
71
73
|
if (!/.[tj]sx?$/i.test(sourcePath || '')) {
|
72
74
|
console.warn(`${sourcePath?.slice(0, 100)} - bad filename.`)
|
@@ -96,9 +96,7 @@ export async function getStaticBindingsForScope(
|
|
96
96
|
const bindings: Record<string, Binding> = scope.getAllBindings() as any
|
97
97
|
const ret: Record<string, any> = {}
|
98
98
|
|
99
|
-
if (
|
100
|
-
shouldPrintDebug
|
101
|
-
) {
|
99
|
+
if (shouldPrintDebug) {
|
102
100
|
// prettier-ignore
|
103
101
|
// console.info(' ', Object.keys(bindings).length, 'variables in scope')
|
104
102
|
// .map(x => bindings[x].identifier?.name).join(', ')
|