From a72705b7aff6a31054216e244a4c2a3142feb2a6 Mon Sep 17 00:00:00 2001 From: Viraj-10 Date: Tue, 17 Oct 2023 17:05:17 +0530 Subject: [PATCH 1/4] fix: storybook config build issue --- example/storybook/.storybook/main.js | 8 ++++++++ example/storybook/babel.config.js | 16 ++++++++-------- yarn.lock | 16 ++++++++-------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/example/storybook/.storybook/main.js b/example/storybook/.storybook/main.js index d9d83ae2b6..23c1eff1f3 100644 --- a/example/storybook/.storybook/main.js +++ b/example/storybook/.storybook/main.js @@ -47,6 +47,14 @@ module.exports = { '../../../packages/themed/src' ), }; + + config.resolve.alias = { + ...config.resolve.alias, + '@gluestack-ui/config': path.join( + __dirname, + '../../../packages/config/src/gluestack-ui.config' + ), + }; config.module.rules.push({ test: /\.mjs$/, include: /node_modules/, diff --git a/example/storybook/babel.config.js b/example/storybook/babel.config.js index 8a6071bd4e..7838774983 100644 --- a/example/storybook/babel.config.js +++ b/example/storybook/babel.config.js @@ -10,14 +10,14 @@ module.exports = function (api) { 'module-resolver', { alias: { - // '@gluestack-ui/themed': path.join( - // __dirname, - // '../../packages/themed/src' - // ), - // '@gluestack-ui/config': path.join( - // __dirname, - // '../../packages/config/src/gluestack-ui.config' - // ), + '@gluestack-ui/themed': path.join( + __dirname, + '../../packages/themed/src' + ), + '@gluestack-ui/config': path.join( + __dirname, + '../../packages/config/src/gluestack-ui.config' + ), // '@gluestack-style/react': path.join( // __dirname, // '../../../dank-style/packages/react/src' diff --git a/yarn.lock b/yarn.lock index 783f6167a3..1591464283 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2524,14 +2524,6 @@ resolved "https://registry.yarnpkg.com/@gluestack-style/legend-motion-animation-driver/-/legend-motion-animation-driver-1.0.2.tgz#051c26b0d501e03b12e4dbfe01b292eee5c29c8f" integrity sha512-rB5HIhVzpgPQ9C1JJvY30a1bP0sQRWWFgUHVaiefH8dA/XRAQpmAIMF48JDctrvoBi/tKp5xN10mLE5CtnDRHg== -"@gluestack-style/react@^0.2.54-alpha.3": - version "0.2.54-alpha.5" - resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-0.2.54-alpha.5.tgz#75ef100236ad81a631f247d43a366981ad4fd976" - integrity sha512-mFnEym5cXH9ZXqKQ/BVQ5OyCZpIASFxMbjn1nwxidta6azi04lyV8i2rX3NWyoHizgT/Z3cV6R5ORCf5SRDqpw== - dependencies: - inline-style-prefixer "^6.0.1" - normalize-css-color "^1.0.2" - "@gluestack-style/react@^0.2.9": version "0.2.43" resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-0.2.43.tgz#1e1cf0fd9b3ab6d2396453a19feb14ba35575768" @@ -2548,6 +2540,14 @@ 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== + dependencies: + inline-style-prefixer "^6.0.1" + normalize-css-color "^1.0.2" + "@gluestack-ui/actionsheet@^0.2.25": version "0.2.25" resolved "https://registry.yarnpkg.com/@gluestack-ui/actionsheet/-/actionsheet-0.2.25.tgz#ac90d00d3eee68c23172994df3f9333f3d7bff83" From 8d82484e3f027912105fbbebd24127a338a73275 Mon Sep 17 00:00:00 2001 From: Viraj-10 Date: Wed, 18 Oct 2023 11:05:03 +0530 Subject: [PATCH 2/4] fix: storybook example fix toast --- example/storybook/src/components/Feedback/Toast/Basic.tsx | 2 +- .../src/components/Feedback/Toast/index.stories.mdx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/example/storybook/src/components/Feedback/Toast/Basic.tsx b/example/storybook/src/components/Feedback/Toast/Basic.tsx index 33a80a06f3..4b1d021229 100644 --- a/example/storybook/src/components/Feedback/Toast/Basic.tsx +++ b/example/storybook/src/components/Feedback/Toast/Basic.tsx @@ -16,7 +16,7 @@ const ToastPlacement = ({ placement = 'top', ...props }: any) => { placement: placement, render: ({ id }) => { return ( - + { return ( - + Download Complete @@ -706,7 +706,7 @@ A Toast component with custom duration allows for specifying the length of time duration: duration, render: ({ id }) => { return ( - + New Message @@ -774,7 +774,7 @@ A Toast component with preserve toast functionality retains the notification on duration: null, render: ({ id }) => { return ( - + Account Security Alert @@ -883,7 +883,7 @@ export default () => { placement: placement, render: ({ id }) => { return ( - + Hello World Toast {id} ); From 582c067aab0547ee473ba3e65f071effd14813cb Mon Sep 17 00:00:00 2001 From: Viraj-10 Date: Wed, 18 Oct 2023 16:57:32 +0530 Subject: [PATCH 3/4] fix: typing issue upgrade style --- .../Disclosure/Actionsheet/Actionsheet.tsx | 2 +- packages/config/package.json | 5 ++--- packages/themed/package.json | 2 +- yarn.lock | 16 ++++------------ 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/example/storybook/src/components/Disclosure/Actionsheet/Actionsheet.tsx b/example/storybook/src/components/Disclosure/Actionsheet/Actionsheet.tsx index af4f5d7b04..0256110370 100644 --- a/example/storybook/src/components/Disclosure/Actionsheet/Actionsheet.tsx +++ b/example/storybook/src/components/Disclosure/Actionsheet/Actionsheet.tsx @@ -40,7 +40,7 @@ const ActionsheetBasic = ({ showActionsheetProp, ...props }: any) => { return (
- Date: Wed, 18 Oct 2023 17:05:55 +0530 Subject: [PATCH 4/4] chore: version bump @gluestack-ui/themed to 1.0.7 and @gluestack-ui/config to 1.0.2 --- packages/config/CHANGELOG.md | 8 ++++++++ packages/config/package.json | 4 ++-- packages/themed/CHANGELOG.md | 7 +++++++ packages/themed/package.json | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md index e69de29bb2..a383a900c5 100644 --- a/packages/config/CHANGELOG.md +++ b/packages/config/CHANGELOG.md @@ -0,0 +1,8 @@ +# @gluestack-ui/config + +## 1.0.2 + +### Patch Changes + +- `@gluestack-style/react` version upgrade + - Typing issue fixes diff --git a/packages/config/package.json b/packages/config/package.json index af1251d622..7830a28ab8 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -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", @@ -30,7 +30,7 @@ "license": "ISC", "devDependencies": { "@gluestack-style/react": "^1.0.7", - "@gluestack-ui/themed": "^1.0.5" + "@gluestack-ui/themed": "^1.0.7" }, "peerDependencies": { "@gluestack-style/react": ">=1.0", diff --git a/packages/themed/CHANGELOG.md b/packages/themed/CHANGELOG.md index ec759b31fa..ae3686426c 100644 --- a/packages/themed/CHANGELOG.md +++ b/packages/themed/CHANGELOG.md @@ -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 diff --git a/packages/themed/package.json b/packages/themed/package.json index 7e925c344b..1cb33b6979 100644 --- a/packages/themed/package.json +++ b/packages/themed/package.json @@ -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",