@tamagui/cli 1.32.2 → 1.32.4

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@tamagui/cli",
-  "version": "1.32.2",
+  "version": "1.32.4",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
-  "module": "dist/esm",
   "main": "dist/cjs",
   "bin": {
     "tama": "./dist/cjs/index.js",
@@ -22,12 +21,12 @@
     ".": {
       "types": "./types/index.d.ts",
       "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js"
+      "require": "./dist/esm/index.mjs"
     }
   },
   "scripts": {
-    "build": "tamagui-build",
-    "watch": "tamagui-build --watch",
+    "build": "tamagui-build --output-mjs",
+    "watch": "yarn build --watch",
     "clean": "tamagui-build clean",
     "clean:build": "tamagui-build clean:build"
   },
@@ -36,10 +35,11 @@
     "@callstack/repack-debugger-app": "^1.0.0",
     "@fastify/sensible": "^4.1.0",
     "@fastify/static": "^5.0.2",
-    "@tamagui/build": "1.32.2",
-    "@tamagui/static": "1.32.2",
-    "@tamagui/types": "1.32.2",
-    "@tamagui/vite-plugin": "1.32.2",
+    "@tamagui/build": "1.32.4",
+    "@tamagui/create-theme": "1.32.4",
+    "@tamagui/static": "1.32.4",
+    "@tamagui/types": "1.32.4",
+    "@tamagui/vite-plugin": "1.32.4",
     "@types/compression": "^1.7.2",
     "@types/morgan": "^1.9.3",
     "@vitejs/plugin-react-swc": "^3.3.0",

package/src/cli.ts

