@tamagui/static 1.79.19 → 1.80.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. package/dist/cjs/extractor/extractMediaStyle.js +5 -11
  2. package/dist/cjs/extractor/extractMediaStyle.js.map +1 -1
  3. package/dist/cjs/extractor/extractMediaStyle.native.js +5 -11
  4. package/dist/cjs/extractor/extractMediaStyle.native.js.map +1 -1
  5. package/dist/cjs/index.js +3 -1
  6. package/dist/cjs/index.js.map +1 -1
  7. package/dist/cjs/index.native.js +3 -1
  8. package/dist/cjs/index.native.js.map +1 -1
  9. package/dist/cjs/minifyCSS.js +33 -0
  10. package/dist/cjs/minifyCSS.js.map +6 -0
  11. package/dist/cjs/minifyCSS.native.js +34 -0
  12. package/dist/cjs/minifyCSS.native.js.map +6 -0
  13. package/dist/esm/extractor/extractMediaStyle.js +5 -11
  14. package/dist/esm/extractor/extractMediaStyle.js.map +1 -1
  15. package/dist/esm/extractor/extractMediaStyle.native.js +5 -11
  16. package/dist/esm/extractor/extractMediaStyle.native.js.map +1 -1
  17. package/dist/esm/index.js +1 -0
  18. package/dist/esm/index.js.map +1 -1
  19. package/dist/esm/index.native.js +1 -0
  20. package/dist/esm/index.native.js.map +1 -1
  21. package/dist/esm/minifyCSS.js +13 -0
  22. package/dist/esm/minifyCSS.js.map +6 -0
  23. package/dist/esm/minifyCSS.native.js +13 -0
  24. package/dist/esm/minifyCSS.native.js.map +6 -0
  25. package/package.json +16 -15
  26. package/src/extractor/extractMediaStyle.ts +6 -31
  27. package/src/index.ts +1 -0
  28. package/src/minifyCSS.ts +10 -0
  29. package/types/extractor/extractMediaStyle.d.ts +1 -1
  30. package/types/extractor/extractMediaStyle.d.ts.map +1 -1
  31. package/types/index.d.ts +1 -0
  32. package/types/index.d.ts.map +1 -1
  33. package/types/minifyCSS.d.ts +2 -0
  34. package/types/minifyCSS.d.ts.map +1 -0
@@ -26,7 +26,7 @@ __export(extractMediaStyle_exports, {
26
26
  isValidMediaCall: () => isValidMediaCall
27
27
  });
28
28
  module.exports = __toCommonJS(extractMediaStyle_exports);
29
- var t = __toESM(require("@babel/types")), import_constants = require("../constants"), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_extractHelpers = require("./extractHelpers");
29
+ var t = __toESM(require("@babel/types")), import_core = 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
31
  const { getStylesAtomic, mediaObjectToString } = (0, import_requireTamaguiCore.requireTamaguiCore)("web"), mt = getMediaQueryTernary(props, ternary, jsxPath, sourcePath);
32
32
  if (!mt)
@@ -44,16 +44,10 @@ function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, i
44
44
  let mediaStyles = [];
