Merge pull request #485 from gluestack/main

Backmerge: main
gluestack · Oct 18, 2023 · 0a4bb8c · 0a4bb8c
2 parents 98c9022 + 36b1418
commit 0a4bb8c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -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"]
 }
diff --git a/.github/workflows/testing.yml → .github/workflows/testing.yml_old b/.github/workflows/testing.yml → .github/workflows/testing.yml_old
diff --git a/example/storybook/package.json b/example/storybook/package.json
@@ -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",

diff --git a/package.json b/package.json
@@ -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",

diff --git a/packages/benchmark-next/package.json b/packages/benchmark-next/package.json
@@ -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",