@tamagui/static 1.0.1-beta.68 → 1.0.1-beta.69

package/dist/jsx/patchReactNativeWeb.js

@@ -2,80 +2,56 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import path from "path";
 import * as fs from "fs-extra";
+const PATCH_PREFIX = "tamagui-patch-";
+const PATCH_VERSION = `${PATCH_PREFIX}-v5`;
+const PATCH_COMMENT = `// ${PATCH_VERSION}`;
+const PATCH_END_COMMENT = `// tamagui-patch-end`;
 function patchReactNativeWeb(dir = require.resolve("react-native-web")) {
   const rootDir = dir.replace(/[\/\\]dist.*/, "");
+  const pkgJSON = fs.readJSONSync(path.join(rootDir, "package.json"));
+  if (pkgJSON.version.split(".")[1] !== "18") {
+    console.error(`\u26D4\uFE0F Error! Tamagui as of beta 69 only works with react-native-web version 0.18.x`, pkgJSON.version);
+    process.exit(1);
+  }
   const modulePath = path.join(rootDir, "dist", "tamagui-exports.js");
   const cjsPath = path.join(rootDir, "dist", "cjs", "tamagui-exports.js");
-  const shouldPatchExports = fs.existsSync(modulePath) && fs.readFileSync(modulePath, "utf-8") === moduleExports && fs.existsSync(cjsPath) && fs.readFileSync(cjsPath, "utf-8") === cjsExports;
-  if (!shouldPatchExports) {
+  const alreadyPatchedImports = fs.existsSync(modulePath) && fs.readFileSync(modulePath, "utf-8") === moduleExports && fs.existsSync(cjsPath) && fs.readFileSync(cjsPath, "utf-8") === cjsExports;
+  if (!alreadyPatchedImports) {
     console.log("      | patch " + path.relative(rootDir, modulePath));
-    console.log("      | patch " + path.relative(rootDir, cjsPath));
     fs.writeFileSync(modulePath, moduleExports);
+    console.log("      | patch " + path.relative(rootDir, cjsPath));
     fs.writeFileSync(cjsPath, cjsExports);
   }
-  const patches = [
-    {
-      id: "dom-props",
-      filePath: ["modules", "createDOMProps", "index.js"],
-      replacee: `  if (dataSet != null) {`,
-      replacer: `
-  if (props.dataSet && props.dataSet.className) {
-    const { className, ...dataSetRest } = props.dataSet
-    classList = className
-    dataSet = dataSetRest
-  }
-  if (props.dataSet && props.dataSet.id) {
-    domProps['id'] = props.dataSet.id
-  }
-  if (dataSet != null) {`
-    },
-    {
-      id: "forward-props",
-      filePath: ["modules", "forwardedProps", "index.js"],
-      replacee: `dataSet: true,`,
-      replacer: `id: true, dataSet: true,`
-    }
-  ];
-  for (const { filePath, replacee, replacer } of patches) {
-    const files = [
-      path.join(rootDir, "dist", ...filePath),
-      path.join(rootDir, "dist", "cjs", ...filePath)
-    ];
-    for (const file of files) {
-      const contents = fs.readFileSync(file, "utf-8");
-      if (contents.includes(replacer)) {
-        continue;
-      }
-      if (!contents.includes(replacee)) {
-        console.warn(`\u26A0\uFE0F Error: couldn't apply className patch! Maybe using incompatible react-native-web version.`, {
-          replacee,
-          contents
-        });
-        continue;
-      }
-      console.log("      | patch " + path.relative(rootDir, file));
-      fs.writeFileSync(file, contents.replace(replacee, replacer));
-    }
+  const dpFile = path.join(rootDir, "dist", "modules", "createDOMProps", "index.js");
+  const dpPatched = fs.readFileSync(path.join(__dirname, "..", "..", "patches", "18", "createDOMProps.js"), "utf-8");
+  const dpFileCJS = path.join(rootDir, "dist", "cjs", "modules", "createDOMProps", "index.js");
+  const dpCJSPatched = fs.readFileSync(path.join(__dirname, "..", "..", "patches", "18", "createDOMProps.cjs.js"), "utf-8");
+  const alreadyPatchedDOMProps = fs.readFileSync(dpFile, "utf-8") === dpPatched && fs.readFileSync(dpFileCJS, "utf-8") === dpCJSPatched;
+  if (!alreadyPatchedDOMProps) {
+    console.log("      | patch " + path.relative(rootDir, dpFile));
+    fs.writeFileSync(dpFile, dpPatched);
+    console.log("      | patch " + path.relative(rootDir, dpFileCJS));
+    fs.writeFileSync(dpFileCJS, dpCJSPatched);
   }
   const moduleEntry = path.join(rootDir, "dist", "index.js");
   const moduleEntrySrc = fs.readFileSync(moduleEntry, "utf-8");
-  if (!moduleEntrySrc.includes("// tamagui-patch-v4")) {
+  if (!moduleEntrySrc.includes(PATCH_COMMENT)) {
     fs.writeFileSync(moduleEntry, `${removePatch(moduleEntrySrc)}
 
-// tamagui-patch-v4
+${PATCH_COMMENT}
 import * as TExports from './tamagui-exports'
 export const TamaguiExports = TExports
-// tamagui-patch-end
+${PATCH_END_COMMENT}
 `);
   }
   const cjsEntry = path.join(rootDir, "dist", "cjs", "index.js");
   const cjsEntrySrc = fs.readFileSync(cjsEntry, "utf-8");
-  if (!cjsEntrySrc.includes("// tamagui-patch-v4")) {
+  if (!cjsEntrySrc.includes(PATCH_COMMENT)) {
     fs.writeFileSync(cjsEntry, `${removePatch(cjsEntrySrc)}
 
-// tamagui-patch-v4
-exports.TamaguiExports = _interopRequireDefault(require("./tamagui-exports"));
-// tamagui-patch-end
+${PATCH_COMMENT}
+exports.TamaguiExports = require("./tamagui-exports");
+${PATCH_END_COMMENT}
 `);
   }
 }
@@ -84,57 +60,21 @@ function removePatch(source) {
   return source.replace(/\/\/ tamagui-patch([.\s\S]*)/g, "");
 }
 __name(removePatch, "removePatch");
-const forwardedPropsObj = `{
-  ...fwdProps.defaultProps,
-  ...fwdProps.accessibilityProps,
-  ...fwdProps.clickProps,
-  ...fwdProps.focusProps,
-  ...fwdProps.keyboardProps,
-  ...fwdProps.mouseProps,
-  ...fwdProps.touchProps,
-  ...fwdProps.styleProps,
-  href: true,
-  lang: true,
-  onScroll: true,
-  onWheel: true,
-  pointerEvents: true
-}
-`;
 const moduleExports = `
-export { atomic } from './exports/StyleSheet/compile'
-export { default as createCompileableStyle } from './exports/StyleSheet/createCompileableStyle'
-export { default as createReactDOMStyle } from './exports/StyleSheet/createReactDOMStyle'
-export { default as i18Style } from './exports/StyleSheet/i18nStyle'
 export { default as createDOMProps } from './modules/createDOMProps'
-export { default as AccessibilityUtil } from './modules/AccessibilityUtil'
-export { default as createElement } from './exports/createElement'
-export { default as css } from './exports/StyleSheet/css'
 export { default as TextAncestorContext } from './exports/Text/TextAncestorContext'
-export { default as pick } from './modules/pick'
 export { default as useElementLayout } from './modules/useElementLayout'
 export { default as useMergeRefs } from './modules/useMergeRefs'
 export { default as usePlatformMethods } from './modules/usePlatformMethods'
 export { default as useResponderEvents } from './modules/useResponderEvents'
-import * as fwdProps from './modules/forwardedProps'
-export const forwardedProps = ${forwardedPropsObj}
 `;
 const cjsExports = `
-exports.atomic = require('./exports/StyleSheet/compile').atomic
-exports.createCompileableStyle = require('./exports/StyleSheet/createCompileableStyle')
-exports.createReactDOMStyle = require('./exports/StyleSheet/createReactDOMStyle')
-exports.i18Style = require('./exports/StyleSheet/i18nStyle')
 exports.createDOMProps = require('./modules/createDOMProps')
-exports.AccessibilityUtil = require('./modules/AccessibilityUtil')
-exports.createElement = require('./exports/createElement')
-exports.css = require('./exports/StyleSheet/css')
 exports.TextAncestorContext = require('./exports/Text/TextAncestorContext')
-exports.pick = require('./modules/pick')
 exports.useElementLayout = require('./modules/useElementLayout')
 exports.useMergeRefs = require('./modules/useMergeRefs')
 exports.usePlatformMethods = require('./modules/usePlatformMethods')
 exports.useResponderEvents = require('./modules/useResponderEvents')
-const fwdProps = require('./modules/forwardedProps')
-exports.forwardedProps = ${forwardedPropsObj}
 `;
 export {
   patchReactNativeWeb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.1-beta.68",
+  "version": "1.0.1-beta.69",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -17,7 +17,8 @@
     "clean": "tamagui-build clean",
     "clean:build": "tamagui-build clean:build",
     "test": "NODE_ENV=test TAMAGUI_COMPILE_PROCESS=1 jest --forceExit",
-    "test:babel": "yarn test tests/babel-test.tsx",
+    "test:output": "TAMAGUI_TARGET=web node -r esbuild-register test-output.tsx",
+    "test:babel": "DISABLE_PRE_TEST=true yarn test tests/babel-test.tsx",
     "test:debug": "NODE_ENV=test TAMAGUI_COMPILE_PROCESS=1 DEBUG_FILE=extract-specs.tsx DEBUG=1 yarn test",
     "test:watch": "NODE_ENV=test TAMAGUI_COMPILE_PROCESS=1 yarn test --watch",
     "test:update-snapshots": "NODE_ENV=test jest --updateSnapshot"
@@ -36,11 +37,11 @@
     "@babel/parser": "^7.15.7",
     "@babel/traverse": "^7.15.4",
     "@expo/match-media": "^0.3.0",
-    "@tamagui/build": "^1.0.1-beta.68",
-    "@tamagui/core-node": "^1.0.1-beta.68",
-    "@tamagui/fake-react-native": "^1.0.1-beta.68",
-    "@tamagui/helpers": "^1.0.1-beta.68",
-    "@tamagui/proxy-worm": "^1.0.1-beta.68",
+    "@tamagui/build": "^1.0.1-beta.69",
+    "@tamagui/core-node": "^1.0.1-beta.69",
+    "@tamagui/fake-react-native": "^1.0.1-beta.69",
+    "@tamagui/helpers": "^1.0.1-beta.69",
+    "@tamagui/proxy-worm": "^1.0.1-beta.69",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.14.36",
     "esbuild-register": "^3.3.2",
@@ -48,13 +49,15 @@
     "fs-extra": "^9.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.1-beta.68"
+    "tamagui": "^1.0.1-beta.69"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.14.5",
     "@babel/types": "^7.15.6",
     "@dish/babel-preset": "^0.0.6",
-    "@testing-library/react": "13.0.0-alpha.4",
+    "@tamagui/config-base": "^1.0.1-beta.69",
+    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/react": "^13.3.0",
     "@types/jest": "*",
     "@types/node": "^16.11.9",
     "@types/react-native": "^0.67.3",
@@ -62,15 +65,17 @@
     "babel-loader": "^8.2.5",
     "css-loader": "^5.2.4",
     "esbuild-loader": "^2.18.0",
-    "jest": "^27.3.1",
+    "jest": "^28.1.1",
+    "jest-dom": "^4.0.0",
+    "jest-environment-jsdom": "^28.1.1",
     "null-loader": "^4.0.1",
     "react": "*",
     "react-dom": "*",
     "react-native-web": "^0.17.5",
-    "react-test-renderer": "^18.1.0",
+    "react-test-renderer": "^18.2.0",
     "style-loader": "^3.3.0",
     "typescript": "^4.7.2",
-    "webpack": "^5.72.0"
+    "webpack": "^5.73.0"
   },
   "peerDependencies": {
     "react-native-web": "*"

package/src/extractor/createEvaluator.ts

@@ -21,7 +21,7 @@ export function createEvaluator({
   tamaguiConfig: TamaguiConfig
   staticNamespace: Record<string, any>
   sourcePath: string
-  traversePath: NodePath<t.JSXElement>
+  traversePath?: NodePath<t.JSXElement>
   shouldPrintDebug: boolean | 'verbose'
 }) {
   // called when evaluateAstNode encounters a dynamic-looking prop
@@ -30,6 +30,7 @@ export function createEvaluator({
     if (
       t.isMemberExpression(n) &&
       t.isIdentifier(n.property) &&
+      traversePath &&
       isValidThemeHook(traversePath, n, sourcePath)
     ) {
       const key = n.property.name