@tamagui/static 1.0.1-beta.193 → 1.0.1-beta.194

package/dist/tamagui-node/tamaguitestdesignsystem-components.config.js

@@ -0,0 +1,31 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+
+// ../test-design-system/dist/cjs/index.js
+var __defProp2 = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = /* @__PURE__ */ __name((target, all) => {
+  for (var name in all)
+    __defProp2(target, name, { get: all[name], enumerable: true });
+}, "__export");
+var __copyProps = /* @__PURE__ */ __name((to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+}, "__copyProps");
+var __toCommonJS = /* @__PURE__ */ __name((mod) => __copyProps(__defProp2({}, "__esModule", { value: true }), mod), "__toCommonJS");
+var src_exports = {};
+__export(src_exports, {
+  MyStack: () => MyStack
+});
+module.exports = __toCommonJS(src_exports);
+var import_core = require("@tamagui/core-node");
+var MyStack = (0, import_core.styled)(import_core.Stack, {
+  backgroundColor: "green"
+});

package/dist/types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/types.ts"],
-  "sourcesContent": ["import type { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\nimport type { PseudoStyles, StaticConfig } from '@tamagui/core-node'\nimport type { StyleObject } from '@tamagui/helpers'\nimport type { TamaguiOptions } from '@tamagui/helpers-node'\nimport type { ViewStyle } from 'react-native'\n\nexport type { TamaguiOptions } from '@tamagui/helpers-node'\n\nexport type { StyleObject } from '@tamagui/helpers'\n\nexport type ClassNameObject = t.StringLiteral | t.Expression\n\nexport interface CacheObject {\n  [key: string]: any\n}\n\nexport interface LogOptions {\n  clear?: boolean\n  timestamp?: boolean\n  error?: Error | null\n}\n\nexport interface Logger {\n  info(msg: string, options?: LogOptions): void\n  warn(msg: string, options?: LogOptions): void\n  error(msg: string, options?: LogOptions): void\n}\n\nexport type ExtractorOptions = {\n  logger?: Logger\n}\n\nexport type ExtractedAttrAttr = {\n  type: 'attr'\n  value: t.JSXAttribute | t.JSXSpreadAttribute\n}\n\nexport type ExtractedAttrStyle = {\n  type: 'style'\n  value: ViewStyle & PseudoStyles\n  attr?: t.JSXAttribute | t.JSXSpreadAttribute\n  name?: string\n}\n\nexport type ExtractedAttr =\n  | ExtractedAttrAttr\n  | { type: 'ternary'; value: Ternary }\n  | ExtractedAttrStyle\n\nexport type ExtractTagProps = {\n  attrs: ExtractedAttr[]\n  node: t.JSXOpeningElement\n  attemptEval: (exprNode: t.Node, evalFn?: ((node: t.Node) => any) | undefined) => any\n  jsxPath: NodePath<t.JSXElement>\n  programPath: NodePath<t.Program>\n  originalNodeName: string\n  lineNumbers: string\n  filePath: string\n  isFlattened: boolean\n  completeProps: Record<string, any>\n  staticConfig: StaticConfig\n}\n\nexport type TamaguiOptionsWithFileInfo = TamaguiOptions & {\n  sourcePath: string\n}\n\nexport type ExtractorParseProps = TamaguiOptionsWithFileInfo & {\n  target: 'native' | 'html'\n  shouldPrintDebug?: boolean | 'verbose'\n  onExtractTag: (props: ExtractTagProps) => void\n  getFlattenedNode?: (props: { isTextView: boolean; tag: string }) => string\n  extractStyledDefinitions?: boolean\n  // identifer, rule\n  onStyleRule?: (identifier: string, rules: string[]) => void\n}\n\nexport interface Ternary {\n  test: t.Expression\n  // shorthand props that don't use hooks\n  inlineMediaQuery?: string\n  remove: Function\n  consequent: Object | null\n  alternate: Object | null\n}\n\nexport type ClassNameToStyleObj = {\n  [key: string]: StyleObject\n}\n\nexport interface PluginContext {\n  write: (path: string, rules: { [key: string]: string }) => any\n}\n"],
+  "sourcesContent": ["import type { NodePath } from '@babel/traverse'\nimport * as t from '@babel/types'\nimport type { PseudoStyles, StaticConfig } from '@tamagui/core-node'\nimport type { StyleObject } from '@tamagui/helpers'\nimport type { TamaguiOptions } from '@tamagui/helpers-node'\nimport type { ViewStyle } from 'react-native'\n\nimport { LoadedComponents } from './index'\n\nexport type { TamaguiOptions } from '@tamagui/helpers-node'\n\nexport type { StyleObject } from '@tamagui/helpers'\n\nexport type ClassNameObject = t.StringLiteral | t.Expression\n\nexport interface CacheObject {\n  [key: string]: any\n}\n\nexport interface LogOptions {\n  clear?: boolean\n  timestamp?: boolean\n  error?: Error | null\n}\n\nexport interface Logger {\n  info(msg: string, options?: LogOptions): void\n  warn(msg: string, options?: LogOptions): void\n  error(msg: string, options?: LogOptions): void\n}\n\nexport type ExtractorOptions = {\n  logger?: Logger\n}\n\nexport type ExtractedAttrAttr = {\n  type: 'attr'\n  value: t.JSXAttribute | t.JSXSpreadAttribute\n}\n\nexport type ExtractedAttrStyle = {\n  type: 'style'\n  value: ViewStyle & PseudoStyles\n  attr?: t.JSXAttribute | t.JSXSpreadAttribute\n  name?: string\n}\n\nexport type ExtractedAttr =\n  | ExtractedAttrAttr\n  | { type: 'ternary'; value: Ternary }\n  | ExtractedAttrStyle\n\nexport type ExtractTagProps = {\n  parserProps: TamaguiOptionsWithFileInfo\n  attrs: ExtractedAttr[]\n  node: t.JSXOpeningElement\n  attemptEval: (exprNode: t.Node, evalFn?: ((node: t.Node) => any) | undefined) => any\n  jsxPath: NodePath<t.JSXElement>\n  programPath: NodePath<t.Program>\n  originalNodeName: string\n  lineNumbers: string\n  filePath: string\n  isFlattened: boolean\n  completeProps: Record<string, any>\n  staticConfig: StaticConfig\n}\n\nexport type TamaguiOptionsWithFileInfo = TamaguiOptions & {\n  sourcePath: string\n  allLoadedComponents: LoadedComponents[]\n}\n\nexport type ExtractorParseProps = Omit<TamaguiOptionsWithFileInfo, 'allLoadedComponents'> & {\n  target: 'native' | 'html'\n  shouldPrintDebug?: boolean | 'verbose'\n  onExtractTag: (props: ExtractTagProps) => void\n  getFlattenedNode?: (props: { isTextView: boolean; tag: string }) => string\n  extractStyledDefinitions?: boolean\n  // identifer, rule\n  onStyleRule?: (identifier: string, rules: string[]) => void\n}\n\nexport interface Ternary {\n  test: t.Expression\n  // shorthand props that don't use hooks\n  inlineMediaQuery?: string\n  remove: Function\n  consequent: Object | null\n  alternate: Object | null\n}\n\nexport type ClassNameToStyleObj = {\n  [key: string]: StyleObject\n}\n\nexport interface PluginContext {\n  write: (path: string, rules: { [key: string]: string }) => any\n}\n"],
   "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;",
   "names": []
 }

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.1-beta.193",
+  "version": "1.0.1-beta.194",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist",
   "files": [
     "tamagui.tsconfig.json",
-    "patches",
     "src",
     "types",
     "dist"
@@ -37,39 +36,43 @@
     "@babel/runtime": "^7.18.9",
     "@babel/traverse": "^7.18.11",
     "@expo/match-media": "^0.3.0",
-    "@tamagui/build": "^1.0.1-beta.193",
-    "@tamagui/cli-color": "^1.0.1-beta.193",
-    "@tamagui/config-default-node": "^1.0.1-beta.193",
-    "@tamagui/core-node": "^1.0.1-beta.193",
-    "@tamagui/fake-react-native": "^1.0.1-beta.193",
-    "@tamagui/helpers": "^1.0.1-beta.193",
-    "@tamagui/helpers-node": "^1.0.1-beta.193",
-    "@tamagui/patch-rnw": "^1.0.1-beta.193",
-    "@tamagui/proxy-worm": "^1.0.1-beta.193",
-    "@tamagui/react-native-svg": "^1.0.1-beta.193",
-    "@tamagui/shorthands": "^1.0.1-beta.193",
+    "@tamagui/build": "^1.0.1-beta.194",
+    "@tamagui/cli-color": "^1.0.1-beta.194",
+    "@tamagui/config-default-node": "^1.0.1-beta.194",
+    "@tamagui/core-node": "^1.0.1-beta.194",
+    "@tamagui/fake-react-native": "^1.0.1-beta.194",
+    "@tamagui/helpers": "^1.0.1-beta.194",
+    "@tamagui/helpers-node": "^1.0.1-beta.194",
+    "@tamagui/proxy-worm": "^1.0.1-beta.194",
+    "@tamagui/react-native-svg": "^1.0.1-beta.194",
+    "@tamagui/rnw": "^1.0.1-beta.194",
+    "@tamagui/shorthands": "^1.0.1-beta.194",
     "babel-literal-to-ast": "^2.1.0",
-    "esbuild": "^0.15.6",
+    "esbuild": "^0.15.11",
     "esbuild-register": "^3.3.3",
     "find-cache-dir": "^3.3.2",
     "find-root": "^1.1.0",
     "fs-extra": "^10.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "react-native-web-lite": "^1.0.1-beta.193",
-    "tamagui": "^1.0.1-beta.193"
+    "react-native-web-lite": "^1.0.1-beta.194",
+    "tamagui": "^1.0.1-beta.194"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.18.6",
-    "@babel/types": "^7.18.10",
+    "@babel/types": "^7.19.4",
     "@dish/babel-preset": "^0.0.6",
+    "@tamagui/test-design-system": "^1.0.1-beta.194",
     "@testing-library/react": "^13.3.0",
+    "@types/babel__generator": "^7.6.4",
+    "@types/babel__traverse": "^7.18.2",
     "@types/find-root": "^1.1.2",
     "@types/node": "^16.11.9",
     "@types/react-native": "^0.69.2",
     "@types/webpack": "^4.41.26",
     "babel-loader": "^8.2.5",
     "css-loader": "^5.2.4",
+    "dedent": "^0.7.0",
     "esbuild-loader": "^2.19.0",
     "null-loader": "^4.0.1",
     "react": "*",

package/src/extractor/babelParse.ts

@@ -1,4 +1,5 @@
 import * as babelParser from '@babel/parser'
+import * as t from '@babel/types'
 
 const plugins: babelParser.ParserPlugin[] = [
   'asyncGenerators',
@@ -22,6 +23,6 @@ export const parserOptions: babelParser.ParserOptions = Object.freeze({
 
 const parser = babelParser.parse.bind(babelParser)
 
-export function babelParse(code: string | Buffer): any {
-  return parser(code.toString(), parserOptions)
+export function babelParse(code: string | Buffer): t.File {
+  return parser(code.toString(), parserOptions) as any
 }

package/src/extractor/bundle.ts

@@ -0,0 +1,110 @@
+import { basename, dirname, join } from 'path'
+
+import esbuild from 'esbuild'
+import { pathExists, stat, writeFile } from 'fs-extra'
+
+import { resolveWebOrNativeSpecificEntry } from './loadTamagui'
+
+/**
+ * For internal loading of new files
+ */
+
+type Props = Omit<Partial<esbuild.BuildOptions>, 'entryPoints'> & {
+  outfile: string
+  entryPoints: string[]
+  resolvePlatformSpecificEntries?: boolean
+}
+
+function getESBuildConfig(
+  { entryPoints, resolvePlatformSpecificEntries, ...options }: Props,
+  aliases?: Record<string, string>
+) {
+  const alias = require('@tamagui/core-node').aliasPlugin
+  if (process.env.DEBUG?.startsWith('tamagui')) {
+    // eslint-disable-next-line no-console
+    console.log(`Building`, entryPoints)
+  }
+  const tsconfig = join(__dirname, '..', '..', 'tamagui.tsconfig.json')
+
+  const resolvedEntryPoints = !resolvePlatformSpecificEntries
+    ? entryPoints
+    : entryPoints.map(resolveWebOrNativeSpecificEntry)
+
+  const res: esbuild.BuildOptions = {
+    bundle: true,
+    entryPoints: resolvedEntryPoints,
+    format: 'cjs',
+    target: 'node18',
+    jsx: 'transform',
+    jsxFactory: 'react',
+    allowOverwrite: true,
+    keepNames: true,
+    platform: 'node',
+    tsconfig,
+    loader: {
+      '.js': 'jsx',
+    },
+    logLevel: 'warning',
+    plugins: [
+      {
+        name: 'external',
+        setup(build) {
+          build.onResolve({ filter: /@tamagui\/core/ }, (args) => {
+            return {
+              path: '@tamagui/core-node',
+              external: true,
+            }
+          })
+
+          build.onResolve({ filter: /^(react-native|react-native\/.*)$/ }, (args) => {
+            return {
+              path: 'react-native-web-lite',
+              external: true,
+            }
+          })
+        },
+      },
+      alias({
+        ...aliases,
+      }),
+    ],
+    ...options,
+  }
+
+  return res
+}
+
+export async function bundle(props: Props, aliases?: Record<string, string>) {
+  await asyncLock(props)
+  return esbuild.build(getESBuildConfig(props, aliases))
+}
+
+export function bundleSync(props: Props, aliases?: Record<string, string>) {
+  return esbuild.buildSync(getESBuildConfig(props, aliases))
+}
+
+// until i do fancier things w plugins:
+async function asyncLock(props: Props) {
+  const lockFile = join(dirname(props.outfile), basename(props.outfile, '.lock'))
+  const lockStat = await stat(lockFile).catch(() => {
+    /* ok */
+  })
+  const lockedMsAgo = !lockStat
+    ? Infinity
+    : new Date().getTime() - new Date(lockStat.mtime).getTime()
+  if (lockedMsAgo < 500) {
+    if (process.env.DEBUG?.startsWith('tamagui')) {
+      // eslint-disable-next-line no-console
+      console.log(`Waiting for existing build`, props.entryPoints)
+    }
+    let tries = 5
+    while (tries--) {
+      if (await pathExists(props.outfile)) {
+        return
+      } else {
+        await new Promise((res) => setTimeout(res, 50))
+      }
+    }
+  }
+  void writeFile(lockFile, '')
+}