@tamagui/static 1.0.1-rc.8 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.1-rc.8",
+  "version": "1.0.1",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist",
@@ -36,31 +36,31 @@
     "@babel/runtime": "^7.19.4",
     "@babel/traverse": "^7.19.6",
     "@expo/match-media": "^0.3.0",
-    "@tamagui/build": "^1.0.1-rc.8",
-    "@tamagui/cli-color": "^1.0.1-rc.8",
-    "@tamagui/config-default-node": "^1.0.1-rc.8",
-    "@tamagui/core-node": "^1.0.1-rc.8",
-    "@tamagui/fake-react-native": "^1.0.1-rc.8",
-    "@tamagui/helpers": "^1.0.1-rc.8",
-    "@tamagui/helpers-node": "^1.0.1-rc.8",
-    "@tamagui/proxy-worm": "^1.0.1-rc.8",
-    "@tamagui/shorthands": "^1.0.1-rc.8",
+    "@tamagui/build": "^1.0.1",
+    "@tamagui/cli-color": "^1.0.1",
+    "@tamagui/config-default-node": "^1.0.1",
+    "@tamagui/core-node": "^1.0.1",
+    "@tamagui/fake-react-native": "^1.0.1",
+    "@tamagui/helpers": "^1.0.1",
+    "@tamagui/helpers-node": "^1.0.1",
+    "@tamagui/proxy-worm": "^1.0.1",
+    "@tamagui/shorthands": "^1.0.1",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.15.11",
-    "esbuild-register": "^3.3.3",
+    "esbuild-register": "^3.4.2",
     "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-internals": "^1.0.1-rc.8",
-    "react-native-web-lite": "^1.0.1-rc.8"
+    "react-native-web-internals": "^1.0.1",
+    "react-native-web-lite": "^1.0.1"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.18.6",
     "@babel/types": "^7.19.4",
     "@dish/babel-preset": "^0.0.6",
-    "@tamagui/test-design-system": "^1.0.1-rc.8",
+    "@tamagui/test-design-system": "^1.0.1",
     "@testing-library/react": "^13.4.0",
     "@types/babel__generator": "^7.6.4",
     "@types/babel__traverse": "^7.18.2",
@@ -78,7 +78,7 @@
     "react-test-renderer": "^18.2.0",
     "style-loader": "^3.3.1",
     "typescript": "^4.7.4",
