@tamagui/build 1.110.3 → 1.110.5

package/__tests__/fixtures/simple-package/index.d.ts

@@ -0,0 +1,2 @@
+export declare const greet: (name: string) => string;
+//# sourceMappingURL=index.d.ts.map

package/__tests__/fixtures/simple-package/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,SAAU,MAAM,KAAG,MAEpC,CAAA"}

package/__tests__/fixtures/simple-package/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "tamagui-build-test-simple-tpackage",
+  "version": "1.110.5",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/types/index.d.ts",
+  "scripts": {
+    "build": "node ../../../tamagui-build.js",
+    "build:bundle": "node ../../../tamagui-build.js --bundle",
+    "build:skip-mjs": "node ../../../tamagui-build.js --skip-mjs",
+    "build:declaration-root": "node ../../../tamagui-build.js --declaration-root",
+    "build:ignore-base-url": "node ../../../tamagui-build.js --ignore-base-url",
+    "build:watch": "node ../../../tamagui-build.js --watch",
+    "build:minify": "MINIFY=true node ../../../tamagui-build.js",
+    "build:target-web": "TAMAGUI_TARGET=web node ../../../tamagui-build.js",
+    "build:target-native": "TAMAGUI_TARGET=native node ../../../tamagui-build.js"
+  },
+  "devDependencies": {
+    "@tamagui/build": "1.110.5",
+    "typescript": "^5.5.2"
+  }
+}

package/__tests__/fixtures/simple-package/src/index.ts

@@ -0,0 +1,10 @@
+export const greet = (name: string): string => {
+  return `Hello, ${name}!`
+}
+
+export const paltformGreeter = (name: string): string => {
+  let salutation
+  process.env.TAMAGUI_TARGET === 'web' ? (salutation = 'Hi') : (salutation = 'Hello')
+  process.env.TAMAGUI_TARGET === 'native' ? (salutation = 'Hey') : (salutation = 'Hello')
+  return `${salutation}, ${name}!`
+}

package/__tests__/fixtures/simple-package/tsconfig.json

@@ -0,0 +1,42 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": ".",
+    "paths": {
+      "vxrn": ["packages/vxrn"],
+      "@vxrn/*": ["packages/*"]
+    },
+    "importHelpers": true,
+    "allowJs": false,
+    "resolveJsonModule": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "declaration": true,
+    "downlevelIteration": true,
+    "strict": true,
+    "esModuleInterop": true,
+    "inlineSourceMap": true,
+    "preserveSymlinks": true,
+    "jsx": "react-jsx",
+    "module": "Preserve",
+    "moduleResolution": "Bundler",
+    "noEmit": false,
+    "noEmitOnError": false,
+    "noImplicitAny": false,
+    "noImplicitReturns": false,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "preserveConstEnums": true,
+    "removeComments": false,
+    "skipLibCheck": true,
+    "sourceMap": false,
+    "strictNullChecks": true,
+    "target": "es2020",
+    "types": ["vite/client", "node", "react"],
+    "lib": ["dom", "esnext"]
+  },
+  "exclude": ["**/test", "**/dist", "**/types", "**/__tests__"],
+  "typeAcquisition": {
+    "enable": true
+  }
+}

package/__tests__/fixtures/watch-package/index.d.ts

@@ -0,0 +1,2 @@
+export declare const greet: (name: string) => string;
+//# sourceMappingURL=index.d.ts.map

package/__tests__/fixtures/watch-package/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,SAAU,MAAM,KAAG,MAEpC,CAAA"}

