@tamagui/static 1.141.5 → 1.142.0

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.
@@ -24,9 +24,44 @@ __export(checkDeps_exports, {
24
24
  checkDeps: () => checkDeps
25
25
  });
26
26
  module.exports = __toCommonJS(checkDeps_exports);
27
- var import_check_dep_versions = require("./check-dep-versions.cjs"),
27
+ var import_node_fs = require("node:fs"),
28
+ import_node_path = require("node:path"),
29
+ import_check_dep_versions = require("./check-dep-versions.cjs"),
28
30
  DEPENDENCY_TYPE = /* @__PURE__ */(DEPENDENCY_TYPE2 => (DEPENDENCY_TYPE2.dependencies = "dependencies", DEPENDENCY_TYPE2.devDependencies = "devDependencies", DEPENDENCY_TYPE2.optionalDependencies = "optionalDependencies", DEPENDENCY_TYPE2.peerDependencies = "peerDependencies", DEPENDENCY_TYPE2.resolutions = "resolutions", DEPENDENCY_TYPE2))(DEPENDENCY_TYPE || {});
31
+ function checkTamaguiPackageVersions(root) {
32
+ const packageJsonPath = (0, import_node_path.join)(root, "package.json");
33
+ if (!(0, import_node_fs.existsSync)(packageJsonPath)) return "";
34
+ const packageJson = JSON.parse((0, import_node_fs.readFileSync)(packageJsonPath, "utf8")),
35
+ tamaguiDeps = [],
36
+ allDeps = {
37
+ ...packageJson.dependencies,
38
+ ...packageJson.devDependencies,
39
+ ...packageJson.optionalDependencies
40
+ };
41
+ for (const [name, version] of Object.entries(allDeps)) (name === "tamagui" || name.startsWith("@tamagui/")) && tamaguiDeps.push({
42
+ name,
43
+ version
44
+ });
45
+ if (tamaguiDeps.length <= 1) return "";
46
+ const normalizeVersion = v => v.startsWith("workspace:") ? v : v.replace(/^[\^~>=<]+/, ""),
47
+ versionGroups = /* @__PURE__ */new Map();
48
+ for (const dep of tamaguiDeps) {
49
+ const normalized = normalizeVersion(dep.version);
50
+ versionGroups.has(normalized) || versionGroups.set(normalized, []), versionGroups.get(normalized).push(`${dep.name}@${dep.version}`);
51
+ }
52
+ if (versionGroups.size <= 1) return "";
53
+ const lines = ["Found mismatched @tamagui/* package versions in package.json:", ""];
54
+ for (const [version, packages] of versionGroups) {
55
+ lines.push(` ${version}:`);
56
+ for (const pkg of packages.sort()) lines.push(` - ${pkg}`);
57
+ }
58
+ return lines.push(""), lines.push("All @tamagui/* packages should use the same version to avoid runtime issues."), lines.push("Run `npx tamagui upgrade` to sync all packages to the latest version."), lines.join(`
59
+ `);
60
+ }
29
61
  async function checkDeps(root) {
30
- const summary = new import_check_dep_versions.CDVC(root).toMismatchSummary();
31
- summary || (console.info("Tamagui dependencies look good \u2705"), process.exit(0)), console.error(summary), process.exit(1);
62
+ const tamaguiMismatchSummary = checkTamaguiPackageVersions(root),
63
+ workspaceMismatchSummary = new import_check_dep_versions.CDVC(root).toMismatchSummary(),
64
+ hasTamaguiMismatch = !!tamaguiMismatchSummary,
65
+ hasWorkspaceMismatch = !!workspaceMismatchSummary;
66
+ !hasTamaguiMismatch && !hasWorkspaceMismatch && (console.info("Tamagui dependencies look good \u2705"), process.exit(0)), hasTamaguiMismatch && console.error(tamaguiMismatchSummary), hasWorkspaceMismatch && (hasTamaguiMismatch && console.error(""), console.error(workspaceMismatchSummary)), process.exit(1);
32
67
  }
package/dist/checkDeps.js CHANGED
@@ -18,9 +18,43 @@ __export(checkDeps_exports, {
18
18
  checkDeps: () => checkDeps
19
19
  });
20
20
  module.exports = __toCommonJS(checkDeps_exports);
21
- var import_check_dep_versions = require("./check-dep-versions"), DEPENDENCY_TYPE = /* @__PURE__ */ ((DEPENDENCY_TYPE2) => (DEPENDENCY_TYPE2.dependencies = "dependencies", DEPENDENCY_TYPE2.devDependencies = "devDependencies", DEPENDENCY_TYPE2.optionalDependencies = "optionalDependencies", DEPENDENCY_TYPE2.peerDependencies = "peerDependencies", DEPENDENCY_TYPE2.resolutions = "resolutions", DEPENDENCY_TYPE2))(DEPENDENCY_TYPE || {});
21
+ var import_node_fs = require("node:fs"), import_node_path = require("node:path"), import_check_dep_versions = require("./check-dep-versions"), DEPENDENCY_TYPE = /* @__PURE__ */ ((DEPENDENCY_TYPE2) => (DEPENDENCY_TYPE2.dependencies = "dependencies", DEPENDENCY_TYPE2.devDependencies = "devDependencies", DEPENDENCY_TYPE2.optionalDependencies = "optionalDependencies", DEPENDENCY_TYPE2.peerDependencies = "peerDependencies", DEPENDENCY_TYPE2.resolutions = "resolutions", DEPENDENCY_TYPE2))(DEPENDENCY_TYPE || {});
22
+ function checkTamaguiPackageVersions(root) {
23
+ const packageJsonPath = (0, import_node_path.join)(root, "package.json");
24
+ if (!(0, import_node_fs.existsSync)(packageJsonPath))
25
+ return "";
26
+ const packageJson = JSON.parse((0, import_node_fs.readFileSync)(packageJsonPath, "utf8")), tamaguiDeps = [], allDeps = {
27
+ ...packageJson.dependencies,
28
+ ...packageJson.devDependencies,
29
+ ...packageJson.optionalDependencies
30
+ };
31
+ for (const [name, version] of Object.entries(allDeps))
32
+ (name === "tamagui" || name.startsWith("@tamagui/")) && tamaguiDeps.push({ name, version });
33
+ if (tamaguiDeps.length <= 1)
34
+ return "";
35
+ const normalizeVersion = (v) => v.startsWith("workspace:") ? v : v.replace(/^[\^~>=<]+/, ""), versionGroups = /* @__PURE__ */ new Map();
36
+ for (const dep of tamaguiDeps) {
37
+ const normalized = normalizeVersion(dep.version);
38
+ versionGroups.has(normalized) || versionGroups.set(normalized, []), versionGroups.get(normalized).push(`${dep.name}@${dep.version}`);
39
+ }
40
+ if (versionGroups.size <= 1)
41
+ return "";
42
+ const lines = [
43
+ "Found mismatched @tamagui/* package versions in package.json:",
44
+ ""
45
+ ];
46
+ for (const [version, packages] of versionGroups) {
47
+ lines.push(` ${version}:`);
48
+ for (const pkg of packages.sort())
49
+ lines.push(` - ${pkg}`);
50
+ }
51
+ return lines.push(""), lines.push(
52
+ "All @tamagui/* packages should use the same version to avoid runtime issues."
53
+ ), lines.push("Run `npx tamagui upgrade` to sync all packages to the latest version."), lines.join(`
54
+ `);
55
+ }
22
56
  async function checkDeps(root) {
23
- const summary = new import_check_dep_versions.CDVC(root).toMismatchSummary();
24
- summary || (console.info("Tamagui dependencies look good \u2705"), process.exit(0)), console.error(summary), process.exit(1);
57
+ const tamaguiMismatchSummary = checkTamaguiPackageVersions(root), workspaceMismatchSummary = new import_check_dep_versions.CDVC(root).toMismatchSummary(), hasTamaguiMismatch = !!tamaguiMismatchSummary, hasWorkspaceMismatch = !!workspaceMismatchSummary;
58
+ !hasTamaguiMismatch && !hasWorkspaceMismatch && (console.info("Tamagui dependencies look good \u2705"), process.exit(0)), hasTamaguiMismatch && console.error(tamaguiMismatchSummary), hasWorkspaceMismatch && (hasTamaguiMismatch && console.error(""), console.error(workspaceMismatchSummary)), process.exit(1);
25
59
  }
