@tamagui/build 3.0.0-beta.1216.1 → 3.0.0-beta.1309.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/build",
-  "version": "3.0.0-beta.1216.1",
+  "version": "3.0.0-beta.1309.1",
   "license": "MIT",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "files": [
@@ -12,7 +12,7 @@
     "tamagui-build.js",
     "tamagui-build-workspace.js",
     "tamagui-tsgo.js",
-    "typescript-native.js",
+    "typescript-path.js",
     "teesx.sh"
   ],
   "bin": {
@@ -44,16 +44,8 @@
     "lodash.debounce": "^4.0.8",
     "oxc-transform": "^0.112.0",
     "picomatch": "4.0.4",
-    "rolldown": "1.2.4"
-  },
-  "optionalDependencies": {
-    "@typescript/typescript-darwin-arm64": "7.1.0-dev.20260722.1",
-    "@typescript/typescript-darwin-x64": "7.1.0-dev.20260722.1",
-    "@typescript/typescript-linux-arm": "7.1.0-dev.20260722.1",
-    "@typescript/typescript-linux-arm64": "7.1.0-dev.20260722.1",
-    "@typescript/typescript-linux-x64": "7.1.0-dev.20260722.1",
-    "@typescript/typescript-win32-arm64": "7.1.0-dev.20260722.1",
-    "@typescript/typescript-win32-x64": "7.1.0-dev.20260722.1"
+    "rolldown": "1.2.4",
+    "typescript": "7.0.2"
   },
   "peerDependencies": {
     "babel-plugin-react-compiler": ">=1"

package/tamagui-build.js

@@ -36,7 +36,7 @@ const { transformSync: oxcTransformSync } = require('oxc-transform')
 const { getTsconfig } = require('get-tsconfig')
 const path = require('node:path')
 const childProcess = require('node:child_process')
-const { getTypeScriptNativePath } = require('./typescript-native')
+const { getTypeScriptPath } = require('./typescript-path')
 const {
   printEsbuildError,
   printBuildError,
@@ -227,6 +227,51 @@ function stripRolldownRegionComments(contents) {
     .replace(/^\/\/#endregion[^\n]*(?:\n|$)/gm, '')
 }
 
+const preserveRequireModuleId = 'tamagui-build:preserve-require'
+const preserveRequirePlugin = {
+  name: 'tamagui-build-preserve-require',
+  resolveId(id) {
+    if (id === preserveRequireModuleId) return id
+  },
+  load(id) {
+    if (id === preserveRequireModuleId) {
+      return 'export const require = globalThis.require'
+    }
+  },
+}
+
+function restoreGlobalRequire(contents) {
+  const injected = contents.match(
+    /(?:\r?\n)?\/\/#region tamagui-build:preserve-require\r?\nconst ([\w$]+) = globalThis\.require;\r?\n[ \t\r\n]*\/\/#endregion\r?\n/
+  )
+  if (injected) {
+    contents = contents.replace(injected[0], '\n')
+    if (injected[1] !== 'require') {
+      const identifier = injected[1].replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+      contents = contents.replace(
+        new RegExp(`\\b${identifier}\\b`, 'g'),
+        'require'
+      )
+    }
+  }
+
+  const runtime = contents.match(
+    /\/\/#region \\0rolldown\/runtime\.js\r?\n([\s\S]*?)\/\/#endregion\r?\n?/
+  )
+  const helper = runtime?.[1].match(
+    /var (__require(?:\$\d+)?) = \/\* @__PURE__ \*\/ \(\(x\) =>[\s\S]*?Calling `require`[\s\S]*?\r?\n\}\);\r?\n/
+  )
+  if (!helper) return contents
+
+  const remainingRuntime = runtime[1].replace(helper[0], '')
+  contents = contents.replace(
+    remainingRuntime.trim() ? helper[0] : runtime[0],
+    ''
+  )
+  const identifier = helper[1].replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+  return contents.replace(new RegExp(`\\b${identifier}\\b`, 'g'), 'require')
+}
+
 async function pruneUnusedImports(contents, filePath) {
   if (!contents.includes('import')) {
     return contents
@@ -236,9 +281,15 @@ async function pruneUnusedImports(contents, filePath) {
 
   const bundle = await rolldown({
     input: entryId,
-    external: (id) => id !== entryId,
+    external: (id) => id !== entryId && id !== preserveRequireModuleId,
     platform: 'neutral',
+    transform: {
+      inject: {
+        require: [preserveRequireModuleId, 'require'],
+      },
+    },
     plugins: [
+      preserveRequirePlugin,
       {
         name: 'tamagui-build-prune-entry',
         resolveId(id) {
@@ -267,7 +318,9 @@ async function pruneUnusedImports(contents, filePath) {
       minify: false,
     })
     const chunk = result.output.find((item) => item.type === 'chunk')
-    return chunk?.code ? stripRolldownRegionComments(chunk.code) : contents
+    return chunk?.code
+      ? stripRolldownRegionComments(restoreGlobalRequire(chunk.code))
+      : contents
   } finally {
     await bundle.close?.()
   }
@@ -387,7 +440,7 @@ async function fullySpecifyOutputs(
         }
 
         transformed.set(file.path, {
-          code: stripRolldownRegionComments(chunk.code).replace(
+          code: stripRolldownRegionComments(restoreGlobalRequire(chunk.code)).replace(
             /\n?\/\/# sourceMappingURL=.*(?:\n|$)/g,
             ''
           ),
@@ -1017,7 +1070,7 @@ async function pruneStaleDeclarations(targetDir, allFiles) {
 }
 
 async function emitDeclarationsWithTsgo(targetDir, allFiles) {
-  const tsgoPath = getTypeScriptNativePath()
+  const tsgoPath = getTypeScriptPath()
   const declarationProject = `.tamagui-build-tsconfig-${process.pid}.json`
   const sourceProject = path
     .relative(process.cwd(), path.resolve(tsProject || 'tsconfig.json'))
@@ -1057,7 +1110,9 @@ async function emitDeclarationsWithTsgo(targetDir, allFiles) {
 
   try {
     await new Promise((resolve, reject) => {
-      const child = childProcess.spawn(tsgoPath, args, { stdio: 'inherit' })
+      const child = childProcess.spawn(process.execPath, [tsgoPath, ...args], {
+        stdio: 'inherit',
+      })
       child.once('error', reject)
       child.once('exit', (code, signal) => {
         if (code === 0) {

package/tamagui-tsgo.js

@@ -1,11 +1,15 @@
 #!/usr/bin/env node
 
 const { spawnSync } = require('node:child_process')
-const { getTypeScriptNativePath } = require('./typescript-native')
+const { getTypeScriptPath } = require('./typescript-path')
 
-const result = spawnSync(getTypeScriptNativePath(), process.argv.slice(2), {
-  stdio: 'inherit',
-})
+const result = spawnSync(
+  process.execPath,
+  [getTypeScriptPath(), ...process.argv.slice(2)],
+  {
+    stdio: 'inherit',
+  }
+)
 
 if (result.error) {
   throw result.error

package/typescript-path.js

@@ -0,0 +1,8 @@
+const path = require('node:path')
+
+function getTypeScriptPath() {
+  const packagePath = require.resolve('typescript/package.json')
+  return path.join(path.dirname(packagePath), 'bin', 'tsc')
+}
+
+module.exports = { getTypeScriptPath }

package/typescript-native.js

@@ -1,13 +0,0 @@
-const path = require('node:path')
-
-function getTypeScriptNativePath() {
-  const packageName = `@typescript/typescript-${process.platform}-${process.arch}`
-  const packagePath = require.resolve(`${packageName}/package.json`)
-  return path.join(
-    path.dirname(packagePath),
-    'lib',
-    process.platform === 'win32' ? 'tsc.exe' : 'tsc'
-  )
-}
-
-module.exports = { getTypeScriptNativePath }