package/__tests__/fixtures/watch-package/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "tamagui-build-test-watch-package",
+  "version": "1.110.5",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.mjs",
+  "types": "dist/types/index.d.ts",
+  "scripts": {
+    "build": "node ../../../tamagui-build.js",
+    "build:bundle": "node ../../../tamagui-build.js --bundle",
+    "build:skip-mjs": "node ../../../tamagui-build.js --skip-mjs",
+    "build:declaration-root": "node ../../../tamagui-build.js --declaration-root",
+    "build:ignore-base-url": "node ../../../tamagui-build.js --ignore-base-url",
+    "build:watch": "node ../../../tamagui-build.js --watch",
+    "build:minify": "MINIFY=true node ../../../tamagui-build.js",
+    "build:target-web": "TAMAGUI_TARGET=web node ../../../tamagui-build.js",
+    "build:target-native": "TAMAGUI_TARGET=native node ../../../tamagui-build.js"
+  },
+  "devDependencies": {
+    "@tamagui/build": "1.110.5",
+    "typescript": "^5.5.2"
+  }
+}

package/__tests__/fixtures/watch-package/src/watch.ts

@@ -0,0 +1,3 @@
+export const greet = (name: string): string => {
+  return `Hi, ${name}!`;
+};

package/__tests__/fixtures/watch-package/tsconfig.json

@@ -0,0 +1,42 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": ".",
+    "paths": {
+      "vxrn": ["packages/vxrn"],
+      "@vxrn/*": ["packages/*"]
+    },
+    "importHelpers": true,
+    "allowJs": false,
+    "resolveJsonModule": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "declaration": true,
+    "downlevelIteration": true,
+    "strict": true,
+    "esModuleInterop": true,
+    "inlineSourceMap": true,
+    "preserveSymlinks": true,
+    "jsx": "react-jsx",
+    "module": "Preserve",
+    "moduleResolution": "Bundler",
+    "noEmit": false,
+    "noEmitOnError": false,
+    "noImplicitAny": false,
+    "noImplicitReturns": false,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "preserveConstEnums": true,
+    "removeComments": false,
+    "skipLibCheck": true,
+    "sourceMap": false,
+    "strictNullChecks": true,
+    "target": "es2020",
+    "types": ["vite/client", "node", "react"],
+    "lib": ["dom", "esnext"]
+  },
+  "exclude": ["**/test", "**/dist", "**/types", "**/__tests__"],
+  "typeAcquisition": {
+    "enable": true
+  }
+}

package/__tests__/fixtures/watch-package/watch.d.ts

@@ -0,0 +1,2 @@
+export declare const greet: (name: string) => string;
+//# sourceMappingURL=watch.d.ts.map

package/__tests__/fixtures/watch-package/watch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["src/watch.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,SAAU,MAAM,KAAG,MAE5B,CAAC"}

package/__tests__/integration.test.ts

