@tamagui/static 1.0.0-alpha.0 → 1.0.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.4",
   "source": "src/index.ts",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -25,48 +25,48 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.15.5",
-    "@babel/generator": "^7.15.4",
-    "@babel/helper-plugin-utils": "^7.14.5",
-    "@babel/parser": "^7.15.7",
     "@babel/plugin-syntax-typescript": "^7.14.5",
-    "@babel/traverse": "^7.15.4",
     "@babel/types": "^7.15.6",
-    "@dish/babel-preset": "^0.0.6",
-    "@expo/match-media": "^0.1.0",
-    "@tamagui/build": "^1.0.0-alpha.0",
-    "@tamagui/core": "^1.0.0-alpha.0",
     "@testing-library/react": "13.0.0-alpha.4",
     "@types/jest": "*",
     "@types/node": "^16.11.9",
     "@types/react-native": "^0.64.2",
     "@types/webpack": "^4.41.26",
-    "babel-literal-to-ast": "^2.1.0",
     "babel-loader": "^8.2.2",
     "css-loader": "^5.2.4",
-    "esbuild": "^0.13.12",
-    "find-cache-dir": "^3.3.1",
-    "fs-extra": "^9.0.0",
-    "invariant": "^2.2.4",
     "jest": "^27.3.1",
     "loader-utils": "^2.0.0",
-    "lodash": "^4.17.20",
     "react": "*",
     "react-dom": "*",
     "react-test-renderer": "18.0.0-beta-149b420f6-20211119",
     "style-loader": "^3.3.0",
-    "tamagui": "^1.0.0-alpha.0",
     "typescript": "^4.4.4",
     "webpack": "^5.58.1"
   },
   "dependencies": {
-    "@tamagui/core-node": "^1.0.0-alpha.0",
-    "@tamagui/fake-react-native": "^1.0.0-alpha.0",
-    "@tamagui/helpers": "^1.0.0-alpha.0",
-    "esbuild-register": "^3.1.2"
+    "@babel/core": "^7.15.5",
+    "@babel/generator": "^7.15.4",
+    "@babel/helper-plugin-utils": "^7.14.5",
+    "@babel/parser": "^7.15.7",
+    "@babel/traverse": "^7.15.4",
+    "@dish/babel-preset": "^0.0.6",
+    "@expo/match-media": "^0.1.0",
+    "@tamagui/build": "^1.0.0-alpha.2",
+    "@tamagui/core": "^1.0.0-alpha.4",
+    "@tamagui/core-node": "^1.0.0-alpha.2",
+    "@tamagui/fake-react-native": "^1.0.0-alpha.2",
+    "@tamagui/helpers": "^1.0.0-alpha.2",
+    "babel-literal-to-ast": "^2.1.0",
+    "esbuild": "^0.13.12",
+    "esbuild-register": "^3.1.2",
+    "find-cache-dir": "^3.3.1",
+    "fs-extra": "^9.0.0",
+    "invariant": "^2.2.4",
+    "lodash": "^4.17.20",
+    "tamagui": "^1.0.0-alpha.4"
   },
   "peerDependencies": {
     "react-native-web": "*"
   },
-  "gitHead": "a41c5a5b08be5518d138515137122c248e3f7c71"
+  "gitHead": "3e3b5401f9daea70cf9a99782d325f58357ca681"
 }

package/src/extractor/createExtractor.ts

@@ -100,6 +100,7 @@ export function createExtractor() {
        */
       const isInternalImport = (importStr: string) =>
         isInsideTamagui(sourcePath) && importStr[0] === '.'
+
       const validComponents: { [key: string]: any } = Object.keys(components)
         .filter((key) => !!components[key]?.staticConfig)
         .reduce((obj, name) => {
@@ -399,9 +400,9 @@ export function createExtractor() {
                 }
                 const propName = prop.key['name']
                 if (!isStaticAttributeName(propName) && propName !== 'tag') {
-                  // if (shouldPrintDebug) {
-                  console.log('  not a valid style prop!', propName)
-                  // }
+                  if (shouldPrintDebug) {
+                    console.log('  not a valid style prop!', propName)
+                  }
                   return false
                 }
                 return true
@@ -489,7 +490,9 @@ export function createExtractor() {
                 const [test, alt, cons] = conditional
                 if (!test) throw new Error(`no test`)
                 if ([alt, cons].some((side) => side && !isExtractable(side))) {
-                  console.log('not extractable', alt, cons)
+                  if (shouldPrintDebug) {
+                    console.log('not extractable', alt, cons)
+                  }
                   return attr
                 }
                 // split into individual ternaries per object property

package/src/extractor/extractHelpers.ts

@@ -21,7 +21,10 @@ export const attrStr = (attr: ExtractedAttr) => {
 
 export const objToStr = (obj: any) => {
   return Object.entries(obj)
-    .map(([k, v]) => `${k}:${Array.isArray(v) ? `[...]` : v && typeof v === 'object' ? `{${objToStr(v)}}` : v}`)
+    .map(
+      ([k, v]) =>
+        `${k}:${Array.isArray(v) ? `[...]` : v && typeof v === 'object' ? `{${objToStr(v)}}` : v}`
+    )
     .join(', ')
 }
 
@@ -69,7 +72,11 @@ export function findComponentName(scope) {
   return componentName
 }
 
-export function isValidThemeHook(jsxPath: NodePath<t.JSXElement>, n: t.MemberExpression, sourcePath: string) {
+export function isValidThemeHook(
+  jsxPath: NodePath<t.JSXElement>,
+  n: t.MemberExpression,
+  sourcePath: string
+) {
   if (!t.isIdentifier(n.object) || !t.isIdentifier(n.property)) return false
   const bindings = jsxPath.scope.getAllBindings()
   const binding = bindings[n.object.name]
@@ -90,4 +97,6 @@ export function isValidThemeHook(jsxPath: NodePath<t.JSXElement>, n: t.MemberExp
   return true
 }
 
-export const isInsideTamagui = (srcName: string) => srcName.includes('/tamagui/')
+export const isInsideTamagui = (srcName: string) => {
+  return srcName.includes('/tamagui/_jsx') || srcName.includes('/core/src')
+}