@tamagui/build 1.0.1-beta.75 → 1.0.1-beta.78

package/.turbo/turbo-build.log

@@ -1 +1 @@
-@tamagui/build:build: cache hit, replaying output c00fa637df78f994
+@tamagui/build:build: cache hit, replaying output 8d9a65547c8e741a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/build",
-  "version": "1.0.1-beta.75",
+  "version": "1.0.1-beta.78",
   "bin": {
     "tamagui-build": "tamagui-build.js"
   },
@@ -15,11 +15,10 @@
     "chokidar": "^3.5.2",
     "esbuild": "^0.14.36",
     "execa": "^5.0.0",
-    "fast-glob": "^3.2.7",
-    "fs-extra": "^9.1.0",
-    "json5": "^2.2.0",
+    "fast-glob": "^3.2.11",
+    "fs-extra": "^10.1.0",
     "lodash.debounce": "^4.0.8",
-    "typescript": "^4.7.2"
+    "typescript": "^4.7.4"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13"

package/tamagui-build.js

@@ -2,7 +2,6 @@
 
 const exec = require('execa')
 const fs = require('fs-extra')
-const json5 = require('json5')
 const esbuild = require('esbuild')
 const fg = require('fast-glob')
 const createExternalPlugin = require('./externalNodePlugin')
@@ -16,126 +15,160 @@ const shouldCleanBuildOnly = !!process.argv.includes('clean:build')
 const shouldWatch = process.argv.includes('--watch')
 
 const pkg = fs.readJSONSync('./package.json')
+let shouldSkipInitialTypes = !!process.env.SKIP_TYPES_INITIAL
+const pkgMain = pkg.main
+const pkgModule = pkg.module
+const pkgModuleJSX = pkg['module:jsx']
 
-if (shouldClean || shouldCleanBuildOnly) {
-  ;(async () => {
-    try {
-      await Promise.allSettled([fs.remove('.turbo'), fs.remove('types'), fs.remove('dist')])
-    } catch {}
-    if (shouldCleanBuildOnly) {
-      console.log('» cleaned', pkg.name)
-      process.exit(0)
-    }
-    try {
-      await Promise.allSettled([fs.remove('node_modules')])
-    } catch {}
+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 {}
+  if (shouldCleanBuildOnly) {
     console.log('» cleaned', pkg.name)
     process.exit(0)
-  })()
-} else {
-  let shouldSkipInitialTypes = !!process.env.SKIP_TYPES_INITIAL
+  }
+  try {
+    await Promise.allSettled([fs.remove('node_modules')])
+  } catch {}
+  console.log('» cleaned', pkg.name)
+  process.exit(0)
+}
 
-  const pkgMain = pkg.main
-  const pkgModule = pkg.module
+if (shouldClean || shouldCleanBuildOnly) {
+  clean().then(() => {
+    process.exit(0)
+  })
+  return
+}
 
-  async function build() {
-    console.log('»', pkg.name)
-    const x = Date.now()
-    let files = (await fg(['src/**/*.ts', 'src/**/*.tsx', 'src/**/*.css'])).filter(
-      (x) => !x.includes('.d.ts')
-    )
+if (shouldWatch) {
+  process.env.IS_WATCHING = true
+  process.env.DISABLE_AUTORUN = true
+  build().then(() => {
+    const rebuild = debounce(build, 100)
+    const chokidar = require('chokidar')
+    chokidar
+      // prevent infinite loop but cause race condition if you just build directly
+      .watch('src', {
+        persistent: true,
+        alwaysStat: true,
+        ignoreInitial: true,
+      })
+      .on('change', rebuild)
+      .on('add', rebuild)
+  })
+  return
+}
 
-    if (process.env.NO_CLEAN) {
-      console.log('skip typecheck')
-    } else {
-      fs.existsSync('tsconfig.tsbuildinfo') && fs.rmSync('tsconfig.tsbuildinfo')
-    }
+build()
 
-    async function buildTsc() {
-      if (jsOnly || shouldSkipTypes) return
-      if (shouldSkipInitialTypes) {
-        shouldSkipInitialTypes = false
-        return
-      }
+async function build() {
+  if (process.env.DEBUG) console.log('»', pkg.name)
+  try {
+    const start = Date.now()
+    await Promise.all([
+      //
+      buildTsc(),
+      buildJs(),
+    ])
+    console.log('built', pkg.name, 'in', Date.now() - start, 'ms')
+  } catch (error) {
+    console.log(error.message)
+    process.exit(1)
+  }
+}
+
+async function buildTsc() {
+  if (jsOnly || shouldSkipTypes) return
+  if (shouldSkipInitialTypes) {
+    shouldSkipInitialTypes = false
+    return
+  }
 
-      // NOTE:
-      // for Intellisense to work in monorepo you need baseUrl: "../.."
-      // but to build things nicely we need here to reset a few things:
-      //  baseUrl: ., outDir: types, rootDir: src
-      // now we can have the best of both worlds
+  function buildNoMap() {
+    return exec(
+      'npx',
+      `tsc --baseUrl . --outDir types --rootDir src --declaration --emitDeclarationOnly`.split(' ')
+    )
+  }
 
-      // NOTE: to get intellisense to *not* suggest importing from the index file when it re-exports another package...
-      // (like tamagui does with @tamagui/core...)
-      // we add `exclude: ['src/index.ts']` to the tsconfig.json which fixes that
-      // but then it causes it to not export the types out from index... so....
-      // we do a stupid, stupid thing to re-write it temporarily without it before build. then restore it after
-      // honestly hate typescript config all around but this seems to work so fuck it
-      const tsConfOg = await fs.readFile('tsconfig.json')
-      const tsConfJSON = json5.parse(tsConfOg)
-      if (tsConfJSON.exclude && tsConfJSON.exclude.includes('src/index.ts')) {
-        tsConfJSON.exclude = tsConfJSON.exclude.filter((x) => x !== 'src/index.ts')
-        await fs.writeJSON('tsconfig.json', tsConfJSON)
-      }
-      try {
-        await exec('npx', [
-          'tsc',
-          '--baseUrl',
-          '.',
-          '--outDir',
-          'types',
-          '--rootDir',
-          'src',
-          '--declaration',
-          '--emitDeclarationOnly',
-          '--declarationMap',
-        ])
-      } finally {
-        // restore
-        await fs.writeFile('tsconfig.json', tsConfOg)
-      }
+  function buildWithMap() {
+    return exec(
+      'npx',
+      `tsc --baseUrl . --outDir types --rootDir src --declaration --emitDeclarationOnly --declarationMap`.split(
+        ' '
+      )
+    )
+  }
+
+  // NOTE:
+  // for Intellisense to work in monorepo you need baseUrl: "../.."
+  // 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()
     }
+  }
+}
 