@@ -0,0 +1,208 @@
+import { execSync, spawn } from 'node:child_process'
+import { existsSync, readFileSync, writeFileSync, statSync } from 'node:fs'
+import { describe, it, expect, beforeAll, afterAll } from 'vitest'
+import { join } from 'node:path'
+import { readFile } from 'node:fs/promises'
+
+const watchPackagePath = join(__dirname, 'fixtures', 'watch-package')
+const watchDistPath = join(watchPackagePath, 'dist')
+const watchSrcFilePath = join(watchPackagePath, 'src', 'watch.ts')
+
+const simplePackagePath = join(__dirname, 'fixtures', 'simple-package')
+const distPath = join(simplePackagePath, 'dist')
+const srcFilePath = join(simplePackagePath, 'src', 'index.ts')
+const distCjsFilePath = join(distPath, 'cjs', 'index.js')
+const watchDistCjsFilePath = join(watchDistPath, 'cjs', 'watch.js')
+const distEsmFilePath = join(distPath, 'esm', 'index.mjs')
+const distTypesFilePath = join(simplePackagePath, 'types', 'index.d.ts')
+// // biome-ignore lint/suspicious/noConsoleLog: <explanation>
+// console.log({
+//   distCjsFilePath,
+//   distEsmFilePath,
+//   distTypesFilePath,
+//   srcFilePath,
+//   simplePackagePath,
+//   distPath,
+// })
+
+describe('tamagui-build integration test', () => {
+  beforeAll(() => {
+    // Clean up dist directory before starting
+    execSync('rm -rf dist && rm -rf types', { cwd: simplePackagePath })
+  })
+
+  it('should build the package correctly', () => {
+    execSync('yarn build', { cwd: simplePackagePath })
+
+    // Check if the output files exist
+    expect(existsSync(distCjsFilePath)).toBe(true)
+    expect(existsSync(distEsmFilePath)).toBe(true)
+    expect(existsSync(distTypesFilePath)).toBe(true)
+
+    // Check the content of the output files
+    const cjsOutput = readFileSync(distCjsFilePath, 'utf-8')
+    const esmOutput = readFileSync(distEsmFilePath, 'utf-8')
+    expect(cjsOutput).toContain('Hello,')
+    expect(esmOutput).toContain('Hello,')
+  })
+
+  it('should bundle the package correctly', () => {
+    execSync('yarn build:bundle', { cwd: simplePackagePath })
+
+    // Check if the output files exist
+    expect(existsSync(distCjsFilePath)).toBe(true)
+    expect(existsSync(distEsmFilePath)).toBe(true)
+
+    // Check the content of the output files
+    const cjsOutput = readFileSync(distCjsFilePath, 'utf-8')
+    const esmOutput = readFileSync(distEsmFilePath, 'utf-8')
+    expect(cjsOutput).toContain('Hello,')
+    expect(esmOutput).toContain('Hello,')
+  })
+
+  it('should skip mjs files when --skip-mjs is used', () => {
+    execSync('rm -rf dist && rm -rf types', { cwd: simplePackagePath })
+    execSync('yarn build:skip-mjs', { cwd: simplePackagePath })
+
+    // Check if the output files exist
+    expect(existsSync(distCjsFilePath)).toBe(true)
+    expect(existsSync(distEsmFilePath)).toBe(false)
+  })
+
+  // it('should set declaration root correctly', () => {
+  //   execSync('rm -rf dist && rm -rf types', { cwd: simplePackagePath })
+
+  //   execSync('yarn build:declaration-root', { cwd: simplePackagePath })
+  //   // Check if the output files exist
+  //   expect(existsSync(distTypesFilePath)).toBe(true)
+  //   // clear up declaration root files
+  //   execSync('rm -rf index.d.ts && index.d', { cwd: simplePackagePath })
+  // })
+
+  it('should ignore base URL when --ignore-base-url is used', () => {
+    execSync('yarn build:ignore-base-url', { cwd: simplePackagePath })
+
+    // Check if the output files exist
+    expect(existsSync(distCjsFilePath)).toBe(true)
+    expect(existsSync(distEsmFilePath)).toBe(true)
+  })
+
+  it('should rebuild the package on file change when --watch is used', async () => {
+    const watchProcess = spawn('yarn', ['build:watch'], { cwd: watchPackagePath })
+
+    // Cache existing content
+    const originalContent = readFileSync(watchSrcFilePath, 'utf-8')
+
+    try {
+      await new Promise<void>((resolve, reject) => {
+        const timeout = setTimeout(() => {
+          reject(new Error('Timeout waiting for build to complete'))
+        }, 15000) // 30 second timeout
+
+        let initialBuildComplete = false
+        let fileModified = false
+
+        watchProcess.stdout.on('data', (data) => {
+          // biome-ignore lint/suspicious/noConsoleLog: <explanation>
+          console.log('Watch process output:', data.toString())
+          if (data.toString().includes('built tamagui-build-test-watch-package')) {
+            if (!initialBuildComplete) {
+              initialBuildComplete = true
+              // biome-ignore lint/suspicious/noConsoleLog: <explanation>
+              console.log('Initial build complete, modifying file...')
+              // Modify the source file
+              const newContent = `export const greet = (name: string): string => {
+  return \`Hi, \${name}!\`;
+};`
+              writeFileSync(watchSrcFilePath, newContent)
+              fileModified = true
+            } else if (fileModified) {
+              // biome-ignore lint/suspicious/noConsoleLog: <explanation>
+              console.log('Rebuild after file modification complete')
+              // Check the updated content of the output file
+              const output = readFileSync(watchDistCjsFilePath, 'utf-8')
+              expect(output).toContain('Hi,')
+
+              // Change content back to original
+              writeFileSync(watchSrcFilePath, originalContent)
+
+              clearTimeout(timeout)
+              resolve()
+            }
+          }
+        })
+      })
+    } finally {
+      watchProcess.kill()
+    }
+  }, 15000)
+
+  it('should generate correct platform-specific output', async () => {
+    execSync('yarn build', { cwd: simplePackagePath })
+
+    const distCjsWebFilePath = join(distPath, 'cjs', 'index.js')
+    const distCjsNativeFilePath = join(distPath, 'cjs', 'index.native.js')
+
+    // Check if the output files exist
+    expect(existsSync(distCjsWebFilePath)).toBe(true)
+    expect(existsSync(distCjsNativeFilePath)).toBe(true)
+
+    // Read the content of the output files
+    const webOutput = await readFile(distCjsWebFilePath, 'utf-8')
+    const nativeOutput = await readFile(distCjsNativeFilePath, 'utf-8')
+
+    // Check for platform-specific content in web output
+    expect(webOutput).toContain('salutation = "Hi"')
+    expect(webOutput).not.toContain('salutation = "Hey"')
+    expect(webOutput).not.toContain('process.env.TAMAGUI_TARGET')
+
+    // Check for platform-specific content in native output
+    expect(nativeOutput).toContain('salutation = "Hey"')
+    expect(nativeOutput).not.toContain('salutation = "Hi"')
+    expect(nativeOutput).not.toContain('process.env.TAMAGUI_TARGET')
+
+    // Check that the common code is present in both outputs
+    expect(webOutput).toContain('greet:')
+    expect(nativeOutput).toContain('greet:')
+  })
+
+  it('should minify the output when MINIFY=true is set', () => {
+    // Build without minification and cache file sizes
+    execSync('yarn build', { cwd: simplePackagePath })
+    const originalCjsSize = statSync(distCjsFilePath).size
+    const originalEsmSize = statSync(distEsmFilePath).size
+
+    // Clean up the output
+    execSync('rm -rf dist && rm -rf types', { cwd: simplePackagePath })
+
+    // Build with minification
+    execSync('yarn build:minify', { cwd: simplePackagePath })
+
+    // Check if the output files exist
+    expect(existsSync(distCjsFilePath)).toBe(true)
+    expect(existsSync(distEsmFilePath)).toBe(true)
+
+    // Check if the minified output is smaller
+    const minifiedCjsSize = statSync(distCjsFilePath).size
+    const minifiedEsmSize = statSync(distEsmFilePath).size
+    expect(minifiedCjsSize).toBeLessThan(originalCjsSize)
+    expect(minifiedEsmSize).toBeLessThan(originalEsmSize)
+
+    // Check the content of the minified output files
+    const cjsOutput = readFileSync(distCjsFilePath, 'utf-8')
+    const esmOutput = readFileSync(distEsmFilePath, 'utf-8')
+
+    // Check for absence of excessive whitespace in minified output
+    expect(cjsOutput).not.toMatch(/^\s+$/m) // No lines with only whitespace
+    expect(esmOutput).not.toMatch(/^\s+$/m) // No lines with only whitespace
+
+    // Check that the number of lines is reduced
+    expect(cjsOutput.split('\n').length).toBeLessThan(10)
+    expect(esmOutput.split('\n').length).toBeLessThan(10)
+  })
+
+  afterAll(() => {
+    // Clean up dist directory after tests
+    execSync('rm -rf dist && rm -rf types', { cwd: simplePackagePath })
+  })
+})

