@tamagui/cli 3.0.0-beta.643.1 → 3.0.0-beta.647.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 (5) hide show
  1. package/dist/build.cjs +17 -7
  2. package/package.json +9 -9
  3. package/src/build.ts +27 -6
  4. package/types/build.d.ts +1 -0
  5. package/types/build.d.ts.map +1 -1
package/dist/build.cjs CHANGED
@@ -227,7 +227,20 @@ const build = async (options) => {
227
227
  optimized: 0,
228
228
  flattened: 0,
229
229
  styled: 0,
230
- found: 0
230
+ found: 0,
231
+ bailed: 0
232
+ };
233
+ const countedFiles = /* @__PURE__ */ new Set();
234
+ const addStats = (sourcePath, fileStats) => {
235
+ if (!countedFiles.has(sourcePath)) {
236
+ countedFiles.add(sourcePath);
237
+ stats.filesProcessed++;
238
+ }
239
+ stats.optimized += fileStats.lowered - fileStats.flattened;
240
+ stats.flattened += fileStats.flattened;
241
+ stats.styled += fileStats.styled;
242
+ stats.found += fileStats.found;
243
+ stats.bailed += fileStats.bailed;
231
244
  };
232
245
  if (options.debug) process.env.NODE_ENV ||= "development";
233
246
  const sources = /* @__PURE__ */ new Map();
@@ -239,11 +252,7 @@ const build = async (options) => {
239
252
  ${sourcePath} [web]`);
240
253
  const out = await compileTarget("web", sourcePath, originalSource);
241
254
  if (out.output.changed || out.plan.stats.found > 0) {
242
- stats.filesProcessed++;
243
- stats.optimized += out.plan.stats.lowered - out.plan.stats.flattened;
244
- stats.flattened += out.plan.stats.flattened;
245
- stats.styled += out.plan.stats.styled;
246
- stats.found += out.plan.stats.found;
255
+ addStats(sourcePath, out.plan.stats);
247
256
  if (isDryRun) {
248
257
  if (out.plan.css) console.info(`
249
258
  css:
@@ -276,6 +285,7 @@ ${out.output.code}`);
276
285
  if (isDryRun) console.info(`
277
286
  ${sourcePath} [native]`);
278
287
  const nativeOut = await compileTarget("native", sourcePath, originalSource);
288
+ if (nativeOut.output.changed || nativeOut.plan.stats.found > 0) addStats(sourcePath, nativeOut.plan.stats);
279
289
  if (isDryRun) if (nativeOut.output.code) console.info(`
280
290
  native:
281
291
  ${nativeOut.output.code}`);
@@ -316,7 +326,7 @@ ${nativeOut.output.code}`);
316
326
  await Promise.all(targetPromises);
317
327
  }
318
328
  if (isDryRun) console.info(`
319
- ${stats.filesProcessed} files | ${stats.found} found | ${stats.optimized} optimized | ${stats.flattened} flattened | ${stats.styled} styled
329
+ ${stats.filesProcessed} files | ${stats.found} found | ${stats.optimized} optimized | ${stats.flattened} flattened | ${stats.styled} styled | ${stats.bailed} bailed
320
330
  `);
