Skip to content

Commit

Permalink
fix: build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
vidhi499 committed Dec 6, 2023
1 parent 17f0b9f commit 3db263c
Show file tree
Hide file tree
Showing 17 changed files with 16,722 additions and 9,579 deletions.
16,161 changes: 16,161 additions & 0 deletions example/storybook/yarn.lock

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
"packages/themed",
"packages/config",
"packages/*",
"packages/styled/**",
"packages/unstyled/**",
"packages/react-native-aria/**",
"packages/**",
"example/storybook"
"packages/**"
],
"scripts": {
"test": "bash ./scripts/test.sh",
Expand All @@ -22,7 +20,7 @@
"lint": "eslint packages/**/**/src --ext .ts,.tsx --config .eslintrc",
"eject:gluestack-style": "git clone -b development [email protected]:gluestack/gluestack-style.git gluestack-style && echo Now update babel.config.js",
"create-new-package": "node ./scripts/create-new-package.js",
"storybook": "cd example/storybook && yarn storybook",
"storybook": "cd example/storybook && yarn && yarn storybook",
"kitchensink:web": "cd example/ui-examples && yarn web"
},
"devDependencies": {
Expand Down
3 changes: 0 additions & 3 deletions packages/config/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"include": ["./src"],
"exclude": ["node_modules", "example"],
"path": {
"@gluestack-ui/themed": ["../themed/src"]
},
"compilerOptions": {
"noEmit": false,
"declaration": true,
Expand Down
11 changes: 7 additions & 4 deletions packages/react-native-aria/button/src/useToggleButton.web.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@ export function useToggleButton(
): any {
/* eslint-enable no-redeclare */
const { isSelected } = state;
const { isPressed, buttonProps } = useButton({
...props,
const { isPressed, buttonProps } = useButton(
// @ts-ignore
onPress: chain(state.toggle, props.onPress),
});
{
...props,
// @ts-ignore
onPress: chain(state.toggle, props.onPress),
}
);

return {
isPressed,
Expand Down
1 change: 0 additions & 1 deletion packages/styled/animation-legend-motion-driver/.nvmrc

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@legendapp/motion": ">=2.2"
},
"devDependencies": {
"@gluestack-style/react": "^1.0.1",
"@gluestack-style/react": "*",
"@types/react": "^18.0.22",
"@types/react-native": "^0.69.15",
"babel-plugin-transform-remove-console": "^6.9.4",
Expand Down
5 changes: 3 additions & 2 deletions packages/styled/animation-legend-motion-driver/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
createMotionAnimatedComponent,
} from '@legendapp/motion';
import { MotionSvg } from '@legendapp/motion/svg';
import { propertyTokenMap } from './propertyTokenMap';
// import { propertyTokenMap } from './propertyTokenMap';
import { Pressable } from 'react-native';

function getVariantProps(props: any, theme: any) {
Expand Down Expand Up @@ -93,6 +93,7 @@ const AnimatePresence = React.forwardRef(
);

const AnimatedPressable = createMotionAnimatedComponent(
// @ts-ignore
Pressable
) as React.ComponentType<typeof Pressable>;

Expand All @@ -101,7 +102,7 @@ const MotionComponents = {
...MotionSvg,
Pressable: AnimatedPressable,
AnimatePresence,
};
} as any;

export class MotionAnimationDriver implements IAnimationDriverPlugin {
name: 'MotionAnimationDriver';
Expand Down
3 changes: 0 additions & 3 deletions packages/styled/animation-legend-motion-driver/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"include": ["./src"],
"exclude": ["node_modules", "example"],
"path": {
"@gluestack-style/react": ["../react/src"]
},
"compilerOptions": {
"emitDeclarationOnly": true,
"noEmit": false,
Expand Down
1 change: 0 additions & 1 deletion packages/styled/animation-moti-driver/.nvmrc

This file was deleted.

10 changes: 6 additions & 4 deletions packages/styled/animation-moti-driver/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"include": ["./src"],
"exclude": ["node_modules", "example"],
"path": {
"@gluestack-ui/themed": ["../../themed/src"],
"@gluestack-style/react": ["../react/src"]
},
"compilerOptions": {
"noEmit": false,
"paths": {
"@gluestack-style/animation-resolver": ["../animation-resolver/src"],
"@gluestack-style/legend-motion-animation-driver": [
"../animation-legend-motion-driver/src"
]
},
"declaration": true,
"allowUnreachableCode": false,
"allowUnusedLabels": true,
Expand Down
3 changes: 0 additions & 3 deletions packages/styled/animation-resolver/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"include": ["./src"],
"exclude": ["node_modules", "example"],
"path": {
"@gluestack-style/react": ["../react/src"]
},
"compilerOptions": {
"emitDeclarationOnly": true,
"noEmit": false,
Expand Down
1 change: 1 addition & 0 deletions packages/styled/babel-plugin-styled-resolver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@babel/traverse": "^7.20.5",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-typescript": "^11.1.5",
"babel-preset-expo": "^9.5.2",
"lodash.merge": "^4.6.2",
"rollup": "^4.6.0"
},
Expand Down
3 changes: 0 additions & 3 deletions packages/styled/babel-plugin-styled-resolver/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
"extends": "expo/tsconfig.base",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@gluestack-style/react": ["../react/src/index"]
},
"emitDeclarationOnly": true,
"noEmit": false,
"declaration": true,
Expand Down
3 changes: 2 additions & 1 deletion packages/styled/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
},
"dependencies": {
"inline-style-prefixer": "^6.0.1",
"normalize-css-color": "^1.0.2"
"normalize-css-color": "^1.0.2",
"react-native-svg": "^14.1.0"
},
"react-native-builder-bob": {
"source": "src",
Expand Down
3 changes: 0 additions & 3 deletions packages/styled/react/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"include": ["./src"],
"exclude": ["node_modules", "example"],
"path": {
"@gluestack-style/react": ["./src"]
},
"compilerOptions": {
"ignoreDeprecations": "5.0",
"emitDeclarationOnly": true,
Expand Down
1 change: 1 addition & 0 deletions packages/unstyled/menu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@gluestack-ui/hooks": "^0.1.7",
"@gluestack-ui/overlay": "^0.1.12",
"@gluestack-ui/utils": "^0.1.12",
"@react-aria/overlays": "^3.19.0",
"@react-native-aria/focus": "^0.2.9",
"@react-native-aria/interactions": "^0.2.11",
"@react-native-aria/menu": "^0.2.9",
Expand Down
Loading

0 comments on commit 3db263c

Please sign in to comment.