26
60
  //# sourceMappingURL=checkDeps.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/checkDeps.ts"],
4
- "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAAqB,iCAET,kBAAL,kBAAKA,sBACVA,iBAAA,eAAe,gBACfA,iBAAA,kBAAkB,mBAClBA,iBAAA,uBAAuB,wBACvBA,iBAAA,mBAAmB,oBACnBA,iBAAA,cAAc,eALJA,mBAAA;AAmBZ,eAAsB,UAAU,MAAc;AAC5C,QAAM,UAAU,IAAI,+BAAK,IAAI,EAAE,kBAAkB;AAEjD,EAAK,YACH,QAAQ,KAAK,uCAAkC,GAC/C,QAAQ,KAAK,CAAC,IAGhB,QAAQ,MAAM,OAAO,GACrB,QAAQ,KAAK,CAAC;AAChB;",
4
+ "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAyC,oBACzC,mBAAqB,sBACrB,4BAAqB,iCAET,kBAAL,kBAAKA,sBACVA,iBAAA,eAAe,gBACfA,iBAAA,kBAAkB,mBAClBA,iBAAA,uBAAuB,wBACvBA,iBAAA,mBAAmB,oBACnBA,iBAAA,cAAc,eALJA,mBAAA;AA6BZ,SAAS,4BAA4B,MAAsB;AACzD,QAAM,sBAAkB,uBAAK,MAAM,cAAc;AACjD,MAAI,KAAC,2BAAW,eAAe;AAC7B,WAAO;AAGT,QAAM,cAA2B,KAAK,UAAM,6BAAa,iBAAiB,MAAM,CAAC,GAG3E,cAAmD,CAAC,GAEpD,UAAU;AAAA,IACd,GAAG,YAAY;AAAA,IACf,GAAG,YAAY;AAAA,IACf,GAAG,YAAY;AAAA,EACjB;AAEA,aAAW,CAAC,MAAM,OAAO,KAAK,OAAO,QAAQ,OAAO;AAClD,KAAI,SAAS,aAAa,KAAK,WAAW,WAAW,MACnD,YAAY,KAAK,EAAE,MAAM,QAAQ,CAAC;AAItC,MAAI,YAAY,UAAU;AACxB,WAAO;AAIT,QAAM,mBAAmB,CAAC,MAEpB,EAAE,WAAW,YAAY,IACpB,IAEF,EAAE,QAAQ,cAAc,EAAE,GAI7B,gBAAgB,oBAAI,IAAsB;AAChD,aAAW,OAAO,aAAa;AAC7B,UAAM,aAAa,iBAAiB,IAAI,OAAO;AAC/C,IAAK,cAAc,IAAI,UAAU,KAC/B,cAAc,IAAI,YAAY,CAAC,CAAC,GAElC,cAAc,IAAI,UAAU,EAAG,KAAK,GAAG,IAAI,IAAI,IAAI,IAAI,OAAO,EAAE;AAAA,EAClE;AAGA,MAAI,cAAc,QAAQ;AACxB,WAAO;AAIT,QAAM,QAAkB;AAAA,IACtB;AAAA,IACA;AAAA,EACF;AAEA,aAAW,CAAC,SAAS,QAAQ,KAAK,eAAe;AAC/C,UAAM,KAAK,KAAK,OAAO,GAAG;AAC1B,eAAW,OAAO,SAAS,KAAK;AAC9B,YAAM,KAAK,SAAS,GAAG,EAAE;AAAA,EAE7B;AAEA,eAAM,KAAK,EAAE,GACb,MAAM;AAAA,IACJ;AAAA,EACF,GACA,MAAM,KAAK,uEAAuE,GAE3E,MAAM,KAAK;AAAA,CAAI;AACxB;AAEA,eAAsB,UAAU,MAAc;AAE5C,QAAM,yBAAyB,4BAA4B,IAAI,GAGzD,2BAA2B,IAAI,+BAAK,IAAI,EAAE,kBAAkB,GAE5D,qBAAqB,EAAQ,wBAC7B,uBAAuB,EAAQ;AAErC,EAAI,CAAC,sBAAsB,CAAC,yBAC1B,QAAQ,KAAK,uCAAkC,GAC/C,QAAQ,KAAK,CAAC,IAGZ,sBACF,QAAQ,MAAM,sBAAsB,GAGlC,yBACE,sBACF,QAAQ,MAAM,EAAE,GAElB,QAAQ,MAAM,wBAAwB,IAGxC,QAAQ,KAAK,CAAC;AAChB;",
5
5
  "names": ["DEPENDENCY_TYPE"]
6
6
  }
@@ -180,7 +180,11 @@ function getBabelParseDefinition(options) {
180
180
  const themedStylesAst = (0, import_literalToAst.literalToAst)(styles);
181
181
  return themedStylesAst.properties.forEach(_ => {
182
182
  const prop = _;
183
- prop.value.type === "StringLiteral" && (prop.value = t.memberExpression(t.identifier("theme"), t.identifier(prop.value.value.slice(1) + ".get()")));
183
+ if (prop.value.type === "StringLiteral") {
184
+ const propVal = prop.value.value.slice(1),
185
+ isComputed = !t.isValidIdentifier(propVal);
186
+ prop.value = t.callExpression(t.memberExpression(t.memberExpression(t.identifier("theme"), isComputed ? t.stringLiteral(propVal) : t.identifier(propVal), isComputed), t.identifier("get")), []);
187
+ }
184
188
  }), themedStylesAst;
185
189
  }
186
190
  let hasDynamicStyle = !1;
@@ -145,10 +145,20 @@ function getBabelParseDefinition(options) {
145
145
  const themedStylesAst = (0, import_literalToAst.literalToAst)(styles);
146
146
  return themedStylesAst.properties.forEach((_) => {
147
147
  const prop = _;
148
- prop.value.type === "StringLiteral" && (prop.value = t.memberExpression(
149
- t.identifier("theme"),
150
- t.identifier(prop.value.value.slice(1) + ".get()")
151
- ));
148
+ if (prop.value.type === "StringLiteral") {
149
+ const propVal = prop.value.value.slice(1), isComputed = !t.isValidIdentifier(propVal);
150
+ prop.value = t.callExpression(
151
+ t.memberExpression(
152
+ t.memberExpression(
153
+ t.identifier("theme"),
154
+ isComputed ? t.stringLiteral(propVal) : t.identifier(propVal),
155
+ isComputed
156
+ ),
157
+ t.identifier("get")
158
+ ),
159
+ []
160
+ );
161
+ }
152
162
  }), themedStylesAst;
153
163
  }