45
45
  for (const { styleObj, negate } of styleOpts) {
46
46
  const singleMediaStyles = getStylesAtomic(styleObj).map((style) => {
47
- const negKey = negate ? "0" : "", ogPrefix = style.identifier.slice(0, style.identifier.indexOf("-") + 1), identifier = `${style.identifier.replace(
48
- ogPrefix,
49
- `${ogPrefix}${import_constants.MEDIA_SEP}${key}${negKey}${import_constants.MEDIA_SEP}`
50
- )}`, className = `.${identifier}`, mediaSelector = mediaObjectToString(tamaguiConfig.media[key]), mediaQuery = `${negate ? "not all" : "screen"} and ${mediaSelector}`, precendencePrefix = mediaKeyPrecendence[key], styleInner = style.rules.map((rule) => rule.replace(style.identifier, identifier)).join(";");
51
- let styleRule = "";
52
- return styleInner.includes("@media") ? styleRule = styleInner.replace("{", ` and ${mediaQuery} {`) : styleRule = `@media ${mediaQuery} { ${precendencePrefix}${styleInner} }`, {
53
- ...style,
54
- identifier,
55
- className,
56
- rules: [styleRule]
47
+ const mediaStyle = (0, import_core.createMediaStyle)(style, key, tamaguiConfig.media, !0, negate), className = `.${mediaStyle.identifier}`;
48
+ return {
49
+ ...mediaStyle,
50
+ className
57
51
  };
58
52
  });
59
53
  shouldPrintDebug === "verbose" && console.info(
@@ -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,kCAInB,mBAA0B,yBAC1B,4BAAmC,0CAEnC,wBAAyC;AAElC,SAAS,kBACd,OACA,SACA,SACA,eACA,YACA,aAAa,GACb,mBAAwC,IACxC;AACA,QAAM,EAAE,iBAAiB,oBAAoB,QAAI,8CAAmB,KAAK,GACnE,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;AAE5C,UAAM,oBADS,gBAAgB,QAAe,EACb,IAAI,CAAC,UAAU;AAC9C,YAAM,SAAS,SAAS,MAAM,IACxB,WAAW,MAAM,WAAW,MAAM,GAAG,MAAM,WAAW,QAAQ,GAAG,IAAI,CAAC,GAItE,aAAa,GAAG,MAAM,WAAW;AAAA,QACrC;AAAA,QACA,GAAG,QAAQ,GAAG,0BAAS,GAAG,GAAG,GAAG,MAAM,GAAG,0BAAS;AAAA,MACpD,CAAC,IACK,YAAY,IAAI,UAAU,IAC1B,gBAAgB,oBAAoB,cAAc,MAAM,GAAG,CAAC,GAG5D,aAAa,GADD,SAAS,YAAY,QACR,QAAQ,aAAa,IAC9C,oBAAoB,oBAAoB,GAAG,GAC3C,aAAa,MAAM,MACtB,IAAI,CAAC,SAAS,KAAK,QAAQ,MAAM,YAAY,UAAU,CAAC,EACxD,KAAK,GAAG;AAEX,UAAI,YAAY;AAChB,aAAI,WAAW,SAAS,QAAQ,IAE9B,YAAY,WAAW,QAAQ,KAAK,QAAQ,UAAU,IAAI,IAE1D,YAAY,UAAU,UAAU,MAAM,iBAAiB,GAAG,UAAU,MAE/D;AAAA,QACL,GAAG;AAAA,QACH;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,MACnB;AAAA,IACF,CAAC;AACD,IAAI,qBAAqB,aACvB,QAAQ;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,MACA,kBAAkB,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,IAAI;AAAA,IACtD,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;AA/JF;AAgKE,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;AAAS,aAAO;AACrB,UAAM,eAAc,aAAQ,SAAR,mBAAc;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,QAAO,mBAAQ,MAAM,WAAW,KAAK,IAAI,MAAlC,mBAAqC,SAArC,mBAA2C;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;AAAY,WAAO;AAE5C,QAAM,eADW,QAAQ,MAAM,eAAe,EAChB;AAC9B,MAAI,CAAC;AAAc,WAAO;AAC1B,QAAM,iBAAiB,aAAa,KAAK;AAEzC,SADI,GAAC,EAAE,oBAAoB,cAAc,KACrC,KAAC,qCAAc,OAAO,UAAU;AAItC;",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
@@ -27,7 +27,7 @@ __export(extractMediaStyle_exports, {
27
27
  isValidMediaCall: () => isValidMediaCall
28
28
  });
29
29
  module.exports = __toCommonJS(extractMediaStyle_exports);
30
- var t = __toESM(require("@babel/types")), import_constants = require("../constants"), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_extractHelpers = require("./extractHelpers");
30
+ var t = __toESM(require("@babel/types")), import_core = require("@tamagui/core"), import_requireTamaguiCore = require("../helpers/requireTamaguiCore"), import_extractHelpers = require("./extractHelpers");
31
31
  function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, importance = 0, shouldPrintDebug = !1) {
32
32
  const { getStylesAtomic, mediaObjectToString } = (0, import_requireTamaguiCore.requireTamaguiCore)("web"), mt = getMediaQueryTernary(props, ternary, jsxPath, sourcePath);
33
33
  if (!mt)
@@ -45,16 +45,10 @@ function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, i
45
45
  let mediaStyles = [];
46
46
  for (const { styleObj, negate } of styleOpts) {
47
47
  const singleMediaStyles = getStylesAtomic(styleObj).map((style) => {
48
- const negKey = negate ? "0" : "", ogPrefix = style.identifier.slice(0, style.identifier.indexOf("-") + 1), identifier = `${style.identifier.replace(
49
- ogPrefix,
50
- `${ogPrefix}${import_constants.MEDIA_SEP}${key}${negKey}${import_constants.MEDIA_SEP}`
51
- )}`, className = `.${identifier}`, mediaSelector = mediaObjectToString(tamaguiConfig.media[key]), mediaQuery = `${negate ? "not all" : "screen"} and ${mediaSelector}`, precendencePrefix = mediaKeyPrecendence[key], styleInner = style.rules.map((rule) => rule.replace(style.identifier, identifier)).join(";");
52
- let styleRule = "";
53
- return styleInner.includes("@media") ? styleRule = styleInner.replace("{", ` and ${mediaQuery} {`) : styleRule = `@media ${mediaQuery} { ${precendencePrefix}${styleInner} }`, {
54
- ...style,
55
- identifier,
56
- className,
57
- rules: [styleRule]
48
+ const mediaStyle = (0, import_core.createMediaStyle)(style, key, tamaguiConfig.media, !0, negate), className = `.${mediaStyle.identifier}`;
49
+ return {
50
+ ...mediaStyle,
51
+ className
58
52
  };
59
53
  });
60
54
  shouldPrintDebug === "verbose" && console.info(
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/extractor/extractMediaStyle.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
package/dist/cjs/index.js CHANGED
@@ -13,8 +13,10 @@ var src_exports = {};
13
13
  module.exports = __toCommonJS(src_exports);
14
14
  var import_setup = require("./setup");
15
15
  __reExport(src_exports, require("./static"), module.exports);
16
+ __reExport(src_exports, require("./minifyCSS"), module.exports);
16
17
  // Annotate the CommonJS export names for ESM import in node:
17
18
  0 && (module.exports = {
18
- ...require("./static")
19
+ ...require("./static"),
20
+ ...require("./minifyCSS")
19
21
  });
20
22
  //# sourceMappingURL=index.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/index.ts"],
4
- "mappings": ";;;;;;;;;;;AAAA;AAAA;AAAA,mBAAO;AACP,wBAAc,qBADd;",
4
+ "mappings": ";;;;;;;;;;;AAAA;AAAA;AAAA,mBAAO;AACP,wBAAc,qBADd;AAEA,wBAAc,wBAFd;",
5
5
  "names": []
6
6
  }
@@ -14,8 +14,10 @@ var src_exports = {};
14
14
  module.exports = __toCommonJS(src_exports);
15
15
  var import_setup = require("./setup");
16
16
  __reExport(src_exports, require("./static"), module.exports);
17
+ __reExport(src_exports, require("./minifyCSS"), module.exports);
17
18
  // Annotate the CommonJS export names for ESM import in node:
18
19
  0 && (module.exports = {
19
- ...require("./static")
20
+ ...require("./static"),
21
+ ...require("./minifyCSS")
20
22
  });
21
23
  //# sourceMappingURL=index.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/index.ts"],
4
- "mappings": ";;;;;;;;;;;;AAAA;AAAA;AAAA,mBAAO;AACP,wBAAc,qBADd;",
4
+ "mappings": ";;;;;;;;;;;;AAAA;AAAA;AAAA,mBAAO;AACP,wBAAc,qBADd;AAEA,wBAAc,wBAFd;",
5
5
  "names": []
6
6
  }
@@ -0,0 +1,33 @@
1
+ var __defProp = Object.defineProperty;
2
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
3
+ var __getOwnPropNames = Object.getOwnPropertyNames;
4
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
5
+ var __export = (target, all) => {
6
+ for (var name in all)
7
+ __defProp(target, name, { get: all[name], enumerable: !0 });
8
+ }, __copyProps = (to, from, except, desc) => {
9
+ if (from && typeof from == "object" || typeof from == "function")
10
+ for (let key of __getOwnPropNames(from))
11
+ !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
12
+ return to;
13
+ };
14
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
15
+ var minifyCSS_exports = {};
16
+ __export(minifyCSS_exports, {
17
+ minifyCSS: () => minifyCSS
18
+ });
19
+ module.exports = __toCommonJS(minifyCSS_exports);
20
+ var import_lightningcss = require("lightningcss");
21
+ function minifyCSS(input) {
22
+ return (0, import_lightningcss.transform)({
23
+ filename: "style.css",
24
+ code: Buffer.from(input),
25
+ minify: !0,
26
+ sourceMap: !0
27
+ });
28
+ }
29
+ // Annotate the CommonJS export names for ESM import in node:
30
+ 0 && (module.exports = {
31
+ minifyCSS
32
+ });
33
+ //# sourceMappingURL=minifyCSS.js.map
@@ -0,0 +1,6 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../../src/minifyCSS.ts"],
4
+ "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAA0B;AAEnB,SAAS,UAAU,OAAe;AACvC,aAAO,+BAAU;AAAA,IACf,UAAU;AAAA,IACV,MAAM,OAAO,KAAK,KAAK;AAAA,IACvB,QAAQ;AAAA,IACR,WAAW;AAAA,EACb,CAAC;AACH;",
5
+ "names": []
6
+ }
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: !0 });
9
+ }, __copyProps = (to, from, except, desc) => {
10
+ if (from && typeof from == "object" || typeof from == "function")
11
+ for (let key of __getOwnPropNames(from))
12
+ !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
13
+ return to;
14
+ };
15
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
16
+ var minifyCSS_exports = {};
17
+ __export(minifyCSS_exports, {
18
+ minifyCSS: () => minifyCSS
19
+ });
20
+ module.exports = __toCommonJS(minifyCSS_exports);
21
+ var import_lightningcss = require("lightningcss");
22
+ function minifyCSS(input) {
23
+ return (0, import_lightningcss.transform)({
24
+ filename: "style.css",
25
+ code: Buffer.from(input),
26
+ minify: !0,
27
+ sourceMap: !0
28
+ });
29
+ }
30
+ // Annotate the CommonJS export names for ESM import in node:
31
+ 0 && (module.exports = {
32
+ minifyCSS
33
+ });
34
+ //# sourceMappingURL=minifyCSS.js.map
@@ -0,0 +1,6 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../../src/minifyCSS.ts"],
4
+ "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAA0B;AAEnB,SAAS,UAAU,OAAe;AACvC,aAAO,+BAAU;AAAA,IACf,UAAU;AAAA,IACV,MAAM,OAAO,KAAK,KAAK;AAAA,IACvB,QAAQ;AAAA,IACR,WAAW;AAAA,EACb,CAAC;AACH;",
5
+ "names": []
6
+ }
@@ -1,5 +1,5 @@
1
1
  import * as t from "@babel/types";