-    async function buildJs() {
-      if (skipJS) {
-        return
-      }
-      const start = Date.now()
-      return await Promise.all([
-        pkgMain
-          ? esbuild.build({
-              entryPoints: files,
-              outdir: 'dist/cjs',
-              bundle: false,
-              sourcemap: true,
-              target: 'node14',
-              keepNames: false,
-              format: 'cjs',
-              color: true,
-              logLevel: 'error',
-              plugins: [externalPlugin],
-              minify: false,
-              platform: 'node',
-            })
-          : null,
-        // dont bundle for tree shaking
-        pkgModule
-          ? esbuild.build({
-              entryPoints: files,
-              outdir: 'dist/esm',
-              sourcemap: true,
-              target: 'es2019',
-              keepNames: false,
-              format: 'esm',
-              color: true,
-              logLevel: 'error',
-              minify: false,
-              platform: 'neutral',
-            })
-          : null,
-        esbuild.build({
+async function buildJs() {
+  if (skipJS) {
+    return
+  }
+  let files = (await fg(['src/**/*.(m)?ts(x)?', 'src/**/*.css'])).filter(
+    (x) => !x.includes('.d.ts')
+  )
+  const externalPlugin = createExternalPlugin({
+    skipNodeModulesBundle: true,
+  })
+  const start = Date.now()
+  return await Promise.all([
+    pkgMain
+      ? esbuild.build({
+          entryPoints: files,
+          outdir: flatOut ? 'dist' : 'dist/cjs',
+          bundle: false,
+          sourcemap: true,
+          target: 'node14',
+          keepNames: false,
+          format: 'cjs',
+          color: true,
+          logLevel: 'error',
+          plugins: [externalPlugin],
+          minify: false,
+          platform: 'node',
+        })
+      : null,
+    // dont bundle for tree shaking
+    pkgModule
+      ? esbuild.build({
+          entryPoints: files,
+          outdir: flatOut ? 'dist' : 'dist/esm',
+          sourcemap: true,
+          target: 'node16',
+          keepNames: false,
+          format: 'esm',
+          color: true,
+          logLevel: 'error',
+          minify: false,
+          platform: 'neutral',
+        })
+      : null,
+    pkgModuleJSX
+      ? esbuild.build({
           // only diff is jsx preserve and outdir
           jsx: 'preserve',
-          outdir: 'dist/jsx',
+          outdir: flatOut ? 'dist' : 'dist/jsx',
           entryPoints: files,
           sourcemap: false,
           target: 'es2019',
@@ -145,47 +178,9 @@ if (shouldClean || shouldCleanBuildOnly) {
           logLevel: 'error',
           minify: false,
           platform: 'neutral',
-        }),
-      ]).then(() => {
-        console.log(`built js in ${Date.now() - start}ms`)
-      })
-    }
-
-    const externalPlugin = createExternalPlugin({
-      skipNodeModulesBundle: true,
-    })
-
-    try {
-      await Promise.all([
-        //
-        buildTsc(),
-        buildJs(),
-      ])
-    } catch (error) {
-      console.log('error', error)
-    } finally {
-      console.log('built in', `${(Date.now() - x) / 1000}s`)
-    }
-  }
-
-  if (shouldWatch) {
-    const path = require('path')
-    process.env.IS_WATCHING = true
-    process.env.DISABLE_AUTORUN = true
-    build().then(() => {
-      const rebuild = debounce(build, 100)
-      const chokidar = require('chokidar')
-      chokidar
-        // prevent infinite loop but cause race condition if you just build directly
-        .watch('src', {
-          persistent: true,
-          alwaysStat: true,
-          ignoreInitial: true,
         })
-        .on('change', rebuild)
-        .on('add', rebuild)
-    })
-  } else {
-    build()
-  }
+      : null,
+  ]).then(() => {
+    if (process.env.DEBUG) console.log(`built js in ${Date.now() - start}ms`)
+  })
 }