@tamagui/cli 3.0.0-beta.1215.1 → 3.0.0-beta.1309.1

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.
Files changed (7) hide show
  1. package/dist/build.cjs +5 -9
  2. package/dist/to-tailwind-default-config.cjs +24 -0
  3. package/package.json +10 -10
  4. package/src/build.ts +10 -24
  5. package/src/to-tailwind-default-config.ts +24 -0
  6. package/types/build.d.ts.map +1 -1
  7. package/types/to-tailwind-default-config.d.ts.map +1 -1
package/dist/build.cjs CHANGED
@@ -39,7 +39,6 @@ var import_node_os = require("node:os");
39
39
  var import_node_child_process = require("node:child_process");
40
40
  var import_node_crypto = require("node:crypto");
41
41
  var import_node_module = require("node:module");
42
- var import_typescript = require("typescript");
43
42
  const import_meta = {};
44
43
  const cliVersion = (0, import_node_module.createRequire)(typeof __filename === "string" ? __filename : import_meta.url)("@tamagui/cli/package.json").version;
45
44
  function insertCssImport(jsContent, cssImport) {
@@ -108,15 +107,12 @@ const build = async (options) => {
108
107
  const outputCSSPath = buildOptions.outputCSS ? (0, import_node_path.resolve)(root, buildOptions.outputCSS) : null;
109
108
  if (outputCSSPath) await trackFile(outputCSSPath);
110
109
  const require2 = (0, import_node_module.createRequire)(typeof __filename === "string" ? __filename : import_meta.url);
111
- const configPath = (0, import_typescript.findConfigFile)(root, import_typescript.sys.fileExists, "tsconfig.json") || (0, import_typescript.findConfigFile)(root, import_typescript.sys.fileExists, "jsconfig.json");
112
- const compilerOptions = configPath ? (0, import_typescript.parseJsonConfigFileContent)((() => {
113
- const loaded = (0, import_typescript.readConfigFile)(configPath, import_typescript.sys.readFile);
114
- if (loaded.error) throw new Error(String(loaded.error.messageText));
115
- return loaded.config;
116
- })(), import_typescript.sys, (0, import_node_path.dirname)(configPath)).options : {};
110
+ const tsconfigPaths = (0, import_static.createTsconfigPathsMatcher)(void 0, root);
117
111
  const resolveCompilerId = (specifier, importer) => {
118
- const resolved = (0, import_typescript.nodeModuleNameResolver)(specifier, importer, compilerOptions, import_typescript.sys).resolvedModule?.resolvedFileName;
119
- if (resolved && !resolved.endsWith(".d.ts")) return resolved;
112
+ for (const candidate of tsconfigPaths?.(specifier) ?? []) try {
113
+ const resolved = require2.resolve(candidate, { paths: [(0, import_node_path.dirname)(importer), root] });
114
+ if (!resolved.endsWith(".d.ts")) return resolved;
115
+ } catch {}
120
116
  try {
121
117
  return require2.resolve(specifier, { paths: [(0, import_node_path.dirname)(importer), root] });
122
118
  } catch {
package/dist/to-tailwind-default-config.cjs CHANGED
@@ -153,6 +153,18 @@ const bundledDefaultGrammarConfig = {
153
153
  "light_accent_level3",
154
154
  "light_accent_level4",
155
155
  "light_brand",
156
+ "light_brand_level2",
157
+ "light_brand_level2_level2",
158
+ "light_brand_level2_level2_level2",
159
+ "light_brand_level2_level2_level3",
160
+ "light_brand_level2_level2_level4",
161
+ "light_brand_level2_level3",
162
+ "light_brand_level2_level4",
163
+ "light_brand_level3",
164
+ "light_brand_level3_level2",
165
+ "light_brand_level3_level3",
166
+ "light_brand_level3_level4",
167
+ "light_brand_level4",
156
168
  "light_inverse",
157
169
  "light_black",
158
170
  "dark",
@@ -234,6 +246,18 @@ const bundledDefaultGrammarConfig = {
234
246
  "dark_accent_level3",
235
247
  "dark_accent_level4",
236
248
  "dark_brand",
249
+ "dark_brand_level2",
250
+ "dark_brand_level2_level2",
251
+ "dark_brand_level2_level2_level2",
252
+ "dark_brand_level2_level2_level3",
253
+ "dark_brand_level2_level2_level4",
254
+ "dark_brand_level2_level3",
255
+ "dark_brand_level2_level4",
256
+ "dark_brand_level3",
257
+ "dark_brand_level3_level2",
258
+ "dark_brand_level3_level3",
259
+ "dark_brand_level3_level4",
260
+ "dark_brand_level4",
237
261
  "dark_red",
238
262
  "dark_red_level2",
239
263
  "dark_red_level2_level2",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/cli",
3
- "version": "3.0.0-beta.1215.1",
3
+ "version": "3.0.0-beta.1309.1",
4
4
  "license": "MIT",
5
5
  "bin": {
6
6
  "tama": "dist/index.cjs",
@@ -52,12 +52,12 @@
52
52
  "test:web": "bun run test"
53
53
  },
54
54
  "dependencies": {
55
- "@tamagui/generate-themes": "3.0.0-beta.1215.1",
56
- "@tamagui/metro-plugin": "3.0.0-beta.1215.1",
57
- "@tamagui/static": "3.0.0-beta.1215.1",
58
- "@tamagui/to-tailwind": "3.0.0-beta.1215.1",
59
- "@tamagui/types": "3.0.0-beta.1215.1",
60
- "@tamagui/vite-plugin": "3.0.0-beta.1215.1",
55
+ "@tamagui/generate-themes": "3.0.0-beta.1309.1",
56
+ "@tamagui/metro-plugin": "3.0.0-beta.1309.1",
57
+ "@tamagui/static": "3.0.0-beta.1309.1",
58
+ "@tamagui/to-tailwind": "3.0.0-beta.1309.1",
59
+ "@tamagui/types": "3.0.0-beta.1309.1",
60
+ "@tamagui/vite-plugin": "3.0.0-beta.1309.1",
61
61
  "arg": "^5.0.2",
62
62
  "chalk": "^4.1.2",
63
63
  "change-case": "^4.1.2",
@@ -74,12 +74,12 @@
74
74
  "opener": "^1.5.2",
75
75
  "prompts": "2.1.0",
76
76
  "ts-morph": "^28.0.0",
77
- "typescript": "~6.0.3",
77
+ "typescript": "7.0.2",
78
78
  "url": "^0.11.0",
79
- "@tamagui/language-service": "3.0.0-beta.1215.1"
79
+ "@tamagui/language-service": "3.0.0-beta.1309.1"
80
80
  },
81
81
  "devDependencies": {
82
- "@tamagui/build": "3.0.0-beta.1215.1",
82
+ "@tamagui/build": "3.0.0-beta.1309.1",
83
83
  "@types/chokidar": "^2.1.3",
84
84
  "@types/marked": "^5.0.0",
85
85
  "vitest": "4.1.0"
package/src/build.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import {
2
2
  CompilerFrontend,
3
+ createTsconfigPathsMatcher,
3
4
  loadTamagui,
4
5
  loadTamaguiBuildConfigSync,
5
6
  compilerProjectStamp,
@@ -14,13 +15,6 @@ import { tmpdir } from 'node:os'
14
15
  import { spawn } from 'node:child_process'
15
16
  import { createHash } from 'node:crypto'
16
17
  import { createRequire } from 'node:module'
17
- import {
18
- findConfigFile,
19
- nodeModuleNameResolver,
20
- parseJsonConfigFileContent,
21
- readConfigFile,
22
- sys,
23
- } from 'typescript'
24
18
 
25
19
  const cliVersion = (
26
20
  createRequire(typeof __filename === 'string' ? __filename : import.meta.url)(
@@ -163,24 +157,16 @@ export const build = async (
163
157
  const require = createRequire(
164
158
  typeof __filename === 'string' ? __filename : import.meta.url
165
159
  )
166
- const configPath =
167
- findConfigFile(root, sys.fileExists, 'tsconfig.json') ||
168
- findConfigFile(root, sys.fileExists, 'jsconfig.json')
169
- const compilerOptions = configPath
170
- ? parseJsonConfigFileContent(
171
- (() => {
172
- const loaded = readConfigFile(configPath, sys.readFile)
173
- if (loaded.error) throw new Error(String(loaded.error.messageText))
174
- return loaded.config
175
- })(),
176
- sys,
177
- dirname(configPath)
178
- ).options
179
- : {}
160
+ const tsconfigPaths = createTsconfigPathsMatcher(undefined, root)
180
161
  const resolveCompilerId = (specifier: string, importer: string): string | null => {
181
- const resolved = nodeModuleNameResolver(specifier, importer, compilerOptions, sys)
182
- .resolvedModule?.resolvedFileName
183
- if (resolved && !resolved.endsWith('.d.ts')) return resolved
162
+ for (const candidate of tsconfigPaths?.(specifier) ?? []) {
163
+ try {
164
+ const resolved = require.resolve(candidate, {
165
+ paths: [dirname(importer), root],
166
+ })
167
+ if (!resolved.endsWith('.d.ts')) return resolved
168
+ } catch {}
169
+ }
184
170
  try {
185
171
  return require.resolve(specifier, { paths: [dirname(importer), root] })
186
172
  } catch {
package/src/to-tailwind-default-config.ts CHANGED
@@ -131,6 +131,18 @@ export const bundledDefaultGrammarConfig = {
131
131
  'light_accent_level3',
132
132
  'light_accent_level4',
133
133
  'light_brand',
134
+ 'light_brand_level2',
135
+ 'light_brand_level2_level2',
136
+ 'light_brand_level2_level2_level2',
137
+ 'light_brand_level2_level2_level3',
138
+ 'light_brand_level2_level2_level4',
139
+ 'light_brand_level2_level3',
140
+ 'light_brand_level2_level4',
141
+ 'light_brand_level3',
142
+ 'light_brand_level3_level2',
143
+ 'light_brand_level3_level3',
144
+ 'light_brand_level3_level4',
145
+ 'light_brand_level4',
134
146
  'light_inverse',
135
147
  'light_black',
136
148
  'dark',
@@ -212,6 +224,18 @@ export const bundledDefaultGrammarConfig = {
212
224
  'dark_accent_level3',
213
225
  'dark_accent_level4',
214
226
  'dark_brand',
227
+ 'dark_brand_level2',
228
+ 'dark_brand_level2_level2',
229
+ 'dark_brand_level2_level2_level2',
230
+ 'dark_brand_level2_level2_level3',
231
+ 'dark_brand_level2_level2_level4',
232
+ 'dark_brand_level2_level3',
233
+ 'dark_brand_level2_level4',
234
+ 'dark_brand_level3',
235
+ 'dark_brand_level3_level2',
236
+ 'dark_brand_level3_level3',
237
+ 'dark_brand_level3_level4',
238
+ 'dark_brand_level4',
215
239
  'dark_red',
216
240
  'dark_red_level2',
217
241
  'dark_red_level2_level2',
package/types/build.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAkB,MAAM,gBAAgB,CAAA;AAuBxE,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAA;IACjB,YAAY,EAAE,WAAW,EAAE,CAAA;CAC5B,CAAA;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAW5E;AAED,eAAO,MAAM,KAAK,YACP,kBAAkB,GAAG;IAC5B,MAAM,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAA;IAClC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,KACA,OAAO,CAAC,WAAW,CA2iBrB,CAAA"}
1
+ {"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAkB,MAAM,gBAAgB,CAAA;AAgBxE,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAA;IACjB,YAAY,EAAE,WAAW,EAAE,CAAA;CAC5B,CAAA;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAW5E;AAED,eAAO,MAAM,KAAK,YACP,kBAAkB,GAAG;IAC5B,MAAM,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAA;IAClC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,KACA,OAAO,CAAC,WAAW,CAmiBrB,CAAA"}
package/types/to-tailwind-default-config.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"to-tailwind-default-config.d.ts","sourceRoot":"","sources":["../src/to-tailwind-default-config.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,2BAA2B;IACtC,UAAU;QACR,IAAI;QACJ,CAAC;QACD,EAAE;QACF,OAAO;QACP,IAAI;QACJ,CAAC;QACD,KAAK;QACL,OAAO;QACP,CAAC;QACD,CAAC;QACD,IAAI;QACJ,IAAI;QACJ,EAAE;QACF,IAAI;QACJ,IAAI;QACJ,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,CAAC;QACD,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,CAAC;QACD,OAAO;QACP,MAAM;QACN,IAAI;QACJ,MAAM;QACN,CAAC;QACD,CAAC;QACD,CAAC;;IAEH,UAAU;IAiCV,UAAU;IAoKV,UAAU;QACR,KAAK;QA+EL,IAAI;QAyCJ,MAAM;QAwBN,MAAM;QACN,KAAK;QAgVL,UAAU;QACV,QAAQ;QA+BR,UAAU;QA+BV,aAAa;;CAmBhB,CAAA"}
1
+ {"version":3,"file":"to-tailwind-default-config.d.ts","sourceRoot":"","sources":["../src/to-tailwind-default-config.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,2BAA2B;IACtC,UAAU;QACR,IAAI;QACJ,CAAC;QACD,EAAE;QACF,OAAO;QACP,IAAI;QACJ,CAAC;QACD,KAAK;QACL,OAAO;QACP,CAAC;QACD,CAAC;QACD,IAAI;QACJ,IAAI;QACJ,EAAE;QACF,IAAI;QACJ,IAAI;QACJ,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,CAAC;QACD,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,EAAE;QACF,CAAC;QACD,OAAO;QACP,MAAM;QACN,IAAI;QACJ,MAAM;QACN,CAAC;QACD,CAAC;QACD,CAAC;;IAEH,UAAU;IAiCV,UAAU;IA4LV,UAAU;QACR,KAAK;QA+EL,IAAI;QAyCJ,MAAM;QAwBN,MAAM;QACN,KAAK;QAgVL,UAAU;QACV,QAAQ;QA+BR,UAAU;QA+BV,aAAa;;CAmBhB,CAAA"}