From 9dff729d1a5779bfdace9b78298aff4d52acc6f3 Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Wed, 5 Jul 2023 12:48:10 +0530 Subject: [PATCH 1/2] fix: media query type for global style --- packages/react/src/types.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/react/src/types.ts b/packages/react/src/types.ts index 50d6a6fc2..a252ac75e 100644 --- a/packages/react/src/types.ts +++ b/packages/react/src/types.ts @@ -699,6 +699,13 @@ export type GlobalStyles = GlobalVariantSx< TokenTypes, 'variants' extends keyof Variants ? Variants['variants'] : unknown > & { + // @ts-ignore + [K in `@${keyof TokenTypes['mediaQueries']}`]?: GlobalVariantSx< + AliasTypes, + TokenTypes, + Variants + >; +} & { variants: GlobalVariantType< 'variants' extends keyof Variants ? Variants['variants'] : unknown, AliasTypes, From 51048ab8f27282605c4faf723ac127759d62a554 Mon Sep 17 00:00:00 2001 From: Suraj Date: Wed, 5 Jul 2023 15:28:28 +0530 Subject: [PATCH 2/2] chore: version updated --- example/babel-plugin-styled-resolver-expo/package.json | 6 +++--- example/expo-app/package.json | 2 +- example/next/package.json | 2 +- example/storybook/package.json | 6 +++--- packages/benchmark-next/package.json | 2 +- packages/react/CHANGELOG.md | 6 ++++++ packages/react/package.json | 2 +- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/example/babel-plugin-styled-resolver-expo/package.json b/example/babel-plugin-styled-resolver-expo/package.json index 03e954da5..9b40740dd 100644 --- a/example/babel-plugin-styled-resolver-expo/package.json +++ b/example/babel-plugin-styled-resolver-expo/package.json @@ -11,7 +11,7 @@ "build": "bob build" }, "dependencies": { - "@gluestack-style/react": "^0.1.30", + "@gluestack-style/react": "^0.1.31", "expo": "~47.0.8", "expo-status-bar": "~1.4.2", "find-yarn-workspace-root": "^2.0.0" @@ -27,10 +27,10 @@ "babel-plugin-relative-path-import": "^2.0.1", "ts-loader": "~8.2.0", "typescript": "^4.6.3", - "@gluestack-style/react": "^0.1.30" + "@gluestack-style/react": "^0.1.31" }, "peerDependencies": { - "@gluestack-style/react": "^0.1.30", + "@gluestack-style/react": "^0.1.31", "react": "*", "react-dom": "*", "react-native": "*", diff --git a/example/expo-app/package.json b/example/expo-app/package.json index 40366953f..be9c32693 100644 --- a/example/expo-app/package.json +++ b/example/expo-app/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@gluestack-style/babel-plugin-styled-resolver": "^0.1.0", - "@gluestack-style/react": "^0.1.30", + "@gluestack-style/react": "^0.1.31", "expo": "~47.0.12", "expo-status-bar": "~1.4.2", "react": "18.1.0", diff --git a/example/next/package.json b/example/next/package.json index 838ef2bf4..459cc5996 100644 --- a/example/next/package.json +++ b/example/next/package.json @@ -23,7 +23,7 @@ "react-native-vector-icons": "^9.1.0", "react-native-vector-icons-for-web": "^0.1.7", "react-native-web-linear-gradient": "^1.1.2", - "@gluestack-style/react": "^0.1.30", + "@gluestack-style/react": "^0.1.31", "@gluestack-style/babel-plugin-styled-resolver": "^0.1.6" }, "devDependencies": { diff --git a/example/storybook/package.json b/example/storybook/package.json index 351c3bd8f..2bc2222fb 100644 --- a/example/storybook/package.json +++ b/example/storybook/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@gluestack-style/animation-plugin": "^0.1.7", - "@gluestack-style/react": "^0.1.30", + "@gluestack-style/react": "^0.1.31", "@gluestack/design-system": "latest", "@legendapp/motion": "^2.2.0", "@react-native-async-storage/async-storage": "~1.17.3", @@ -43,7 +43,7 @@ "devDependencies": { "@babel/core": "^7.19.3", "@gluestack-style/animation-plugin": "^0.1.7", - "@gluestack-style/react": "^0.1.30", + "@gluestack-style/react": "^0.1.31", "@storybook/addon-actions": "^6.5.14", "@storybook/addon-controls": "^6.5.14", "@storybook/addon-docs": "^6.5.15", @@ -69,7 +69,7 @@ "typescript": "4.9.4" }, "peerDependencies": { - "@gluestack-style/react": "^0.1.30", + "@gluestack-style/react": "^0.1.31", "react": "*", "react-dom": "*", "react-native": "*", diff --git a/packages/benchmark-next/package.json b/packages/benchmark-next/package.json index 18ea475f8..9b08406a6 100644 --- a/packages/benchmark-next/package.json +++ b/packages/benchmark-next/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@gluestack-style/babel-plugin-styled-resolver": "^0.1.6", - "@gluestack-style/react": "^0.1.30", + "@gluestack-style/react": "^0.1.31", "@emotion/styled": "^11.3.0", "@expo/next-adapter": "^4.0.13", "@types/react": "17.0.1", diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index dc2f5c132..3d7274e4f 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -1,5 +1,11 @@ # @gluestack-style/react +## 0.1.31 + +### Patch Changes + +- - Global style media query typing fixes + ## 0.1.30 ### Patch Changes diff --git a/packages/react/package.json b/packages/react/package.json index 73ad3d597..655cdcf33 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,7 +1,7 @@ { "name": "@gluestack-style/react", "description": "A universal & performant styling library for React Native, Next.js & React", - "version": "0.1.30", + "version": "0.1.31", "keywords": [ "React Native", "Next.js",