@tamagui/build 1.135.4 → 1.135.5

package/.turbo/turbo-test.log

@@ -1,27 +1,27 @@
 
- RUN  v3.2.4 /Users/n8/tamagui/code/packages/build
+ RUN  v4.0.4 /Users/n8/tamagui/code/packages/build
 
-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 61 ms
+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 70 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 335 ms
+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 374 ms
 
 Rebuild after file modification complete
 
- ✓ __tests__/integration.test.ts (7 tests) 10340ms
-   ✓ tamagui-build integration test > should build the package correctly  1433ms
-   ✓ tamagui-build integration test > should bundle the package correctly  1173ms
-   ✓ tamagui-build integration test > should skip mjs files when --skip-mjs is used  1217ms
-   ✓ tamagui-build integration test > should ignore base URL when --ignore-base-url is used  1275ms
-   ✓ tamagui-build integration test > should rebuild the package on file change when --watch is used  1414ms
-   ✓ tamagui-build integration test > should generate correct platform-specific output  1189ms
-   ✓ tamagui-build integration test > should minify the output when MINIFY=true is set  2615ms
-
- Test Files  1 passed (1)
-      Tests  7 passed (7)
-   Start at  09:56:41
-   Duration  10.55s (transform 48ms, setup 0ms, collect 42ms, tests 10.34s, environment 0ms, prepare 48ms)
+ ✓ __tests__/integration.test.ts (7 tests) 9752ms
+     ✓ should build the package correctly  1507ms
+     ✓ should bundle the package correctly  1113ms
+     ✓ should skip mjs files when --skip-mjs is used  1164ms
+     ✓ should ignore base URL when --ignore-base-url is used  1125ms
+     ✓ should rebuild the package on file change when --watch is used  1328ms
+     ✓ should generate correct platform-specific output  1181ms
+     ✓ should minify the output when MINIFY=true is set  2313ms
+
+ Test Files  1 passed (1)
+      Tests  7 passed (7)
+   Start at  06:15:53
+   Duration  9.86s (transform 37ms, setup 0ms, collect 42ms, tests 9.75s, environment 0ms, prepare 2ms)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/build",
-  "version": "1.135.4",
+  "version": "1.135.5",
   "bin": {
     "tamagui-build": "tamagui-build.js",
     "teesx": "./teesx.sh"
@@ -13,22 +13,22 @@
   },
   "dependencies": {
     "@babel/core": "^7.25.2",
-    "@swc/core": "^1.7.21",
-    "@tamagui/babel-plugin-fully-specified": "1.135.4",
+    "@swc/core": "^1.14.0",
+    "@tamagui/babel-plugin-fully-specified": "1.135.5",
     "@types/fs-extra": "^9.0.13",
     "chokidar": "^3.5.2",
-    "esbuild": "^0.25.0",
+    "esbuild": "^0.25.11",
     "esbuild-plugin-es5": "^2.1.1",
     "esbuild-register": "^3.6.0",
     "execa": "^5.0.0",
     "fast-glob": "^3.2.11",
     "fs-extra": "^11.2.0",
     "lodash.debounce": "^4.0.8",
-    "oxc-transform": "^0.74.0",
+    "oxc-transform": "^0.95.0",
     "typescript": "^5.8.2"
   },
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "devDependencies": {
-    "vitest": "^3.2.4"
+    "vitest": "^4.0.4"
   }
 }

package/tamagui-build.js

@@ -56,8 +56,6 @@ const pkg = FSE.readJSONSync('./package.json')
 let shouldSkipInitialTypes = !!process.env.SKIP_TYPES_INITIAL
 const pkgMain = pkg.main
 const pkgSource = pkg.source
-const bundleNative = pkg.tamagui?.['bundle.native']
-const bundleNativeTest = pkg.tamagui?.['bundle.native.test']
 const pkgModule = pkg.module
 const pkgModuleJSX = pkg['module:jsx']
 const pkgTypes = Boolean(pkg.types || pkg.typings)
@@ -176,6 +174,9 @@ async function build({ skipTypes } = {}) {
     ])
 
     console.info('built', pkg.name, 'in', Date.now() - start, 'ms')