154
164
  let hasDynamicStyle = !1;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/extractor/extractToNative.ts"],
4
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA2D,wBAC3D,mBAAsB,sCACtB,6BAAwB,uCACxB,gBAAsB,0BACtB,kBAAqB,qCACrB,IAAmB,kCACnB,mBAAyB,sBACzB,0BAAiC,gCAEjC,yBAAgC,8BAChC,sBAA6B,2BAC7B,wBAA+B,6BAC/B,sBAA6B,2BAC7B,qBAA2C;AAE3C,MAAM,uBAAmB,gBAAAA,SAAS;AAAA;AAAA;AAAA,CAGjC,GAEK,uBAAmB,gBAAAA,SAAS;AAAA;AAAA,CAEjC,GAEK,sBAAkB,gBAAAA,SAAS;AAAA;AAAA,CAEhC,GAEK,yBAAqB,gBAAAA,SAAS;AAAA;AAAA,CAEnC,GAEK,gBAAY,wCAAgB,EAAE,UAAU,SAAS,CAAC;AAExD,IAAI;AAEG,SAAS,gBACd,gBACA,YACA,SACiB;AACjB,QAAM,UAAM,qBAAM,YAAY;AAAA,IAC5B,YAAY;AAAA,IACZ,SAAS,CAAC,OAAO,YAAY;AAAA,EAC/B,CAAC,GAEK,cAAc,eAAe,GAE7B,UAAM,kCAAqB,KAAK,YAAY;AAAA,IAChD,SAAS,CAAC,CAAC,aAAa,OAAO,CAAC;AAAA,IAChC,YAAY;AAAA,IACZ;AAAA,IACA,UAAU;AAAA,EACZ,CAAC;AAED,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,oBAAoB;AAGtC,SAAO;AACT;AAEO,SAAS,iBAAiB;AAC/B,aAAO,oCAAQ,CAAC,KAAK,aACnB,IAAI,cAAc,CAAC,GACZ,wBAAwB,OAAO,EACvC;AACH;AAEO,SAAS,wBAAwB,SAAyB;AAC/D,SAAO;AAAA,IACL,MAAM;AAAA,IAEN,SAAS;AAAA,MACP,SAAS;AAAA,QACP,MAAiB,MAAM;AACrB,cAAI,aAAa,KAAK,KAAK,KAAK;AAKhC,cAJI,YAAY,SAAS,cAAc,KAInC,CAAC,YAAY,SAAS,MAAM,KAAK,CAAC,YAAY,SAAS,MAAM;AAC/D;AAKF,UAAI,QAAQ,IAAI,aAAa,SAAS,KAAK,MACzC,aAAa,WAAW,QAAQ,QAAQ,EAAE;AAG5C,cAAI,kBAAkB,IAClB,yBAAyB;AAC7B,gBAAM,cAAc,CAAC,GACf,kBAAkB,KAAK,MAAM,sBAAsB,OAAO,GAG1D;AAAA;AAAA,YACJ,KAAK,KAAK,KAAK,CAAC,GAAG,iBACf,IAAI,CAAC,YAAY,SAAS,SAAS,GAAG,EACvC,KAAK,GAAG,KAAK;AAAA,aACZ,eAAe,uBAAuB,KAAK,oBAAoB,KAAK,IAEpE,EAAE,kBAAkB,cAAc,QAAI,0CAAiB;AAAA,YAC3D,QAAQ;AAAA,YACR,MAAM;AAAA,UACR,CAAC;AAED,cAAI;AACF;AAGF,UAAI,CAAC,QAAQ,UAAU,CAAC,QAAQ,eAE9B,kCAA8B,+CAA2B,CAAC,CAAC;AAG7D,gBAAM,eAAe;AAAA;AAAA,YAEnB,UAAU;AAAA,YACV,GAAG;AAAA,YACH,GAAG;AAAA,UACL,GAEM,eAAW,kCAAa,YAAY,YAAY;AAEtD,mBAAS,cAAc,OAAY,MAA2B;AAE5D,gBAAI,MAAM,GADS,GAAG,OAAO,KAAK,WAAW,EAAE,MAAM,EAC9B;AACvB,gBAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,oBAAM,cAAc,KAAK,MACrB,KAAK,IAAI,MAAM,QACd,KAAK,IAAI,MAAM,SAAS,KAAK,IAAI,IAAI,OAClC,IAAI,KAAK,IAAI,IAAI,IAAI,KACrB,MACJ;AACJ,qBAAO,QAAI,2BAAS,UAAU,CAAC,IAAI,WAAW;AAAA,YAChD;AACA,+BAAY,GAAG,IAAI,OACZ,cAAc,GAAG;AAAA,UAC1B;AAEA,mBAAS,cAAc,KAAa;AAClC,uBAAO,gBAAAA,SAAS,cAAc,EAAE;AAAA,cAC9B,OAAO,gBAAgB;AAAA,cACvB,KAAK;AAAA,YACP,CAAC,EAAE;AAAA,UACL;AAEA,cAAI;AAEJ,cAAI;AACF,kBAAM,UAAU,UAAU,MAAM;AAAA,cAC9B,kBAAkB,CAAC,gBAAgB,WAAW;AAAA,cAC9C,0BAA0B,QAAQ;AAAA,cAClC,cAAc,oBAAI,IAAI;AAAA,gBACpB;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,cACF,CAAC;AAAA,cACD;AAAA,cACA,GAAG;AAAA;AAAA,cAEH,yBAAyB,QAAQ,oCAC7B,KACA;AAAA,cACJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,cAQA,iBAAiB,EAAE,WAAW,GAAG;AAC/B,uBAAK,oBACH,kBAAkB,IAClB,KAAK,iBAAiB,QAAQ,iBAAiB,CAAC,IAE3C,aAAa,sBAAsB;AAAA,cAC5C;AAAA,cAEA,aAAa,OAAO;AAClB,+BAAe,MAAM,IAAI;AACzB,sBAAM,aAAa,EAAE,gBAAgB,CAAC,CAAC,GACjC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,GACpC,cAA8B,CAAC,GAC/B,aAAwD,CAAC,GACzD,gBAAgB,oBAAI,IAAY;AAEtC,yBAAS,mBAAmB,OAAsB;AAChD,sBAAI,CAAC,MAAO;AAGZ,wBAAM,EAAE,OAAO,OAAO,IAAI,iBAAiB,KAAK;AAGhD,sBAAI,YAAuC;AAC3C,sBAAI,UAAU,QAAQ,mCAAmC;AACvD,+BAAW,OAAO;AAChB,oCAAc,IAAI,OAAO,GAAG,EAAE,MAAM,GAAG,EAAE,CAAC,CAAC;AAI7C,gCAAY,yBAAyB,MAAM;AAAA,kBAC7C;AACA,wBAAM,QAAQ,cAAc,OAAO,MAAM,IAAI;AAC7C,yBAAI,aACF,mBAAmB,KAAK,GACxB,mBAAmB,OAAO,EAAI,GACvB,aAGF;AAAA,gBACT;AAEA,yBAAS,mBAAmB,MAAW,MAAM,IAAO;AAClD,kBAAI,MAAM,QAAQ,IAAI,KAClB,MAAM,gBAAgB,YAAY,SAAS,KAAK,GAAG,IAAI,KAEvD,MAAM,gBAAgB,YAAY,SAAS,KAAK,IAAI;AAAA,gBAE1D;AAEA,yBAAS,yBAAyB,QAAgB;AAChD,wBAAM,sBAAkB,kCAAa,MAAM;AAC3C,yCAAgB,WAAW,QAAQ,CAAC,MAAM;AACxC,0BAAM,OAAO;AACb,oBAAI,KAAK,MAAM,SAAS,oBACtB,KAAK,QAAQ,EAAE;AAAA,sBACb,EAAE,WAAW,OAAO;AAAA,sBACpB,EAAE,WAAW,KAAK,MAAM,MAAM,MAAM,CAAC,IAAI,QAAQ;AAAA,oBACnD;AAAA,kBAEJ,CAAC,GACM;AAAA,gBACT;AAEA,oBAAI,kBAAkB;AAEtB,2BAAW,QAAQ,MAAM;AACvB,0BAAQ,KAAK,MAAM;AAAA,oBACjB,KAAK,SAAS;AACZ,0BAAI,YAAY,mBAAmB,KAAK,KAAK;AAC7C,yCAAmB,SAAS,GACxB,QAAQ,qCACV,mBAAmB,WAAW,EAAI;AAEpC;AAAA,oBACF;AAAA,oBAEA,KAAK,WAAW;AACd,4BAAM,EAAE,YAAY,UAAU,IAAI,KAAK,OACjC,WAAW,mBAAmB,UAAU,GACxC,UAAU,mBAAmB,SAAS;AAE5C,sBAAI,QAAQ,sCACV,YAAY,KAAK,KAAK,MAAM,IAAI,GAChC;AAAA,wBACE,EAAE;AAAA,0BACA,EAAE,WAAW,gBAAgB,YAAY,SAAS,CAAC,GAAG;AAAA,0BACtD,YAAY,EAAE,YAAY;AAAA,0BAC1B,WAAW,EAAE,YAAY;AAAA,wBAC3B;AAAA,wBACA;AAAA,sBACF;AAGF,4BAAM,YAAY,EAAE;AAAA,wBAClB,KAAK,MAAM;AAAA,wBACX,YAAY,EAAE,YAAY;AAAA,wBAC1B,WAAW,EAAE,YAAY;AAAA,sBAC3B;AACA,yCAAmB,SAAS;AAC5B;AAAA,oBACF;AAAA,oBAEA,KAAK,QAAQ;AACX,sBAAI,EAAE,qBAAqB,KAAK,KAAK,SAC/B,sCAAe,KAAK,KAAK,MAC3B,WAAW,SAAS;AAAA,wBAClB,EAAE,iBAAiB,KAAK,MAAM,UAAU,EAAE,WAAW,OAAO,CAAC;AAAA,sBAC/D,GACI,QAAQ,qCACV,cAAc,SAAS;AAAA,wBACrB,EAAE;AAAA,0BACA,KAAK,MAAM;AAAA,0BACX,EAAE,WAAW,OAAO;AAAA,wBACtB;AAAA,sBACF,IAIN,WAAW,KAAK,KAAK,KAAK;AAC1B;AAAA,oBACF;AAAA,kBACF;AAKF,oBAFA,MAAM,KAAK,aAAa,YAGtB,QAAQ,sCACP,cAAc,QACb,cAAc,SAAS,SAAS,KAChC,kBACF;AACA,kBAAK,2BACH,KAAK,iBAAiB,QAAQ,gBAAgB,CAAC,GAC/C,KAAK,iBAAiB,QAAQ,mBAAmB,CAAC,GAClD,yBAAyB;AAG3B,wBAAM,OAAO,MAAM,gBAAgB,MAAM,KAAK,KAAK,MAC7C,oBAAoB,KAAK,MAAM;AAAA,oBACnC,OAAO;AAAA,kBACT;AAEA,uBAAK;AAAA,oBACH;AAAA,oBACA,EAAE,oBAAoB,SAAS;AAAA,sBAC7B,EAAE;AAAA,wBACA;AAAA,wBACA,EAAE,eAAe,EAAE,WAAW,mBAAmB,GAAG;AAAA,0BAClD,EAAE,WAAW,IAAI;AAAA,0BACjB,EAAE;AAAA,4BACA,CAAC,EAAE,WAAW,OAAO,GAAG,EAAE,WAAW,cAAc,CAAC;AAAA,4BACpD,EAAE,eAAe;AAAA,8BACf,EAAE;AAAA,gCACA,EAAE,eAAe,EAAE,WAAW,gBAAgB,GAAG;AAAA,kCAC/C,EAAE;AAAA,oCACA,CAAC;AAAA,oCACD,EAAE,eAAe;AAAA,sCACf,EAAE;AAAA,wCACA,EAAE,gBAAgB,CAAC,GAAG,cAAc,QAAQ,CAAC;AAAA,sCAC/C;AAAA,oCACF,CAAC;AAAA,kCACH;AAAA,kCACA,EAAE,gBAAgB;AAAA,oCAChB,EAAE,cAAc,EAAE,WAAW,cAAc,CAAC;AAAA,kCAC9C,CAAC;AAAA,gCACH,CAAC;AAAA,8BACH;AAAA,4BACF,CAAC;AAAA,0BACH;AAAA,wBACF,CAAC;AAAA,sBACH;AAAA,oBACF,CAAC;AAAA,kBACH,GAGA,MAAM,KAAK,OAAO,mBACd,MAAM,QAAQ,KAAK,mBAErB,MAAM,QAAQ,KAAK,eAAe,OAAO,oBAGvC,YAAY,UACd,MAAM,KAAK,WAAW;AAAA,oBACpB,EAAE;AAAA,sBACA,EAAE,cAAc,aAAa;AAAA,sBAC7B,EAAE,uBAAuB,EAAE,gBAAgB,WAAW,CAAC;AAAA,oBACzD;AAAA,kBACF;AAAA,gBAEJ;AACE,wBAAM,KAAK,WAAW;AAAA,oBACpB,EAAE;AAAA,sBACA,EAAE,cAAc,OAAO;AAAA,sBACvB,EAAE;AAAA,wBACA,WAAW,SAAS,WAAW,IAC1B,WAAW,SAAS,CAAC,IACtB;AAAA,sBACN;AAAA,oBACF;AAAA,kBACF;AAAA,cAEJ;AAAA,YACF,CAAC;AAAA,UACH,SAAS,KAAK;AACZ,gBAAI,eAAe,OAAO;AAExB,kBAAI,UAAU,GAAG,qBAAqB,YAAY,MAAM,IAAI,OAAO;AACnE,cAAI,QAAQ,SAAS,6CAA6C,MAChE,UAAU,gDAEZ,QAAQ,KAAK,oCAAoC,SAAS,IAAI,KAAK;AACnE;AAAA,YACF;AAAA,UACF;AAEA,cAAI,CAAC,OAAO,KAAK,WAAW,EAAE,QAAQ;AACpC,YAAI,oBACF,QAAQ,KAAK,eAAe,GAE1B,OAAK,SAAS,GAAG;AACrB;AAAA,UACF;AAEA,gBAAM,kBAAc,kCAAa,WAAW,GACtC,iBAAa,gBAAAA;AAAA,YACjB;AAAA,UACF,EAAE;AAAA,YACA,OAAO,gBAAgB;AAAA,UACzB,CAAC;AAGD,qBAAW,aAAa,CAAC,EAAE,KAAK,UAAU,CAAC,IAAI,aAC/C,KAAK,iBAAiB,QAAQ,UAAU,GAExC,KAAK,iBAAiB,QAAQ,iBAAiB,CAAC,GAE5C,qBACF,QAAQ,KAAK;AAAA;AAAA,CAAoC,GACjD,QAAQ;AAAA,gBACN,iBAAAC,SAAU,KAAK,MAAM,EAClB,KAAK,MAAM;AAAA,CAAI,EACf,OAAO,CAAC,MAAM,CAAC,EAAE,WAAW,IAAI,CAAC,EACjC,KAAK;AAAA,CAAI;AAAA,UACd,IAGE,OAAK,SAAS,GAAG;AAAA,QACvB;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;AAEA,SAAS,eAAe,MAA2B;AACjD,EAAI,KAAK,WAAW,KAAK,CAAC,MAAM,EAAE,SAAS,kBAAkB,EAAE,KAAK,SAAS,OAAO,KAG9E,QAAQ,IAAI,OAAO,WAAW,SAAS,KACzC,QAAQ,KAAK,6DAAmD;AAGtE;AAEA,SAAS,iBAAiB,OAAe;AACvC,QAAM,SAAiB,CAAC,GAClB,QAAgB,CAAC;AACvB,MAAI,UAAU;AACd,aAAW,OAAO,OAAO;AACvB,UAAM,MAAM,MAAM,GAAG;AACrB,IAAI,OAAO,IAAI,CAAC,MAAM,OACpB,OAAO,GAAG,IAAI,KACd,UAAU,MAEV,MAAM,GAAG,IAAI;AAAA,EAEjB;AACA,SAAO,EAAE,QAAQ,UAAU,OAAO,QAAQ,MAAM;AAClD;",
4
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA2D,wBAC3D,mBAAsB,sCACtB,6BAAwB,uCACxB,gBAAsB,0BACtB,kBAAqB,qCACrB,IAAmB,kCACnB,mBAAyB,sBACzB,0BAAiC,gCAEjC,yBAAgC,8BAChC,sBAA6B,2BAC7B,wBAA+B,6BAC/B,sBAA6B,2BAC7B,qBAA2C;AAE3C,MAAM,uBAAmB,gBAAAA,SAAS;AAAA;AAAA;AAAA,CAGjC,GAEK,uBAAmB,gBAAAA,SAAS;AAAA;AAAA,CAEjC,GAEK,sBAAkB,gBAAAA,SAAS;AAAA;AAAA,CAEhC,GAEK,yBAAqB,gBAAAA,SAAS;AAAA;AAAA,CAEnC,GAEK,gBAAY,wCAAgB,EAAE,UAAU,SAAS,CAAC;AAExD,IAAI;AAEG,SAAS,gBACd,gBACA,YACA,SACiB;AACjB,QAAM,UAAM,qBAAM,YAAY;AAAA,IAC5B,YAAY;AAAA,IACZ,SAAS,CAAC,OAAO,YAAY;AAAA,EAC/B,CAAC,GAEK,cAAc,eAAe,GAE7B,UAAM,kCAAqB,KAAK,YAAY;AAAA,IAChD,SAAS,CAAC,CAAC,aAAa,OAAO,CAAC;AAAA,IAChC,YAAY;AAAA,IACZ;AAAA,IACA,UAAU;AAAA,EACZ,CAAC;AAED,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,oBAAoB;AAGtC,SAAO;AACT;AAEO,SAAS,iBAAiB;AAC/B,aAAO,oCAAQ,CAAC,KAAK,aACnB,IAAI,cAAc,CAAC,GACZ,wBAAwB,OAAO,EACvC;AACH;AAEO,SAAS,wBAAwB,SAAyB;AAC/D,SAAO;AAAA,IACL,MAAM;AAAA,IAEN,SAAS;AAAA,MACP,SAAS;AAAA,QACP,MAAiB,MAAM;AACrB,cAAI,aAAa,KAAK,KAAK,KAAK;AAKhC,cAJI,YAAY,SAAS,cAAc,KAInC,CAAC,YAAY,SAAS,MAAM,KAAK,CAAC,YAAY,SAAS,MAAM;AAC/D;AAKF,UAAI,QAAQ,IAAI,aAAa,SAAS,KAAK,MACzC,aAAa,WAAW,QAAQ,QAAQ,EAAE;AAG5C,cAAI,kBAAkB,IAClB,yBAAyB;AAC7B,gBAAM,cAAc,CAAC,GACf,kBAAkB,KAAK,MAAM,sBAAsB,OAAO,GAG1D;AAAA;AAAA,YACJ,KAAK,KAAK,KAAK,CAAC,GAAG,iBACf,IAAI,CAAC,YAAY,SAAS,SAAS,GAAG,EACvC,KAAK,GAAG,KAAK;AAAA,aACZ,eAAe,uBAAuB,KAAK,oBAAoB,KAAK,IAEpE,EAAE,kBAAkB,cAAc,QAAI,0CAAiB;AAAA,YAC3D,QAAQ;AAAA,YACR,MAAM;AAAA,UACR,CAAC;AAED,cAAI;AACF;AAGF,UAAI,CAAC,QAAQ,UAAU,CAAC,QAAQ,eAE9B,kCAA8B,+CAA2B,CAAC,CAAC;AAG7D,gBAAM,eAAe;AAAA;AAAA,YAEnB,UAAU;AAAA,YACV,GAAG;AAAA,YACH,GAAG;AAAA,UACL,GAEM,eAAW,kCAAa,YAAY,YAAY;AAEtD,mBAAS,cAAc,OAAY,MAA2B;AAE5D,gBAAI,MAAM,GADS,GAAG,OAAO,KAAK,WAAW,EAAE,MAAM,EAC9B;AACvB,gBAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,oBAAM,cAAc,KAAK,MACrB,KAAK,IAAI,MAAM,QACd,KAAK,IAAI,MAAM,SAAS,KAAK,IAAI,IAAI,OAClC,IAAI,KAAK,IAAI,IAAI,IAAI,KACrB,MACJ;AACJ,qBAAO,QAAI,2BAAS,UAAU,CAAC,IAAI,WAAW;AAAA,YAChD;AACA,+BAAY,GAAG,IAAI,OACZ,cAAc,GAAG;AAAA,UAC1B;AAEA,mBAAS,cAAc,KAAa;AAClC,uBAAO,gBAAAA,SAAS,cAAc,EAAE;AAAA,cAC9B,OAAO,gBAAgB;AAAA,cACvB,KAAK;AAAA,YACP,CAAC,EAAE;AAAA,UACL;AAEA,cAAI;AAEJ,cAAI;AACF,kBAAM,UAAU,UAAU,MAAM;AAAA,cAC9B,kBAAkB,CAAC,gBAAgB,WAAW;AAAA,cAC9C,0BAA0B,QAAQ;AAAA,cAClC,cAAc,oBAAI,IAAI;AAAA,gBACpB;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,cACF,CAAC;AAAA,cACD;AAAA,cACA,GAAG;AAAA;AAAA,cAEH,yBAAyB,QAAQ,oCAC7B,KACA;AAAA,cACJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,cAQA,iBAAiB,EAAE,WAAW,GAAG;AAC/B,uBAAK,oBACH,kBAAkB,IAClB,KAAK,iBAAiB,QAAQ,iBAAiB,CAAC,IAE3C,aAAa,sBAAsB;AAAA,cAC5C;AAAA,cAEA,aAAa,OAAO;AAClB,+BAAe,MAAM,IAAI;AACzB,sBAAM,aAAa,EAAE,gBAAgB,CAAC,CAAC,GACjC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,GACpC,cAA8B,CAAC,GAC/B,aAAwD,CAAC,GACzD,gBAAgB,oBAAI,IAAY;AAEtC,yBAAS,mBAAmB,OAAsB;AAChD,sBAAI,CAAC,MAAO;AAGZ,wBAAM,EAAE,OAAO,OAAO,IAAI,iBAAiB,KAAK;AAGhD,sBAAI,YAAuC;AAC3C,sBAAI,UAAU,QAAQ,mCAAmC;AACvD,+BAAW,OAAO;AAChB,oCAAc,IAAI,OAAO,GAAG,EAAE,MAAM,GAAG,EAAE,CAAC,CAAC;AAI7C,gCAAY,yBAAyB,MAAM;AAAA,kBAC7C;AACA,wBAAM,QAAQ,cAAc,OAAO,MAAM,IAAI;AAC7C,yBAAI,aACF,mBAAmB,KAAK,GACxB,mBAAmB,OAAO,EAAI,GACvB,aAGF;AAAA,gBACT;AAEA,yBAAS,mBAAmB,MAAW,MAAM,IAAO;AAClD,kBAAI,MAAM,QAAQ,IAAI,KAClB,MAAM,gBAAgB,YAAY,SAAS,KAAK,GAAG,IAAI,KAEvD,MAAM,gBAAgB,YAAY,SAAS,KAAK,IAAI;AAAA,gBAE1D;AAEA,yBAAS,yBAAyB,QAAgB;AAChD,wBAAM,sBAAkB,kCAAa,MAAM;AAC3C,yCAAgB,WAAW,QAAQ,CAAC,MAAM;AACxC,0BAAM,OAAO;AACb,wBAAI,KAAK,MAAM,SAAS,iBAAiB;AACvC,4BAAM,UAAU,KAAK,MAAM,MAAM,MAAM,CAAC,GAClC,aAAa,CAAC,EAAE,kBAAkB,OAAO;AAC/C,2BAAK,QAAQ,EAAE;AAAA,wBACb,EAAE;AAAA,0BACA,EAAE;AAAA,4BACA,EAAE,WAAW,OAAO;AAAA,4BACpB,aAAa,EAAE,cAAc,OAAO,IAAI,EAAE,WAAW,OAAO;AAAA,4BAC5D;AAAA,0BACF;AAAA,0BACA,EAAE,WAAW,KAAK;AAAA,wBACpB;AAAA,wBACA,CAAC;AAAA,sBACH;AAAA,oBACF;AAAA,kBACF,CAAC,GACM;AAAA,gBACT;AAEA,oBAAI,kBAAkB;AAEtB,2BAAW,QAAQ,MAAM;AACvB,0BAAQ,KAAK,MAAM;AAAA,oBACjB,KAAK,SAAS;AACZ,0BAAI,YAAY,mBAAmB,KAAK,KAAK;AAC7C,yCAAmB,SAAS,GACxB,QAAQ,qCACV,mBAAmB,WAAW,EAAI;AAEpC;AAAA,oBACF;AAAA,oBAEA,KAAK,WAAW;AACd,4BAAM,EAAE,YAAY,UAAU,IAAI,KAAK,OACjC,WAAW,mBAAmB,UAAU,GACxC,UAAU,mBAAmB,SAAS;AAE5C,sBAAI,QAAQ,sCACV,YAAY,KAAK,KAAK,MAAM,IAAI,GAChC;AAAA,wBACE,EAAE;AAAA,0BACA,EAAE,WAAW,gBAAgB,YAAY,SAAS,CAAC,GAAG;AAAA,0BACtD,YAAY,EAAE,YAAY;AAAA,0BAC1B,WAAW,EAAE,YAAY;AAAA,wBAC3B;AAAA,wBACA;AAAA,sBACF;AAGF,4BAAM,YAAY,EAAE;AAAA,wBAClB,KAAK,MAAM;AAAA,wBACX,YAAY,EAAE,YAAY;AAAA,wBAC1B,WAAW,EAAE,YAAY;AAAA,sBAC3B;AACA,yCAAmB,SAAS;AAC5B;AAAA,oBACF;AAAA,oBAEA,KAAK,QAAQ;AACX,sBAAI,EAAE,qBAAqB,KAAK,KAAK,SAC/B,sCAAe,KAAK,KAAK,MAC3B,WAAW,SAAS;AAAA,wBAClB,EAAE,iBAAiB,KAAK,MAAM,UAAU,EAAE,WAAW,OAAO,CAAC;AAAA,sBAC/D,GACI,QAAQ,qCACV,cAAc,SAAS;AAAA,wBACrB,EAAE;AAAA,0BACA,KAAK,MAAM;AAAA,0BACX,EAAE,WAAW,OAAO;AAAA,wBACtB;AAAA,sBACF,IAIN,WAAW,KAAK,KAAK,KAAK;AAC1B;AAAA,oBACF;AAAA,kBACF;AAKF,oBAFA,MAAM,KAAK,aAAa,YAGtB,QAAQ,sCACP,cAAc,QACb,cAAc,SAAS,SAAS,KAChC,kBACF;AACA,kBAAK,2BACH,KAAK,iBAAiB,QAAQ,gBAAgB,CAAC,GAC/C,KAAK,iBAAiB,QAAQ,mBAAmB,CAAC,GAClD,yBAAyB;AAG3B,wBAAM,OAAO,MAAM,gBAAgB,MAAM,KAAK,KAAK,MAC7C,oBAAoB,KAAK,MAAM;AAAA,oBACnC,OAAO;AAAA,kBACT;AAEA,uBAAK;AAAA,oBACH;AAAA,oBACA,EAAE,oBAAoB,SAAS;AAAA,sBAC7B,EAAE;AAAA,wBACA;AAAA,wBACA,EAAE,eAAe,EAAE,WAAW,mBAAmB,GAAG;AAAA,0BAClD,EAAE,WAAW,IAAI;AAAA,0BACjB,EAAE;AAAA,4BACA,CAAC,EAAE,WAAW,OAAO,GAAG,EAAE,WAAW,cAAc,CAAC;AAAA,4BACpD,EAAE,eAAe;AAAA,8BACf,EAAE;AAAA,gCACA,EAAE,eAAe,EAAE,WAAW,gBAAgB,GAAG;AAAA,kCAC/C,EAAE;AAAA,oCACA,CAAC;AAAA,oCACD,EAAE,eAAe;AAAA,sCACf,EAAE;AAAA,wCACA,EAAE,gBAAgB,CAAC,GAAG,cAAc,QAAQ,CAAC;AAAA,sCAC/C;AAAA,oCACF,CAAC;AAAA,kCACH;AAAA,kCACA,EAAE,gBAAgB;AAAA,oCAChB,EAAE,cAAc,EAAE,WAAW,cAAc,CAAC;AAAA,kCAC9C,CAAC;AAAA,gCACH,CAAC;AAAA,8BACH;AAAA,4BACF,CAAC;AAAA,0BACH;AAAA,wBACF,CAAC;AAAA,sBACH;AAAA,oBACF,CAAC;AAAA,kBACH,GAGA,MAAM,KAAK,OAAO,mBACd,MAAM,QAAQ,KAAK,mBAErB,MAAM,QAAQ,KAAK,eAAe,OAAO,oBAGvC,YAAY,UACd,MAAM,KAAK,WAAW;AAAA,oBACpB,EAAE;AAAA,sBACA,EAAE,cAAc,aAAa;AAAA,sBAC7B,EAAE,uBAAuB,EAAE,gBAAgB,WAAW,CAAC;AAAA,oBACzD;AAAA,kBACF;AAAA,gBAEJ;AACE,wBAAM,KAAK,WAAW;AAAA,oBACpB,EAAE;AAAA,sBACA,EAAE,cAAc,OAAO;AAAA,sBACvB,EAAE;AAAA,wBACA,WAAW,SAAS,WAAW,IAC1B,WAAW,SAAS,CAAC,IACtB;AAAA,sBACN;AAAA,oBACF;AAAA,kBACF;AAAA,cAEJ;AAAA,YACF,CAAC;AAAA,UACH,SAAS,KAAK;AACZ,gBAAI,eAAe,OAAO;AAExB,kBAAI,UAAU,GAAG,qBAAqB,YAAY,MAAM,IAAI,OAAO;AACnE,cAAI,QAAQ,SAAS,6CAA6C,MAChE,UAAU,gDAEZ,QAAQ,KAAK,oCAAoC,SAAS,IAAI,KAAK;AACnE;AAAA,YACF;AAAA,UACF;AAEA,cAAI,CAAC,OAAO,KAAK,WAAW,EAAE,QAAQ;AACpC,YAAI,oBACF,QAAQ,KAAK,eAAe,GAE1B,OAAK,SAAS,GAAG;AACrB;AAAA,UACF;AAEA,gBAAM,kBAAc,kCAAa,WAAW,GACtC,iBAAa,gBAAAA;AAAA,YACjB;AAAA,UACF,EAAE;AAAA,YACA,OAAO,gBAAgB;AAAA,UACzB,CAAC;AAGD,qBAAW,aAAa,CAAC,EAAE,KAAK,UAAU,CAAC,IAAI,aAC/C,KAAK,iBAAiB,QAAQ,UAAU,GAExC,KAAK,iBAAiB,QAAQ,iBAAiB,CAAC,GAE5C,qBACF,QAAQ,KAAK;AAAA;AAAA,CAAoC,GACjD,QAAQ;AAAA,gBACN,iBAAAC,SAAU,KAAK,MAAM,EAClB,KAAK,MAAM;AAAA,CAAI,EACf,OAAO,CAAC,MAAM,CAAC,EAAE,WAAW,IAAI,CAAC,EACjC,KAAK;AAAA,CAAI;AAAA,UACd,IAGE,OAAK,SAAS,GAAG;AAAA,QACvB;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;AAEA,SAAS,eAAe,MAA2B;AACjD,EAAI,KAAK,WAAW,KAAK,CAAC,MAAM,EAAE,SAAS,kBAAkB,EAAE,KAAK,SAAS,OAAO,KAG9E,QAAQ,IAAI,OAAO,WAAW,SAAS,KACzC,QAAQ,KAAK,6DAAmD;AAGtE;AAEA,SAAS,iBAAiB,OAAe;AACvC,QAAM,SAAiB,CAAC,GAClB,QAAgB,CAAC;AACvB,MAAI,UAAU;AACd,aAAW,OAAO,OAAO;AACvB,UAAM,MAAM,MAAM,GAAG;AACrB,IAAI,OAAO,IAAI,CAAC,MAAM,OACpB,OAAO,GAAG,IAAI,KACd,UAAU,MAEV,MAAM,GAAG,IAAI;AAAA,EAEjB;AACA,SAAO,EAAE,QAAQ,UAAU,OAAO,QAAQ,MAAM;AAClD;",
5
5
  "names": ["template", "generator"]
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/static",
3
- "version": "1.141.5",
3
+ "version": "1.142.0",
4
4
  "source": "src/index.ts",