package/package.json

@@ -1,17 +1,20 @@
 {
   "name": "@tamagui/build",
-  "version": "1.110.3",
+  "version": "1.110.5",
   "bin": {
     "tamagui-build": "tamagui-build.js",
     "teesx": "./teesx.sh"
   },
+  "scripts": {
+    "test": "vitest --run"
+  },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@babel/core": "^7.25.2",
     "@swc/core": "^1.7.21",
-    "@tamagui/babel-plugin-fully-specified": "1.110.3",
+    "@tamagui/babel-plugin-fully-specified": "1.110.5",
     "@types/fs-extra": "^9.0.13",
     "babel-plugin-fully-specified": "*",
     "chokidar": "^3.5.2",
@@ -21,10 +24,11 @@
     "execa": "^5.0.0",
     "fast-glob": "^3.2.11",
     "fs-extra": "^11.2.0",
-    "lodash.debounce": "^4.0.8"
-  },
-  "devDependencies": {
+    "lodash.debounce": "^4.0.8",
     "typescript": "^5.5.2"
   },
-  "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14"
+  "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
+  "devDependencies": {
+    "vitest": "0.34.3"
+  }
 }

package/tamagui-build.js

@@ -2,7 +2,6 @@
 /* eslint-disable no-console */
 
 const { transform } = require('@babel/core')