+
+    // Run afterBuild script if defined
+    await runAfterBuild()
   } catch (error) {
     console.error(` ❌ Error building in ${process.cwd()}:\n\n`, error.stack + '\n')
     if (!shouldWatch) {
@@ -184,6 +185,28 @@ async function build({ skipTypes } = {}) {
   }
 }
 
+async function runAfterBuild() {
+  const afterBuild = pkg.scripts?.afterBuild
+  if (!afterBuild) return
+
+  try {
+    console.info('Running afterBuild script...')
+    const start = Date.now()
+
+    childProcess.execSync(afterBuild, {
+      stdio: 'inherit',
+      cwd: process.cwd()
+    })
+
+    console.info('afterBuild completed in', Date.now() - start, 'ms')
+  } catch (error) {
+    console.error('afterBuild failed:', error.message)
+    if (!shouldWatch) {
+      throw error
+    }
+  }
+}
+
 async function buildTsc(allFiles) {
   if (!pkgTypes || jsOnly || shouldSkipTypes) return
   if (shouldSkipInitialTypes) {
@@ -374,13 +397,31 @@ async function buildJs(allFiles) {
   const bundlePlugin = {
     name: `external-most-modules`,
     setup(build) {
+      // Alias esbuild to esbuild-wasm (but keep it external)
+      build.onResolve({ filter: /^esbuild$/ }, (args) => {
+        return { path: 'esbuild-wasm', external: true }
+      })
+
       build.onResolve({ filter: /.*/ }, (args) => {
+        // Externalize node built-ins
+        if (args.path.startsWith('node:')) {
+          return { external: true }
+        }
+
         if (
           !args.path.startsWith('.') &&
-          !args.path.startsWith('/') &&
-          !args.path.startsWith('node:')
+          !args.path.startsWith('/')
         ) {
-          return { external: /^(esbuild|mdx-bundler)$/.test(args.path) }
+          // Keep esbuild-wasm external (it needs access to WASM files)
+          if (args.path === 'esbuild-wasm' || args.path.startsWith('esbuild-wasm/')) {
+            return { external: true }
+          }
+          // Bundle mdx-bundler and its dependencies
+          if (args.path === 'mdx-bundler' || args.path.startsWith('mdx-bundler/')) {
+            return { external: false }
+          }
+          // Externalize all other npm packages
+          return { external: true }
         }
       })
     },
@@ -388,58 +429,6 @@ async function buildJs(allFiles) {
 
   const external = shouldBundleFlag ? ['@swc/*', '*.node'] : undefined
 
-  /** @type { import('esbuild').BuildOptions } */
-  const esbuildBundleProps =
-    bundleNative || bundleNativeTest
-      ? {
-          entryPoints: [bundleNative],
-          bundle: true,
-          plugins: [
-            alias({
-              '@tamagui/web': require.resolve('@tamagui/web/native'),
-
-              'react-native': require.resolve('@tamagui/fake-react-native'),
-              'react-native/Libraries/Renderer/shims/ReactFabric': require.resolve(
-                '@tamagui/fake-react-native'
-              ),
-              'react-native/Libraries/Renderer/shims/ReactNative': require.resolve(
-                '@tamagui/fake-react-native'
-              ),
-
-              'react-native/Libraries/Pressability/Pressability': require.resolve(
-                '@tamagui/fake-react-native'
-              ),
-
-              'react-native/Libraries/Pressability/usePressability': require.resolve(
-                '@tamagui/fake-react-native/idFn'
-              ),
-
-              'react-native-safe-area-context': require.resolve(
-                '@tamagui/fake-react-native'
-              ),
-              'react-native-gesture-handler': require.resolve('@tamagui/proxy-worm'),
-            }),
-          ],
-          external: [
-            'react',
-            'react-dom',
-            bundleNativeTest ? 'react-native' : undefined,
-          ].filter(Boolean),
-          resolveExtensions: [
-            '.native.ts',
-            '.native.tsx',
-            '.native.js',
-            '.ts',
-            '.tsx',
-            '.js',
-            '.jsx',
-          ],
-          minify: !!process.env.MINIFY,
-          define: {
-            'process.env.TAMAGUI_IS_CORE_NODE': '"1"',
-          },
-        }
-      : {}
 
   const start = Date.now()
 
@@ -498,33 +487,6 @@ async function buildJs(allFiles) {
         })
       : null,
 
-    // for tests to load native-mode from node
-    bundleNative && !shouldSkipNative
-      ? esbuildWriteIfChanged(
-          {
-            ...esbuildBundleProps,
-            outfile: `dist/native.js`,
-          },
-          {
-            platform: 'native',
-          }
-        )
-      : null,
-
-    // for tests to load native-mode from node
-    bundleNativeTest && !shouldSkipNative
-      ? esbuildWriteIfChanged(
-          {
-            ...esbuildBundleProps,
-            outfile: `dist/test.js`,
-          },
-          {
-            platform: 'native',
-            env: 'test',
-          }
-        )
-      : null,
-
     // web output to esm
     pkgModule
       ? esbuildWriteIfChanged(esmConfig, {
@@ -614,12 +576,12 @@ async function esbuildWriteIfChanged(
     // compat with jsx and hermes back a few versions generally:
     /** @type { import('esbuild').BuildOptions } */
     const nativeEsbuildSettings = {
-      target: isESM ? 'esnext' : 'node16',
+      target: 'esnext',
       supported: {
         'logical-assignment': false,
       },
       jsx: 'automatic',
-      platform: 'node',
+      platform: 'neutral',
     }
 
     /** @type { import('esbuild').BuildOptions } */
@@ -636,13 +598,17 @@ async function esbuildWriteIfChanged(
       },
     }
 
-    return {
+    /** @type { import('esbuild').BuildOptions } */
+    const out = {
       ...opts,
 
+      conditions: platform === 'native' ? ['react-native'] : [],
+      mainFields: isESM ? ['import', 'module', 'main'] : ['require', 'main'],
+
       plugins: [
         ...(opts.plugins || []),
 
-        ...(platform === 'native'
+        ...(platform === 'native' && !opts.bundle
           ? [
               // class isnt supported by hermes
               es5Plugin(),
@@ -650,6 +616,9 @@ async function esbuildWriteIfChanged(
           : []),
       ].filter(Boolean),
 
+
+      format: isESM ? 'esm' : 'cjs',
+
       treeShaking: true,
       minifySyntax: true,
       write: false,
@@ -669,9 +638,14 @@ async function esbuildWriteIfChanged(
         ...(env && {
           'process.env.NODE_ENV': `"${env}"`,
         }),
+        ...(shouldBundleNodeModules && {
+          'process.env.ESBUILD_BINARY_PATH': `"true"`,
+        }),
         ...opts.define,
       },
     }
+
+    return out
   })()
 
   let built
@@ -832,7 +806,12 @@ async function esbuildWriteIfChanged(
               configFile: false,
               sourceMap: true,
               plugins: [
-                require.resolve('@tamagui/babel-plugin-fully-specified/commonjs'),
+                [
+                  require.resolve('@tamagui/babel-plugin-fully-specified/commonjs'),
+                  {
+                    esExtensionDefault: platform === 'native' ? '.native.cjs' : '.cjs',
+                  },
+                ],
               ].filter(Boolean),
             })
 
@@ -844,7 +823,8 @@ async function esbuildWriteIfChanged(
     return
   }
 
-  if (shouldSkipMJS || !isESM) {
+  // Skip mjs transformation if --skip-mjs flag is set
+  if (shouldSkipMJS) {
     return
   }
 
@@ -857,19 +837,21 @@ async function esbuildWriteIfChanged(
       if (!path.endsWith('.js')) return
 
       // for web do mjs, for native keep js since rollup gets confused when you have both
-      const mjsOutPath = platform === 'native' ? path : path.replace('.js', '.mjs')
+      const newOutPath = platform === 'native' ? path : path.replace('.js', '.mjs')
 
       // if bundling no need to specify as its all internal
       // and babel is bad on huge bundled files
       const result = opts.bundle
         ? { code: contents }
         : transform(contents, {
-            filename: mjsOutPath,
+            filename: newOutPath,
             configFile: false,
             sourceMap: true,
             plugins: [
               [
-                require.resolve('@tamagui/babel-plugin-fully-specified'),
+                isESM
+                  ? require.resolve('@tamagui/babel-plugin-fully-specified')
+                  : require.resolve('@tamagui/babel-plugin-fully-specified/commonjs'),
                 {
                   esExtensionDefault: platform === 'native' ? '.native.js' : '.mjs',
                   esExtensions: platform === 'native' ? ['.js'] : ['.mjs'],
@@ -886,13 +868,13 @@ async function esbuildWriteIfChanged(
       // output to mjs fully specified
       if (
         await flush(
-          mjsOutPath,
+          newOutPath,
           result.code +
-            (result.map ? `\n//# sourceMappingURL=${basename(mjsOutPath)}.map\n` : '')
+            (result.map ? `\n//# sourceMappingURL=${basename(newOutPath)}.map\n` : '')
         )
       ) {
         if (result.map) {
-          await FSE.writeFile(mjsOutPath + '.map', JSON.stringify(result.map), 'utf8')
+          await FSE.writeFile(newOutPath + '.map', JSON.stringify(result.map), 'utf8')
         }
       }
     })