@tamagui/build 2.1.0 → 2.2.0-1781044625560

package/.turbo/turbo-test$colon$web.log

@@ -9,39 +9,41 @@ $ node ../../../tamagui-build.js --skip-mjs
 $ node ../../../tamagui-build.js --skip-sourcemaps
 $ node ../../../tamagui-build.js --ignore-base-url
 stdout | __tests__/integration.test.ts > tamagui-build integration test > should rebuild the package on file change when --watch is used
-Watch process output: built tamagui-build-test-watch-package in 84 ms
+Watch process output: built tamagui-build-test-watch-package in 79 ms
 
 Initial build complete, modifying file...
 
 stdout | __tests__/integration.test.ts > tamagui-build integration test > should rebuild the package on file change when --watch is used
-Watch process output: built tamagui-build-test-watch-package in 372 ms
+Watch process output: built tamagui-build-test-watch-package in 356 ms
 
 Rebuild after file modification complete
 
 $ node ../../../tamagui-build.js
 $ node ../../../tamagui-build.js
 $ node ../../../tamagui-build.js
+$ node ../../../tamagui-build.js
 $ MINIFY=true node ../../../tamagui-build.js
 $ node ../../../tamagui-build.js
 $ node ../../../tamagui-build.js
 $ node ../../../tamagui-build.js
 $ node ../../../tamagui-build.js
- ✓ __tests__/integration.test.ts (12 tests) 9959ms
-     ✓ should build the package correctly  646ms
-     ✓ should bundle the package correctly  572ms
-     ✓ should skip mjs files when --skip-mjs is used  643ms
-     ✓ should skip sourcemaps when --skip-sourcemaps is used  647ms
-     ✓ should ignore base URL when --ignore-base-url is used  654ms
-     ✓ should rebuild the package on file change when --watch is used  777ms
-     ✓ should generate correct platform-specific output  662ms
-     ✓ should keep side-effectful native statements outside dev-only guards  653ms
-     ✓ should minify the output when MINIFY=true is set  1346ms
-     ✓ should clean stale outputs before building  1392ms
-     ✓ should keep only the required js aliases after postprocessing  690ms
-     ✓ should keep explicit cjs .js mains as final output  1234ms
+ ✓ __tests__/integration.test.ts (13 tests) 10843ms
+     ✓ should build the package correctly  662ms
+     ✓ should bundle the package correctly  598ms
+     ✓ should skip mjs files when --skip-mjs is used  654ms
+     ✓ should skip sourcemaps when --skip-sourcemaps is used  670ms
+     ✓ should ignore base URL when --ignore-base-url is used  680ms
+     ✓ should rebuild the package on file change when --watch is used  781ms
+     ✓ should generate correct platform-specific output  678ms
+     ✓ should prune imports left unused after platform DCE  724ms
+     ✓ should keep side-effectful native statements outside dev-only guards  730ms
+     ✓ should minify the output when MINIFY=true is set  1462ms
+     ✓ should clean stale outputs before building  1336ms
+     ✓ should keep only the required js aliases after postprocessing  679ms
+     ✓ should keep explicit cjs .js mains as final output  1154ms
 
  Test Files  1 passed (1)
-      Tests  12 passed (12)
-   Start at  12:38:37
-   Duration  10.08s (transform 41ms, setup 0ms, collect 47ms, tests 9.96s, environment 0ms, prepare 2ms)
+      Tests  13 passed (13)
+   Start at  17:38:08
+   Duration  10.96s (transform 41ms, setup 0ms, collect 48ms, tests 10.84s, environment 0ms, prepare 2ms)
 

package/__tests__/fixtures/js-main-package/.turbo/turbo-build.log

@@ -1,2 +1,2 @@
 $ node ../../../tamagui-build.js
-built tamagui-build-test-js-main-package in 1895 ms
+built tamagui-build-test-js-main-package in 1531 ms

package/__tests__/fixtures/simple-package/.turbo/turbo-build.log

@@ -1,2 +1,2 @@
 $ node ../../../tamagui-build.js
-built tamagui-build-test-simple-tpackage in 1026 ms
+built tamagui-build-test-simple-tpackage in 941 ms

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