5
5
  "types": "./types/index.d.ts",
6
6
  "type": "commonjs",
@@ -50,19 +50,19 @@
50
50
  "@babel/template": "^7.25.0",
51
51
  "@babel/traverse": "^7.25.4",
52
52
  "@babel/types": "^7.25.4",
53
- "@tamagui/cli-color": "1.141.5",
54
- "@tamagui/config-default": "1.141.5",
55
- "@tamagui/core": "1.141.5",
56
- "@tamagui/fake-react-native": "1.141.5",
57
- "@tamagui/generate-themes": "1.141.5",
58
- "@tamagui/helpers": "1.141.5",
59
- "@tamagui/helpers-node": "1.141.5",
60
- "@tamagui/proxy-worm": "1.141.5",
61
- "@tamagui/react-native-web-internals": "1.141.5",
62
- "@tamagui/react-native-web-lite": "1.141.5",
63
- "@tamagui/shorthands": "1.141.5",
64
- "@tamagui/types": "1.141.5",
65
- "@tamagui/web": "1.141.5",
53
+ "@tamagui/cli-color": "1.142.0",
54
+ "@tamagui/config-default": "1.142.0",
55
+ "@tamagui/core": "1.142.0",
56
+ "@tamagui/fake-react-native": "1.142.0",
57
+ "@tamagui/generate-themes": "1.142.0",
58
+ "@tamagui/helpers": "1.142.0",
59
+ "@tamagui/helpers-node": "1.142.0",
60
+ "@tamagui/proxy-worm": "1.142.0",
61
+ "@tamagui/react-native-web-internals": "1.142.0",
62
+ "@tamagui/react-native-web-lite": "1.142.0",
63
+ "@tamagui/shorthands": "1.142.0",
64
+ "@tamagui/types": "1.142.0",
65
+ "@tamagui/web": "1.142.0",
66
66
  "babel-literal-to-ast": "^2.1.0",