2
- import { MEDIA_SEP } from "../constants";
2
+ import { createMediaStyle } from "@tamagui/core";
3
3
  import { requireTamaguiCore } from "../helpers/requireTamaguiCore";
4
4
  import { isPresent, isValidImport } from "./extractHelpers";
5
5
  function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, importance = 0, shouldPrintDebug = !1) {
@@ -19,16 +19,10 @@ function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, i
19
19
  let mediaStyles = [];
20
20
  for (const { styleObj, negate } of styleOpts) {
21
21
  const singleMediaStyles = getStylesAtomic(styleObj).map((style) => {
22
- const negKey = negate ? "0" : "", ogPrefix = style.identifier.slice(0, style.identifier.indexOf("-") + 1), identifier = `${style.identifier.replace(
23
- ogPrefix,
24
- `${ogPrefix}${MEDIA_SEP}${key}${negKey}${MEDIA_SEP}`
25
- )}`, className = `.${identifier}`, mediaSelector = mediaObjectToString(tamaguiConfig.media[key]), mediaQuery = `${negate ? "not all" : "screen"} and ${mediaSelector}`, precendencePrefix = mediaKeyPrecendence[key], styleInner = style.rules.map((rule) => rule.replace(style.identifier, identifier)).join(";");
26
- let styleRule = "";
27
- return styleInner.includes("@media") ? styleRule = styleInner.replace("{", ` and ${mediaQuery} {`) : styleRule = `@media ${mediaQuery} { ${precendencePrefix}${styleInner} }`, {
28
- ...style,
29
- identifier,
30
- className,
31
- rules: [styleRule]
22
+ const mediaStyle = createMediaStyle(style, key, tamaguiConfig.media, !0, negate), className = `.${mediaStyle.identifier}`;
23
+ return {
24
+ ...mediaStyle,
25
+ className
32
26
  };
33
27
  });
34
28
  shouldPrintDebug === "verbose" && console.info(
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/extractor/extractMediaStyle.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
@@ -1,5 +1,5 @@
1
1
  import * as t from "@babel/types";
2
- import { MEDIA_SEP } from "../constants";
2
+ import { createMediaStyle } from "@tamagui/core";
3
3
  import { requireTamaguiCore } from "../helpers/requireTamaguiCore";
4
4
  import { isPresent, isValidImport } from "./extractHelpers";
5
5
  function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, importance = 0, shouldPrintDebug = !1) {
@@ -19,16 +19,10 @@ function extractMediaStyle(props, ternary, jsxPath, tamaguiConfig, sourcePath, i
19
19
  let mediaStyles = [];
20
20
  for (const { styleObj, negate } of styleOpts) {
21
21
  const singleMediaStyles = getStylesAtomic(styleObj).map((style) => {
22
- const negKey = negate ? "0" : "", ogPrefix = style.identifier.slice(0, style.identifier.indexOf("-") + 1), identifier = `${style.identifier.replace(
23
- ogPrefix,
24
- `${ogPrefix}${MEDIA_SEP}${key}${negKey}${MEDIA_SEP}`
25
- )}`, className = `.${identifier}`, mediaSelector = mediaObjectToString(tamaguiConfig.media[key]), mediaQuery = `${negate ? "not all" : "screen"} and ${mediaSelector}`, precendencePrefix = mediaKeyPrecendence[key], styleInner = style.rules.map((rule) => rule.replace(style.identifier, identifier)).join(";");
26
- let styleRule = "";
27
- return styleInner.includes("@media") ? styleRule = styleInner.replace("{", ` and ${mediaQuery} {`) : styleRule = `@media ${mediaQuery} { ${precendencePrefix}${styleInner} }`, {
28
- ...style,
29
- identifier,
30
- className,
31
- rules: [styleRule]
22
+ const mediaStyle = createMediaStyle(style, key, tamaguiConfig.media, !0, negate), className = `.${mediaStyle.identifier}`;
23
+ return {
24
+ ...mediaStyle,
25
+ className
32
26
  };
33
27
  });
34
28
  shouldPrintDebug === "verbose" && console.info(
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/extractor/extractMediaStyle.ts"],
4
- "mappings": "AACA,YAAY,OAAO;AAInB,SAAS,iBAAiB;AAC1B,SAAS,0BAA0B;AAEnC,SAAS,WAAW,qBAAqB;AAElC,SAAS,kBACd,OACA,SACA,SACA,eACA,YACA,aAAa,GACb,mBAAwC,IACxC;AACA,QAAM,EAAE,iBAAiB,oBAAoB,IAAI,mBAAmB,KAAK,GACnE,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,SAAS;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;AAE5C,UAAM,oBADS,gBAAgB,QAAe,EACb,IAAI,CAAC,UAAU;AAC9C,YAAM,SAAS,SAAS,MAAM,IACxB,WAAW,MAAM,WAAW,MAAM,GAAG,MAAM,WAAW,QAAQ,GAAG,IAAI,CAAC,GAItE,aAAa,GAAG,MAAM,WAAW;AAAA,QACrC;AAAA,QACA,GAAG,QAAQ,GAAG,SAAS,GAAG,GAAG,GAAG,MAAM,GAAG,SAAS;AAAA,MACpD,CAAC,IACK,YAAY,IAAI,UAAU,IAC1B,gBAAgB,oBAAoB,cAAc,MAAM,GAAG,CAAC,GAG5D,aAAa,GADD,SAAS,YAAY,QACR,QAAQ,aAAa,IAC9C,oBAAoB,oBAAoB,GAAG,GAC3C,aAAa,MAAM,MACtB,IAAI,CAAC,SAAS,KAAK,QAAQ,MAAM,YAAY,UAAU,CAAC,EACxD,KAAK,GAAG;AAEX,UAAI,YAAY;AAChB,aAAI,WAAW,SAAS,QAAQ,IAE9B,YAAY,WAAW,QAAQ,KAAK,QAAQ,UAAU,IAAI,IAE1D,YAAY,UAAU,UAAU,MAAM,iBAAiB,GAAG,UAAU,MAE/D;AAAA,QACL,GAAG;AAAA,QACH;AAAA,QACA;AAAA,QACA,OAAO,CAAC,SAAS;AAAA,MACnB;AAAA,IACF,CAAC;AACD,IAAI,qBAAqB,aACvB,QAAQ;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,MACA,kBAAkB,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,IAAI;AAAA,IACtD,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;AAAS,aAAO;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;AAAY,WAAO;AAE5C,QAAM,eADW,QAAQ,MAAM,eAAe,EAChB;AAC9B,MAAI,CAAC;AAAc,WAAO;AAC1B,QAAM,iBAAiB,aAAa,KAAK;AAEzC,SADI,GAAC,EAAE,oBAAoB,cAAc,KACrC,CAAC,cAAc,OAAO,UAAU;AAItC;",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
package/dist/esm/index.js CHANGED
@@ -1,3 +1,4 @@
1
1
  import "./setup";
2
2
  export * from "./static";
3
+ export * from "./minifyCSS";
3
4
  //# sourceMappingURL=index.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/index.ts"],
4
- "mappings": "AAAA,OAAO;AACP,cAAc;",
4
+ "mappings": "AAAA,OAAO;AACP,cAAc;AACd,cAAc;",
5
5
  "names": []
6
6
  }
@@ -1,3 +1,4 @@
1
1
  import "./setup";
2
2
  export * from "./static";
3
+ export * from "./minifyCSS";
3
4
  //# sourceMappingURL=index.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/index.ts"],
4
- "mappings": "AAAA,OAAO;AACP,cAAc;",
4
+ "mappings": "AAAA,OAAO;AACP,cAAc;AACd,cAAc;",
5
5
  "names": []
6
6
  }
@@ -0,0 +1,13 @@
1
+ import { transform } from "lightningcss";
2
+ function minifyCSS(input) {
3
+ return transform({
4
+ filename: "style.css",
5
+ code: Buffer.from(input),
6
+ minify: !0,
7
+ sourceMap: !0
8
+ });
9
+ }
10
+ export {
11
+ minifyCSS
12
+ };
13
+ //# sourceMappingURL=minifyCSS.js.map
@@ -0,0 +1,6 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../../src/minifyCSS.ts"],
4
+ "mappings": "AAAA,SAAS,iBAAiB;AAEnB,SAAS,UAAU,OAAe;AACvC,SAAO,UAAU;AAAA,IACf,UAAU;AAAA,IACV,MAAM,OAAO,KAAK,KAAK;AAAA,IACvB,QAAQ;AAAA,IACR,WAAW;AAAA,EACb,CAAC;AACH;",
5
+ "names": []
6
+ }
@@ -0,0 +1,13 @@
1
+ import { transform } from "lightningcss";
2
+ function minifyCSS(input) {
3
+ return transform({
4
+ filename: "style.css",
5
+ code: Buffer.from(input),
6
+ minify: !0,
7
+ sourceMap: !0
8
+ });
9
+ }
10
+ export {
11
+ minifyCSS
12
+ };
13
+ //# sourceMappingURL=minifyCSS.js.map
@@ -0,0 +1,6 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../../src/minifyCSS.ts"],
4
+ "mappings": "AAAA,SAAS,iBAAiB;AAEnB,SAAS,UAAU,OAAe;AACvC,SAAO,UAAU;AAAA,IACf,UAAU;AAAA,IACV,MAAM,OAAO,KAAK,KAAK;AAAA,IACvB,QAAQ;AAAA,IACR,WAAW;AAAA,EACb,CAAC;AACH;",
5
+ "names": []
6
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/static",
3
- "version": "1.79.19",
3
+ "version": "1.80.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.79.19",
39
- "@tamagui/cli-color": "1.79.19",
40
- "@tamagui/config-default": "1.79.19",
41
- "@tamagui/core": "1.79.19",
42
- "@tamagui/fake-react-native": "1.79.19",
43
- "@tamagui/generate-themes": "1.79.19",
44
- "@tamagui/helpers": "1.79.19",
45
- "@tamagui/helpers-node": "1.79.19",
46
- "@tamagui/proxy-worm": "1.79.19",
47
- "@tamagui/shorthands": "1.79.19",
48
- "@tamagui/types": "1.79.19",
38
+ "@tamagui/build": "1.80.0",
39
+ "@tamagui/cli-color": "1.80.0",
40
+ "@tamagui/config-default": "1.80.0",
41
+ "@tamagui/core": "1.80.0",
42
+ "@tamagui/fake-react-native": "1.80.0",
43
+ "@tamagui/generate-themes": "1.80.0",
44
+ "@tamagui/helpers": "1.80.0",
45
+ "@tamagui/helpers-node": "1.80.0",
46
+ "@tamagui/proxy-worm": "1.80.0",
47
+ "@tamagui/shorthands": "1.80.0",
48
+ "@tamagui/types": "1.80.0",
49
49
  "babel-literal-to-ast": "^2.1.0",
50
50
  "esbuild": "~0.19.3",
51
51
  "esbuild-register": "^3.4.2",
@@ -53,15 +53,16 @@
53
53
  "find-root": "^1.1.0",
54
54
  "fs-extra": "^11.1.0",
55
55
  "invariant": "^2.2.4",
56
+ "lightningcss": "^1.22.1",
56
57
  "lodash": "^4.17.21",
57
58
  "react-native-web": "^0.19.9",
58
- "react-native-web-internals": "1.79.19",
59
- "react-native-web-lite": "1.79.19"
59
+ "react-native-web-internals": "1.80.0",
60
+ "react-native-web-lite": "1.80.0"
60
61
  },
61
62
  "devDependencies": {
62
63
  "@babel/plugin-syntax-typescript": "^7.23.3",
63
64
  "@expo/match-media": "^0.4.0",
64
- "@tamagui/test-design-system": "1.79.19",
65
+ "@tamagui/test-design-system": "1.80.0",
65
66
  "@testing-library/react": "^14.0.0",
66
67
  "@types/babel__generator": "^7.6.4",
67
68
  "@types/babel__traverse": "^7.18.2",
@@ -1,9 +1,8 @@
1
1
  import { NodePath } from '@babel/traverse'
2
2
  import * as t from '@babel/types'
3
- import type { TamaguiInternalConfig } from '@tamagui/core'
3
+ import { TamaguiInternalConfig, createMediaStyle } from '@tamagui/core'
4
4
  import type { ViewStyle } from 'react-native'
5
5
 
6
- import { MEDIA_SEP } from '../constants'
7
6
  import { requireTamaguiCore } from '../helpers/requireTamaguiCore'
8
7
  import type { StyleObject, TamaguiOptionsWithFileInfo, Ternary } from '../types'
9
8
  import { isPresent, isValidImport } from './extractHelpers'
@@ -52,40 +51,16 @@ export function extractMediaStyle(
52
51
 
53
52
  for (const { styleObj, negate } of styleOpts) {
54
53
  const styles = getStylesAtomic(styleObj as any)
54
+
55
55
  const singleMediaStyles = styles.map((style) => {
56
- const negKey = negate ? '0' : ''
57
- const ogPrefix = style.identifier.slice(0, style.identifier.indexOf('-') + 1)
58
- // adds an extra separator before and after to detect later
59
- // so it goes from: "_f-[hash]"
60
- // to: "_f-_sm0_[hash]" or "_f-_sm_[hash]"
61
- const identifier = `${style.identifier.replace(
62
- ogPrefix,
63
- `${ogPrefix}${MEDIA_SEP}${key}${negKey}${MEDIA_SEP}`
64
- )}`
65
- const className = `.${identifier}`
66
- const mediaSelector = mediaObjectToString(tamaguiConfig.media[key])
67
- // screen and
68
- const screenStr = negate ? 'not all' : 'screen'
69
- const mediaQuery = `${screenStr} and ${mediaSelector}`
70
- const precendencePrefix = mediaKeyPrecendence[key]
71
- const styleInner = style.rules
72
- .map((rule) => rule.replace(style.identifier, identifier))
73
- .join(';')
74
- // combines media queries if they already exist
75
- let styleRule = ''
76
- if (styleInner.includes('@media')) {
77
- // combine
78
- styleRule = styleInner.replace('{', ` and ${mediaQuery} {`)
79
- } else {
80
- styleRule = `@media ${mediaQuery} { ${precendencePrefix}${styleInner} }`
81
- }
56
+ const mediaStyle = createMediaStyle(style, key, tamaguiConfig.media, true, negate)
57
+ const className = `.${mediaStyle.identifier}`
82
58
  return {
83
- ...style,
84
- identifier,
59
+ ...mediaStyle,
85
60
  className,
86
- rules: [styleRule],
87
61
  }
88
62
  })
63
+
89
64
  if (shouldPrintDebug === 'verbose') {
90
65
  console.info(
91
66
  ' media styles:',
package/src/index.ts CHANGED
@@ -1,2 +1,3 @@
1
1
  import './setup'
2
2
  export * from './static'
3
+ export * from './minifyCSS'
@@ -0,0 +1,10 @@
1
+ import { transform } from 'lightningcss'
2
+
3
+ export function minifyCSS(input: string) {
4
+ return transform({
5
+ filename: 'style.css',
6
+ code: Buffer.from(input),
7
+ minify: true,
8
+ sourceMap: true,
9
+ })
10
+ }
@@ -1,6 +1,6 @@
1
1
  import { NodePath } from '@babel/traverse';
2
2
  import * as t from '@babel/types';
3
- import type { TamaguiInternalConfig } from '@tamagui/core';
3
+ import { TamaguiInternalConfig } from '@tamagui/core';
4
4
  import type { StyleObject, TamaguiOptionsWithFileInfo, Ternary } from '../types';
5
5
  export declare function extractMediaStyle(props: TamaguiOptionsWithFileInfo, ternary: Ternary, jsxPath: NodePath<t.JSXElement>, tamaguiConfig: TamaguiInternalConfig, sourcePath: string, importance?: number, shouldPrintDebug?: boolean | 'verbose'): {
6
6
  mediaStyles: StyleObject[];
@@ -1 +1 @@
1
- {"version":3,"file":"extractMediaStyle.d.ts","sourceRoot":"","sources":["../../src/extractor/extractMediaStyle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAK1D,OAAO,KAAK,EAAE,WAAW,EAAE,0BAA0B,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAGhF,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,0BAA0B,EACjC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/B,aAAa,EAAE,qBAAqB,EACpC,UAAU,EAAE,MAAM,EAClB,UAAU,SAAI,EACd,gBAAgB,GAAE,OAAO,GAAG,SAAiB;;;SAqF9C;AA0FD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,0BAA0B,EACjC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/B,IAAI,EAAE,CAAC,CAAC,UAAU,EAClB,UAAU,EAAE,MAAM,WAenB"}
1
+ {"version":3,"file":"extractMediaStyle.d.ts","sourceRoot":"","sources":["../../src/extractor/extractMediaStyle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAAE,qBAAqB,EAAoB,MAAM,eAAe,CAAA;AAIvE,OAAO,KAAK,EAAE,WAAW,EAAE,0BAA0B,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAGhF,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,0BAA0B,EACjC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/B,aAAa,EAAE,qBAAqB,EACpC,UAAU,EAAE,MAAM,EAClB,UAAU,SAAI,EACd,gBAAgB,GAAE,OAAO,GAAG,SAAiB;;;SA6D9C;AA0FD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,0BAA0B,EACjC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,EAC/B,IAAI,EAAE,CAAC,CAAC,UAAU,EAClB,UAAU,EAAE,MAAM,WAenB"}
package/types/index.d.ts CHANGED
@@ -1,3 +1,4 @@
1
1
  import './setup';
2
2
  export * from './static';
3
+ export * from './minifyCSS';
3
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,CAAA;AAChB,cAAc,UAAU,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,CAAA;AAChB,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA"}
@@ -0,0 +1,2 @@
1
+ export declare function minifyCSS(input: string): import("lightningcss").TransformResult;
2
+ //# sourceMappingURL=minifyCSS.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"minifyCSS.d.ts","sourceRoot":"","sources":["../src/minifyCSS.ts"],"names":[],"mappings":"AAEA,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,0CAOtC"}