2
0
Эх сурвалжийг харах

♻️ refactor(ui-components): 重构组件文件结构并更新导入路径

- 将所有组件文件移动到 `src/components/` 目录下以改善组织架构
- 更新 `package.json` 中的导出路径以反映新的组件目录结构
- 修复组件文件中 `cn` 工具函数的导入路径,从 `./utils/cn` 改为 `../utils/cn`
- 更新测试文件中的组件导入路径以匹配新的文件位置
yourname 4 долоо хоног өмнө
parent
commit
09cd6ecaf8

+ 59 - 59
mini-ui-packages/mini-shared-ui-components/package.json

@@ -11,65 +11,65 @@
       "import": "./dist/src/index.js",
       "require": "./dist/src/index.js"
     },
-    "./button": {
-      "types": "./dist/src/button.d.ts",
-      "import": "./dist/src/button.js",
-      "require": "./dist/src/button.js"
-    },
-    "./avatar-upload": {
-      "types": "./dist/src/avatar-upload.d.ts",
-      "import": "./dist/src/avatar-upload.js",
-      "require": "./dist/src/avatar-upload.js"
-    },
-    "./card": {
-      "types": "./dist/src/card.d.ts",
-      "import": "./dist/src/card.js",
-      "require": "./dist/src/card.js"
-    },
-    "./dialog": {
-      "types": "./dist/src/dialog.d.ts",
-      "import": "./dist/src/dialog.js",
-      "require": "./dist/src/dialog.js"
-    },
-    "./form": {
-      "types": "./dist/src/form.d.ts",
-      "import": "./dist/src/form.js",
-      "require": "./dist/src/form.js"
-    },
-    "./image": {
-      "types": "./dist/src/image.d.ts",
-      "import": "./dist/src/image.js",
-      "require": "./dist/src/image.js"
-    },
-    "./input": {
-      "types": "./dist/src/input.d.ts",
-      "import": "./dist/src/input.js",
-      "require": "./dist/src/input.js"
-    },
-    "./label": {
-      "types": "./dist/src/label.d.ts",
-      "import": "./dist/src/label.js",
-      "require": "./dist/src/label.js"
-    },
-    "./navbar": {
-      "types": "./dist/src/navbar.d.ts",
-      "import": "./dist/src/navbar.js",
-      "require": "./dist/src/navbar.js"
-    },
-    "./page-container": {
-      "types": "./dist/src/page-container.d.ts",
-      "import": "./dist/src/page-container.js",
-      "require": "./dist/src/page-container.js"
-    },
-    "./tab-bar": {
-      "types": "./dist/src/tab-bar.d.ts",
-      "import": "./dist/src/tab-bar.js",
-      "require": "./dist/src/tab-bar.js"
-    },
-    "./user-status-bar": {
-      "types": "./dist/src/user-status-bar.d.ts",
-      "import": "./dist/src/user-status-bar.js",
-      "require": "./dist/src/user-status-bar.js"
+    "./components/button": {
+      "types": "./dist/src/components/button.d.ts",
+      "import": "./dist/src/components/button.js",
+      "require": "./dist/src/components/button.js"
+    },
+    "./components/avatar-upload": {
+      "types": "./dist/src/components/avatar-upload.d.ts",
+      "import": "./dist/src/components/avatar-upload.js",
+      "require": "./dist/src/components/avatar-upload.js"
+    },
+    "./components/card": {
+      "types": "./dist/src/components/card.d.ts",
+      "import": "./dist/src/components/card.js",
+      "require": "./dist/src/components/card.js"
+    },
+    "./components/dialog": {
+      "types": "./dist/src/components/dialog.d.ts",
+      "import": "./dist/src/components/dialog.js",
+      "require": "./dist/src/components/dialog.js"
+    },
+    "./components/form": {
+      "types": "./dist/src/components/form.d.ts",
+      "import": "./dist/src/components/form.js",
+      "require": "./dist/src/components/form.js"
+    },
+    "./components/image": {
+      "types": "./dist/src/components/image.d.ts",
+      "import": "./dist/src/components/image.js",
+      "require": "./dist/src/components/image.js"
+    },
+    "./components/input": {
+      "types": "./dist/src/components/input.d.ts",
+      "import": "./dist/src/components/input.js",
+      "require": "./dist/src/components/input.js"
+    },
+    "./components/label": {
+      "types": "./dist/src/components/label.d.ts",
+      "import": "./dist/src/components/label.js",
+      "require": "./dist/src/components/label.js"
+    },
+    "./components/navbar": {
+      "types": "./dist/src/components/navbar.d.ts",
+      "import": "./dist/src/components/navbar.js",
+      "require": "./dist/src/components/navbar.js"
+    },
+    "./components/page-container": {
+      "types": "./dist/src/components/page-container.d.ts",
+      "import": "./dist/src/components/page-container.js",
+      "require": "./dist/src/components/page-container.js"
+    },
+    "./components/tab-bar": {
+      "types": "./dist/src/components/tab-bar.d.ts",
+      "import": "./dist/src/components/tab-bar.js",
+      "require": "./dist/src/components/tab-bar.js"
+    },
+    "./components/user-status-bar": {
+      "types": "./dist/src/components/user-status-bar.d.ts",
+      "import": "./dist/src/components/user-status-bar.js",
+      "require": "./dist/src/components/user-status-bar.js"
     },
     "./utils/cn": {
       "types": "./dist/src/utils/cn.d.ts",

+ 1 - 1
mini-ui-packages/mini-shared-ui-components/src/avatar-upload.tsx → mini-ui-packages/mini-shared-ui-components/src/components/avatar-upload.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react'
 import { View, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
-import { cn } from './utils/cn'
+import { cn } from '../utils/cn'
 
 interface AvatarUploadProps {
   currentAvatar?: string

+ 1 - 1
mini-ui-packages/mini-shared-ui-components/src/button.tsx → mini-ui-packages/mini-shared-ui-components/src/components/button.tsx

@@ -1,5 +1,5 @@
 import { Button as TaroButton, ButtonProps as TaroButtonProps } from '@tarojs/components'
-import { cn } from './utils/cn'
+import { cn } from '../utils/cn'
 import { cva, type VariantProps } from 'class-variance-authority'
 
 const buttonVariants = cva(

+ 1 - 1
mini-ui-packages/mini-shared-ui-components/src/card.tsx → mini-ui-packages/mini-shared-ui-components/src/components/card.tsx

@@ -1,5 +1,5 @@
 import { View } from '@tarojs/components'
-import { cn } from './utils/cn'
+import { cn } from '../utils/cn'
 
 interface CardProps {
   className?: string

+ 1 - 1
mini-ui-packages/mini-shared-ui-components/src/dialog.tsx → mini-ui-packages/mini-shared-ui-components/src/components/dialog.tsx

@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 import { View, Text } from '@tarojs/components'
-import { cn } from './utils/cn'
+import { cn } from '../utils/cn'
 
 interface DialogProps {
   open: boolean

+ 1 - 1
mini-ui-packages/mini-shared-ui-components/src/form.tsx → mini-ui-packages/mini-shared-ui-components/src/components/form.tsx

@@ -11,7 +11,7 @@ import {
   type FieldValues,
 } from "react-hook-form"
 
-import { cn } from './utils/cn'
+import { cn } from '../utils/cn'
 import { Label } from './label'
 
 const Form: typeof FormProvider = FormProvider

+ 1 - 1
mini-ui-packages/mini-shared-ui-components/src/image.tsx → mini-ui-packages/mini-shared-ui-components/src/components/image.tsx

@@ -1,5 +1,5 @@
 import { View, Image as TaroImage, ImageProps as TaroImageProps } from '@tarojs/components'
-import { cn } from './utils/cn'
+import { cn } from '../utils/cn'
 import { useState } from 'react'
 
 export interface ImageProps extends Omit<TaroImageProps, 'onError'> {

+ 1 - 1
mini-ui-packages/mini-shared-ui-components/src/input.tsx → mini-ui-packages/mini-shared-ui-components/src/components/input.tsx

@@ -1,5 +1,5 @@
 import { Input as TaroInput, InputProps as TaroInputProps, View, Text } from '@tarojs/components'
-import { cn } from './utils/cn'
+import { cn } from '../utils/cn'
 import { cva, type VariantProps } from 'class-variance-authority'
 import { forwardRef } from 'react'
 

+ 1 - 1
mini-ui-packages/mini-shared-ui-components/src/label.tsx → mini-ui-packages/mini-shared-ui-components/src/components/label.tsx

@@ -1,5 +1,5 @@
 import { View, Text } from '@tarojs/components'
-import { cn } from './utils/cn'
+import { cn } from '../utils/cn'
 import { cva, type VariantProps } from 'class-variance-authority'
 import { forwardRef } from 'react'
 

+ 2 - 2
mini-ui-packages/mini-shared-ui-components/src/navbar.tsx → mini-ui-packages/mini-shared-ui-components/src/components/navbar.tsx

@@ -1,8 +1,8 @@
 import React from 'react'
 import { View, Text } from '@tarojs/components'
-import { cn } from './utils/cn'
+import { cn } from '../utils/cn'
 import Taro from '@tarojs/taro'
-import { isWeapp } from './utils/platform'
+import { isWeapp } from '../utils/platform'
 
 export interface NavbarProps {
   title?: string

+ 1 - 1
mini-ui-packages/mini-shared-ui-components/src/page-container.tsx → mini-ui-packages/mini-shared-ui-components/src/components/page-container.tsx

@@ -1,6 +1,6 @@
 import React, { ReactNode } from 'react'
 import { View } from '@tarojs/components'
-import { cn } from './utils/cn'
+import { cn } from '../utils/cn'
 
 export interface PageContainerProps {
   children: ReactNode

+ 0 - 0
mini-ui-packages/mini-shared-ui-components/src/tab-bar.tsx → mini-ui-packages/mini-shared-ui-components/src/components/tab-bar.tsx


+ 1 - 1
mini-ui-packages/mini-shared-ui-components/src/user-status-bar.tsx → mini-ui-packages/mini-shared-ui-components/src/components/user-status-bar.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { View, Text, Image } from '@tarojs/components'
-import { cn } from './utils/cn'
+import { cn } from '../utils/cn'
 
 export interface UserStatusBarProps {
   userName?: string

+ 1 - 1
mini-ui-packages/mini-shared-ui-components/tests/components/button.test.tsx

@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react'
-import { Button } from '../../src/button'
+import { Button } from '../../src/components/button'
 
 describe('Button', () => {
   it('renders correctly', () => {