@tamagui/static 1.123.6 → 1.123.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/extractor/extractMediaStyle.js +2 -2
- package/dist/extractor/extractMediaStyle.js.map +1 -1
- package/dist/extractor/extractMediaStyle.native.js +2 -2
- package/dist/extractor/extractMediaStyle.native.js.map +2 -2
- package/dist/extractor/extractToClassNames.js +3 -3
- package/dist/extractor/extractToClassNames.js.map +1 -1
- package/dist/extractor/extractToClassNames.native.js +3 -3
- package/dist/extractor/extractToClassNames.native.js.map +2 -2
- package/package.json +14 -14
- package/src/extractor/extractMediaStyle.ts +2 -2
- package/src/extractor/extractToClassNames.ts +3 -3
@@ -28,7 +28,7 @@ __export(extractMediaStyle_exports, {
|
|
28
28
|
module.exports = __toCommonJS(extractMediaStyle_exports);
|
29
29
|
var t = __toESM(require("@babel/types")), core = __toESM(require("@tamagui/core")), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_extractHelpers = require("./extractHelpers");
|
30
30
|
function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, importance = 0, shouldPrintDebug = !1) {
|
31
|
-
const {
|
31
|
+
const { getCSSStylesAtomic, mediaObjectToString } = (0, import_requireTamaguiCore.requireTamaguiCore)("web"), mt = getMediaQueryTernary(props, ternary, jsxPath, sourcePath);
|
32
32
|
if (!mt)
|
33
33
|
return null;
|
34
34
|
const { key } = mt;
|
@@ -43,7 +43,7 @@ function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, i
|
|
43
43
|
const mediaKeyPrecendence = Object.keys(tamaguiConfig.media).reduce((acc, cur, i) => (acc[cur] = new Array(importance + 1).fill(":root").join(""), acc), {});
|
44
44
|
let mediaStyles = [];
|
45
45
|
for (const { styleObj, negate } of styleOpts) {
|
46
|
-
const singleMediaStyles =
|
46
|
+
const singleMediaStyles = getCSSStylesAtomic(styleObj).map((style) => {
|
47
47
|
const mediaStyle = core.createMediaStyle(
|
48
48
|
style,
|
49
49
|
key,
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/extractor/extractMediaStyle.ts"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,QAAmB,kCAEnB,OAAsB,mCAGtB,4BAAmC,0CAEnC,wBAAyC;AAElC,SAAS,kBACd,OACA,SACA,SACA,eACA,YACA,aAAa,GACb,mBAAwC,IACxC;AACA,QAAM,EAAE,
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,QAAmB,kCAEnB,OAAsB,mCAGtB,4BAAmC,0CAEnC,wBAAyC;AAElC,SAAS,kBACd,OACA,SACA,SACA,eACA,YACA,aAAa,GACb,mBAAwC,IACxC;AACA,QAAM,EAAE,oBAAoB,oBAAoB,QAAI,8CAAmB,KAAK,GACtE,KAAK,qBAAqB,OAAO,SAAS,SAAS,UAAU;AACnE,MAAI,CAAC;AACH,WAAO;AAET,QAAM,EAAE,IAAI,IAAI;AAEhB,MAAI,CADO,cAAc,MAAM,GAAG;AAEhC,mBAAQ,MAAM,gBAAgB,GAAG,gBAAgB,OAAO,KAAK,cAAc,KAAK,CAAC,EAAE,GAC5E;AAET,QAAM,cAAc,CAAC,UAA4B,SAAS,OACjD,WAAW,EAAE,UAAU,OAAO,IAAI,MAErC,YAAY;AAAA,IAChB,YAAY,QAAQ,YAAY,EAAK;AAAA,IACrC,YAAY,QAAQ,WAAW,EAAI;AAAA,EACrC,EAAE,OAAO,+BAAS;AAClB,MAAI,oBAAoB,CAAC,UAAU;AACjC,mBAAQ,KAAK,2BAA2B,GACjC;AAIT,QAAM,sBADY,OAAO,KAAK,cAAc,KAAK,EACX,OAAO,CAAC,KAAK,KAAK,OACtD,IAAI,GAAG,IAAI,IAAI,MAAM,aAAa,CAAC,EAAE,KAAK,OAAO,EAAE,KAAK,EAAE,GACnD,MACN,CAAC,CAAC;AACL,MAAI,cAA6B,CAAC;AAKlC,aAAW,EAAE,UAAU,OAAO,KAAK,WAAW;AAG5C,UAAM,oBAFS,mBAAmB,QAAe,EAEhB,IAAI,CAAC,UAAU;AAC9C,YAAM,aAAa,KAAK;AAAA,QACtB;AAAA,QACA;AAAA,QACA,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,GACM,YAAY,IAAI,WAAW,KAAK,qBAAqB,CAAC;AAC5D,aAAO;AAAA,QACL,GAAG;AAAA,QACH;AAAA,MACF;AAAA,IACF,CAAC;AAED,IAAI,qBAAqB,aACvB,QAAQ;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,MACA,kBAAkB,IAAI,CAAC,MAAM,EAAE,KAAK,qBAAqB,CAAC,EAAE,KAAK,IAAI;AAAA,IACvE,GAGF,cAAc,CAAC,GAAG,aAAa,GAAG,iBAAiB;AAAA,EACrD;AAEA,iBAAQ,OAAO,GACR,EAAE,aAAa,qBAAqB,GAAG,oBAAoB;AACpE;AAEA,SAAS,qBACP,OACA,SACA,SACA,YAKA;AAGA,MAAI,EAAE,oBAAoB,QAAQ,IAAI,KAAK,QAAQ,KAAK,aAAa,MAAM;AAEzE,UAAM,YAAY;AAAA,MAChB;AAAA,MACA,QAAQ,KAAK;AAAA,MACb;AAAA,MACA;AAAA,MACA,QAAQ;AAAA,IACV;AACA,QAAI;AACF,aAAO;AAAA,QACL,GAAG;AAAA,QACH,qBAAqB;AAAA,UACnB,GAAG;AAAA,UACH,MAAM,QAAQ,KAAK;AAAA,QACrB;AAAA,MACF;AAAA,EAEJ;AAGA,QAAM,SAAS;AAAA,IACb;AAAA,IACA,QAAQ;AAAA,IACR;AAAA,IACA;AAAA,IACA,QAAQ;AAAA,EACV;AACA,SAAI,SACK;AAAA,IACL,GAAG;AAAA,IACH,qBAAqB;AAAA,EACvB,IAEK;AACT;AAEA,SAAS,2BACP,OACA,MACA,SACA,YACA,kBACA;AACA,MAAI;AACF,WAAO;AAAA,MACL,KAAK;AAAA,MACL,aAAa;AAAA,IACf;AAEF,MACE,EAAE,mBAAmB,IAAI,KACzB,EAAE,aAAa,KAAK,MAAM,KAC1B,EAAE,aAAa,KAAK,QAAQ,GAC5B;AACA,UAAM,OAAO,KAAK,OAAO,MACnB,MAAM,KAAK,SAAS,MAEpB,UADW,QAAQ,MAAM,eAAe,EACrB,IAAI;AAC7B,QAAI,CAAC,QAAS,QAAO;AACrB,UAAM,cAAc,QAAQ,MAAM;AAElC,WADI,CAAC,EAAE,qBAAqB,WAAW,KAAK,CAAC,YAAY,QACrD,CAAC,iBAAiB,OAAO,SAAS,YAAY,MAAM,UAAU,IAAU,KACrE,EAAE,KAAK,aAAa,KAAK;AAAA,EAClC;AACA,MAAI,EAAE,aAAa,IAAI,GAAG;AACxB,UAAM,MAAM,KAAK,MACX,OAAO,QAAQ,MAAM,WAAW,KAAK,IAAI,GAAG,MAAM;AAExD,WADI,CAAC,EAAE,qBAAqB,IAAI,KAC5B,CAAC,KAAK,QAAQ,CAAC,iBAAiB,OAAO,SAAS,KAAK,MAAM,UAAU,IAChE,KACF,EAAE,KAAK,aAAa,IAAI;AAAA,EACjC;AACA,SAAO;AACT;AAEO,SAAS,iBACd,OACA,SACA,MACA,YACA;AAIA,MAHI,CAAC,QAAQ,CAAC,EAAE,iBAAiB,IAAI,KACjC,CAAC,EAAE,aAAa,KAAK,MAAM,KAE3B,KAAK,OAAO,SAAS,WAAY,QAAO;AAE5C,QAAM,eADW,QAAQ,MAAM,eAAe,EAChB;AAC9B,MAAI,CAAC,aAAc,QAAO;AAC1B,QAAM,iBAAiB,aAAa,KAAK;AAEzC,SADI,GAAC,EAAE,oBAAoB,cAAc,KACrC,KAAC,qCAAc,OAAO,UAAU;AAItC;",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -29,7 +29,7 @@ __export(extractMediaStyle_exports, {
|
|
29
29
|
module.exports = __toCommonJS(extractMediaStyle_exports);
|
30
30
|
var t = __toESM(require("@babel/types")), core = __toESM(require("@tamagui/core")), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_extractHelpers = require("./extractHelpers");
|
31
31
|
function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath) {
|
32
|
-
var importance = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : 0, shouldPrintDebug = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : !1, {
|
32
|
+
var importance = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : 0, shouldPrintDebug = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : !1, { getCSSStylesAtomic, mediaObjectToString } = (0, import_requireTamaguiCore.requireTamaguiCore)("web"), mt = getMediaQueryTernary(props, ternary, jsxPath, sourcePath);
|
33
33
|
if (!mt)
|
34
34
|
return null;
|
35
35
|
var { key } = mt, mq = tamaguiConfig.media[key];
|
@@ -52,7 +52,7 @@ function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath) {
|
|
52
52
|
}, {}), mediaStyles = [], _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
|
53
53
|
try {
|
54
54
|
for (var _loop = function() {
|
55
|
-
var { styleObj, negate } = _step.value, styles =
|
55
|
+
var { styleObj, negate } = _step.value, styles = getCSSStylesAtomic(styleObj), singleMediaStyles = styles.map(function(style) {
|
56
56
|
var mediaStyle = core.createMediaStyle(style, key, tamaguiConfig.media, !0, negate), className = `.${mediaStyle[core.StyleObjectIdentifier]}`;
|
57
57
|
return {
|
58
58
|
...mediaStyle,
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/extractor/Users/n8/tamagui/code/compiler/static/src/extractor/extractMediaStyle.ts"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AACA;;;;;;QAAmB,kCAEnB,OAAsB,mCAGtB,4BAAmC,0CAEnC,wBAAyC;AAElC,SAASA,kBACdC,OACAC,SACAC,SACAC,eACAC,YAAkB;MAClBC,aAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAa,GACbC,mBAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAwC,IAElC,EAAEC,
|
5
|
-
"names": ["extractMediaStyle", "props", "ternary", "jsxPath", "tamaguiConfig", "sourcePath", "importance", "shouldPrintDebug", "
|
4
|
+
"mappings": "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",
|
5
|
+
"names": ["extractMediaStyle", "props", "ternary", "jsxPath", "tamaguiConfig", "sourcePath", "importance", "shouldPrintDebug", "getCSSStylesAtomic", "mediaObjectToString", "requireTamaguiCore", "mt", "getMediaQueryTernary", "key", "mq", "media", "console", "error", "Object", "keys", "getStyleObj", "styleObj", "negate", "styleOpts", "consequent", "alternate", "filter", "isPresent", "length", "info", "mediaKeys", "mediaKeyPrecendence", "reduce", "acc", "cur", "i", "Array", "fill", "join", "mediaStyles", "styles", "singleMediaStyles", "map", "style", "mediaStyle", "core", "createMediaStyle", "className", "StyleObjectIdentifier", "x", "remove", "ternaryWithoutMedia", "t", "isLogicalExpression", "test", "operator", "mediaLeft", "getMediaInfoFromExpression", "left", "inlineMediaQuery", "right", "result", "bindingName", "isMemberExpression", "isIdentifier", "object", "property", "binding", "name", "bindings", "scope", "getAllBindings", "bindingNode", "path", "node", "isVariableDeclarator", "init", "isValidMediaCall", "getBinding", "isCallExpression", "callee", "mediaBinding", "useMediaImport", "parent", "isImportDeclaration", "isValidImport"]
|
6
6
|
}
|
@@ -39,7 +39,7 @@ async function extractToClassNames({
|
|
39
39
|
options,
|
40
40
|
shouldPrintDebug
|
41
41
|
}) {
|
42
|
-
const tm = (0, import_timer.timer)(), {
|
42
|
+
const tm = (0, import_timer.timer)(), { getCSSStylesAtomic } = (0, import_requireTamaguiCore.requireTamaguiCore)("web");
|
43
43
|
if (sourcePath.includes("node_modules"))
|
44
44
|
return null;
|
45
45
|
if (shouldPrintDebug && console.warn(`--- ${sourcePath} ---
|
@@ -107,7 +107,7 @@ async function extractToClassNames({
|
|
107
107
|
return style;
|
108
108
|
}, addStyles = (style) => {
|
109
109
|
if (!style) return [];
|
110
|
-
const styleWithPrev = ensureNeededPrevStyle(style), res2 =
|
110
|
+
const styleWithPrev = ensureNeededPrevStyle(style), res2 = getCSSStylesAtomic(styleWithPrev);
|
111
111
|
return res2.length && (finalStyles = [...finalStyles, ...res2]), res2;
|
112
112
|
};
|
113
113
|
let lastMediaImportance = 1;
|
@@ -126,7 +126,7 @@ async function extractToClassNames({
|
|
126
126
|
} else
|
127
127
|
finalClassNames = [...finalClassNames, t.stringLiteral(newClassNames)];
|
128
128
|
} else {
|
129
|
-
const styles2 =
|
129
|
+
const styles2 = getCSSStylesAtomic(attr.value);
|
130
130
|
finalStyles = [...finalStyles, ...styles2];
|
131
131
|
for (const style of styles2) {
|
132
132
|
const prop = style[helpers.StyleObjectPseudo] ? `${style[helpers.StyleObjectProperty]}-${style[helpers.StyleObjectPseudo]}` : style[helpers.StyleObjectProperty];
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/extractor/extractToClassNames.ts"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,WAAsB,+BACtB,OAAsB,+BAEtB,mBAAqB,sCACrB,IAAmB,kCACnB,UAAyB,sCAGzB,4BAAmC,0CAEnC,oBAA2B,yBAC3B,wBAA+B,6BAE/B,sBAA6B,2BAC7B,+BAAsC,oCACtC,wBAA+B,6BAC/B,2BAAkC,gCAClC,yBAAgC,8BAChC,gCAAgD,qCAChD,eAAsB;AAEtB,MAAM,mBAAmB;AAAA,EACvB,eAAe;AAAA,EACf,cAAc;AAAA,EACd,aAAa;AAAA,EACb,cAAc;AAChB;AAkBA,eAAsB,oBAAoB;AAAA,EACxC;AAAA,EACA;AAAA,EACA,aAAa;AAAA,EACb;AAAA,EACA;AACF,GAAgE;AAC9D,QAAM,SAAK,oBAAM,GACX,EAAE,
|
4
|
+
"mappings": "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",
|
5
5
|
"names": ["res", "styles", "generate"]
|
6
6
|
}
|
@@ -33,7 +33,7 @@ var path = __toESM(require("node:path")), util = __toESM(require("node:util")),
|
|
33
33
|
shadowOffset: !0
|
34
34
|
};
|
35
35
|
async function extractToClassNames(param) {
|
36
|
-
var { extractor, source, sourcePath = "", options, shouldPrintDebug } = param, tm = (0, import_timer.timer)(), {
|
36
|
+
var { extractor, source, sourcePath = "", options, shouldPrintDebug } = param, tm = (0, import_timer.timer)(), { getCSSStylesAtomic } = (0, import_requireTamaguiCore.requireTamaguiCore)("web");
|
37
37
|
if (sourcePath.includes("node_modules"))
|
38
38
|
return null;
|
39
39
|
if (shouldPrintDebug && console.warn(`--- ${sourcePath} ---
|
@@ -108,7 +108,7 @@ async function extractToClassNames(param) {
|
|
108
108
|
return style2;
|
109
109
|
}, addStyles = function(style2) {
|
110
110
|
if (!style2) return [];
|
111
|
-
var styleWithPrev = ensureNeededPrevStyle(style2), res2 =
|
111
|
+
var styleWithPrev = ensureNeededPrevStyle(style2), res2 = getCSSStylesAtomic(styleWithPrev);
|
112
112
|
return res2.length && (finalStyles = [
|
113
113
|
...finalStyles,
|
114
114
|
...res2
|
@@ -134,7 +134,7 @@ async function extractToClassNames(param) {
|
|
134
134
|
t.stringLiteral(newClassNames)
|
135
135
|
];
|
136
136
|
} else {
|
137
|
-
var styles2 =
|
137
|
+
var styles2 = getCSSStylesAtomic(attr1.value);
|
138
138
|
finalStyles = [
|
139
139
|
...finalStyles,
|
140
140
|
...styles2
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/extractor/Users/n8/tamagui/code/compiler/static/src/extractor/extractToClassNames.ts"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;WAAsB,+BACtB,OAAsB,+BAEtB,mBAAqB,sCACrB,IAAmB,kCACnB,UAAyB,sCAGzB,4BAAmC,0CAEnC,oBAA2B,yBAC3B,wBAA+B,6BAE/B,sBAA6B,2BAC7B,+BAAsC,oCACtC,wBAA+B,6BAC/B,2BAAkC,gCAClC,yBAAgC,8BAChC,gCAAgD,qCAChD,eAAsB,oBAEhBA,mBAAmB;EACvBC,eAAe;EACfC,cAAc;EACdC,aAAa;EACbC,cAAc;AAChB;AAkBA,eAAsBC,oBAAoB,OAMf;MANe,EACxCC,WACAC,QACAC,aAAa,IACbC,SACAC,iBAAgB,IALwB,OAOlCC,SAAKC,oBAAAA,GACL,EAAEC,
|
5
|
-
"names": ["mergeStyleGroups", "shadowOpacity", "shadowRadius", "shadowColor", "shadowOffset", "extractToClassNames", "extractor", "source", "sourcePath", "options", "shouldPrintDebug", "tm", "timer", "
|
4
|
+
"mappings": "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",
|
5
|
+
"names": ["mergeStyleGroups", "shadowOpacity", "shadowRadius", "shadowColor", "shadowOffset", "extractToClassNames", "extractor", "source", "sourcePath", "options", "shouldPrintDebug", "tm", "timer", "getCSSStylesAtomic", "requireTamaguiCore", "includes", "console", "warn", "Error", "path", "isAbsolute", "test", "slice", "disableExtraction", "loadTamagui", "printLog", "createLogger", "ast", "babelParse", "err", "error", "mark", "cssMap", "Map", "existingHoists", "hasFlattened", "res", "parse", "platform", "extractStyledDefinitions", "onStyleRule", "identifier", "rules", "css", "join", "info", "set", "commentTexts", "getFlattenedNode", "param", "tag", "onExtractTag", "parserProps", "attrs", "node", "attemptEval", "jsxPath", "originalNodeName", "filePath", "lineNumbers", "programPath", "isFlattened", "staticConfig", "acceptsClassName", "didFlattenThisTag", "finalClassNames", "finalAttrs", "finalStyles", "viewStyles", "attr", "type", "value", "ensureNeededPrevStyle", "style", "keys", "Object", "some", "key", "k", "addStyles", "styleWithPrev", "length", "lastMediaImportance", "styles", "newFontFamily", "getFontFamilyClassNameFromProps", "newClassNames", "helpers", "concatClassName", "map", "x", "StyleObjectIdentifier", "existing", "find", "previous", "replace", "t", "stringLiteral", "prop", "StyleObjectPseudo", "StyleObjectProperty", "push", "jsxAttribute", "jsxIdentifier", "val", "isJSXSpreadAttribute", "isSimpleSpread", "logicalExpression", "argument", "memberExpression", "name", "evaluatedValue", "mediaExtraction", "extractMediaStyle", "getTamagui", "ternaryWithoutMedia", "inlineMediaQuery", "mediaStyles", "addTernaryStyle", "consequent", "alternate", "ternary", "a", "b", "cCN", "aCN", "conditionalExpression", "JSON", "stringify", "attributes", "extraClassNames", "process", "env", "TAMAGUI_DEBUG_OPTIMIZATIONS", "componentName", "names", "buildClassName", "nameExpr", "hoistClassNames", "expr", "isIdentifier", "ensureImportingConcat", "simpleSpreads", "filter", "callExpression", "jsxExpressionContainer", "comment", "util", "format", "styleObject", "StyleObjectRules", "className", "has", "get", "modified", "optimized", "flattened", "styled", "Array", "from", "values", "trim", "result", "generate", "concise", "filename", "retainLines", "sourceFileName", "sourceMaps", "code", "split", "startsWith", "js"]
|
6
6
|
}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@tamagui/static",
|
3
|
-
"version": "1.123.
|
3
|
+
"version": "1.123.8",
|
4
4
|
"source": "src/index.ts",
|
5
5
|
"types": "./types/index.d.ts",
|
6
6
|
"type": "commonjs",
|
@@ -44,19 +44,19 @@
|
|
44
44
|
"@babel/runtime": "^7.25.4",
|
45
45
|
"@babel/traverse": "^7.25.4",
|
46
46
|
"@babel/types": "^7.25.4",
|
47
|
-
"@tamagui/build": "1.123.
|
48
|
-
"@tamagui/cli-color": "1.123.
|
49
|
-
"@tamagui/config-default": "1.123.
|
50
|
-
"@tamagui/core": "1.123.
|
51
|
-
"@tamagui/fake-react-native": "1.123.
|
52
|
-
"@tamagui/generate-themes": "1.123.
|
53
|
-
"@tamagui/helpers": "1.123.
|
54
|
-
"@tamagui/helpers-node": "1.123.
|
55
|
-
"@tamagui/proxy-worm": "1.123.
|
56
|
-
"@tamagui/react-native-web-internals": "1.123.
|
57
|
-
"@tamagui/react-native-web-lite": "1.123.
|
58
|
-
"@tamagui/shorthands": "1.123.
|
59
|
-
"@tamagui/types": "1.123.
|
47
|
+
"@tamagui/build": "1.123.8",
|
48
|
+
"@tamagui/cli-color": "1.123.8",
|
49
|
+
"@tamagui/config-default": "1.123.8",
|
50
|
+
"@tamagui/core": "1.123.8",
|
51
|
+
"@tamagui/fake-react-native": "1.123.8",
|
52
|
+
"@tamagui/generate-themes": "1.123.8",
|
53
|
+
"@tamagui/helpers": "1.123.8",
|
54
|
+
"@tamagui/helpers-node": "1.123.8",
|
55
|
+
"@tamagui/proxy-worm": "1.123.8",
|
56
|
+
"@tamagui/react-native-web-internals": "1.123.8",
|
57
|
+
"@tamagui/react-native-web-lite": "1.123.8",
|
58
|
+
"@tamagui/shorthands": "1.123.8",
|
59
|
+
"@tamagui/types": "1.123.8",
|
60
60
|
"babel-literal-to-ast": "^2.1.0",
|
61
61
|
"browserslist": "^4.22.2",
|
62
62
|
"check-dependency-version-consistency": "^4.1.0",
|
@@ -17,7 +17,7 @@ export function extractMediaStyle(
|
|
17
17
|
importance = 0,
|
18
18
|
shouldPrintDebug: boolean | 'verbose' = false
|
19
19
|
) {
|
20
|
-
const {
|
20
|
+
const { getCSSStylesAtomic, mediaObjectToString } = requireTamaguiCore('web')
|
21
21
|
const mt = getMediaQueryTernary(props, ternary, jsxPath, sourcePath)
|
22
22
|
if (!mt) {
|
23
23
|
return null
|
@@ -51,7 +51,7 @@ export function extractMediaStyle(
|
|
51
51
|
// this should be done using the same logic as createMediaStyle
|
52
52
|
|
53
53
|
for (const { styleObj, negate } of styleOpts) {
|
54
|
-
const styles =
|
54
|
+
const styles = getCSSStylesAtomic(styleObj as any)
|
55
55
|
|
56
56
|
const singleMediaStyles = styles.map((style) => {
|
57
57
|
const mediaStyle = core.createMediaStyle(
|
@@ -50,7 +50,7 @@ export async function extractToClassNames({
|
|
50
50
|
shouldPrintDebug,
|
51
51
|
}: ExtractToClassNamesProps): Promise<ExtractedResponse | null> {
|
52
52
|
const tm = timer()
|
53
|
-
const {
|
53
|
+
const { getCSSStylesAtomic } = requireTamaguiCore('web')
|
54
54
|
|
55
55
|
if (sourcePath.includes('node_modules')) {
|
56
56
|
return null
|
@@ -170,7 +170,7 @@ export async function extractToClassNames({
|
|
170
170
|
const addStyles = (style: ViewStyle | null): StyleObject[] => {
|
171
171
|
if (!style) return []
|
172
172
|
const styleWithPrev = ensureNeededPrevStyle(style)
|
173
|
-
const res =
|
173
|
+
const res = getCSSStylesAtomic(styleWithPrev as any)
|
174
174
|
if (res.length) {
|
175
175
|
finalStyles = [...finalStyles, ...res]
|
176
176
|
}
|
@@ -183,7 +183,7 @@ export async function extractToClassNames({
|
|
183
183
|
switch (attr.type) {
|
184
184
|
case 'style': {
|
185
185
|
if (!isFlattened) {
|
186
|
-
const styles =
|
186
|
+
const styles = getCSSStylesAtomic(attr.value as any)
|
187
187
|
|
188
188
|
finalStyles = [...finalStyles, ...styles]
|
189
189
|
|