@@ -1,6 +1,7 @@
 {
   "name": "tamagui-build-test-simple-tpackage",
   "version": "2.0.0-rc.0-1769885482630",
+  "sideEffects": false,
   "main": "dist/cjs",
   "module": "dist/esm",
   "module:jsx": "dist/jsx",

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

@@ -1,3 +1,5 @@
+import { getNativeOnlyMarker } from './nativeOnly'
+
 export { nestedHello } from './nested'
 
 export const greet = (name: string): string => {
@@ -29,6 +31,26 @@ export function getPlatformMarker() {
   return process.env.TAMAGUI_TARGET === 'native' ? 'native-only-marker' : 'web-only-marker'
 }
 
+export function getNativeImportMarker() {
+  if (process.env.TAMAGUI_TARGET === 'native') {
+    return getNativeOnlyMarker()
+  }
+
+  return 'web-import-marker'
+}
+
+export function getNodeEnvMarker() {
+  if (process.env.NODE_ENV === 'test') {
+    return 'test-env-marker'
+  }
+
+  if (process.env.NODE_ENV === 'development') {
+    return 'development-env-marker'
+  }
+
+  return 'runtime-env-marker'
+}
+
 export function applyNativeLogicalMarker(items: string[]) {
   process.env.TAMAGUI_TARGET === 'native' && items.push('native-logical-marker')
   process.env.TAMAGUI_TARGET !== 'native' && items.push('web-logical-marker')

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

@@ -0,0 +1,3 @@
+export function getNativeOnlyMarker() {
+  return 'native-import-marker'
+}

package/__tests__/fixtures/watch-package/.turbo/turbo-build.log

@@ -1,2 +1,2 @@
 $ node ../../../tamagui-build.js
-built tamagui-build-test-watch-package in 1049 ms
+built tamagui-build-test-watch-package in 548 ms

package/__tests__/integration.test.ts

@@ -30,7 +30,7 @@ describe('tamagui-build integration test', () => {
   beforeAll(() => {
     // Clean up dist directory before starting
     execSync('rm -rf dist && rm -rf types', { cwd: simplePackagePath })
-    execSync('rm -rf dist && rm -rf types', { cwd: jsMainPackagePath })
+    execSync('rm -rf dist', { cwd: jsMainPackagePath })
   })
 
   it('should build the package correctly', () => {
@@ -117,10 +117,11 @@ describe('tamagui-build integration test', () => {
       await new Promise<void>((resolve, reject) => {
         const timeout = setTimeout(() => {
           reject(new Error('Timeout waiting for build to complete'))
-        }, 15000) // 30 second timeout
+        }, 15000)
 
         let initialBuildComplete = false
         let fileModified = false
+        const replacementGreeting = originalContent.includes('Hi,') ? 'Hey' : 'Hi'
 
         watchProcess.stdout.on('data', (data) => {
           console.log('Watch process output:', data.toString())
@@ -130,7 +131,7 @@ describe('tamagui-build integration test', () => {
               console.log('Initial build complete, modifying file...')
               // Modify the source file
               const newContent = `export const greet = (name: string): string => {
-  return \`Hi, \${name}!\`;
+  return \`${replacementGreeting}, \${name}!\`;
 };`
               writeFileSync(watchSrcFilePath, newContent)
               fileModified = true
@@ -138,7 +139,7 @@ describe('tamagui-build integration test', () => {
               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,')
+              expect(output).toContain(`${replacementGreeting},`)
 
               // Change content back to original
               writeFileSync(watchSrcFilePath, originalContent)
@@ -150,6 +151,7 @@ describe('tamagui-build integration test', () => {
         })
       })
     } finally {
+      writeFileSync(watchSrcFilePath, originalContent)
       watchProcess.kill()
     }
   }, 15000)
@@ -183,6 +185,27 @@ describe('tamagui-build integration test', () => {
     expect(nativeOutput).toContain('greet:')
   })
 
+  it('should prune imports left unused after platform DCE', async () => {
+    execSync('bun run build', { cwd: simplePackagePath })
+
+    const webOutput = await readFile(join(distPath, 'esm', 'index.mjs'), 'utf-8')
+    const nativeOutput = await readFile(join(distPath, 'esm', 'index.native.js'), 'utf-8')
+    const nativeOnlyOutput = await readFile(
+      join(distPath, 'esm', 'nativeOnly.native.js'),
+      'utf-8'
+    )
+
+    expect(webOutput).toContain('web-import-marker')
+    expect(webOutput).not.toContain('native-import-marker')
+    expect(webOutput).not.toContain('getNativeOnlyMarker')
+    expect(webOutput).not.toContain('./nativeOnly')
+    expect(webOutput).toContain('process.env.NODE_ENV === "test"')
+    expect(webOutput).toContain('process.env.NODE_ENV === "development"')
+
+    expect(nativeOutput).toContain('getNativeOnlyMarker')
+    expect(nativeOnlyOutput).toContain('native-import-marker')
+  })
+
   it('should keep side-effectful native statements outside dev-only guards', async () => {
     execSync('bun run build', { cwd: simplePackagePath })
 
@@ -292,6 +315,6 @@ describe('tamagui-build integration test', () => {
   afterAll(() => {
     // Clean up dist directory after tests
     execSync('rm -rf dist && rm -rf types', { cwd: simplePackagePath })
-    execSync('rm -rf dist && rm -rf types', { cwd: jsMainPackagePath })
+    execSync('rm -rf dist', { cwd: jsMainPackagePath })
   })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/build",
-  "version": "2.1.0",
+  "version": "2.2.0-1781044625560",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "bin": {
     "tamagui-build": "tamagui-build.js",
@@ -17,7 +17,7 @@
     "@babel/core": "^7.25.2",
     "@babel/preset-typescript": "^7.26.0",
     "@swc/core": "^1.14.0",
-    "@tamagui/babel-plugin-fully-specified": "2.1.0",
+    "@tamagui/babel-plugin-fully-specified": "2.2.0-1781044625560",
     "@types/fs-extra": "^9.0.13",
     "baseline-browser-mapping": "^2.9.15",
     "chokidar": "^3.5.2",
@@ -28,6 +28,8 @@
     "fs-extra": "^11.2.0",
     "lodash.debounce": "^4.0.8",
     "oxc-transform": "^0.112.0",
+    "picomatch": "4.0.3",
+    "rolldown": "1.0.1",
     "typescript": "~5.9.2"
   },
   "peerDependencies": {

package/tamagui-build.js

@@ -27,6 +27,8 @@ const { transform } = require('@babel/core')
 const FSE = require('fs-extra')
 const esbuild = require('esbuild')
 const fastGlob = require('fast-glob')
+const picomatch = require('picomatch')
+const { rolldown } = require('rolldown')
 const createExternalPlugin = require('./externalNodePlugin')
 const debounce = require('lodash.debounce')
 const { basename, dirname } = require('node:path')
@@ -91,6 +93,183 @@ function dceTamaguiTarget(contents, { format, jsx, platform }) {
   return result.code || contents
 }
 
+const sideEffectsMatchersCache = new Map()
+const packageSideEffectsCache = new Map()
+const sideEffectsExtensionCandidates = ['.js', '.mjs', '.cjs', '.jsx', '.ts', '.tsx']
+
+function normalizeSideEffectsSpecifier(specifier) {
+  return specifier
+    .replace(/[?#].*$/, '')
+    .replace(/^\.\/+/, '')
+    .replace(/^\/+/, '')
+}
+
+function getSideEffectsSpecifierCandidates(specifier) {
+  const normalized = normalizeSideEffectsSpecifier(specifier)
+  if (!normalized) return []
+
+  const candidates = [normalized]
+  const lastSegment = normalized.split('/').pop() || ''
+  const hasKnownExtension = /\.(?:[cm]?js|jsx|tsx?|css|json)$/.test(lastSegment)
+
+  if (!hasKnownExtension) {
+    for (const extension of sideEffectsExtensionCandidates) {
+      candidates.push(`${normalized}${extension}`)
+    }
+    for (const extension of sideEffectsExtensionCandidates) {
+      candidates.push(`${normalized}/index${extension}`)
+    }
+  }
+
+  return candidates
+}
+
+function sideEffectsMatch(sideEffects, specifier) {
+  if (sideEffects === true || sideEffects === undefined) return true
+  if (sideEffects === false) return false
+  if (!Array.isArray(sideEffects)) return true
+
+  const candidates = getSideEffectsSpecifierCandidates(specifier)
+  if (!candidates.length) return false
+
+  const cacheKey = JSON.stringify(sideEffects)
+  let matcher = sideEffectsMatchersCache.get(cacheKey)
+  if (!matcher) {
+    matcher = picomatch(sideEffects, { dot: true })
+    sideEffectsMatchersCache.set(cacheKey, matcher)
+  }
+  return candidates.some((candidate) => matcher(candidate))
+}
+
+function getPackageNameFromSpecifier(specifier) {
+  if (!specifier || specifier.startsWith('.') || specifier.startsWith('/')) return null
+  if (specifier.startsWith('node:')) return null
+  const parts = specifier.split('/')
+  return specifier.startsWith('@') ? parts.slice(0, 2).join('/') : parts[0]
+}
+
+function findPackageJsonFromResolvedFile(filePath, packageName) {
+  let current = dirname(filePath)
+  while (current && current !== dirname(current)) {
+    const packageJsonPath = path.join(current, 'package.json')
+    if (FSE.existsSync(packageJsonPath)) {
+      try {
+        const json = FSE.readJSONSync(packageJsonPath)
+        if (!packageName || json.name === packageName) {
+          return { path: packageJsonPath, json }
+        }
+      } catch {
+        return null
+      }
+    }
+    current = dirname(current)
+  }
+  return null
+}
+
+function getPackageSideEffects(packageName) {
+  if (packageSideEffectsCache.has(packageName)) {
+    return packageSideEffectsCache.get(packageName)
+  }
+
+  let found = null
+
+  try {
+    const packageJsonPath = require.resolve(`${packageName}/package.json`, {
+      paths: [process.cwd()],
+    })
+    found = {
+      path: packageJsonPath,
+      json: FSE.readJSONSync(packageJsonPath),
+    }
+  } catch {
+    try {
+      const resolved = require.resolve(packageName, {
+        paths: [process.cwd()],
+      })
+      found = findPackageJsonFromResolvedFile(resolved, packageName)
+    } catch {
+      found = null
+    }
+  }
+
+  const value = found
+    ? {
+        sideEffects: found.json.sideEffects,
+      }
+    : null
+
+  packageSideEffectsCache.set(packageName, value)
+  return value
+}
+
+function moduleHasSideEffects(id) {
+  if (id.startsWith('.') || id.startsWith('/')) {
+    return sideEffectsMatch(pkg.sideEffects, id)
+  }
+
+  const packageName = getPackageNameFromSpecifier(id)
+  if (!packageName) return true
+
+  const packageInfo = getPackageSideEffects(packageName)
+  if (!packageInfo) return true
+
+  const subpath = normalizeSideEffectsSpecifier(id.slice(packageName.length))
+  return sideEffectsMatch(packageInfo.sideEffects, subpath)
+}
+
+function stripRolldownRegionComments(contents) {
+  return contents
+    .replace(/^\/\/#region[^\n]*(?:\n|$)/gm, '')
+    .replace(/^\/\/#endregion[^\n]*(?:\n|$)/gm, '')
+}
+
+async function pruneUnusedImports(contents, filePath) {
+  if (!contents.includes('import')) {
+    return contents
+  }
+
+  const entryId = `${path.resolve(filePath)}?tamagui-build-prune`
+
+  const bundle = await rolldown({
+    input: entryId,
+    external: (id) => id !== entryId,
+    platform: 'neutral',
+    plugins: [
+      {
+        name: 'tamagui-build-prune-entry',
+        resolveId(id) {
+          if (id === entryId) return id
+        },
+        load(id) {
+          if (id === entryId) {
+            return {
+              code: contents,
+              moduleSideEffects: true,
+            }
+          }
+        },
+      },
+    ],
+    treeshake: {
+      moduleSideEffects: (id) => moduleHasSideEffects(id),
+    },
+  })
+
+  try {
+    const result = await bundle.generate({
+      format: 'esm',
+      sourcemap: false,
+      comments: false,
+      minify: false,
+    })
+    const chunk = result.output.find((item) => item.type === 'chunk')
+    return chunk?.code ? stripRolldownRegionComments(chunk.code) : contents
+  } finally {
+    await bundle.close?.()
+  }
+}
+
 function hasFlag(flag) {
   return process.argv.includes(flag)
 }
@@ -1065,21 +1244,22 @@ async function esbuildWriteIfChanged(
         }
 
         if (!isMap && path.endsWith('.js')) {
+          const hadTamaguiTarget = contents.includes('process.env.TAMAGUI_TARGET')
           contents = dceTamaguiTarget(contents, {
             format: opts.format,
             jsx: opts.jsx,
             platform,
           })
+
+          if (isESM && hadTamaguiTarget) {
+            contents = await pruneUnusedImports(contents, path)
+          }
         }
 
         if (isESM && pkg.sideEffects !== true && pkg.sideEffects !== undefined) {
           const sideEffects = pkg.sideEffects
           // sideEffects: false means nothing has side effects, strip all bare imports
           // sideEffects: ["*.css", ...] means only matching files have side effects
-          const picomatch = require('picomatch')
-          const matchers = sideEffects === false
-            ? null // strip everything
-            : (Array.isArray(sideEffects) ? sideEffects : []).map((p) => picomatch(p))
 
           const result = []
           const lines = contents.split('\n')
@@ -1090,14 +1270,13 @@ async function esbuildWriteIfChanged(
               result.push(line)
               continue
             }
-            const specifier = match[1].replace(/^\.\//, '')
             // sideEffects: false → strip all bare imports
-            if (matchers === null) {
+            if (sideEffects === false) {
               result.push('')
               continue
             }
             // sideEffects: [...] → keep if specifier matches any pattern
-            const hasSideEffect = matchers.some((m) => m(specifier))
+            const hasSideEffect = sideEffectsMatch(sideEffects, match[1])
             result.push(hasSideEffect ? line : '')
           }