Skip to content

Commit a28cddb

Browse files
authored
Merge pull request #1844 from gluestack/main
Backmerge Main -> Patch
2 parents 22fa248 + ffde7bd commit a28cddb

File tree

6 files changed

+51
-310
lines changed

6 files changed

+51
-310
lines changed

example/storybook-nativewind/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@gluestack/storybook-nativewind",
2+
"name": "@nativewind-gluestack/storybook-nativewind",
33
"private": true,
44
"version": "0.1.0",
55
"main": "index.js",
@@ -28,8 +28,8 @@
2828
"@expo/webpack-config": "^0.17.2",
2929
"@geometricpanda/storybook-addon-iframe": "^0.2.2",
3030
"@gluestack-style/react": "^1.0.26",
31-
"@gluestack-ui/config": "^1.1.9",
32-
"@gluestack-ui/themed": "^1.1.9",
31+
"@gluestack-ui/config": "^1.1.10",
32+
"@gluestack-ui/themed": "^1.1.8",
3333
"@gluestack/design-system": "^0.5.27",
3434
"@legendapp/motion": "^2.2.0",
3535
"@react-aria/button": "^3.7.0",

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"scripts": {
99
"test": "bash ./scripts/test.sh",
1010
"dev": "turbo run dev",
11-
"build": "turbo run build --filter=[@gluestack-*,@react-native-aria*] --no-cache && yarn build:rest",
12-
"build:rest": "turbo run build --filter=@gluestack-* --no-cache --ignore=@gluestack-style/react",
11+
"build": "turbo run build --filter=@gluestack-style/react --filter=@react-native-aria/* --no-cache && yarn build:rest",
12+
"build:rest": "turbo run build --filter=@gluestack-ui/* --filter=@gluestack-style/* --no-cache",
1313
"clean": "turbo run clean && rm -rf node_modules",
1414
"format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\" --ignore-path .gitignore",
1515
"release": "changeset publish",

packages/config/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @gluestack-ui/config
22

3+
## 1.1.10
4+
5+
### Patch Changes
6+
7+
- dependencies changes
8+
39
## 1.1.9
410

511
### Patch Changes

packages/config/package.json

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gluestack-ui/config",
3-
"version": "1.1.9",
3+
"version": "1.1.10",
44
"main": "build/gluestack-ui.config.js",
55
"types": "build/gluestack-ui.config.d.ts",
66
"module": "build/gluestack-ui.config",
@@ -34,8 +34,42 @@
3434
"author": "",
3535
"license": "ISC",
3636
"devDependencies": {
37-
"@gluestack-style/react": "^1.0.43",
38-
"@gluestack-ui/themed": "^1.1.9"
37+
"@expo/html-elements": "latest",
38+
"@gluestack-style/animation-resolver": "1.0.4",
39+
"@gluestack-style/legend-motion-animation-driver": "1.0.3",
40+
"@gluestack-ui/accordion": "1.0.1",
41+
"@gluestack-ui/actionsheet": "0.2.37",
42+
"@gluestack-ui/alert": "0.1.12",
43+
"@gluestack-ui/alert-dialog": "0.1.25",
44+
"@gluestack-ui/avatar": "0.1.15",
45+
"@gluestack-ui/button": "1.0.1",
46+
"@gluestack-ui/checkbox": "0.1.24",
47+
"@gluestack-ui/divider": "0.1.8",
48+
"@gluestack-ui/fab": "0.1.18",
49+
"@gluestack-ui/form-control": "0.1.16",
50+
"@gluestack-ui/icon": "0.1.20",
51+
"@gluestack-ui/image": "0.1.7",
52+
"@gluestack-ui/input": "0.1.24",
53+
"@gluestack-ui/link": "0.1.17",
54+
"@gluestack-ui/menu": "0.2.29",
55+
"@gluestack-ui/modal": "0.1.29",
56+
"@gluestack-ui/overlay": "0.1.12",
57+
"@gluestack-ui/popover": "0.1.31",
58+
"@gluestack-ui/pressable": "0.1.14",
59+
"@gluestack-ui/progress": "0.1.13",
60+
"@gluestack-ui/provider": "0.1.10",
61+
"@gluestack-ui/radio": "0.1.25",
62+
"@gluestack-ui/select": "0.1.24",
63+
"@gluestack-ui/slider": "0.1.21",
64+
"@gluestack-ui/spinner": "0.1.14",
65+
"@gluestack-ui/switch": "0.1.19",
66+
"@gluestack-ui/tabs": "0.1.14",
67+
"@gluestack-ui/textarea": "0.1.20",
68+
"@gluestack-ui/toast": "1.0.4",
69+
"@gluestack-ui/tooltip": "0.1.26",
70+
"@legendapp/motion": "latest",
71+
"@gluestack-style/react": "1.0.48",
72+
"@gluestack-ui/themed": "1.1.8"
3973
},
4074
"peerDependencies": {
4175
"@gluestack-style/react": ">=1.0",

packages/config/src/components/AlertDialog/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
import { createAlertDialog } from '@gluestack-ui/alert-dialog';
77
import { View, Pressable, ScrollView } from 'react-native';
88
import { styled } from '@gluestack-style/react';
9+
910
const StyledRoot = styled(
1011
View,
1112
{

0 commit comments

Comments
 (0)