@tamagui/build 1.0.1-beta.76 → 1.0.1-beta.79

package/.turbo/turbo-build.log

@@ -1 +1 @@
-@tamagui/build:build: cache hit, replaying output cc1d4d16ed3548a4
+@tamagui/build:build: cache hit, replaying output 26e656fc1b671471

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/build",
-  "version": "1.0.1-beta.76",
+  "version": "1.0.1-beta.79",
   "bin": {
     "tamagui-build": "tamagui-build.js"
   },
@@ -17,9 +17,8 @@
     "execa": "^5.0.0",
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.1.0",
-    "json5": "^2.2.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')
@@ -75,11 +74,12 @@ async function build() {
       buildTsc(),
       buildJs(),
     ])
-    if (shouldWatch) {
-      console.log('built in', Date.now() - start, 'ms')
-    }
+    console.log('built', pkg.name, 'in', Date.now() - start, 'ms')
   } catch (error) {
-    console.log(error.message)
+    console.error(`Error building:`, error.message)
+    if (!shouldWatch) {
+      process.exit(1)
+    }
   }
 }
 
@@ -90,40 +90,36 @@ async function buildTsc() {
     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(
+        ' '
+      )
+    )
+  }
+
   // 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
-
-  // 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)
-  }
+  // for best of both worlds
   try {
-    await exec('npx', [
-      'tsc',
-      '--baseUrl',
-      '.',
-      '--outDir',
-      'types',
-      '--rootDir',
-      'src',
-      '--declaration',
-      '--emitDeclarationOnly',
-      '--declarationMap',
-    ])
+    await buildWithMap()
   } finally {
-    // restore
-    await fs.writeFile('tsconfig.json', tsConfOg)
+    // 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()
+    }
   }
 }
 
@@ -176,7 +172,7 @@ async function buildJs() {
           jsx: 'preserve',
           outdir: flatOut ? 'dist' : 'dist/jsx',
           entryPoints: files,
-          sourcemap: false,
+          sourcemap: true,
           target: 'es2019',
           keepNames: false,
           format: 'esm',