Skip to content

Commit

Permalink
Merge pull request #1311 from gluestack/main
Browse files Browse the repository at this point in the history
Backmerge Main -> Patch
  • Loading branch information
Viraj-10 authored Oct 19, 2023
2 parents 97a693a + 28e0ea6 commit 0b87087
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const ActionsheetBasic = ({ showActionsheetProp, ...props }: any) => {

return (
<Center>
<Button onPress={() => setShowActionsheet(true)}>
<Button>
<ButtonText>Open</ButtonText>
</Button>
<Actionsheet
Expand Down
8 changes: 8 additions & 0 deletions packages/config/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# @gluestack-ui/config

## 1.0.2

### Patch Changes

- `@gluestack-style/react` version upgrade
- Typing issue fixes
9 changes: 4 additions & 5 deletions packages/config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gluestack-ui/config",
"version": "1.0.1",
"version": "1.0.2",
"main": "build/gluestack-ui.config.js",
"types": "build/gluestack-ui.config.d.ts",
"module": "build/gluestack-ui.config",
Expand Down Expand Up @@ -29,8 +29,8 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@gluestack-style/react": "^1.0.5",
"@gluestack-ui/themed": "^1.0.5"
"@gluestack-style/react": "^1.0.7",
"@gluestack-ui/themed": "^1.0.7"
},
"peerDependencies": {
"@gluestack-style/react": ">=1.0",
Expand All @@ -47,6 +47,5 @@
"github": {
"release": true
}
},
"dependencies": {}
}
}
7 changes: 7 additions & 0 deletions packages/themed/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @gluestack-ui/themed

## 1.0.7

### Patch Changes

- `@gluestack-style/react` version upgrade
- Typing issue fixes

## 1.0.6

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/themed/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gluestack-ui/themed",
"version": "1.0.6",
"version": "1.0.7",
"main": "build/index.js",
"types": "build/index.d.ts",
"module": "build/index",
Expand Down Expand Up @@ -70,7 +70,7 @@
"@babel/preset-env": "^7.22.9",
"@babel/preset-react": "^7.22.5",
"@babel/preset-typescript": "^7.22.5",
"@gluestack-style/react": "^1.0.3",
"@gluestack-style/react": "^1.0.7",
"@types/react-native": "^0.71.6",
"file-loader": "^6.2.0",
"react": "^18.2.0",
Expand Down
16 changes: 4 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2532,18 +2532,10 @@
inline-style-prefixer "^6.0.1"
normalize-css-color "^1.0.2"

"@gluestack-style/react@^1.0.3":
version "1.0.5"
resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-1.0.5.tgz#80c3255d935cf619eaff3423f182560765bf058e"
integrity sha512-zVyt74Tn/uqzo/F9ctYIaYoyggG+oWDw2XfOBDcuCGTwkclvAcprYdXWPDkCvy4aBOfIRUkwlz1qaEgaD40G0w==
dependencies:
inline-style-prefixer "^6.0.1"
normalize-css-color "^1.0.2"

"@gluestack-style/react@^1.0.5":
version "1.0.6"
resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-1.0.6.tgz#8452e681341b20426b01435c5c9b75455f33aab7"
integrity sha512-NUQrfXoPEUNxOIOVIP2U1ZAY4V7lVHyJ0klLecpjQQlO2BEP8youK/jRH2VOTtYASGiNWLFAUXQ+xnmw1dsVCA==
"@gluestack-style/react@^1.0.7":
version "1.0.7"
resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-1.0.7.tgz#583fec8b1d15dba3882dccdc0f691de725e47ab7"
integrity sha512-a5B/QXmrwmW90nv8Z2kAyb9ARJrrKKLEf8wHge3bsjZVgyY2mW34/9vCOGWS6+5aipMhBQrwYwXXgC3EDA8TRg==
dependencies:
inline-style-prefixer "^6.0.1"
normalize-css-color "^1.0.2"
Expand Down

0 comments on commit 0b87087

Please sign in to comment.