Skip to content
This repository has been archived by the owner on Dec 11, 2023. It is now read-only.

Backmerge: main #485

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Backmerge: main #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2ddf18
fix: changeset build issue
Viraj-10 Oct 17, 2023
c696c98
fix: changeset build issue
Viraj-10 Oct 17, 2023
36b1418
fix: commenting test workflow
Viraj-10 Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .changeset/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,5 @@
"access": "public",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": [
"expo-app",
"babel-gluestack-style-resolver-example",
"example-storybook",
"next-example-styled",
"benchmark-next"
]
"ignore": ["benchmark-next", "@gluestack/ui-storybook"]
}
0 .github/workflows/testing.yml → .github/workflows/testing.yml_old
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion example/storybook/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"dependencies": {
"@expo/html-elements": "^0.4.2",
"@gluestack-style/react": "^0.2.11-alpha.0",
"@gluestack-style/react": "1.0.6",
"@gluestack-ui/actionsheet": "^0.2.16",
"@gluestack-ui/alert-dialog": "^0.1.14",
"@gluestack-ui/button": "^0.1.23",
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"scripts": {
"test": "bash ./scripts/test.sh",
"dev": "turbo run dev",
"build": "turbo run build --filter=@gluestack-style* --no-cache",
"build": "turbo run build --filter=@gluestack-style/react --no-cache && yarn build:rest",
"build:rest": "turbo run build --filter=@gluestack-style* --no-cache --ignore=@gluestack-style/react",
"clean": "turbo run clean && rm -rf node_modules",
"format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\" --ignore-path .gitignore",
"release": "changeset publish",
Expand Down
4 changes: 2 additions & 2 deletions packages/benchmark-next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"styled-components": "^5.3.0"
},
"devDependencies": {
"@gluestack-style/babel-plugin-styled-resolver": "^0.1.6",
"@gluestack-style/react": "^0.1.33",
"@gluestack-style/babel-plugin-styled-resolver": "1.0.0",
"@gluestack-style/react": "1.0.6",
"@emotion/styled": "^11.3.0",
"@expo/next-adapter": "^4.0.13",
"@types/react": "17.0.1",
Expand Down