Merge pull request #444 from jpudysz/fix/module-exports

fix: module exports

components/native/ActivityIndicator/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/ActivityIndicator.js"
+  "main": "../../../lib/commonjs/components/native/ActivityIndicator.js",
+  "module": "../../../lib/module/components/native/ActivityIndicator.js"
 }

components/native/FlatList/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/FlatList.js"
+  "main": "../../../lib/commonjs/components/native/FlatList.js",
+  "module": "../../../lib/module/components/native/FlatList.js"
 }

components/native/Image/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/Image.js"
+  "main": "../../../lib/commonjs/components/native/Image.js",
+  "module": "../../../lib/module/components/native/Image.js"
 }

components/native/ImageBackground/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/ImageBackground.js"
+  "main": "../../../lib/commonjs/components/native/ImageBackground.js",
+  "module": "../../../lib/module/components/native/ImageBackground.js"
 }

components/native/KeyboardAvoidingView/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/KeyboardAvoidingView.js"
+  "main": "../../../lib/commonjs/components/native/KeyboardAvoidingView.js",
+  "module": "../../../lib/module/components/native/KeyboardAvoidingView.js"
 }

components/native/Pressable/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/Pressable.js",
+  "module": "../../../lib/module/components/native/Pressable.js",
   "react-native": "../../../lib/commonjs/components/native/Pressable.native.js"
 }

components/native/RefreshControl/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/RefreshControl.js"
+  "main": "../../../lib/commonjs/components/native/RefreshControl.js",
+  "module": "../../../lib/module/components/native/RefreshControl.js"
 }

components/native/ScrollView/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/ScrollView.js"
+  "main": "../../../lib/commonjs/components/native/ScrollView.js",
+  "module": "../../../lib/module/components/native/ScrollView.js"
 }

components/native/SectionList/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/SectionList.js"
+  "main": "../../../lib/commonjs/components/native/SectionList.js",
+  "module": "../../../lib/module/components/native/SectionList.js"
 }

components/native/Switch/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/Switch.js"
+  "main": "../../../lib/commonjs/components/native/Switch.js",
+  "module": "../../../lib/module/components/native/Switch.js"
 }

components/native/Text/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/Text.js"
+  "main": "../../../lib/commonjs/components/native/Text.js",
+  "module": "../../../lib/module/components/native/Text.js"
 }

components/native/TextInput/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/TextInput.js"
+  "main": "../../../lib/commonjs/components/native/TextInput.js",
+  "module": "../../../lib/module/components/native/TextInput.js"
 }

components/native/TouchableHighlight/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/TouchableHighlight.js"
+  "main": "../../../lib/commonjs/components/native/TouchableHighlight.js",
+  "module": "../../../lib/module/components/native/TouchableHighlight.js"
 }

components/native/TouchableOpacity/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/TouchableOpacity.js"
+  "main": "../../../lib/commonjs/components/native/TouchableOpacity.js",
+  "module": "../../../lib/module/components/native/TouchableOpacity.js"
 }

components/native/View/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/View.js"
+  "main": "../../../lib/commonjs/components/native/View.js",
+  "module": "../../../lib/module/components/native/View.js"
 }

components/native/VirtualizedList/package.json

@@ -1,3 +1,4 @@
 {
-  "main": "../../../lib/commonjs/components/native/VirtualizedList.js"
+  "main": "../../../lib/commonjs/components/native/VirtualizedList.js",
+  "module": "../../../lib/module/components/native/VirtualizedList.js"
 }

src/web/shadowRegistry.ts

@@ -2,7 +2,7 @@ import type { UnistylesTheme, UnistylesValues } from '../types'
 import { UnistylesListener } from './listener'
 import { UnistylesRegistry } from './registry'
 import { deepMergeObjects } from '../utils'
-import { equal, extractSecrets, extractUnistyleDependencies, isInDocument, keyInObject } from './utils'
+import { equal, extractSecrets, extractUnistyleDependencies, isInDocument } from './utils'
 import { getVariants } from './variants'
 
 type Style = UnistylesValues | ((...args: Array<any>) => UnistylesValues)
@@ -67,13 +67,6 @@ class UnistylesShadowRegistryBuilder {
 
                 // Regular style
                 if (!secrets) {
-                    Object.keys(unistyleStyle).forEach(key => {
-                        if (keyInObject(ref.style, key)) {
-                            // @ts-expect-error - Styles won't have read only properties
-                            ref.style[key] = ''
-                        }
-                    })
-
                     return unistyleStyle as UnistylesValues
                 }
 
@@ -133,6 +126,7 @@ class UnistylesShadowRegistryBuilder {
         this.classNamesMap.set(ref, newClassNames)
         // Add new classnames to the ref
         ref.classList.add(...newClassNames)
+        ref.removeAttribute('styles')
 
         return newClassNames
     }

src/web/utils/unistyle.ts

@@ -30,7 +30,7 @@ export const assignSecrets = <T>(object: T, secrets: UnistyleSecrets) => {
 }
 
 export const extractSecrets = (object: any) => {
-    return keyInObject(object, '__uni__secrets__') ? object.__uni__secrets__ as UnistyleSecrets : undefined
+    return object && keyInObject(object, '__uni__secrets__') ? object.__uni__secrets__ as UnistyleSecrets : undefined
 }
 
 export const removeInlineStyles = (values: UnistylesValues) => {