@tamagui/static 1.0.1-beta.133 → 1.0.1-beta.136

package/dist/jsx/require.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/require.ts"],
-  "sourcesContent": ["import { join } from 'path'\n\nimport type { StaticConfig } from '@tamagui/core-node'\n\nimport { SHOULD_DEBUG } from './constants'\n\nconst nameToPaths = {}\nconst Module = require('module')\nconst og = Module.prototype.require\nglobalThis['ogRequire'] = og\n\nexport const getNameToPaths = () => nameToPaths\n\n// just for catching egregious amounts of errors in a tight loop\nlet tries = 0\nsetInterval(() => {\n  tries = 0\n}, 50)\n\nexport function registerRequire() {\n  if (Module.prototype.require !== globalThis['ogRequire']) {\n    console.warn('didnt unregister before re-registering')\n    process.exit(1)\n  }\n\n  const proxyWorm = require('@tamagui/proxy-worm')\n  const rnw = require('react-native-web')\n  const core = require('@tamagui/core-node')\n\n  Module.prototype.require = function (path: string) {\n    if (SHOULD_DEBUG) {\n      console.log('tamagui require', path)\n    }\n    if (path.endsWith('.css') || path.endsWith('.json') || path.endsWith('.ttf')) {\n      return {}\n    }\n    if (\n      path === '@gorhom/bottom-sheet' ||\n      path.startsWith('react-native-reanimated') ||\n      path === 'expo-linear-gradient' ||\n      path === '@expo/vector-icons'\n    ) {\n      return proxyWorm\n    }\n    if (\n      path.startsWith('react-native') &&\n      // allow our rnw.tsx imports through\n      !path.startsWith('react-native-web/dist/cjs/exports')\n    ) {\n      return rnw\n      // return og('react-native-web')\n    }\n    if (path === '@tamagui/core') {\n      return core\n    }\n    try {\n      const out = og.apply(this, arguments)\n      if (!nameToPaths[path]) {\n        if (out && typeof out === 'object') {\n          for (const key in out) {\n            try {\n              const conf = out[key]?.staticConfig as StaticConfig\n              if (conf) {\n                if (conf.componentName) {\n                  nameToPaths[conf.componentName] ??= new Set()\n                  const fullName = path.startsWith('.')\n                    ? join(`${this.path.replace(/dist(\\/cjs)?/, 'src')}`, path)\n                    : path\n                  nameToPaths[conf.componentName].add(fullName)\n                } else {\n                  // console.log('no name component', path)\n                }\n              }\n            } catch {\n              // ok\n            }\n          }\n        }\n      }\n      return out\n    } catch (err: any) {\n      if (SHOULD_DEBUG) {\n        console.error(\n          `Tamagui failed requiring ${path} from your tamagui.config.ts file, ignoring\\n`,\n          err.message,\n          err.stack\n        )\n      }\n      const max = process.env.TAMAGUI_MAX_ERRORS ? +process.env.TAMAGUI_MAX_ERRORS : 200\n      if (++tries > max) {\n        console.log(\n          `Too many errors loading design system, exiting (set TAMAGUI_MAX_ERRORS to override)..`\n        )\n        // avoid infinite loops\n        process.exit(1)\n      }\n      // return proxyWorm by default\n      return proxyWorm\n    }\n  }\n\n  return Module.prototype.require\n}\n\nexport function unregisterRequire() {\n  Module.prototype.require = og\n}\n"],
-  "mappings": "AAAA;AAIA;AAEA,MAAM,cAAc,CAAC;AACrB,MAAM,SAAS,QAAQ,QAAQ;AAC/B,MAAM,KAAK,OAAO,UAAU;AAC5B,WAAW,eAAe;AAEnB,MAAM,iBAAiB,MAAM;AAGpC,IAAI,QAAQ;AACZ,YAAY,MAAM;AAChB,UAAQ;AACV,GAAG,EAAE;AAEE,2BAA2B;AAChC,MAAI,OAAO,UAAU,YAAY,WAAW,cAAc;AACxD,YAAQ,KAAK,wCAAwC;AACrD,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,QAAM,YAAY,QAAQ,qBAAqB;AAC/C,QAAM,MAAM,QAAQ,kBAAkB;AACtC,QAAM,OAAO,QAAQ,oBAAoB;AAEzC,SAAO,UAAU,UAAU,SAAU,MAAc;AA7BrD;AA8BI,QAAI,cAAc;AAChB,cAAQ,IAAI,mBAAmB,IAAI;AAAA,IACrC;AACA,QAAI,KAAK,SAAS,MAAM,KAAK,KAAK,SAAS,OAAO,KAAK,KAAK,SAAS,MAAM,GAAG;AAC5E,aAAO,CAAC;AAAA,IACV;AACA,QACE,SAAS,0BACT,KAAK,WAAW,yBAAyB,KACzC,SAAS,0BACT,SAAS,sBACT;AACA,aAAO;AAAA,IACT;AACA,QACE,KAAK,WAAW,cAAc,KAE9B,CAAC,KAAK,WAAW,mCAAmC,GACpD;AACA,aAAO;AAAA,IAET;AACA,QAAI,SAAS,iBAAiB;AAC5B,aAAO;AAAA,IACT;AACA,QAAI;AACF,YAAM,MAAM,GAAG,MAAM,MAAM,SAAS;AACpC,UAAI,CAAC,YAAY,OAAO;AACtB,YAAI,OAAO,OAAO,QAAQ,UAAU;AAClC,qBAAW,OAAO,KAAK;AACrB,gBAAI;AACF,oBAAM,OAAO,UAAI,SAAJ,mBAAU;AACvB,kBAAI,MAAM;AACR,oBAAI,KAAK,eAAe;AACtB,yCAAY,KAAK,mBAAjB,8BAAoC,oBAAI,IAAI;AAC5C,wBAAM,WAAW,KAAK,WAAW,GAAG,IAChC,KAAK,GAAG,KAAK,KAAK,QAAQ,gBAAgB,KAAK,KAAK,IAAI,IACxD;AACJ,8BAAY,KAAK,eAAe,IAAI,QAAQ;AAAA,gBAC9C,OAAO;AAAA,gBAEP;AAAA,cACF;AAAA,YACF,QAAE;AAAA,YAEF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AACA,aAAO;AAAA,IACT,SAAS,KAAP;AACA,UAAI,cAAc;AAChB,gBAAQ,MACN,4BAA4B;AAAA,GAC5B,IAAI,SACJ,IAAI,KACN;AAAA,MACF;AACA,YAAM,MAAM,QAAQ,IAAI,qBAAqB,CAAC,QAAQ,IAAI,qBAAqB;AAC/E,UAAI,EAAE,QAAQ,KAAK;AACjB,gBAAQ,IACN,uFACF;AAEA,gBAAQ,KAAK,CAAC;AAAA,MAChB;AAEA,aAAO;AAAA,IACT;AAAA,EACF;AAEA,SAAO,OAAO,UAAU;AAC1B;AAEO,6BAA6B;AAClC,SAAO,UAAU,UAAU;AAC7B;",
+  "sourcesContent": ["import { join, sep } from 'path'\n\nimport type { StaticConfig } from '@tamagui/core-node'\n\nimport { SHOULD_DEBUG } from './constants'\n\nconst nameToPaths = {}\nconst Module = require('module')\nconst og = Module.prototype.require\nglobalThis['ogRequire'] = og\n\nexport const getNameToPaths = () => nameToPaths\n\n// just for catching egregious amounts of errors in a tight loop\nlet tries = 0\nsetInterval(() => {\n  tries = 0\n}, 50)\n\nexport function registerRequire() {\n  if (Module.prototype.require !== globalThis['ogRequire']) {\n    console.warn('didnt unregister before re-registering')\n    process.exit(1)\n  }\n\n  const proxyWorm = require('@tamagui/proxy-worm')\n  const rnw = require('react-native-web')\n  const core = require('@tamagui/core-node')\n\n  Module.prototype.require = function (path: string) {\n    if (SHOULD_DEBUG) {\n      console.log('tamagui require', path)\n    }\n    if (path.endsWith('.css') || path.endsWith('.json') || path.endsWith('.ttf')) {\n      return {}\n    }\n    if (\n      path === '@gorhom/bottom-sheet' ||\n      path.startsWith('react-native-reanimated') ||\n      path === 'expo-linear-gradient' ||\n      path === '@expo/vector-icons'\n    ) {\n      return proxyWorm\n    }\n    if (\n      path.startsWith('react-native') &&\n      // allow our rnw.tsx imports through\n      !path.startsWith('react-native-web/dist/cjs/exports'.replace(/\\//g, sep))\n    ) {\n      return rnw\n      // return og('react-native-web')\n    }\n    if (path === '@tamagui/core') {\n      return core\n    }\n    try {\n      const out = og.apply(this, arguments)\n      if (!nameToPaths[path]) {\n        if (out && typeof out === 'object') {\n          for (const key in out) {\n            try {\n              const conf = out[key]?.staticConfig as StaticConfig\n              if (conf) {\n                if (conf.componentName) {\n                  nameToPaths[conf.componentName] ??= new Set()\n                  const fullName = path.startsWith('.')\n                    ? join(`${this.path.replace(/dist(\\/cjs)?/, 'src')}`, path)\n                    : path\n                  nameToPaths[conf.componentName].add(fullName)\n                } else {\n                  // console.log('no name component', path)\n                }\n              }\n            } catch {\n              // ok\n            }\n          }\n        }\n      }\n      return out\n    } catch (err: any) {\n      if (SHOULD_DEBUG) {\n        console.error(\n          `Tamagui failed requiring ${path} from your tamagui.config.ts file, ignoring\\n`,\n          err.message,\n          err.stack\n        )\n      }\n      const max = process.env.TAMAGUI_MAX_ERRORS ? +process.env.TAMAGUI_MAX_ERRORS : 200\n      if (++tries > max) {\n        console.log(\n          `Too many errors loading design system, exiting (set TAMAGUI_MAX_ERRORS to override)..`\n        )\n        // avoid infinite loops\n        process.exit(1)\n      }\n      // return proxyWorm by default\n      return proxyWorm\n    }\n  }\n\n  return Module.prototype.require\n}\n\nexport function unregisterRequire() {\n  Module.prototype.require = og\n}\n"],
+  "mappings": "AAAA;AAIA;AAEA,MAAM,cAAc,CAAC;AACrB,MAAM,SAAS,QAAQ,QAAQ;AAC/B,MAAM,KAAK,OAAO,UAAU;AAC5B,WAAW,eAAe;AAEnB,MAAM,iBAAiB,MAAM;AAGpC,IAAI,QAAQ;AACZ,YAAY,MAAM;AAChB,UAAQ;AACV,GAAG,EAAE;AAEE,2BAA2B;AAChC,MAAI,OAAO,UAAU,YAAY,WAAW,cAAc;AACxD,YAAQ,KAAK,wCAAwC;AACrD,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,QAAM,YAAY,QAAQ,qBAAqB;AAC/C,QAAM,MAAM,QAAQ,kBAAkB;AACtC,QAAM,OAAO,QAAQ,oBAAoB;AAEzC,SAAO,UAAU,UAAU,SAAU,MAAc;AA7BrD;AA8BI,QAAI,cAAc;AAChB,cAAQ,IAAI,mBAAmB,IAAI;AAAA,IACrC;AACA,QAAI,KAAK,SAAS,MAAM,KAAK,KAAK,SAAS,OAAO,KAAK,KAAK,SAAS,MAAM,GAAG;AAC5E,aAAO,CAAC;AAAA,IACV;AACA,QACE,SAAS,0BACT,KAAK,WAAW,yBAAyB,KACzC,SAAS,0BACT,SAAS,sBACT;AACA,aAAO;AAAA,IACT;AACA,QACE,KAAK,WAAW,cAAc,KAE9B,CAAC,KAAK,WAAW,oCAAoC,QAAQ,OAAO,GAAG,CAAC,GACxE;AACA,aAAO;AAAA,IAET;AACA,QAAI,SAAS,iBAAiB;AAC5B,aAAO;AAAA,IACT;AACA,QAAI;AACF,YAAM,MAAM,GAAG,MAAM,MAAM,SAAS;AACpC,UAAI,CAAC,YAAY,OAAO;AACtB,YAAI,OAAO,OAAO,QAAQ,UAAU;AAClC,qBAAW,OAAO,KAAK;AACrB,gBAAI;AACF,oBAAM,OAAO,UAAI,SAAJ,mBAAU;AACvB,kBAAI,MAAM;AACR,oBAAI,KAAK,eAAe;AACtB,yCAAY,KAAK,mBAAjB,8BAAoC,oBAAI,IAAI;AAC5C,wBAAM,WAAW,KAAK,WAAW,GAAG,IAChC,KAAK,GAAG,KAAK,KAAK,QAAQ,gBAAgB,KAAK,KAAK,IAAI,IACxD;AACJ,8BAAY,KAAK,eAAe,IAAI,QAAQ;AAAA,gBAC9C,OAAO;AAAA,gBAEP;AAAA,cACF;AAAA,YACF,QAAE;AAAA,YAEF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AACA,aAAO;AAAA,IACT,SAAS,KAAP;AACA,UAAI,cAAc;AAChB,gBAAQ,MACN,4BAA4B;AAAA,GAC5B,IAAI,SACJ,IAAI,KACN;AAAA,MACF;AACA,YAAM,MAAM,QAAQ,IAAI,qBAAqB,CAAC,QAAQ,IAAI,qBAAqB;AAC/E,UAAI,EAAE,QAAQ,KAAK;AACjB,gBAAQ,IACN,uFACF;AAEA,gBAAQ,KAAK,CAAC;AAAA,MAChB;AAEA,aAAO;AAAA,IACT;AAAA,EACF;AAEA,SAAO,OAAO,UAAU;AAC1B;AAEO,6BAA6B;AAClC,SAAO,UAAU,UAAU;AAC7B;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.1-beta.133",
+  "version": "1.0.1-beta.136",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -34,14 +34,14 @@
     "@babel/parser": "^7.15.7",
     "@babel/traverse": "^7.15.4",
     "@expo/match-media": "^0.3.0",