-    "vitest": "^0.25.7",
+    "vitest": "^0.26.2",
     "webpack": "^5.74.0"
   },
   "peerDependencies": {

package/src/extractor/babelParse.ts

@@ -24,5 +24,9 @@ export const parserOptions: babelParser.ParserOptions = Object.freeze({
 const parser = babelParser.parse.bind(babelParser)
 
 export function babelParse(code: string | Buffer): t.File {
-  return parser(code.toString(), parserOptions) as any
+  try {
+    return parser(code.toString(), parserOptions) as any
+  } catch (err) {
+    throw new Error(`Error parsing babel: ${err} in code`)
+  }
 }

package/src/extractor/createExtractor.ts

@@ -478,6 +478,9 @@ export function createExtractor(
         // }
 
         if (!Component) {
+          /**
+           * We could/should still extract CSS just limited to validStyleProps
+           */
           return
         }
 

package/src/extractor/extractToClassNames.ts

@@ -51,12 +51,19 @@ export async function extractToClassNames({
 }: ExtractToClassNamesProps): Promise<ExtractedResponse | null> {
   const tm = timer()
 
+  if (shouldPrintDebug) {
+    console.log(`Parsing \n\n --- ${sourcePath} --- \n\n`)
+  }
+
   if (typeof source !== 'string') {
     throw new Error('`source` must be a string of javascript')
   }
   if (sourcePath && !path.isAbsolute(sourcePath)) {
     throw new Error('`sourcePath` must be an absolute path to a .js file')
   }
+  if (!/.[tj]sx?$/i.test(sourcePath || '')) {
+    console.log(`${sourcePath?.slice(0, 100)} - bad filename.`)
+  }
 
   // dont include loading in timing of parsing (one time cost)
   await extractor.loadTamagui(options)
@@ -72,7 +79,7 @@ export async function extractToClassNames({
     ast = babelParse(source)
   } catch (err) {
     // eslint-disable-next-line no-console
-    console.error('babel parse error:', sourcePath)
+    console.error('babel parse error:', sourcePath?.slice(0, 100))
     throw err
   }
 
@@ -178,7 +185,9 @@ export async function extractToClassNames({
 
               for (const style of styles) {
                 //  leave them  as attributes
-                const prop = style.pseudo ? `${style.property}-${style.pseudo}` : style.property
+                const prop = style.pseudo
+                  ? `${style.property}-${style.pseudo}`
+                  : style.property
                 finalAttrs.push(
                   t.jsxAttribute(t.jsxIdentifier(prop), t.stringLiteral(style.identifier))
                 )
@@ -259,7 +268,11 @@ export async function extractToClassNames({
               finalStyles = [...finalStyles, ...mediaExtraction.mediaStyles]
             }
             if (mediaExtraction.ternaryWithoutMedia) {
-              addTernaryStyle(mediaExtraction.ternaryWithoutMedia, mediaExtraction.mediaStyles, [])
+              addTernaryStyle(
+                mediaExtraction.ternaryWithoutMedia,
+                mediaExtraction.mediaStyles,
+                []
+              )
             } else {
               finalClassNames = [
                 ...finalClassNames,
@@ -276,7 +289,11 @@ export async function extractToClassNames({
         const aCN = b.map((x) => x.identifier).join(' ')
         if (a.length && b.length) {
           finalClassNames.push(
-            t.conditionalExpression(ternary.test, t.stringLiteral(cCN), t.stringLiteral(aCN))
+            t.conditionalExpression(
+              ternary.test,
+              t.stringLiteral(cCN),
+              t.stringLiteral(aCN)
+            )
           )
         } else {
           finalClassNames.push(
@@ -338,7 +355,12 @@ export async function extractToClassNames({
         )
       }
 
-      const comment = util.format('/* %s:%s (%s) */', filePath, lineNumbers, originalNodeName)
+      const comment = util.format(
+        '/* %s:%s (%s) */',
+        filePath,
+        lineNumbers,
+        originalNodeName
+      )
 
       for (const { identifier, rules } of finalStyles) {
         const className = `.${identifier}`
@@ -399,7 +421,8 @@ export async function extractToClassNames({
 
   if (shouldLogTiming) {
     const memUsed = mem
-      ? Math.round(((process.memoryUsage().heapUsed - mem.heapUsed) / 1024 / 1204) * 10) / 10
+      ? Math.round(((process.memoryUsage().heapUsed - mem.heapUsed) / 1024 / 1204) * 10) /
+        10
       : 0
     const path = basename(sourcePath || '')
       .replace(/\.[jt]sx?$/, '')

package/src/extractor/getStaticBindingsForScope.ts

@@ -33,7 +33,7 @@ const loadCmd = `${join(__dirname, 'loadFile.js')}`
 let exited = false
 const child = fork(loadCmd, [], {
   execArgv: ['-r', 'esbuild-register'],
-  detached: true,
+  detached: false,
   stdio: 'ignore',
 })
 

package/src/extractor/loadTamagui.ts

@@ -1,6 +1,6 @@
 import { readFileSync } from 'fs'
 /* eslint-disable no-console */
-import { basename, dirname, extname, join, relative, sep, resolve } from 'path'
+import { basename, dirname, extname, join, relative, resolve, sep } from 'path'
 
 import generate from '@babel/generator'
 import traverse from '@babel/traverse'
@@ -74,10 +74,19 @@ export async function loadTamagui(props: Props): Promise<TamaguiProjectInfo> {
     )
   )
 
-  const external = ['@tamagui/core', '@tamagui/core-node', 'react', 'react-dom', 'react-native-svg']
+  const external = [
+    '@tamagui/core',
+    '@tamagui/core-node',
+    'react',
+    'react-dom',
+    'react-native-svg',
+  ]
   const configEntry = props.config ? join(process.cwd(), props.config) : ''
 
-  if (process.env.NODE_ENV === 'development' && process.env.DEBUG?.startsWith('tamagui')) {
+  if (
+    process.env.NODE_ENV === 'development' &&
+    process.env.DEBUG?.startsWith('tamagui')
+  ) {
     console.log(`Building config entry`, configEntry)
   }
 
@@ -141,7 +150,8 @@ Tamagui built config and components:`
 
     // map from built back to original module names
     for (const component of components) {
-      component.moduleName = baseComponents[componentOutPaths.indexOf(component.moduleName)]
+      component.moduleName =
+        baseComponents[componentOutPaths.indexOf(component.moduleName)]
       if (!component.moduleName) {
         throw new Error(`Tamagui internal err`)
       }
@@ -157,7 +167,10 @@ Tamagui built config and components:`
       components = [...components, ...coreComponents]
     }
 
-    if (process.env.NODE_ENV === 'development' && process.env.DEBUG?.startsWith('tamagui')) {
+    if (
+      process.env.NODE_ENV === 'development' &&
+      process.env.DEBUG?.startsWith('tamagui')
+    ) {
       console.log('Loaded components', components)
     }
 
@@ -180,7 +193,7 @@ Tamagui built config and components:`
 
 export function resolveWebOrNativeSpecificEntry(entry: string) {
   const workspaceRoot = resolve()
-  const resolved = require.resolve(entry, {paths: [workspaceRoot]})
+  const resolved = require.resolve(entry, { paths: [workspaceRoot] })
   const ext = extname(resolved)
   const fileName = basename(resolved).replace(ext, '')
   const specificExt = process.env.TAMAGUI_TARGET === 'web' ? 'web' : 'native'
@@ -295,7 +308,9 @@ function transformAddExports(ast: t.File) {
     ExportNamedDeclaration(nodePath) {
       if (nodePath.node.specifiers) {
         for (const spec of nodePath.node.specifiers) {
-          usedNames.add(t.isIdentifier(spec.exported) ? spec.exported.name : spec.exported.value)
+          usedNames.add(
+            t.isIdentifier(spec.exported) ? spec.exported.name : spec.exported.value
+          )
         }
       }
     },
@@ -328,8 +343,8 @@ function transformAddExports(ast: t.File) {
   }).code
 }
 
-const esbuildit = (src: string, target?: 'modern') =>
-  esbuild.transformSync(src, {
+const esbuildit = (src: string, target?: 'modern') => {
+  return esbuild.transformSync(src, {
     ...esbuildOptions,
     ...(target === 'modern' && {
       target: 'es2022',
@@ -339,6 +354,7 @@ const esbuildit = (src: string, target?: 'modern') =>
       format: 'esm',
     }),
   }).code
+}
 
 function loadComponents(props: Props): null | LoadedComponents[] {
   const componentsModules = props.components
@@ -368,7 +384,9 @@ function loadComponents(props: Props): null | LoadedComponents[] {
         // need to write to tsx to enable reading it properly (:/ esbuild-register)
         if (isDynamic) {
           writtenContents = forceExports
-            ? esbuildit(transformAddExports(babelParse(esbuildit(fileContents, 'modern'))))
+            ? esbuildit(
+                transformAddExports(babelParse(esbuildit(fileContents, 'modern')))
+              )
             : esbuildit(fileContents)
 
           writeFileSync(loadModule, writtenContents)