Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/unstyled build #2579

Merged
merged 14 commits into from
Nov 11, 2024
Merged

Fix/unstyled build #2579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
501f472
v1.0.8-alpha.11
Viraj-10 Nov 8, 2024
1d9bff3
fix: changing jsx to preserve
Viraj-10 Nov 8, 2024
ca2b084
v1.0.8-alpha.12
Viraj-10 Nov 8, 2024
343651a
v1.0.8-alpha.13
Viraj-10 Nov 8, 2024
826fa6e
v1.0.8-alpha.14
Viraj-10 Nov 8, 2024
5532eed
v1.0.8-alpha.15
Viraj-10 Nov 8, 2024
cc90408
fix: typescript version upgrade
Viraj-10 Nov 11, 2024
5654ffb
fix: changing build script
Viraj-10 Nov 11, 2024
d010bc9
fix: clean script
Viraj-10 Nov 11, 2024
02340bb
fix: updated package json for tsc build
Viraj-10 Nov 11, 2024
4360270
fix: tsconfig files
Viraj-10 Nov 11, 2024
4b721d0
fix: updated typescript version
Viraj-10 Nov 11, 2024
935552b
fix: build issues
Viraj-10 Nov 11, 2024
b6c7dda
fix: react native aria build
Viraj-10 Nov 11, 2024
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
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
"scripts": {
"test": "bash ./scripts/test.sh",
"dev": "turbo run dev",
"build:unstyled": "turbo run build --filter=./packages/unstyled/*",
"build": "turbo run build --filter=@gluestack-style/react --filter=@react-native-aria/* --no-cache && yarn build:rest",
"build:rest": "turbo run build --filter=@gluestack-ui/* --filter=@gluestack-style/* --filter=!@gluestack-ui/nativewind-utils --no-cache",
"clean": "turbo run clean && rm -rf node_modules",
"clean": "turbo run clean",
"format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\" --ignore-path .gitignore",
"release": "changeset publish",
"prepare": "husky install",
Expand Down Expand Up @@ -46,7 +47,7 @@
"release-it": "^15.5.1",
"ts-node": "^10.9.1",
"tsc-files": "^1.1.3",
"turbo": "latest",
"turbo": "^1.13.3",
"typescript": "5.1.6"
},
"resolutions": {
Expand Down
43 changes: 8 additions & 35 deletions packages/unstyled/accordion/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,17 @@
"nextjs"
],
"version": "1.0.7",
"main": "lib/commonjs/index",
"module": "lib/module/index",
"types": "lib/typescript/index.d.ts",
"main": "lib/index",
"module": "lib/index",
"types": "lib/index.d.ts",
"react-native": "src/index",
"source": "src/index",
"typings": "lib/typescript/index.d.ts",
"typings": "lib/index.d.ts",
"scripts": {
"prepare": "bob build",
"prepare": "tsc",
"release": "release-it",
"build": "bob build",
"watch": "tsc --watch",
"build": "tsc",
"clean": "rm -rf lib",
"dev:web": "cd example/native && yarn web --clear",
"storybook": "cd example/native/storybook && yarn web"
Expand All @@ -40,7 +41,7 @@
"react-native-builder-bob": "^0.20.1",
"react-native-web": "^0.19.9",
"tsconfig": "7",
"typescript": "^4.9.4"
"typescript": "^5.6.3"
},
"dependencies": {
"@gluestack-ui/utils": "^0.1.12",
Expand All @@ -57,17 +58,6 @@
"react": ">=16",
"react-dom": ">=16"
},
"react-native-builder-bob": {
"source": "src",
"output": "lib",
"targets": [
"commonjs",
[
"module"
],
"typescript"
]
},
"files": [
"lib/",
"src/"
Expand All @@ -87,22 +77,5 @@
"setupFiles": [
"<rootDir>/src/jest/mock.ts"
]
},
"release-it": {
"git": {
"commitMessage": "chore: release ${version}",
"tagName": "v${version}"
},
"npm": {
"publish": true
},
"github": {
"release": true
},
"plugins": {
"@release-it/conventional-changelog": {
"preset": "angular"
}
}
}
}
2 changes: 1 addition & 1 deletion packages/unstyled/accordion/src/AccordionItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { forwardRef, useContext, useMemo, useState } from 'react';
import { AccordionContext, AccordionItemContext } from './Context';
import { IAccordionItemProps } from './types';
import type { IAccordionItemProps } from './types';
import { useAccordionItem } from '@react-native-aria/accordion';

