@tamagui/static 1.0.0-beta.193 → 1.0.0-beta.2

package/dist/jsx/extractor/createExtractor.js

@@ -416,14 +416,14 @@ function createExtractor() {
               }
               const staticConditional = getStaticConditional(value);
               if (staticConditional) {
-                if (shouldPrintDebug) {
-                  console.log(` static conditional ${name} = `, value);
+                if (shouldPrintDebug === "verbose") {
+                  console.log(` static conditional ${name}`, value);
                 }
                 return { type: "ternary", value: staticConditional };
               }
               const staticLogical = getStaticLogical(value);
               if (staticLogical) {
-                if (shouldPrintDebug) {
+                if (shouldPrintDebug === "verbose") {
                   console.log(` static ternary ${name} = `, value);
                 }
                 return { type: "ternary", value: staticLogical };
@@ -586,6 +586,7 @@ function createExtractor() {
                 });
               });
             }, mergeStyles = function(prev2, next) {
+              normalizeStyleObject(next);
               for (const key in next) {
                 if (pseudos[key]) {
                   prev2[key] = prev2[key] || {};

package/dist/jsx/extractor/getStaticBindingsForScope.js

@@ -21,7 +21,16 @@ function importModule(path) {
   const filenames = [path.replace(".js", ".tsx"), path.replace(".js", ".ts"), path];
   for (const file of filenames) {
     if (existsSync(file)) {
-      return require(file);
+      const { unregister } = require("esbuild-register/dist/node").register({
+        target: "es2019",
+        format: "cjs"
+      });
+      try {
+        return require(file);
+      } catch {
+      } finally {
+        unregister();
+      }
     }
   }
   return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/static",
-  "version": "1.0.0-beta.193+14c13acd",
+  "version": "1.0.0-beta.2",
   "source": "src/index.ts",
   "typings": "types",
   "main": "dist/cjs",
@@ -34,11 +34,11 @@
     "@babel/parser": "^7.15.7",
     "@babel/traverse": "^7.15.4",
     "@expo/match-media": "^0.1.0",
-    "@tamagui/build": "^1.0.0-beta.193+14c13acd",
-    "@tamagui/core-node": "^1.0.0-beta.193+14c13acd",
-    "@tamagui/fake-react-native": "^1.0.0-beta.193+14c13acd",
-    "@tamagui/helpers": "^1.0.0-beta.193+14c13acd",
-    "@tamagui/proxy-worm": "^1.0.0-beta.193+14c13acd",
+    "@tamagui/build": "^1.0.0-beta.2",
+    "@tamagui/core-node": "^1.0.0-beta.2",
+    "@tamagui/fake-react-native": "^1.0.0-beta.2",
+    "@tamagui/helpers": "^1.0.0-beta.2",
+    "@tamagui/proxy-worm": "^1.0.0-beta.2",
     "babel-literal-to-ast": "^2.1.0",
     "esbuild": "^0.14.36",
     "esbuild-register": "^3.3.2",
@@ -46,7 +46,7 @@
     "fs-extra": "^9.1.0",
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
-    "tamagui": "^1.0.0-beta.193+14c13acd"
+    "tamagui": "^1.0.0-beta.2"
   },
   "devDependencies": {
     "@babel/plugin-syntax-typescript": "^7.14.5",
@@ -57,7 +57,7 @@
     "@types/node": "^16.11.9",
     "@types/react-native": "^0.67.3",
     "@types/webpack": "^4.41.26",
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^8.2.5",
     "css-loader": "^5.2.4",
     "esbuild-loader": "^2.18.0",
     "jest": "^27.3.1",
@@ -65,7 +65,7 @@
     "react": "*",
     "react-dom": "*",
     "react-native-web": "^0.17.5",
-    "react-test-renderer": "18.0.0-beta-149b420f6-20211119",
+    "react-test-renderer": "^18.1.0",
     "style-loader": "^3.3.0",
     "typescript": "^4.5.2",
     "webpack": "^5.72.0"
@@ -73,5 +73,5 @@
   "peerDependencies": {
     "react-native-web": "*"
   },
-  "gitHead": "14c13acd9143e76d975e7a6c311d4a5f3a00bced"
+  "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14"
 }

package/types/extractor/createExtractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAEA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAOtB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAqCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;;;wBAqBb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,kPAiBrC,mBAAmB;;;;;;EAy/C3B"}
+{"version":3,"file":"createExtractor.d.ts","sourceRoot":"","sources":["../../src/extractor/createExtractor.ts"],"names":[],"mappings":"AAEA,OAAiB,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AACjC,OAAO,EAGL,qBAAqB,EAOtB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAIL,mBAAmB,EAEpB,MAAM,UAAU,CAAA;AAqCjB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;AAI1D,wBAAgB,eAAe;;;;;;;;;;;;;;;;wBAqBb,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,kPAiBrC,mBAAmB;;;;;;EA0/C3B"}

package/types/extractor/getStaticBindingsForScope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getStaticBindingsForScope.d.ts","sourceRoot":"","sources":["../../src/extractor/getStaticBindingsForScope.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AA8BjC,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EACtC,SAAS,sBAAe,EACxB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,EAC3C,gBAAgB,EAAE,OAAO,GAAG,SAAS,GACpC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAqIrB"}
+{"version":3,"file":"getStaticBindingsForScope.d.ts","sourceRoot":"","sources":["../../src/extractor/getStaticBindingsForScope.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAwCjC,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EACtC,SAAS,sBAAe,EACxB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,EAC3C,gBAAgB,EAAE,OAAO,GAAG,SAAS,GACpC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAqIrB"}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Nate Wienert
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.