67
67
  "browserslist": "^4.22.2",
68
68
  "check-dependency-version-consistency": "^4.1.0",
@@ -79,7 +79,7 @@
79
79
  "devDependencies": {
80
80
  "@babel/plugin-syntax-typescript": "^7.25.4",
81
81
  "@expo/match-media": "^0.4.0",
82
- "@tamagui/build": "1.141.5",
82
+ "@tamagui/build": "1.142.0",
83
83
  "@types/babel__core": "^7.20.5",
84
84
  "@types/find-root": "^1.1.2",
85
85
  "@types/node": "^22.1.0",
package/src/checkDeps.ts CHANGED
@@ -1,3 +1,5 @@
1
+ import { existsSync, readFileSync } from 'node:fs'
2
+ import { join } from 'node:path'
1
3
  import { CDVC } from './check-dep-versions'
2
4
 
3
5
  export enum DEPENDENCY_TYPE {
@@ -19,14 +21,114 @@ export type Options = {
19
21
  ignorePathPattern?: readonly string[]
20
22
  }
21
23
 
24
+ type PackageJson = {
25
+ dependencies?: Record<string, string>
26
+ devDependencies?: Record<string, string>
27
+ optionalDependencies?: Record<string, string>
28
+ }
29
+
30
+ /**
31
+ * Checks if @tamagui/* packages within a single package.json have mismatched versions.
32
+ * Returns a summary of mismatches or empty string if all versions match.
33
+ */
34
+ function checkTamaguiPackageVersions(root: string): string {
35
+ const packageJsonPath = join(root, 'package.json')
36
+ if (!existsSync(packageJsonPath)) {
37
+ return ''
38
+ }
39
+
40
+ const packageJson: PackageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'))
41
+
42
+ // Collect all @tamagui/* dependencies and their versions
43
+ const tamaguiDeps: { name: string; version: string }[] = []
44
+
45
+ const allDeps = {
46
+ ...packageJson.dependencies,
47
+ ...packageJson.devDependencies,
48
+ ...packageJson.optionalDependencies,
49
+ }
50
+
51
+ for (const [name, version] of Object.entries(allDeps)) {
52
+ if (name === 'tamagui' || name.startsWith('@tamagui/')) {
53
+ tamaguiDeps.push({ name, version })
54
+ }
55
+ }
56
+
57
+ if (tamaguiDeps.length <= 1) {
58
+ return ''
59
+ }
60
+
61
+ // Normalize versions by removing prefixes like ^, ~, >=, etc.
62
+ const normalizeVersion = (v: string): string => {
63
+ // Handle workspace: protocol
64
+ if (v.startsWith('workspace:')) {
65
+ return v
66
+ }
67
+ return v.replace(/^[\^~>=<]+/, '')
68
+ }
69
+
70
+ // Group by normalized version
71
+ const versionGroups = new Map<string, string[]>()
72
+ for (const dep of tamaguiDeps) {
73
+ const normalized = normalizeVersion(dep.version)
74
+ if (!versionGroups.has(normalized)) {
75
+ versionGroups.set(normalized, [])
76
+ }
77
+ versionGroups.get(normalized)!.push(`${dep.name}@${dep.version}`)
78
+ }
79
+
80
+ // If all packages have the same normalized version, no mismatch
81
+ if (versionGroups.size <= 1) {
82
+ return ''
83
+ }
84
+
85
+ // Build mismatch summary
86
+ const lines: string[] = [
87
+ 'Found mismatched @tamagui/* package versions in package.json:',
88
+ '',
89
+ ]
90
+
91
+ for (const [version, packages] of versionGroups) {
92
+ lines.push(` ${version}:`)
93
+ for (const pkg of packages.sort()) {
94
+ lines.push(` - ${pkg}`)
95
+ }
96
+ }
97
+
98
+ lines.push('')
99
+ lines.push(
100
+ 'All @tamagui/* packages should use the same version to avoid runtime issues.'
101
+ )
102
+ lines.push('Run `npx tamagui upgrade` to sync all packages to the latest version.')
103
+
104
+ return lines.join('\n')
105
+ }
106
+
22
107
  export async function checkDeps(root: string) {
23
- const summary = new CDVC(root).toMismatchSummary()
108
+ // Check for @tamagui/* version mismatches within the same package.json
109
+ const tamaguiMismatchSummary = checkTamaguiPackageVersions(root)
110
+
111
+ // Check for dependency version mismatches across workspace packages
112
+ const workspaceMismatchSummary = new CDVC(root).toMismatchSummary()
24
113
 
25
- if (!summary) {
114
+ const hasTamaguiMismatch = Boolean(tamaguiMismatchSummary)
115
+ const hasWorkspaceMismatch = Boolean(workspaceMismatchSummary)
116
+
117
+ if (!hasTamaguiMismatch && !hasWorkspaceMismatch) {
26
118
  console.info(`Tamagui dependencies look good ✅`)
27
119
  process.exit(0)
28
120
  }
29
121
 
30
- console.error(summary)
122
+ if (hasTamaguiMismatch) {
123
+ console.error(tamaguiMismatchSummary)
124
+ }
125
+
126
+ if (hasWorkspaceMismatch) {
127
+ if (hasTamaguiMismatch) {
128
+ console.error('') // Add spacing between error sections
129
+ }
130
+ console.error(workspaceMismatchSummary)
131
+ }
132
+
31
133
  process.exit(1)
32
134
  }
@@ -230,9 +230,18 @@ export function getBabelParseDefinition(options: TamaguiOptions) {
230
230
  themedStylesAst.properties.forEach((_) => {
231
231
  const prop = _ as t.ObjectProperty
232
232
  if (prop.value.type === 'StringLiteral') {
233
- prop.value = t.memberExpression(
234
- t.identifier('theme'),
235
- t.identifier(prop.value.value.slice(1) + '.get()')
233
+ const propVal = prop.value.value.slice(1)
234
+ const isComputed = !t.isValidIdentifier(propVal)
235
+ prop.value = t.callExpression(
236
+ t.memberExpression(
237
+ t.memberExpression(
238
+ t.identifier('theme'),
239
+ isComputed ? t.stringLiteral(propVal) : t.identifier(propVal),
240
+ isComputed
241
+ ),
242
+ t.identifier('get')
243
+ ),
244
+ []
236
245
  )
237
246
  }
238
247
  })
@@ -1 +1 @@
1
- {"version":3,"file":"checkDeps.d.ts","sourceRoot":"","sources":["../src/checkDeps.ts"],"names":[],"mappings":"AAEA,oBAAY,eAAe;IACzB,YAAY,iBAAiB;IAC7B,eAAe,oBAAoB;IACnC,oBAAoB,yBAAyB;IAC7C,gBAAgB,qBAAqB;IACrC,WAAW,gBAAgB;CAC5B;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CAAC,EAAE,SAAS,GAAG,eAAe,EAAE,EAAE,CAAA;IACzC,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC7B,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC,oBAAoB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACxC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC9B,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CACtC,CAAA;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,iBAU3C"}
1
+ {"version":3,"file":"checkDeps.d.ts","sourceRoot":"","sources":["../src/checkDeps.ts"],"names":[],"mappings":"AAIA,oBAAY,eAAe;IACzB,YAAY,iBAAiB;IAC7B,eAAe,oBAAoB;IACnC,oBAAoB,yBAAyB;IAC7C,gBAAgB,qBAAqB;IACrC,WAAW,gBAAgB;CAC5B;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CAAC,EAAE,SAAS,GAAG,eAAe,EAAE,EAAE,CAAA;IACzC,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC7B,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC,oBAAoB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACxC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC9B,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CACtC,CAAA;AAqFD,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,iBA2B3C"}
@@ -1 +1 @@
1
- {"version":3,"file":"extractToNative.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToNative.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAwB,MAAM,aAAa,CAAA;AAQxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AA4B9C,wBAAgB,eAAe,CAC7B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,eAAe,CAoBjB;AAED,wBAAgB,cAAc,QAK7B;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,cAAc;;;;wBAM3C,GAAG;;;EAmWtB"}
1
+ {"version":3,"file":"extractToNative.d.ts","sourceRoot":"","sources":["../../src/extractor/extractToNative.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAwB,MAAM,aAAa,CAAA;AAQxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AA4B9C,wBAAgB,eAAe,CAC7B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,GACtB,eAAe,CAoBjB;AAED,wBAAgB,cAAc,QAK7B;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,cAAc;;;;wBAM3C,GAAG;;;EA4WtB"}