diff --git a/.changeset/hip-berries-drop.md b/.changeset/hip-berries-drop.md new file mode 100644 index 00000000..3812bc04 --- /dev/null +++ b/.changeset/hip-berries-drop.md @@ -0,0 +1,5 @@ +--- +"@devup-ui/wasm": patch +--- + +Fix transforming component from other package diff --git a/apps/landing/package.json b/apps/landing/package.json index f8b8ab0e..05d6cca2 100644 --- a/apps/landing/package.json +++ b/apps/landing/package.json @@ -13,9 +13,9 @@ "@devup-ui/react": "workspace:*", "@mdx-js/loader": "^3.1.0", "@mdx-js/react": "^3.1.0", - "@next/mdx": "^15.1.4", + "@next/mdx": "^15.1.5", "@types/mdx": "^2.0.13", - "next": "^15.1.4", + "next": "^15.1.5", "react": "^19.0.0", "react-dom": "^19.0.0", "react-syntax-highlighter": "^15.6.1", diff --git a/apps/landing/src/app/(detail)/docs/LeftMenu.tsx b/apps/landing/src/app/(detail)/docs/LeftMenu.tsx index 75dc71e4..ed3d0e66 100644 --- a/apps/landing/src/app/(detail)/docs/LeftMenu.tsx +++ b/apps/landing/src/app/(detail)/docs/LeftMenu.tsx @@ -24,7 +24,7 @@ export function LeftMenu() { children: 'Input', }, { - to: URL_PREFIX + '/docs/api/input', + to: URL_PREFIX + '/docs/api/text', children: 'Text', }, { @@ -43,6 +43,10 @@ export function LeftMenu() { to: URL_PREFIX + '/docs/api/center', children: 'Center', }, + { + to: URL_PREFIX + '/docs/api/grid', + children: 'Grid', + }, { to: URL_PREFIX + '/docs/api/css', children: 'css', @@ -81,6 +85,10 @@ export function LeftMenu() { to: URL_PREFIX + '/docs/devup/breakpoints', children: 'Breakpoints', }, + { + to: URL_PREFIX + '/docs/devup/figma-plugin', + children: 'Figma Plugin', + }, ]} > Devup diff --git a/apps/landing/src/app/(detail)/docs/MenuItem.tsx b/apps/landing/src/app/(detail)/docs/MenuItem.tsx index 63bca7c5..9f042ca2 100644 --- a/apps/landing/src/app/(detail)/docs/MenuItem.tsx +++ b/apps/landing/src/app/(detail)/docs/MenuItem.tsx @@ -1,21 +1,26 @@ +'use client' import { Box, css, Flex, Text } from '@devup-ui/react' import Link from 'next/link' +import { usePathname } from 'next/navigation' import { OpenMenuItem } from './OpenMenuItem' export interface MenuItemProps { - selected?: boolean children?: React.ReactNode to?: string subMenu?: { - selected?: boolean children?: React.ReactNode to?: string }[] } export function MenuItem(props: MenuItemProps) { - const { selected, children, to, subMenu } = props + const { children, to, subMenu } = props + const path = usePathname() + const selected = to + ? path.startsWith(to) + : !!subMenu?.some((item) => (item.to ? path.startsWith(item.to) : false)) + if (subMenu) return const inner = ( & Required>) { - const [open, handleOpen] = useReducer((state) => !state, false) + const path = usePathname() + const selected = subMenu.some((item) => + item.to ? path.startsWith(item.to) : false, + ) + const [open, handleOpen] = useReducer((state) => !state, selected) return ( <> {subMenu.map(({ children, to }, idx) => { + const selected = to ? path.startsWith(to) : false const inner = ( - - + {selected && ( + + )} + {children} diff --git a/apps/landing/src/app/(detail)/docs/api/grid/page.mdx b/apps/landing/src/app/(detail)/docs/api/grid/page.mdx new file mode 100644 index 00000000..ee8abf42 --- /dev/null +++ b/apps/landing/src/app/(detail)/docs/api/grid/page.mdx @@ -0,0 +1 @@ +# Grid diff --git a/apps/landing/src/components/Header/HeaderWrap.tsx b/apps/landing/src/components/Header/HeaderWrap.tsx index 3b5487c8..b59de9a9 100644 --- a/apps/landing/src/components/Header/HeaderWrap.tsx +++ b/apps/landing/src/components/Header/HeaderWrap.tsx @@ -9,7 +9,9 @@ export function HeaderWrap({ children }: { children: React.ReactNode }) { return ( {children} diff --git a/apps/next/package.json b/apps/next/package.json index 668ce8ba..4c56fdcb 100644 --- a/apps/next/package.json +++ b/apps/next/package.json @@ -12,7 +12,7 @@ "dependencies": { "react": "^19.0.0", "react-dom": "^19.0.0", - "next": "^15.1.4", + "next": "^15.1.5", "@devup-ui/react": "workspace:*" }, "devDependencies": { diff --git a/apps/vite-lib/package.json b/apps/vite-lib/package.json index ab0d37cf..10d80293 100644 --- a/apps/vite-lib/package.json +++ b/apps/vite-lib/package.json @@ -10,7 +10,7 @@ "dependencies": { "react": "^19.0.0", "@devup-ui/react": "workspace:*", - "vite": "^6.0.7" + "vite": "^6.0.11" }, "devDependencies": { "vite-plugin-dts": "^4.5.0", diff --git a/apps/vite/package.json b/apps/vite/package.json index c556cc32..02e3dd28 100644 --- a/apps/vite/package.json +++ b/apps/vite/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "@devup-ui/vite-plugin": "workspace:*", - "vite": "^6.0.7", + "vite": "^6.0.11", "@vitejs/plugin-react": "^4.3.4", "typescript": "^5", "@types/node": "^22", diff --git a/benchmark/next-chakra-ui/package.json b/benchmark/next-chakra-ui/package.json index 326925bc..03a89bd5 100644 --- a/benchmark/next-chakra-ui/package.json +++ b/benchmark/next-chakra-ui/package.json @@ -10,9 +10,9 @@ "lint": "next lint" }, "dependencies": { - "@chakra-ui/react": "^3.3.1", + "@chakra-ui/react": "^3.4.0", "@emotion/react": "^11.14.0", - "next": "^15.1.4", + "next": "^15.1.5", "next-themes": "^0.4.4", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/benchmark/next-devup-ui/package.json b/benchmark/next-devup-ui/package.json index bff3dc51..9d6cd4f9 100644 --- a/benchmark/next-devup-ui/package.json +++ b/benchmark/next-devup-ui/package.json @@ -12,7 +12,7 @@ "dependencies": { "react": "^19.0.0", "react-dom": "^19.0.0", - "next": "^15.1.4", + "next": "^15.1.5", "@devup-ui/react": "workspace:*" }, "devDependencies": { diff --git a/benchmark/next-kuma-ui/package.json b/benchmark/next-kuma-ui/package.json index 91468a74..e107a091 100644 --- a/benchmark/next-kuma-ui/package.json +++ b/benchmark/next-kuma-ui/package.json @@ -12,11 +12,11 @@ "dependencies": { "react": "^19.0.0", "react-dom": "^19.0.0", - "next": "^15.1.4", - "@kuma-ui/core": "^1.5.8" + "next": "^15.1.5", + "@kuma-ui/core": "^1.5.9" }, "devDependencies": { - "@kuma-ui/next-plugin": "^1.3.2", + "@kuma-ui/next-plugin": "^1.3.3", "typescript": "^5", "@types/node": "^22", "@types/react": "^19", diff --git a/libs/extractor/src/lib.rs b/libs/extractor/src/lib.rs index 17625413..9a65e5bb 100644 --- a/libs/extractor/src/lib.rs +++ b/libs/extractor/src/lib.rs @@ -159,7 +159,7 @@ mod tests { assert_debug_snapshot!(extract( "test.tsx", r"import {Box} from '@devup-ui/core' - {}} aria-valuenow={24} key={2} /> + {}} aria-valuenow={24} key={2} tabIndex={1} /> ", ExtractOption { package: "@devup-ui/core".to_string(), @@ -1347,4 +1347,23 @@ PROCESS_DATA.map(({ id, title, content }, idx) => ( ) .unwrap()); } + + #[test] + #[serial] + fn avoid_same_name_component() { + reset_class_map(); + assert_debug_snapshot!(extract( + "test.js", + r#"import {Box} from '@devup-ui/core' +import {Button} from '@devup/ui' + ; + ;