-    "@tamagui/build": "^1.0.1-beta.133",
-    "@tamagui/config-default-node": "^1.0.1-beta.133",
-    "@tamagui/core-node": "^1.0.1-beta.133",
-    "@tamagui/fake-react-native": "^1.0.1-beta.133",
-    "@tamagui/helpers": "^1.0.1-beta.133",
-    "@tamagui/patch-rnw": "^1.0.1-beta.133",
-    "@tamagui/proxy-worm": "^1.0.1-beta.133",
-    "@tamagui/shorthands": "^1.0.1-beta.133",
+    "@tamagui/build": "^1.0.1-beta.136",
+    "@tamagui/config-default-node": "^1.0.1-beta.136",
+    "@tamagui/core-node": "^1.0.1-beta.136",
+    "@tamagui/fake-react-native": "^1.0.1-beta.136",
+    "@tamagui/helpers": "^1.0.1-beta.136",
+    "@tamagui/patch-rnw": "^1.0.1-beta.136",
+    "@tamagui/proxy-worm": "^1.0.1-beta.136",
+    "@tamagui/shorthands": "^1.0.1-beta.136",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.14.49",
     "esbuild-register": "^3.3.3",
@@ -49,7 +49,7 @@
     "fs-extra": "^10.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.1-beta.133"