@@ -68,23 +68,25 @@ const COMMAND_MAP = {
   //     await update()
   //   },
   // },
-  // dev: {
-  //   shorthands: ['d'],
-  //   description: `Run tamagui vite`,
-  //   flags: {
-  //     '--help': Boolean,
-  //     '--debug': Boolean,
-  //     '--verbose': Boolean,
-  //   },
-  //   async run() {
-  //     const { _, ...flags } = arg(this.flags)
-  //     const { dev } = await import('./dev')
-  //     const options = await getOptions({
-  //       debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
-  //     })
-  //     await dev(options)
-  //   },
-  // },
+
+  dev: {
+    shorthands: ['d'],
+    description: `Run tamagui vite`,
+    flags: {
+      '--help': Boolean,
+      '--debug': Boolean,
+      '--verbose': Boolean,
+    },
+    async run() {
+      const { _, ...flags } = arg(this.flags)
+      const { dev } = await import('./dev')
+      const options = await getOptions({
+        debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
+      })
+      await dev(options)
+    },
+  },
+
   // studio: {
   //   shorthands: ['s'],
   //   description: `Studio`,

package/src/dev/createDevServer.ts

@@ -1,5 +1,3 @@
-import { readFile } from 'fs/promises'
-
 import { CLIResolvedOptions } from '@tamagui/types'
 
 import { DEFAULT_PORT } from '../utils/constants'

package/src/dev.ts

@@ -44,7 +44,7 @@ export const dev = async (options: CLIResolvedOptions) => {
       // @ts-ignore
       plugins,
       appType: 'custom',
-      root: join(root, 'src/index.ts'),
+      root: join(root, 'src/test-tamagui-stack.tsx'),
       build: {
         ssr: true,
       },
@@ -66,9 +66,9 @@ export const dev = async (options: CLIResolvedOptions) => {
     }
 
     const [react, reactJsxRuntime, reactNative] = await Promise.all([
-      readFile(join(process.cwd(), 'react.js'), 'utf-8'),
-      readFile(join(process.cwd(), 'react-jsx-runtime.js'), 'utf-8'),
-      readFile(join(process.cwd(), 'react-native.js'), 'utf-8'),
+      readFile(join(process.cwd(), 'testing-area', 'react.js'), 'utf-8'),
+      readFile(join(process.cwd(), 'testing-area', 'react-jsx-runtime.js'), 'utf-8'),
+      readFile(join(process.cwd(), 'testing-area', 'react-native.js'), 'utf-8'),
     ])
 
     const reactCode = react.replace(

package/src/generate-themes.ts

@@ -1,8 +1,15 @@
 #!/usr/bin/env node
 
+import Module from 'module'
+
+import type { ThemeBuilder } from '@tamagui/create-theme/theme-builder'
 import { CLIResolvedOptions } from '@tamagui/types'
 import fs from 'fs-extra'
 
+type ThemeBuilderInterceptOpts = {
+  onComplete: (result: { themeBuilder: ThemeBuilder<any> }) => void
+}
+
 export async function generateThemes(
   options: CLIResolvedOptions & {
     inPath: string
@@ -10,10 +17,45 @@ export async function generateThemes(
   }
 ) {
   require('esbuild-register/dist/node').register()
+
+  let promise: Promise<null | ThemeBuilder<any>> | null = null as any
+
+  const ogRequire = Module.prototype.require
+  // @ts-ignore
+  Module.prototype.require = function (id) {
+    // @ts-ignore
+    const out = ogRequire.apply(this, arguments)
+    if (id === '@tamagui/create-theme/theme-builder') {
+      if (!promise) {
+        let resolve: Function
+        promise = new Promise((res) => {
+          resolve = res
+        })
+        return createThemeIntercept(out, {
+          onComplete: (result) => {
+            resolve?.(result.themeBuilder)
+          },
+        })
+      }
+    }
+    return out
+  }
+
   const requiredThemes = require(options.inPath)
   const themes = requiredThemes['default'] || requiredThemes['themes']
   const generatedThemes = generatedThemesToTypescript(themes)
-  await fs.writeFile(options.outPath, generatedThemes)
+
+  const themeBuilder = promise ? await promise : null
+
+  await Promise.all([
+    fs.writeFile(options.outPath, generatedThemes),
+    themeBuilder?.state
+      ? fs.writeFile(
+          `${options.outPath}.theme-builder.json`,
+          JSON.stringify(themeBuilder?.state)
+        )
+      : null,
+  ])
 }
 
 function generatedThemesToTypescript(themes: Record<string, any>) {
@@ -66,3 +108,41 @@ ${Object.entries(obj)
   .join(',\n')}
 }`
 }
+
+function createThemeIntercept(
+  createThemeExport: any,
+  themeBuilderInterceptOpts: ThemeBuilderInterceptOpts
+) {
+  return new Proxy(createThemeExport, {
+    get(target, key) {
+      const out = Reflect.get(target, key)
+      if (key === 'createThemeBuilder') {
+        return new Proxy(out, {
+          apply(target, thisArg, argArray) {
+            const builder = Reflect.apply(target, thisArg, argArray) as any
+            return themeBuilderIntercept(builder, themeBuilderInterceptOpts)
+          },
+        })
+      }
+      return out
+    },
+  })
+}
+
+function themeBuilderIntercept(
+  themeBuilder: any,
+  themeBuilderInterceptOpts: ThemeBuilderInterceptOpts
+) {
+  return new Proxy(themeBuilder, {
+    get(target, key) {
+      const out = Reflect.get(target, key)
+      if (key === 'build') {
+        // get the state and return!
+        themeBuilderInterceptOpts.onComplete({
+          themeBuilder,
+        })
+      }
+      return out
+    },
+  })
+}

package/src/index.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
 
+process.env.TAMAGUI_TARGET = 'web'
 
-import './cli'
+require('./cli')

package/types/dev/createDevServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createDevServer.d.ts","sourceRoot":"","sources":["../../src/dev/createDevServer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAKnD,wBAAsB,eAAe,CACnC,OAAO,EAAE,kBAAkB,EAC3B,EACE,SAAS,EACT,cAAc,GACf,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,gCAgKhE;AAyBD;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,GAAG,CAAA;IACb,MAAM,EAAE,GAAG,CAAA;IACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;AAED;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,UAAU,GAAG,OAAO,GAAG,MAAM,CAAA;IACrC,IAAI,EAAE,cAAc,GAAG,IAAI,CAAA;CAC5B"}
+{"version":3,"file":"createDevServer.d.ts","sourceRoot":"","sources":["../../src/dev/createDevServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAKnD,wBAAsB,eAAe,CACnC,OAAO,EAAE,kBAAkB,EAC3B,EACE,SAAS,EACT,cAAc,GACf,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,gCAgKhE;AAyBD;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,GAAG,CAAA;IACb,MAAM,EAAE,GAAG,CAAA;IACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;AAED;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,UAAU,GAAG,OAAO,GAAG,MAAM,CAAA;IACrC,IAAI,EAAE,cAAc,GAAG,IAAI,CAAA;CAC5B"}

package/types/generate-themes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-themes.d.ts","sourceRoot":"","sources":["../src/generate-themes.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAGnD,wBAAsB,cAAc,CAClC,OAAO,EAAE,kBAAkB,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAChB,iBAOF"}
+{"version":3,"file":"generate-themes.d.ts","sourceRoot":"","sources":["../src/generate-themes.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAOnD,wBAAsB,cAAc,CAClC,OAAO,EAAE,kBAAkB,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAChB,iBA0CF"}

package/types/index.d.ts

@@ -1,3 +1,2 @@
 #!/usr/bin/env node
-import './cli';
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAGA,OAAO,OAAO,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}