321
331
  if (options.expectOptimizations !== void 0) {
322
332
  const totalOptimizations = stats.optimized + stats.flattened;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/cli",
3
- "version": "3.0.0-beta.643.1",
3
+ "version": "3.0.0-beta.647.1",
4
4
  "bin": {
5
5
  "tama": "dist/index.cjs",
6
6
  "tamagui": "dist/index.cjs"
@@ -51,12 +51,12 @@
51
51
  "test:web": "bun run test"
52
52
  },
53
53
  "dependencies": {
54
- "@tamagui/generate-themes": "3.0.0-beta.643.1",
55
- "@tamagui/metro-plugin": "3.0.0-beta.643.1",
56
- "@tamagui/static": "3.0.0-beta.643.1",
57
- "@tamagui/to-tailwind": "3.0.0-beta.643.1",
58
- "@tamagui/types": "3.0.0-beta.643.1",
59
- "@tamagui/vite-plugin": "3.0.0-beta.643.1",
54
+ "@tamagui/generate-themes": "3.0.0-beta.647.1",
55
+ "@tamagui/metro-plugin": "3.0.0-beta.647.1",
56
+ "@tamagui/static": "3.0.0-beta.647.1",
57
+ "@tamagui/to-tailwind": "3.0.0-beta.647.1",
58
+ "@tamagui/types": "3.0.0-beta.647.1",
59
+ "@tamagui/vite-plugin": "3.0.0-beta.647.1",
60
60
  "arg": "^5.0.2",
61
61
  "chalk": "^4.1.2",
62
62
  "change-case": "^4.1.2",
@@ -75,10 +75,10 @@
75
75
  "ts-morph": "^28.0.0",
76
76
  "typescript": "~6.0.3",
77
77
  "url": "^0.11.0",
78
- "@tamagui/language-service": "3.0.0-beta.643.1"
78
+ "@tamagui/language-service": "3.0.0-beta.647.1"
79
79
  },
80
80
  "devDependencies": {
81
- "@tamagui/build": "3.0.0-beta.643.1",
81
+ "@tamagui/build": "3.0.0-beta.647.1",
82
82
  "@types/chokidar": "^2.1.3",
83
83
  "@types/marked": "^5.0.0",
84
84
  "vitest": "4.0.4"
package/src/build.ts CHANGED
@@ -34,6 +34,7 @@ export type BuildStats = {
34
34
  flattened: number
35
35
  styled: number
36
36
  found: number
37
+ bailed: number
37
38
  }
38
39
 
39
40
  export type TrackedFile = {
@@ -362,6 +363,26 @@ export const build = async (
362
363
  flattened: 0,
363
364
  styled: 0,
364
365
  found: 0,
366
+ bailed: 0,
367
+ }
368
+
369
+ // both target passes report through here, so a `--target native` run stops
370
+ // summarizing itself as all zeros. a file counts once even when it compiles for
371
+ // both targets, otherwise `files` double-counts every shared component.
372
+ const countedFiles = new Set<string>()
373
+ const addStats = (
374
+ sourcePath: string,
375
+ fileStats: Awaited<ReturnType<typeof compileTarget>>['plan']['stats']
376
+ ) => {
377
+ if (!countedFiles.has(sourcePath)) {
378
+ countedFiles.add(sourcePath)
379
+ stats.filesProcessed++
380
+ }
381
+ stats.optimized += fileStats.lowered - fileStats.flattened
382
+ stats.flattened += fileStats.flattened
383
+ stats.styled += fileStats.styled
384
+ stats.found += fileStats.found
385
+ stats.bailed += fileStats.bailed
365
386
  }
366
387
 
367
388
  if (options.debug) {
@@ -384,11 +405,7 @@ export const build = async (
384
405
  const out = await compileTarget('web', sourcePath, originalSource)
385
406
 
386
407
  if (out.output.changed || out.plan.stats.found > 0) {
387
- stats.filesProcessed++
388
- stats.optimized += out.plan.stats.lowered - out.plan.stats.flattened
389
- stats.flattened += out.plan.stats.flattened
390
- stats.styled += out.plan.stats.styled
391
- stats.found += out.plan.stats.found
408
+ addStats(sourcePath, out.plan.stats)
392
409
 
393
410
  if (isDryRun) {
394
411
  if (out.plan.css) {
@@ -460,6 +477,10 @@ export const build = async (
460
477
  // Use the ORIGINAL source, not what was just written to disk
461
478
  const nativeOut = await compileTarget('native', sourcePath, originalSource)
462
479
 
480
+ if (nativeOut.output.changed || nativeOut.plan.stats.found > 0) {
481
+ addStats(sourcePath, nativeOut.plan.stats)
482
+ }
483
+
463
484
  if (isDryRun) {
464
485
  if (nativeOut.output.code) {
465
486
  console.info(`\nnative:\n${nativeOut.output.code}`)
@@ -567,7 +588,7 @@ export const build = async (
567
588
 
568
589
  if (isDryRun) {
569
590
  console.info(
570
- `\n${stats.filesProcessed} files | ${stats.found} found | ${stats.optimized} optimized | ${stats.flattened} flattened | ${stats.styled} styled\n`
591
+ `\n${stats.filesProcessed} files | ${stats.found} found | ${stats.optimized} optimized | ${stats.flattened} flattened | ${stats.styled} styled | ${stats.bailed} bailed\n`
571
592
  )
572
593
  }
573
594
 
package/types/build.d.ts CHANGED
@@ -5,6 +5,7 @@ export type BuildStats = {
5
5
  flattened: number;
6
6
  styled: number;
7
7
  found: number;
8
+ bailed: number;
8
9
  };
9
10
  export type TrackedFile = {
10
11
  path: string;
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;CACd,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,CAuhBrB,CAAA"}
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"}