@tamagui/build 1.0.0-alpha.2 → 1.0.0-alpha.22

package/.ultra.cache.json

@@ -1 +1 @@
-{"files":{"node_modules":"1637314740088.0405","externalNodePlugin.js":"fa1cd57f4fb8bc9a8c7ea03adaabc309b322ae0b","package.json":"1f64427e6ff4d05435038f5640160c049cd1a882","tamagui-build.js":"05b9862d7b7019904cd3c34ec444b259cdc8d6aa"},"deps":{}}
+{"files":{"node_modules":"1637314740088.0405","externalNodePlugin.js":"fa1cd57f4fb8bc9a8c7ea03adaabc309b322ae0b","package.json":"debcb00839a9a83a4779764d057c3584db919d43","tamagui-build.js":"7820f3c95f0fb219b6981e6a8d704f9df4fd9c31.1637967515169.9587"},"deps":{}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/build",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.22",
   "bin": {
     "tamagui-build": "tamagui-build.js"
   },
@@ -11,15 +11,17 @@
   "publishConfig": {
     "access": "public"
   },
-  "devDependencies": {
+  "dependencies": {
     "chokidar": "^3.5.2",
-    "chokidar-cli": "^2.1.0",
-    "dts-bundle-generator": "^5.9.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": "a9f30fdf4ebd448961a6e133741cd4b903185559"
+  "gitHead": "f247aca6f00c201efbc317bb24b22a62b08d1033"
 }

package/tamagui-build.js

@@ -2,16 +2,15 @@
 
 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 skipTypes = process.argv.includes('skip-types') || process.env.SKIP_TYPES
-const jsx = process.argv.includes('--jsx')
-const watch = process.argv.includes('--watch')
-const legacy = process.argv.includes('legacy')
+const shouldSkipTypes = process.argv.includes('skip-types') || process.env.SKIP_TYPES
+const shouldWatch = process.argv.includes('--watch')
 
 const pkg = fs.readJSONSync('./package.json')
 const pkgSource = pkg.source || 'src/index.ts'
@@ -30,27 +29,42 @@ async function build() {
   }
 
   async function buildTsc() {
-    if (process.env.JS_ONLY || skipTypes) return
+    if (process.env.JS_ONLY || shouldSkipTypes) 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')
+
+    // 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 {
-      if (legacy) {
-        await exec('npx', [
-          'tsc',
-          '--declaration',
-          '--emitDeclarationOnly',
-          '--declarationMap',
-          '--declarationDir',
-          'types',
-        ])
-      } else {
-        await exec(
-          'npx',
-          // was going super slow... --no-check for now..?
-          ['dts-bundle-generator', watch ? '--no-check' : [], '-o', 'types.d.ts', pkgSource].flat()
-        )
-      }
-    } catch (err) {
-      console.log('Errors during tsc build, may be ok')
-      console.log(err.message.replace(ignoreSkipLibCheckOutputRNNodeConflicting, ''))
+      await exec('npx', [
+        'tsc',
+        '--baseUrl',
+        '.',
+        '--outDir',
+        'types',
+        '--rootDir',
+        'src',
+        '--declaration',
+        '--emitDeclarationOnly',
+        '--declarationMap',
+      ])
+    } finally {
+      // restore
+      await fs.writeFile('tsconfig.json', tsConfOg)
     }
   }
 
@@ -67,11 +81,11 @@ async function build() {
             pkgMain
               ? esbuild
                   .build({
-                    entryPoints: ['./src/index'],
-                    outfile: pkgMain,
+                    entryPoints: files,
+                    outdir: 'dist/cjs',
+                    bundle: false,
                     sourcemap: true,
                     target: 'node16',
-                    bundle: true,
                     keepNames: true,
                     format: 'cjs',
                     color: true,
@@ -89,7 +103,7 @@ async function build() {
               ? esbuild
                   .build({
                     entryPoints: files,
-                    outdir: 'dist',
+                    outdir: 'dist/esm',
                     sourcemap: true,
                     target: 'es2020',
                     keepNames: true,
@@ -103,26 +117,24 @@ async function build() {
                     console.log(' >-> esm')
                   })
               : null,
-            jsx
-              ? esbuild
-                  .build({
-                    // only diff is jsx preserve and outdir
-                    jsx: 'preserve',
-                    outdir: '_jsx',
-                    entryPoints: files,
-                    sourcemap: false,
-                    target: 'es2020',
-                    keepNames: true,
-                    format: 'esm',
-                    color: true,
-                    logLevel: 'error',
-                    minify: false,
-                    platform: 'neutral',
-                  })
-                  .then(() => {
-                    console.log(' >-> jsx')
-                  })
-              : null,
+            esbuild
+              .build({
+                // only diff is jsx preserve and outdir
+                jsx: 'preserve',
+                outdir: 'dist/jsx',
+                entryPoints: files,
+                sourcemap: false,
+                target: 'es2020',
+                keepNames: true,
+                format: 'esm',
+                color: true,
+                logLevel: 'error',
+                minify: false,
+                platform: 'neutral',
+              })
+              .then(() => {
+                console.log(' >-> jsx')
+              }),
           ]),
     ])
   } catch (error) {
@@ -132,7 +144,7 @@ async function build() {
   }
 }
 
-if (watch) {
+if (shouldWatch) {
   const path = require('path')
   process.env.IS_WATCHING = true
   process.env.DISABLE_AUTORUN = true
@@ -161,13 +173,13 @@ if (watch) {
 
   for (const dir of watchDirs) {
     if (dir === 'src') {
-      build().then(() => watch())
+      build().then(() => doWatch())
     } else {
-      watch()
+      doWatch()
     }
 
     const watchSize = {}
-    function watch() {
+    function doWatch() {
       const finish = (event, path, stats) => {
         if (dir === 'src' || (stats && stats.size != watchSize[path])) {
           if (stats) watchSize[path] = stats.size
@@ -205,39 +217,3 @@ function debounce(callback, wait) {
     timer = setTimeout(() => callback(...args), wait)
   }
 }
-
-const ignoreSkipLibCheckOutputRNNodeConflicting = `../../node_modules/@types/node/globals.d.ts(47,11): error TS2300: Duplicate identifier 'AbortController'.
-../../node_modules/@types/node/globals.d.ts(60,11): error TS2300: Duplicate identifier 'AbortSignal'.
-../../node_modules/@types/node/globals.d.ts(67,13): error TS2300: Duplicate identifier 'AbortController'.
-../../node_modules/@types/node/globals.d.ts(72,13): error TS2300: Duplicate identifier 'AbortSignal'.
-../../node_modules/@types/react-native/globals.d.ts(50,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'Blob' must be of type '{ new (blobParts?: BlobPart[] | undefined, options?: BlobPropertyBag | undefined): Blob; prototype: Blob; }', but here has type '{ new (blobParts?: (string | Blob)[] | undefined, options?: BlobOptions | undefined): Blob; prototype: Blob; }'.
-../../node_modules/@types/react-native/globals.d.ts(65,15): error TS2300: Duplicate identifier 'FormData'.
-../../node_modules/@types/react-native/globals.d.ts(122,5): error TS2717: Subsequent property declarations must have the same type.  Property 'body' must be of type 'BodyInit | null | undefined', but here has type 'BodyInit_ | undefined'.
-../../node_modules/@types/react-native/globals.d.ts(131,5): error TS2717: Subsequent property declarations must have the same type.  Property 'signal' must be of type 'AbortSignal | null | undefined', but here has type 'AbortSignal | undefined'.
-../../node_modules/@types/react-native/globals.d.ts(149,14): error TS2300: Duplicate identifier 'RequestInfo'.
-../../node_modules/@types/react-native/globals.d.ts(168,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'Response' must be of type '{ new (body?: BodyInit | null | undefined, init?: ResponseInit | undefined): Response; prototype: Response; error(): Response; redirect(url: string | URL, status?: number | undefined): Response; }', but here has type '{ new (body?: BodyInit_ | undefined, init?: ResponseInit | undefined): Response; prototype: Response; error: () => Response; redirect: (url: string, status?: number | undefined) => Response; }'.
-../../node_modules/@types/react-native/globals.d.ts(245,5): error TS2717: Subsequent property declarations must have the same type.  Property 'abort' must be of type 'ProgressEvent<XMLHttpRequestEventTarget>', but here has type 'ProgressEvent<EventTarget>'.
-../../node_modules/@types/react-native/globals.d.ts(246,5): error TS2717: Subsequent property declarations must have the same type.  Property 'error' must be of type 'ProgressEvent<XMLHttpRequestEventTarget>', but here has type 'ProgressEvent<EventTarget>'.
-../../node_modules/@types/react-native/globals.d.ts(247,5): error TS2717: Subsequent property declarations must have the same type.  Property 'load' must be of type 'ProgressEvent<XMLHttpRequestEventTarget>', but here has type 'ProgressEvent<EventTarget>'.
-../../node_modules/@types/react-native/globals.d.ts(248,5): error TS2717: Subsequent property declarations must have the same type.  Property 'loadend' must be of type 'ProgressEvent<XMLHttpRequestEventTarget>', but here has type 'ProgressEvent<EventTarget>'.
-../../node_modules/@types/react-native/globals.d.ts(249,5): error TS2717: Subsequent property declarations must have the same type.  Property 'loadstart' must be of type 'ProgressEvent<XMLHttpRequestEventTarget>', but here has type 'ProgressEvent<EventTarget>'.
-../../node_modules/@types/react-native/globals.d.ts(250,5): error TS2717: Subsequent property declarations must have the same type.  Property 'progress' must be of type 'ProgressEvent<XMLHttpRequestEventTarget>', but here has type 'ProgressEvent<EventTarget>'.
-../../node_modules/@types/react-native/globals.d.ts(251,5): error TS2717: Subsequent property declarations must have the same type.  Property 'timeout' must be of type 'ProgressEvent<XMLHttpRequestEventTarget>', but here has type 'ProgressEvent<EventTarget>'.
-../../node_modules/@types/react-native/globals.d.ts(292,14): error TS2300: Duplicate identifier 'XMLHttpRequestResponseType'.
-../../node_modules/@types/react-native/globals.d.ts(299,15): error TS2300: Duplicate identifier 'URL'.
-../../node_modules/@types/react-native/globals.d.ts(324,15): error TS2300: Duplicate identifier 'URLSearchParams'.
-../../node_modules/@types/react-native/globals.d.ts(368,5): error TS2717: Subsequent property declarations must have the same type.  Property 'onopen' must be of type '((this: WebSocket, ev: Event) => any) | null', but here has type '(() => void) | null'.
-../../node_modules/@types/react-native/globals.d.ts(369,5): error TS2717: Subsequent property declarations must have the same type.  Property 'onmessage' must be of type '((this: WebSocket, ev: MessageEvent<any>) => any) | null', but here has type '((event: WebSocketMessageEvent) => void) | null'.
-../../node_modules/@types/react-native/globals.d.ts(370,5): error TS2717: Subsequent property declarations must have the same type.  Property 'onerror' must be of type '((this: WebSocket, ev: Event) => any) | null', but here has type '((event: WebSocketErrorEvent) => void) | null'.
-../../node_modules/@types/react-native/globals.d.ts(371,5): error TS2717: Subsequent property declarations must have the same type.  Property 'onclose' must be of type '((this: WebSocket, ev: CloseEvent) => any) | null', but here has type '((event: WebSocketCloseEvent) => void) | null'.
-../../node_modules/@types/react-native/globals.d.ts(372,5): error TS2717: Subsequent property declarations must have the same type.  Property 'addEventListener' must be of type '{ <K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, options?: boolean | AddEventListenerOptions | undefined): void; (type: string, listener: EventListenerOrEventListenerObject, options?: boolean | ... 1 more ... | undefined): void; }', but here has type 'WebsocketEventListener'.
-../../node_modules/@types/react-native/globals.d.ts(373,5): error TS2717: Subsequent property declarations must have the same type.  Property 'removeEventListener' must be of type '{ <K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, options?: boolean | EventListenerOptions | undefined): void; (type: string, listener: EventListenerOrEventListenerObject, options?: boolean | ... 1 more ... | undefined): void; }', but here has type 'WebsocketEventListener'.
-../../node_modules/@types/react-native/globals.d.ts(376,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'WebSocket' must be of type '{ new (url: string | URL, protocols?: string | string[] | undefined): WebSocket; prototype: WebSocket; readonly CLOSED: number; readonly CLOSING: number; readonly CONNECTING: number; readonly OPEN: number; }', but here has type '{ new (uri: string, protocols?: string | string[] | null | undefined, options?: { [optionName: string]: any; headers: { [headerName: string]: string; }; } | null | undefined): WebSocket; ... 4 more ...; readonly OPEN: number; }'.
-../../node_modules/@types/react-native/globals.d.ts(400,15): error TS2300: Duplicate identifier 'AbortSignal'.
-../../node_modules/@types/react-native/globals.d.ts(400,15): error TS2420: Class 'AbortSignal' incorrectly implements interface 'EventTarget'.
-  Property 'dispatchEvent' is missing in type 'AbortSignal' but required in type 'EventTarget'.
-../../node_modules/@types/react-native/globals.d.ts(435,15): error TS2300: Duplicate identifier 'AbortController'.
-../../node_modules/@types/react-native/globals.d.ts(460,14): error TS2717: Subsequent property declarations must have the same type.  Property 'error' must be of type 'DOMException | null', but here has type 'Error | null'.
-../../node_modules/@types/react-native/globals.d.ts(468,14): error TS2717: Subsequent property declarations must have the same type.  Property 'result' must be of type 'string | ArrayBuffer | null', but here has type 'string | ArrayBuffer'.
-../../node_modules/@types/react-native/node_modules/@types/react/index.d.ts(3094,14): error TS2300: Duplicate identifier 'LibraryManagedAttributes'.
-../../node_modules/@types/react-native/node_modu`

package/tsconfig.json

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