diff --git a/client/package.json b/client/package.json index 664b7bdc..c39fec38 100644 --- a/client/package.json +++ b/client/package.json @@ -37,9 +37,10 @@ "@react-native-community/slider": "^4.5.2", "@react-native-picker/picker": "^2.7.5", "@shopify/react-native-skia": "1.2.3", - "design": "workspace:*", + "design": "workspace:react-exo-ui@*", "react-dom": "^18.2.0", "react-exo": "workspace:*", + "react-exo-ui": "workspace:*", "react-native-bootsplash": "^5.5.2", "react-native-gesture-handler": "^2.16.0", "react-native-get-random-values": "^1.11.0", diff --git a/design/env.d.ts b/design/env.d.ts index ab69098d..9bf6c699 100644 --- a/design/env.d.ts +++ b/design/env.d.ts @@ -1,7 +1,7 @@ import type {AppThemes, AppBreakpoints} from './styles'; import type {SvgProps} from 'react-native-svg'; -declare module 'styles' { +declare module 'react-exo-ui/styles' { export interface UnistylesThemes extends AppThemes {} export interface UnistylesBreakpoints extends AppBreakpoints {} } @@ -11,6 +11,11 @@ declare module 'design/styles' { export interface UnistylesBreakpoints extends AppBreakpoints {} } +declare module 'styles' { + export interface UnistylesThemes extends AppThemes {} + export interface UnistylesBreakpoints extends AppBreakpoints {} +} + declare module '*.svg' { const content: React.FC; export default content; diff --git a/design/package.json b/design/package.json index c741c596..08545c41 100644 --- a/design/package.json +++ b/design/package.json @@ -1,5 +1,5 @@ { - "name": "design", + "name": "react-exo-ui", "private": true, "type": "module", "scripts": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f30a00cb..605c21a3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,7 +54,7 @@ importers: specifier: 1.2.3 version: 1.2.3(react-native-reanimated@3.8.1)(react-native@0.73.6)(react@18.3.0) design: - specifier: workspace:* + specifier: workspace:react-exo-ui@* version: link:../design react: specifier: ^18.2.0 @@ -65,6 +65,9 @@ importers: react-exo: specifier: workspace:* version: link:../library + react-exo-ui: + specifier: workspace:* + version: link:../design react-native: specifier: ^0.73.0 version: 0.73.6(@babel/core@7.23.9)(@babel/preset-env@7.23.6)(react@18.3.0) @@ -562,6 +565,9 @@ importers: specifier: ^8.0.10 version: 8.0.10(@types/react@18.3.0)(react-dom@18.3.0)(react@18.2.0) design: + specifier: workspace:react-exo-ui@* + version: link:../../../design + react-exo-ui: specifier: workspace:* version: link:../../../design devDependencies: @@ -598,9 +604,6 @@ importers: '@lingui/react': specifier: ^4.10.0 version: 4.10.0(react@18.3.0) - design: - specifier: workspace:* - version: link:../../../design react: specifier: ^18.2.0 version: 18.3.0 @@ -622,6 +625,9 @@ importers: react-redux: specifier: ^9.1.2 version: 9.1.2(@types/react@18.3.0)(react@18.3.0)(redux@5.0.1) + storybook-common: + specifier: workspace:* + version: link:../common vite-plugin-node-polyfills: specifier: ^0.21.0 version: 0.21.0(rollup@4.13.0)(vite@5.2.11) @@ -671,9 +677,6 @@ importers: storybook: specifier: 8.0.10 version: 8.0.10(@babel/preset-env@7.23.6)(react-dom@18.3.0)(react@18.3.0) - storybook-common: - specifier: workspace:* - version: link:../common typescript: specifier: ^5.3.2 version: 5.4.3 @@ -690,7 +693,7 @@ importers: specifier: ^4.10.0 version: 4.10.0(react@18.3.0) design: - specifier: workspace:* + specifier: workspace:react-exo-ui@* version: link:../../design react: specifier: ^18.2.0 @@ -704,6 +707,9 @@ importers: react-exo: specifier: workspace:* version: link:../../library + react-exo-ui: + specifier: workspace:* + version: link:../../design react-native: specifier: ^0.73.6 version: 0.73.6(@babel/core@7.23.9)(@babel/preset-env@7.23.6)(react@18.3.0) diff --git a/toolkit/storybook/common/package.json b/toolkit/storybook/common/package.json index d445a676..b3232046 100644 --- a/toolkit/storybook/common/package.json +++ b/toolkit/storybook/common/package.json @@ -6,7 +6,8 @@ "@iconify/react": "^4.1.1", "@storybook/addon-essentials": "^8.0.10", "@storybook/blocks": "^8.0.10", - "design": "workspace:*" + "design": "workspace:react-exo-ui@*", + "react-exo-ui": "workspace:*" }, "devDependencies": { "@types/react": "^18.2.0", diff --git a/toolkit/storybook/web/package.json b/toolkit/storybook/web/package.json index c7082cd4..f2a9a9ce 100644 --- a/toolkit/storybook/web/package.json +++ b/toolkit/storybook/web/package.json @@ -10,7 +10,6 @@ "@lingui/core": "^4.10.0", "@lingui/macro": "^4.10.0", "@lingui/react": "^4.10.0", - "design": "workspace:*", "react": "^18.2.0", "react-dom": "^18.2.0", "react-exo": "workspace:*", @@ -18,6 +17,7 @@ "react-native-svg": "^15.1.0", "react-native-web": "^0.19.10", "react-redux": "^9.1.2", + "storybook-common": "workspace:*", "vite-plugin-node-polyfills": "^0.21.0" }, "devDependencies": { @@ -36,7 +36,6 @@ "config": "workspace:*", "client": "workspace:*", "storybook": "8.0.10", - "storybook-common": "workspace:*", "typescript": "^5.3.2" }, "browserslist": { diff --git a/toolkit/vocs/package.json b/toolkit/vocs/package.json index 8a0498f4..a0b18da1 100644 --- a/toolkit/vocs/package.json +++ b/toolkit/vocs/package.json @@ -11,11 +11,12 @@ "@lingui/core": "^4.10.0", "@lingui/macro": "^4.10.0", "@lingui/react": "^4.10.0", - "design": "workspace:*", + "design": "workspace:react-exo-ui@*", "react": "^18.2.0", "react-docgen": "^7.0.3", "react-dom": "^18.2.0", "react-exo": "workspace:*", + "react-exo-ui": "workspace:*", "react-native": "^0.73.6", "react-native-svg": "^15.1.0", "react-native-web": "^0.19.10",