export const AccordionItem = <T,>(StyledAccordionItem: any) =>
Expand Down
2 changes: 1 addition & 1 deletion packages/unstyled/accordion/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { AccordionContentText } from './AccordionContentText';
import { AccordionItem } from './AccordionItem';
import { AccordionTrigger } from './AccordionTrigger';
import { AccordionContent } from './AccordionContent';
import { IAccordionComponentType } from './types';
import type { IAccordionComponentType } from './types';
import { AccordionIcon } from './AccordionIcon';
import { AccordionHeader } from './AccordionHeader';

Expand Down
16 changes: 8 additions & 8 deletions packages/unstyled/accordion/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
{
"include": ["src"],
"include": ["./src"],
"exclude": ["node_modules", "example"],
"paths": {
"@gluestack-ui/utils": ["../utils/src"]
},
"paths": {},
"compilerOptions": {
"emitDeclarationOnly": true,
"ignoreDeprecations": "5.0",
"noEmit": false,
"baseUrl": "",
"declaration": true,
"allowJs": true,
"allowUnreachableCode": false,
"allowUnusedLabels": true,
"esModuleInterop": true,
"verbatimModuleSyntax": true,
"forceConsistentCasingInFileNames": true,
"jsx": "react",
"jsx": "preserve",
"lib": ["esnext", "dom"],
"module": "esnext",
"moduleResolution": "node",
Expand All @@ -26,6 +25,7 @@
"resolveJsonModule": true,
"skipLibCheck": true,
"strict": true,
"target": "esnext"
"target": "esnext",
"outDir": "./lib"
}
}
43 changes: 8 additions & 35 deletions packages/unstyled/actionsheet/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,17 @@
"nextjs"
],
"version": "0.2.45",
"main": "lib/commonjs/index",
"module": "lib/module/index",
"types": "lib/typescript/index.d.ts",
"main": "lib/index",
"module": "lib/index",
"types": "lib/index.d.ts",
"react-native": "src/index",
"source": "src/index",
"typings": "lib/typescript/index.d.ts",
"typings": "lib/index.d.ts",
"scripts": {
"prepare": "bob build",
"prepare": "tsc",
"release": "release-it",
"build": "bob build",
"watch": "tsc --watch",
"build": "tsc",
"clean": "rm -rf lib",
"dev:web": "cd example/native && yarn web --clear",
"storybook": "cd example/native/storybook && yarn web"
Expand All @@ -40,7 +41,7 @@
"react-native-builder-bob": "^0.20.1",
"react-native-web": "^0.19.9",
"tsconfig": "7",
"typescript": "^4.9.4"
"typescript": "^5.6.3"
},
"dependencies": {
"@gluestack-ui/hooks": "0.1.11",
Expand All @@ -60,17 +61,6 @@
"react": ">=16",
"react-dom": ">=16"
},
"react-native-builder-bob": {
"source": "src",
"output": "lib",
"targets": [
"commonjs",
[
"module"
],
"typescript"
]
},
"files": [
"lib/",
"src/"
Expand All @@ -90,22 +80,5 @@
"setupFiles": [
"<rootDir>/src/jest/mock.ts"
]
},
"release-it": {
"git": {
"commitMessage": "chore: release ${version}",
"tagName": "v${version}"
},
"npm": {
"publish": true
},
"github": {
"release": true
},
"plugins": {
"@release-it/conventional-changelog": {
"preset": "angular"
}
}
}
}
19 changes: 8 additions & 11 deletions packages/unstyled/actionsheet/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
{
"include": ["src"],
"include": ["./src"],
"exclude": ["node_modules", "example"],
"paths": {
"@gluestack-ui/utils": ["../utils/src"],
"@gluestack-ui/transitions": ["../transitions/src"],
"@gluestack-ui/hooks": ["../hooks/src"],
"@gluestack-ui/overlay": ["../overlay/src"]
},
"paths": {},
"compilerOptions": {
"emitDeclarationOnly": true,
"ignoreDeprecations": "5.0",
"noEmit": false,
"baseUrl": "",
"declaration": true,
"allowJs": true,
"allowUnreachableCode": false,
"allowUnusedLabels": true,
"esModuleInterop": true,
"verbatimModuleSyntax": true,
"forceConsistentCasingInFileNames": true,
"jsx": "react",
"jsx": "preserve",
"lib": ["esnext", "dom"],
"module": "esnext",
"moduleResolution": "node",
Expand All @@ -29,6 +25,7 @@
"resolveJsonModule": true,
"skipLibCheck": true,
"strict": true,
"target": "esnext"
"target": "esnext",
"outDir": "./lib"
}
}
43 changes: 8 additions & 35 deletions packages/unstyled/alert-dialog/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,17 @@
"nextjs"
],
"version": "0.1.31",
"main": "lib/commonjs/index",
"module": "lib/module/index",
"types": "lib/typescript/index.d.ts",
"main": "lib/index",
"module": "lib/index",
"types": "lib/index.d.ts",
"react-native": "src/index",
"source": "src/index",
"typings": "lib/typescript/index.d.ts",
"typings": "lib/index.d.ts",
"scripts": {
"prepare": "bob build",
"prepare": "tsc",
"release": "release-it",
"build": "bob build",
"watch": "tsc --watch",
"build": "tsc",
"clean": "rm -rf lib",
"dev:web": "cd example/native && yarn web --clear",
"storybook": "cd example/native/storybook && yarn web"
Expand All @@ -40,7 +41,7 @@
"react-native-builder-bob": "^0.20.1",
"react-native-web": "^0.19.9",
"tsconfig": "7",
"typescript": "^4.9.4"
"typescript": "^5.6.3"
},
"dependencies": {
"@gluestack-ui/hooks": "0.1.11",
Expand All @@ -59,17 +60,6 @@
"type": "git",
"url": "git+https://github.com/gluestack/gluestack-ui.git"
},
"react-native-builder-bob": {
"source": "src",
"output": "lib",
"targets": [
"commonjs",
[
"module"
],
"typescript"
]
},
"files": [
"lib/",
"src/"
Expand All @@ -89,22 +79,5 @@
"setupFiles": [
"<rootDir>/src/jest/mock.ts"
]
},
"release-it": {
"git": {
"commitMessage": "chore: release ${version}",
"tagName": "v${version}"
},
"npm": {
"publish": true
},
"github": {
"release": true
},
"plugins": {
"@release-it/conventional-changelog": {
"preset": "angular"
}
}
}
}
19 changes: 8 additions & 11 deletions packages/unstyled/alert-dialog/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
{
"include": ["src"],
"include": ["./src"],
"exclude": ["node_modules", "example"],
"paths": {
"@gluestack-ui/utils": ["../utils/src"],
"@gluestack-ui/transitions": ["../transitions/src"],
"@gluestack-ui/overlay": ["../overlay/src"],
"@gluestack-ui/hooks": ["../hooks/src"]
},
"paths": {},
"compilerOptions": {
"emitDeclarationOnly": true,
"ignoreDeprecations": "5.0",
"noEmit": false,
"baseUrl": "",
"declaration": true,
"allowJs": true,
"allowUnreachableCode": false,
"allowUnusedLabels": true,
"esModuleInterop": true,
"verbatimModuleSyntax": true,
"forceConsistentCasingInFileNames": true,
"jsx": "react",
"jsx": "preserve",
"lib": ["esnext", "dom"],
"module": "esnext",
"moduleResolution": "node",
Expand All @@ -29,6 +25,7 @@
"resolveJsonModule": true,
"skipLibCheck": true,
"strict": true,
"target": "esnext"
"target": "esnext",
"outDir": "./lib"
}
}
Loading
Loading