@tamagui/build 1.0.1-beta.99 → 1.0.1-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/build",
-  "version": "1.0.1-beta.99",
+  "version": "1.0.1-rc.0",
   "bin": {
     "tamagui-build": "tamagui-build.js"
   },
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "chokidar": "^3.5.2",
-    "esbuild": "^0.14.48",
+    "esbuild": "^0.15.11",
     "execa": "^5.0.0",
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.1.0",

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')
@@ -10,7 +11,9 @@ 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 shouldBundleNodeModules = !!process.argv.includes('--bundle-modules')
 const shouldClean = !!process.argv.includes('clean')
 const shouldCleanBuildOnly = !!process.argv.includes('clean:build')
 const shouldWatch = process.argv.includes('--watch')
@@ -20,21 +23,32 @@ let shouldSkipInitialTypes = !!process.env.SKIP_TYPES_INITIAL
 const pkgMain = pkg.main
 const pkgModule = pkg.module
 const pkgModuleJSX = pkg['module:jsx']
+const pkgTypes = Boolean(pkg['types'] || pkg['typings'])
 
 const flatOut = [pkgMain, pkgModule, pkgModuleJSX].filter(Boolean).length === 1
 
 async function clean() {
   try {
-    await Promise.allSettled([fs.remove('.turbo'), fs.remove('types'), fs.remove('dist')])
-  } catch {}
+    await Promise.allSettled([
+      //
+      fs.remove('.turbo'),
+      fs.remove('.ultra.cache.json'),
+      fs.remove('types'),
+      fs.remove('dist'),
+    ])
+  } catch {
+    // ok
+  }
   if (shouldCleanBuildOnly) {
-    console.log('» cleaned', pkg.name)
+    console.log('🔹 cleaned', pkg.name)
     process.exit(0)
   }
   try {
     await Promise.allSettled([fs.remove('node_modules')])
-  } catch {}
-  console.log('» cleaned', pkg.name)
+  } catch {
+    // ok
+  }
+  console.log('🔹 cleaned', pkg.name)
   process.exit(0)
 }
 
@@ -67,7 +81,7 @@ if (shouldWatch) {
 build()
 
 async function build() {
-  if (process.env.DEBUG) console.log('»', pkg.name)
+  if (process.env.DEBUG) console.log('🔹', pkg.name)
   try {
     const start = Date.now()
     await Promise.all([
@@ -81,27 +95,42 @@ 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 (!pkgTypes) return
   if (jsOnly || shouldSkipTypes) return
   if (shouldSkipInitialTypes) {
     shouldSkipInitialTypes = false
     return
   }
 
-  function buildNoMap() {
-    return exec(
-      'npx',
-      `tsc --baseUrl . --outDir types --rootDir src --declaration --emitDeclarationOnly`.split(' ')
-    )
-  }
-
-  function buildWithMap() {
-    return exec(
-      'npx',
-      `tsc --baseUrl . --outDir types --rootDir src --declaration --emitDeclarationOnly --declarationMap`.split(
-        ' '
-      )
-    )
+  async function buildThenCopy() {
+    if (!(await fs.pathExists(`tsconfig.json`))) {
+      throw new Error(`No tsconfig.json found`)
+    }
+    const targetDir = 'types'
+    try {
+      // 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(' '))
+    } finally {
+      await fs.remove('tsconfig.tsbuildinfo')
+    }
   }
 
   // NOTE:
@@ -109,23 +138,18 @@ async function buildTsc() {
   // but to build things nicely we need here to reset a few things:
   //  baseUrl: ., outDir: types, rootDir: src
   // for best of both worlds
-  try {
-    await buildWithMap()
-  } finally {
-    // if no types folder, patch a typescript bug...
-    if (!(await fs.pathExists('types'))) {
-      console.warn('BUG re-run without declaration first fixes no output bug...')
-      await buildNoMap()
-      await buildWithMap()
-    }
-  }
+
+  // there's a bug with typescript where outputting within the same dir just doesn't output for whatever reason
+  // i have a hunch it's some cache thing, because if i give a new outDir it works
+  // so fixing by always giving a random tmp outdir, and then copying
+  await buildThenCopy()
 }
 
 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({
@@ -137,31 +161,35 @@ async function buildJs() {
       ? esbuildWriteIfChanged({
           entryPoints: files,
           outdir: flatOut ? 'dist' : 'dist/cjs',
-          bundle: false,
+          bundle: shouldBundle,
           sourcemap: true,
           target: 'node14',
           keepNames: false,
           format: 'cjs',
           color: true,
+          allowOverwrite: true,
+          jsx: 'automatic',
           logLevel: 'error',
-          plugins: [externalPlugin],
+          plugins: shouldBundleNodeModules ? [] : [externalPlugin],
           minify: false,
           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,
+          jsx: 'automatic',
+          allowOverwrite: true,
           format: 'esm',
           color: true,
           logLevel: 'error',
           minify: false,
-          platform: 'neutral',
+          platform: shouldBundle ? 'node' : 'neutral',
         })
       : null,
     pkgModuleJSX
@@ -170,8 +198,10 @@ async function buildJs() {
           jsx: 'preserve',
           outdir: flatOut ? 'dist' : 'dist/jsx',
           entryPoints: files,
+          bundle: shouldBundle,
           sourcemap: true,
-          target: 'es2019',
+          allowOverwrite: true,
+          target: 'es2020',
           keepNames: false,
           format: 'esm',
           color: true,

package/.turbo/turbo-build.log

@@ -1 +0,0 @@
-@tamagui/build:build: cache hit, replaying output 1c47fd3f5c7392cf

package/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "include": [],
-  "files": [],
-  "compilerOptions": {
-    "composite": true,
-    "jsx": "preserve"
-  },
-}