+    "tamagui": "^1.0.1-beta.136"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.14.5",
@@ -69,8 +69,8 @@
     "react-test-renderer": "^18.2.0",
     "style-loader": "^3.3.1",
     "typescript": "^4.7.4",
-    "vitest": "^0.19.1",
-    "webpack": "^5.73.0"
+    "vitest": "^0.20.3",
+    "webpack": "^5.74.0"
   },
   "peerDependencies": {
     "react-native-web": "*"

package/src/extractor/createExtractor.ts

@@ -1,4 +1,4 @@
-import { relative } from 'path'
+import { basename, relative } from 'path'
 
 import traverse, { NodePath, Visitor } from '@babel/traverse'
 import * as t from '@babel/types'
@@ -446,9 +446,8 @@ export function createExtractor() {
             ? node.loc.start.line +
               (node.loc.start.line !== node.loc.end.line ? `-${node.loc.end.line}` : '')
             : ''
-          const tagId = [componentName, `${node.name.name}`, `${filePath}:${lineNumbers}`].filter(
-            Boolean
-          )
+
+          const codePosition = `${filePath}:${lineNumbers}`
 
           // debug just one
           const debugPropValue = node.attributes
@@ -465,41 +464,53 @@ export function createExtractor() {
             shouldPrintDebug = debugPropValue
           }
 
-          try {
-            node.attributes.find(
-              (n) =>
-                t.isJSXAttribute(n) &&
-                t.isJSXIdentifier(n.name) &&
-                n.name.name === 'debug' &&
-                n.value === null
+          if (shouldPrintDebug) {
+            console.log('\n')
+            console.log(
+              '\x1b[33m%s\x1b[0m',
+              `${componentName} | ${codePosition} -------------------`
             )
+            console.log(
+              '\x1b[1m',
+              '\x1b[32m',
+              `<${originalNodeName} />`,
+              disableDebugAttr ? '' : '🐛'
+            )
+          }
 
-            if (shouldPrintDebug) {
-              console.log('\n')
-              console.log('\x1b[33m%s\x1b[0m', `${tagId[0]} | ${tagId[2]} -------------------`)
-              console.log('\x1b[1m', '\x1b[32m', `<${originalNodeName} />`)
-            }
-
-            // add data-is
-            if (shouldAddDebugProp && !disableDebugAttr) {
-              res.modified++
+          // add data-* debug attributes
+          if (shouldAddDebugProp && !disableDebugAttr) {
+            res.modified++
+            node.attributes.unshift(
+              t.jsxAttribute(t.jsxIdentifier('data-is'), t.stringLiteral(node.name.name))
+            )
+            if (componentName) {
               node.attributes.unshift(
-                t.jsxAttribute(t.jsxIdentifier('data-is'), t.stringLiteral(tagId.join(' ')))
+                t.jsxAttribute(t.jsxIdentifier('data-in'), t.stringLiteral(componentName))
               )
             }
 
-            const shouldLog = !hasLogged
-            if (shouldLog) {
-              console.log(`  1️⃣  Inline optimized  2️⃣  Inline flattened  3️⃣  styled() extracted`)
-              const prefix = '      |'
-              // prettier-ignore
-              console.log(prefixLogs || prefix, '                         total ·  1️⃣  ·  2️⃣  ·  3️⃣')
-              hasLogged = true
-            }
-            if (disableExtraction) {
-              return
-            }
+            node.attributes.unshift(
+              t.jsxAttribute(
+                t.jsxIdentifier('data-at'),
+                t.stringLiteral(`${basename(filePath)}:${lineNumbers}`)
+              )
+            )
+          }
 
+          const shouldLog = !hasLogged
+          if (shouldLog) {
+            console.log(`  1️⃣  Inline optimized  2️⃣  Inline flattened  3️⃣  styled() extracted`)
+            const prefix = '      |'
+            // prettier-ignore
+            console.log(prefixLogs || prefix, '                         total ·  1️⃣  ·  2️⃣  ·  3️⃣')
+            hasLogged = true
+          }
+          if (disableExtraction) {
+            return
+          }
+
+          try {
             const { staticConfig } = component
             const variants = staticConfig.variants || {}
             const isTextView = staticConfig.isText || false

package/src/require.ts

@@ -1,4 +1,4 @@
-import { join } from 'path'
+import { join, sep } from 'path'
 
 import type { StaticConfig } from '@tamagui/core-node'
 
@@ -45,7 +45,7 @@ export function registerRequire() {
     if (
       path.startsWith('react-native') &&
       // allow our rnw.tsx imports through
-      !path.startsWith('react-native-web/dist/cjs/exports')
+      !path.startsWith('react-native-web/dist/cjs/exports'.replace(/\//g, sep))
     ) {
       return rnw
       // return og('react-native-web')