@tamagui/build 1.0.1-beta.140 → 1.0.1-beta.143

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/build",
-  "version": "1.0.1-beta.140",
+  "version": "1.0.1-beta.143",
   "bin": {
     "tamagui-build": "tamagui-build.js"
   },

package/tamagui-build.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+/* eslint-disable no-console */
 
 const exec = require('execa')
 const fs = require('fs-extra')
@@ -6,12 +7,12 @@ const esbuild = require('esbuild')
 const fg = require('fast-glob')
 const createExternalPlugin = require('./externalNodePlugin')
 const debounce = require('lodash.debounce')
-const { dirname, join } = require('path')
-const { tmpdir } = require('os')
+const { dirname } = require('path')
 
 const jsOnly = !!process.env.JS_ONLY
 const skipJS = !!(process.env.SKIP_JS || false)
-const shouldSkipTypes = !!(process.argv.includes('skip-types') || process.env.SKIP_TYPES)
+const shouldSkipTypes = !!(process.argv.includes('--skip-types') || process.env.SKIP_TYPES)
+const shouldBundle = !!process.argv.includes('--bundle')
 const shouldClean = !!process.argv.includes('clean')
 const shouldCleanBuildOnly = !!process.argv.includes('clean:build')
 const shouldWatch = process.argv.includes('--watch')
@@ -33,14 +34,18 @@ async function clean() {
       fs.remove('types'),
       fs.remove('dist'),
     ])
-  } catch {}
+  } catch {
+    // ok
+  }
   if (shouldCleanBuildOnly) {
     console.log('🔹 cleaned', pkg.name)
     process.exit(0)
   }
   try {
     await Promise.allSettled([fs.remove('node_modules')])
-  } catch {}
+  } catch {
+    // ok
+  }
   console.log('🔹 cleaned', pkg.name)
   process.exit(0)
 }
@@ -88,6 +93,19 @@ async function build() {
   }
 }
 
+// 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 (jsOnly || shouldSkipTypes) return
   if (shouldSkipInitialTypes) {
@@ -99,17 +117,16 @@ async function buildTsc() {
     if (!(await fs.pathExists(`tsconfig.json`))) {
       throw new Error(`No tsconfig.json found`)
     }
-    const targetDir = `types${Math.floor(Math.random() * 1_000_000)}`
+    const targetDir = 'types'
     try {
-      // typescripts build cache messes up when doing declarationOnly so need to bust it
+      // typescripts build cache messes up when doing declarationOnly
+      await fs.remove('tsconfig.tsbuildinfo')
       await fs.ensureDir(targetDir)
       const cmd = `tsc --baseUrl . --outDir ${targetDir} --rootDir src --emitDeclarationOnly --declarationMap`
       // console.log('\x1b[2m$', `npx ${cmd}`)
       await exec('npx', cmd.split(' '))
-      await fs.remove('types')
-      await fs.copy(targetDir, 'types')
     } finally {
-      await fs.remove(targetDir)
+      await fs.remove('tsconfig.tsbuildinfo')
     }
   }
 
@@ -129,7 +146,7 @@ async function buildJs() {
   if (skipJS) {
     return
   }
-  let files = (await fg(['src/**/*.(m)?ts(x)?', 'src/**/*.css'])).filter(
+  let files = (await fg(['src/**/*.(m)?[jt]s(x)?', 'src/**/*.css'])).filter(
     (x) => !x.includes('.d.ts')
   )
   const externalPlugin = createExternalPlugin({
@@ -141,7 +158,7 @@ async function buildJs() {
       ? esbuildWriteIfChanged({
           entryPoints: files,
           outdir: flatOut ? 'dist' : 'dist/cjs',
-          bundle: false,
+          bundle: shouldBundle,
           sourcemap: true,
           target: 'node14',
           keepNames: false,
@@ -153,11 +170,11 @@ async function buildJs() {
           platform: 'node',
         })
       : null,
-    // dont bundle for tree shaking
     pkgModule
       ? esbuildWriteIfChanged({
           entryPoints: files,
           outdir: flatOut ? 'dist' : 'dist/esm',
+          bundle: shouldBundle,
           sourcemap: true,
           target: 'node16',
           keepNames: false,
@@ -165,7 +182,7 @@ async function buildJs() {
           color: true,
           logLevel: 'error',
           minify: false,
-          platform: 'neutral',
+          platform: shouldBundle ? 'node' : 'neutral',
         })
       : null,
     pkgModuleJSX
@@ -174,8 +191,9 @@ async function buildJs() {
           jsx: 'preserve',
           outdir: flatOut ? 'dist' : 'dist/jsx',
           entryPoints: files,
+          bundle: shouldBundle,
           sourcemap: true,
-          target: 'es2019',
+          target: 'es2020',
           keepNames: false,
           format: 'esm',
           color: true,