@tamagui/build 1.0.0-alpha.12 → 1.0.0-alpha.31

package/.ultra.cache.json

@@ -1 +1 @@
-{"files":{"node_modules":"1637314740088.0405","externalNodePlugin.js":"fa1cd57f4fb8bc9a8c7ea03adaabc309b322ae0b","package.json":"debcb00839a9a83a4779764d057c3584db919d43","tamagui-build.js":"7820f3c95f0fb219b6981e6a8d704f9df4fd9c31.1637967515169.9587"},"deps":{}}
+{"files":{"node_modules":"1637314740088.0405","externalNodePlugin.js":"fa1cd57f4fb8bc9a8c7ea03adaabc309b322ae0b","package.json":"1a540bebd6c1b0404e01511a8af29cd532436279","tamagui-build.js":"06b3a361913d9bd875ce4eeb7f3cdad6b443ece3.1638416111368.626","tsconfig.json":"9862a02e4684884dd8a070c3b58132d338d0ca79"},"deps":{}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/build",
-  "version": "1.0.0-alpha.12",
+  "version": "1.0.0-alpha.31",
   "bin": {
     "tamagui-build": "tamagui-build.js"
   },
@@ -11,14 +11,17 @@
   "publishConfig": {
     "access": "public"
   },
-  "devDependencies": {
+  "dependencies": {
     "chokidar": "^3.5.2",
-    "chokidar-cli": "^2.1.0",
-    "esbuild": "^0.13.14",
+    "esbuild": "^0.13.12",
     "execa": "^5.0.0",
     "fast-glob": "^3.2.7",
     "fs-extra": "^9.1.0",
-    "typescript": "^4.2.4"
+    "json5": "^2.2.0",
+    "typescript": "^4.5.2"
+  },
+  "devDependencies": {
+    "@types/fs-extra": "^9.0.13"
   },
-  "gitHead": "d50261a4e08d2212395af4f2d8f49555fc780c3e"
+  "gitHead": "3593d13742ae284776db7fbe0486d622312c7c15"
 }

package/tamagui-build.js

@@ -2,17 +2,20 @@
 
 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')
 const path = require('path')
 
-const skipJS = process.env.SKIP_JS || false
-const shouldSkipTypes = process.argv.includes('skip-types') || process.env.SKIP_TYPES
+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 shouldWatch = process.argv.includes('--watch')
 
+let shouldSkipInitialTypes = !!process.env.SKIP_TYPES_INITIAL
+
 const pkg = fs.readJSONSync('./package.json')
-const pkgSource = pkg.source || 'src/index.ts'
 const pkgMain = pkg.main
 const pkgModule = pkg.module
 
@@ -28,25 +31,48 @@ async function build() {
   }
 
   async function buildTsc() {
-    if (process.env.JS_ONLY || shouldSkipTypes) return
+    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
     await fs.remove('types')
-    await exec('npx', [
-      'tsc',
-      '--baseUrl',
-      '.',
-      '--outDir',
-      'types',
-      '--rootDir',
-      'src',
-      '--declaration',
-      '--emitDeclarationOnly',
-      '--declarationMap',
-    ])
+
+    // 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)
+    }
   }
 
   const externalPlugin = createExternalPlugin({
@@ -129,72 +155,21 @@ if (shouldWatch) {
   const path = require('path')
   process.env.IS_WATCHING = true
   process.env.DISABLE_AUTORUN = true
-
-  // TODO determine internal packages smarter
-  const deps = [
-    ...new Set([...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.devDependencies || {})]),
-  ]
-    .filter(Boolean)
-    .filter((x) => x.includes(`tamagui`))
-
-  const watchDirs = [
-    'src',
-    ...deps.flatMap((d) => {
-      try {
-        return path.dirname(require.resolve(d))
-      } catch {
-        const potentialDir = path.join('..', d.replace('@tamagui/', '') + '/dist')
-        if (fs.existsSync(potentialDir)) {
-          return potentialDir
-        }
-        return []
-      }
-    }),
-  ]
-
-  for (const dir of watchDirs) {
-    if (dir === 'src') {
-      build().then(() => doWatch())
-    } else {
-      doWatch()
+  build().then(() => {
+    const finish = (_, path, stats) => {
+      build()
     }
-
-    const watchSize = {}
-    function doWatch() {
-      const finish = (event, path, stats) => {
-        if (dir === 'src' || (stats && stats.size != watchSize[path])) {
-          if (stats) watchSize[path] = stats.size
-          console.log('watch build', dir)
-          build()
-        }
-      }
-
-      const chokidar = require('chokidar')
-      chokidar
-        // prevent infinite loop but cause race condition if you just build directly
-        .watch(dir, {
-          persistent: true,
-          alwaysStat: true,
-          ignoreInitial: true,
-        })
-        .on('change', finish)
-        .on('add', finish)
-    }
-  }
-
-  if (deps.length) {
-    console.log('  ', pkg.name, '👀', deps.join(', '))
-  }
+    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', finish)
+      .on('add', finish)
+  })
 } else {
-  process.on('uncaughtException', console.log.bind(console))
-  process.on('unhandledRejection', console.log.bind(console))
   build()
 }
-
-function debounce(callback, wait) {
-  let timer
-  return (...args) => {
-    clearTimeout(timer)
-    timer = setTimeout(() => callback(...args), wait)
-  }
-}

package/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "jsx": "preserve"
+  },
+}