From 9e6e92bbb943396425ba7419849021fe204734db Mon Sep 17 00:00:00 2001 From: Zai Shi Date: Sun, 14 Apr 2024 14:22:48 +0200 Subject: [PATCH] export joy from a different dir --- apps/demo/src/components/provider.tsx | 3 ++- apps/dev/src/components/provider.tsx | 3 ++- docs/docs/02-customization/03-custom-components.md | 3 ++- packages/stack-server/src/app/(main)/layout.tsx | 2 +- packages/stack/package.json | 12 ++++++++++-- packages/stack/src/index.tsx | 1 - packages/stack/src/joy.tsx | 1 + 7 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 packages/stack/src/joy.tsx diff --git a/apps/demo/src/components/provider.tsx b/apps/demo/src/components/provider.tsx index c1bbe2c69..d9c81b846 100644 --- a/apps/demo/src/components/provider.tsx +++ b/apps/demo/src/components/provider.tsx @@ -3,7 +3,8 @@ import React, { useState } from "react"; import { CssVarsProvider, getInitColorSchemeScript } from '@mui/joy/styles'; import CssBaseline from '@mui/joy/CssBaseline'; -import { StackTheme, StackJoyTheme } from "@stackframe/stack"; +import { StackTheme } from "@stackframe/stack"; +import { StackJoyTheme } from "@stackframe/stack/joy"; type UI = 'default' | 'joy'; const CurrentUIContext = React.createContext<[UI, React.Dispatch>]>(['default', () => {}]); diff --git a/apps/dev/src/components/provider.tsx b/apps/dev/src/components/provider.tsx index e81565dd5..e1b7f090f 100644 --- a/apps/dev/src/components/provider.tsx +++ b/apps/dev/src/components/provider.tsx @@ -3,7 +3,8 @@ import React, { useState } from "react"; import { CssVarsProvider, getInitColorSchemeScript } from '@mui/joy/styles'; import CssBaseline from '@mui/joy/CssBaseline'; -import { StackTheme, StackJoyTheme } from "@stackframe/stack"; +import { StackTheme } from "@stackframe/stack"; +import { StackJoyTheme } from "@stackframe/stack/joy"; import { Button } from "./custom-button"; type UI = 'default' | 'joy'; diff --git a/docs/docs/02-customization/03-custom-components.md b/docs/docs/02-customization/03-custom-components.md index 031792a29..7ae205909 100644 --- a/docs/docs/02-customization/03-custom-components.md +++ b/docs/docs/02-customization/03-custom-components.md @@ -95,7 +95,8 @@ Replace `StackTheme` with `StackJoyTheme`, and put it inside your `CssVarsProvid import React from "react"; import { CssVarsProvider, getInitColorSchemeScript } from '@mui/joy/styles'; import CssBaseline from '@mui/joy/CssBaseline'; - import { StackProvider, StackJoyTheme } from "@stackframe/stack"; + import { StackProvider } from "@stackframe/stack"; + import StackJoyTheme from "@stackframe/stack/joy"; import Provider from "src/components/provider"; import { stackServerApp } from "src/stack"; diff --git a/packages/stack-server/src/app/(main)/layout.tsx b/packages/stack-server/src/app/(main)/layout.tsx index 726b46213..9fa177260 100644 --- a/packages/stack-server/src/app/(main)/layout.tsx +++ b/packages/stack-server/src/app/(main)/layout.tsx @@ -1,6 +1,6 @@ import { StackProvider } from "@stackframe/stack"; import { stackServerApp } from "@/stack"; -import { StackJoyTheme } from "@stackframe/stack"; +import { StackJoyTheme } from "@stackframe/stack/joy"; export default function Layout(props: { children: React.ReactNode }) { return ( diff --git a/packages/stack/package.json b/packages/stack/package.json index fd360bd85..c884d6539 100644 --- a/packages/stack/package.json +++ b/packages/stack/package.json @@ -2,8 +2,16 @@ "name": "@stackframe/stack", "version": "2.2.1", "type": "module", - "types": "./dist/index.d.ts", - "main": "./dist/index.js", + "exports": { + ".": { + "types": "./dist/index.d.ts", + "default": "./dist/index.js" + }, + "./joy": { + "types": "./dist/joy.d.ts", + "default": "./dist/joy.js" + } + }, "scripts": { "typecheck": "tsc --noEmit", "build": "tsc", diff --git a/packages/stack/src/index.tsx b/packages/stack/src/index.tsx index cf377d764..2da95c731 100644 --- a/packages/stack/src/index.tsx +++ b/packages/stack/src/index.tsx @@ -22,5 +22,4 @@ export { default as AccountSettings } from "./components-page/account-settings"; export { useDesign } from './providers/design-provider'; export { useComponents } from './providers/component-provider'; export { StackTheme, ThemeConfig } from './providers/theme-provider'; -export { StackJoyTheme } from './providers/joy-provider'; export * from './components-core'; \ No newline at end of file diff --git a/packages/stack/src/joy.tsx b/packages/stack/src/joy.tsx new file mode 100644 index 000000000..7dc0f6368 --- /dev/null +++ b/packages/stack/src/joy.tsx @@ -0,0 +1 @@ +export { StackJoyTheme } from './providers/joy-provider'; \ No newline at end of file