-const exec = require('execa')
 const fs = require('fs-extra')
 const esbuild = require('esbuild')
 const fg = require('fast-glob')
@@ -11,6 +10,11 @@ const debounce = require('lodash.debounce')
 const { basename, dirname } = require('node:path')
 const alias = require('./esbuildAliasPlugin')
 const { es5Plugin } = require('./esbuild-es5')
+const ts = require('typescript')
+const path = require('node:path')
+
+// biome-ignore lint/suspicious/noConsoleLog: <explanation>
+console.log('TypeScript version:', ts.version)
 
 const jsOnly = !!process.env.JS_ONLY
 const skipJS = !!(process.env.SKIP_JS || false)
@@ -64,6 +68,8 @@ const replaceRNWeb = {
   },
 }
 
+let cachedConfig = null
+
 async function clean() {
   try {
     await Promise.allSettled([
@@ -134,42 +140,41 @@ async function build({ skipTypes } = {}) {
   }
 }
 
-// const targetDir = `.types${Math.floor(Math.random() * 1_000_000)}`
-// const cleanup = () => {
-//   try {
-//     fs.removeSync(targetDir)
-//   } catch {
-//     // ok
-//   }
-// }
-
-// process.once('beforeExit', cleanup)
-// process.once('SIGINT', cleanup)
-// process.once('SIGTERM', cleanup)
-
 async function buildTsc() {
-  if (!pkgTypes) return
-  if (jsOnly || shouldSkipTypes) return
+  if (!pkgTypes || jsOnly || shouldSkipTypes) return
   if (shouldSkipInitialTypes) {
     shouldSkipInitialTypes = false
     return
   }
 
   const targetDir = 'types'
+  await fs.ensureDir(targetDir)
+
   try {
-    // typescripts build cache messes up when doing declarationOnly
-    await fs.remove('tsconfig.tsbuildinfo')
-    await fs.ensureDir(targetDir)
+    console.info(`Starting TypeScript compilation for ${pkg.name}`)
 
-    const declarationToRootFlag = declarationToRoot ? ' --declarationDir ./' : ''
-    const baseUrlFlag = ignoreBaseUrl ? '' : ` --baseUrl ${baseUrl}`
-    const tsProjectFlag = tsProject ? ` --project ${tsProject}` : ''
-    const cmd = `tsc${baseUrlFlag}${tsProjectFlag} --outDir ${targetDir} --rootDir src ${declarationToRootFlag}--emitDeclarationOnly --declarationMap`
+    const { config, error } = await loadTsConfig()
+    if (error) throw error
 
-    console.info('\x1b[2m$', `npx ${cmd}`)
-    await exec('npx', cmd.split(' '))
+    const compilerOptions = createCompilerOptions(config.options, targetDir)
+    const { program, emitResult, diagnostics } = await compileTypeScript(
+      config.fileNames,
+      compilerOptions
+    )
+
+    reportDiagnostics(diagnostics)
+
+    if (emitResult.emitSkipped) {
+      throw new Error('TypeScript compilation failed')
+    }
+
+    console.info(`TypeScript compilation completed successfully for ${pkg.name}`)
   } catch (err) {
-    console.info(err.message)
+    if (err.code === 'ENOTFOUND' || err.code === 'ECONNREFUSED') {
+      console.error(`Network error during compilation for ${pkg.name}:`, err.message)
+    } else {
+      console.error(`Error during TypeScript compilation for ${pkg.name}:`, err)
+    }
     if (!shouldWatch) {
       process.exit(1)
     }
@@ -178,6 +183,96 @@ async function buildTsc() {
   }
 }
 
+async function loadTsConfig() {
+  if (cachedConfig && shouldWatch) {
+    return cachedConfig
+  }
+
+  const configPath = ts.findConfigFile(
+    './',
+    ts.sys.fileExists,
+    tsProject || 'tsconfig.json'
+  )
+  if (!configPath) {
+    return { error: new Error("Could not find a valid 'tsconfig.json'.") }
+  }
+
+  const configFile = ts.readConfigFile(configPath, ts.sys.readFile)
+  if (configFile.error) {
+    return {
+      error: new Error(`Error reading tsconfig.json: ${configFile.error.messageText}`),
+    }
+  }
+
+  const parsedCommandLine = ts.parseJsonConfigFileContent(
+    configFile.config,
+    ts.sys,
+    path.dirname(configPath)
+  )
+
+  if (parsedCommandLine.errors.length) {
+    return {
+      error: new Error(
+        `Error parsing tsconfig.json: ${ts.formatDiagnostics(parsedCommandLine.errors, formatHost)}`
+      ),
+    }
+  }
+
+  cachedConfig = { config: parsedCommandLine }
+  return cachedConfig
+}
+
+function createCompilerOptions(baseOptions, targetDir) {
+  const compilerOptions = {
+    ...baseOptions,
+    declaration: true,
+    emitDeclarationOnly: true,
+    declarationMap: true,
+    outDir: targetDir,
+    rootDir: 'src',
+    incremental: true,
+    tsBuildInfoFile: 'tsconfig.tsbuildinfo',
+  }
+
+  if (declarationToRoot) {
+    compilerOptions.declarationDir = './'
+  }
+
+  if (!ignoreBaseUrl) {
+    compilerOptions.baseUrl = baseUrl
+  }
+
+  return compilerOptions
+}
+
+async function compileTypeScript(fileNames, options) {
+  const program = ts.createProgram(fileNames, options)
+  const emitResult = program.emit()
+  const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics)
+
+  return { program, emitResult, diagnostics: allDiagnostics }
+}
+
+const formatHost = {
+  getCanonicalFileName: (path) => path,
+  getCurrentDirectory: ts.sys.getCurrentDirectory,
+  getNewLine: () => ts.sys.newLine,
+}
+
+function reportDiagnostics(diagnostics) {
+  diagnostics.forEach((diagnostic) => {
+    let message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n')
+    if (diagnostic.file && diagnostic.start !== undefined) {
+      const { line, character } = ts.getLineAndCharacterOfPosition(
+        diagnostic.file,
+        diagnostic.start
+      )
+      message = `${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`
+    }
+    console.error(message)
+  })
+}
+
 async function buildJs() {
   if (skipJS) {
     return