@tamagui/cli 1.32.3 → 1.33.0

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@tamagui/cli",
-  "version": "1.32.3",
+  "version": "1.33.0",
   "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,16 +35,17 @@
     "@callstack/repack-debugger-app": "^1.0.0",
     "@fastify/sensible": "^4.1.0",
     "@fastify/static": "^5.0.2",
-    "@tamagui/build": "1.32.3",
-    "@tamagui/create-theme": "1.32.3",
-    "@tamagui/static": "1.32.3",
-    "@tamagui/types": "1.32.3",
-    "@tamagui/vite-plugin": "1.32.3",
+    "@tamagui/build": "1.33.0",
+    "@tamagui/create-theme": "1.33.0",
+    "@tamagui/static": "1.33.0",
+    "@tamagui/types": "1.33.0",
+    "@tamagui/vite-plugin": "1.33.0",
     "@types/compression": "^1.7.2",
     "@types/morgan": "^1.9.3",
     "@vitejs/plugin-react-swc": "^3.3.0",
     "arg": "^5.0.2",
     "chalk": "^4.1.2",
+    "change-case": "^4.1.2",
     "chokidar": "^3.5.2",
     "compression": "^1.7.4",
     "esbuild": "^0.17.17",
@@ -66,6 +66,7 @@
     "open": "^8.4.0",
     "open-editor": "^4.0.0",
     "pretty-format": "^28.1.0",
+    "prompts": "2.1.0",
     "source-map": "^0.7.3",
     "ts-morph": "^15.1.0",
     "typescript": "^5.1.3",

package/src/cli.ts

@@ -42,6 +42,42 @@ const COMMAND_MAP = {
     },
   },
 
+  'install-font': {
+    shorthands: ['if'],
+    description: `Use to install fonts into your monorepo`,
+    flags: {
+      '--help': Boolean,
+      '--debug': Boolean,
+      '--verbose': Boolean,
+    },
+    async run() {
+      // const { _, ...flags } = arg(this.flags)
+      const { installGeneratedPackage } = await import('./install-generated-package.js')
+      // const options = await getOptions({
+      //   debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
+      // })
+      await installGeneratedPackage('font')
+    },
+  },
+
+  'install-icon': {
+    shorthands: ['ic'],
+    description: `Use to install icon packs into your monorepo`,
+    flags: {
+      '--help': Boolean,
+      '--debug': Boolean,
+      '--verbose': Boolean,
+    },
+    async run() {
+      // const { _, ...flags } = arg(this.flags)
+      const { installGeneratedPackage } = await import('./install-generated-package.js')
+      // const options = await getOptions({
+      //   debug: flags['--debug'] ? (flags['--verbose'] ? 'verbose' : true) : false,
+      // })
+      await installGeneratedPackage('icon')
+    },
+  },
+
   // build: {
   //   shorthands: ['b'],
   //   description: `Use to pre-build a Tamagui component directory`,
@@ -68,23 +104,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/index.ts

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

package/src/install-generated-package.ts

@@ -0,0 +1,76 @@
+import { execSync } from 'child_process'
+import { existsSync, rmSync } from 'fs'
+import { readFile } from 'fs/promises'
+import { homedir } from 'os'
+import path from 'path'
+
+import chalk from 'chalk'
+import { pascalCase } from 'change-case'
+import { copy, ensureDir } from 'fs-extra'
+import prompts from 'prompts'
+
+const home = homedir()
+const tamaguiDir = path.join(home, '.tamagui')
+
+export const installGeneratedPackage = async (type: 'font' | 'icon') => {
+  const repoName = type === 'font' ? 'tamagui-google-fonts' : 'tamagui-iconify'
+  console.log(`Setting up ${chalk.blueBright(tamaguiDir)}...`)
+
+  await ensureDir(tamaguiDir)
+  const tempDir = path.join(tamaguiDir, repoName)
+  if (existsSync(tempDir)) {
+    rmSync(tempDir, { recursive: true })
+  }
+  try {
+    execSync(
+      `cd ${tamaguiDir} &&
+      git clone -n --depth=1 --branch generated --filter=tree:0 https://github.com/tamagui/${repoName}
+      cd ${repoName}
+      git sparse-checkout set --no-cone meta
+      git checkout`,
+      {
+        stdio: 'inherit',
+      }
+    )
+  } catch (error) {
+    throw new Error(
+      `You don't have access to Tamagui ${
+        type === 'font' ? 'fonts' : 'icons'
+      }. Check 🥡 Tamagui Takeout (https://tamagui.dev/takeout) for more info.`
+    )
+  }
+
+  const meta = JSON.parse(
+    await readFile(path.join(tamaguiDir, repoName, `meta`, `data.json`)).then((r) =>
+      r.toString()
+    )
+  )
+
+  const result = await prompts({
+    name: 'packageName',
+    type: 'autocomplete',
+    message: `Pick a ${type}:`,
+
+    choices: Object.entries<any>(meta).map(([slug, data]) => ({
+      title:
+        type === 'font'
+          ? `${slug}: ${data.weights.length} weights, ${data.styles.length} styles, ${
+              data.subsets.length
+            } subsets (https://fonts.google.com/specimen/${pascalCase(slug)})`
+          : `${data.name}: ${data.total} icons, ${data.license.title} license (${data.author.url})`,
+      value: slug,
+    })),
+  })
+
+  const packageName = `${type === 'font' ? 'font-' : ''}${result.packageName}`
+  const packageDir = path.join(tempDir, `packages`, packageName)
+
+  execSync(
+    `cd ${tempDir} &&
+    git sparse-checkout set --no-cone packages/${packageName}
+    git checkout`
+  )
+  const finalDir = path.join('packages', packageName)
+  await copy(packageDir, finalDir)
+  console.log(`Created the package under ${finalDir}`)
+}

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/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":""}

package/types/install-generated-package.d.ts

@@ -0,0 +1,2 @@
+export declare const installGeneratedPackage: (type: 'font' | 'icon') => Promise<void>;
+//# sourceMappingURL=install-generated-package.d.ts.map

package/types/install-generated-package.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"install-generated-package.d.ts","sourceRoot":"","sources":["../src/install-generated-package.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,uBAAuB,SAAgB,MAAM,GAAG,MAAM,kBA6DlE,CAAA"}