Merge pull request #4 from dev-five-git/add-image

owjs3901 · web-flow · commit 5f6e8da31ad5 · 2025-01-15T13:46:12.000+09:00
Add Image component
diff --git a/.changeset/odd-zebras-enjoy.md b/.changeset/odd-zebras-enjoy.md
@@ -0,0 +1,5 @@
+---
+"@devup-ui/webpack-plugin": patch
+---
+
+Fix hot reload issue
diff --git a/.changeset/tricky-roses-ring.md b/.changeset/tricky-roses-ring.md
@@ -0,0 +1,6 @@
+---
+"@devup-ui/wasm": patch
+"@devup-ui/react": patch
+---
+
+Add Image component
diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -43,6 +43,7 @@ jobs:
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v5
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
       - name: Create Release Pull Request or Publish to npm
         id: changesets
diff --git 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.3",
+    "next": "^15.1.4",
     "@devup-ui/react": "workspace:*"
   },
   "devDependencies": {
diff --git a/bindings/devup-ui-wasm/package.json b/bindings/devup-ui-wasm/package.json
@@ -25,6 +25,6 @@
   "types": "./pkg/index.d.ts",
   "scripts": {
     "build": "wasm-pack build --target nodejs --out-dir ./pkg --out-name index",
-    "test": "cargo test"
+    "test": "wasm-pack test --node"
   }
 }
diff --git a/bindings/devup-ui-wasm/src/lib.rs b/bindings/devup-ui-wasm/src/lib.rs
@@ -106,7 +106,7 @@ pub fn code_extract(
         Err(error) => Err(JsValue::from_str(error.to_string().as_str())),
     }
 }
-fn object_to_typography(obj: Object, level: u8) -> Result<Typography, JsValue> {
+pub fn object_to_typography(obj: Object, level: u8) -> Result<Typography, JsValue> {
     Ok(Typography::new(
         Reflect::get(&obj, &JsValue::from_str("fontFamily"))?
             .as_string()
diff --git a/bindings/devup-ui-wasm/tests/wasm.rs b/bindings/devup-ui-wasm/tests/wasm.rs
@@ -0,0 +1,47 @@
+use devup_ui_wasm::object_to_typography;
+use js_sys::{Object, Reflect};
+use wasm_bindgen::JsValue;
+use wasm_bindgen_test::*;
+
+#[allow(dead_code)]
+#[wasm_bindgen_test]
+fn test_object_to_typography() {
+    let obj = Object::new();
+    Reflect::set(
+        &obj,
+        &JsValue::from_str("fontFamily"),
+        &JsValue::from_str("Arial"),
+    )
+    .unwrap();
+    Reflect::set(
+        &obj,
+        &JsValue::from_str("fontSize"),
+        &JsValue::from_str("12px"),
+    )
+    .unwrap();
+    Reflect::set(
+        &obj,
+        &JsValue::from_str("fontWeight"),
+        &JsValue::from_str("bold"),
+    )
+    .unwrap();
+    Reflect::set(
+        &obj,
+        &JsValue::from_str("lineHeight"),
+        &JsValue::from_str("1.5"),
+    )
+    .unwrap();
+    Reflect::set(
+        &obj,
+        &JsValue::from_str("letterSpacing"),
+        &JsValue::from_str("1px"),
+    )
+    .unwrap();
+    let typography = object_to_typography(obj, 0).unwrap();
+    assert_eq!(typography.font_family, "Arial");
+    assert_eq!(typography.font_size, "12px");
+    assert_eq!(typography.font_weight, "bold");
+    assert_eq!(typography.line_height, "1.5");
+    assert_eq!(typography.letter_spacing, "1px");
+    assert_eq!(typography.level, 0);
+}
diff --git a/bindings/devup-ui-wasm/tests/web.rs b/bindings/devup-ui-wasm/tests/web.rs
diff --git a/libs/extractor/src/component.rs b/libs/extractor/src/component.rs
@@ -11,6 +11,7 @@ pub enum ExportVariableKind {
     Flex,
     VStack,
     Center,
+    Image,
     Css,
 }
 
@@ -23,6 +24,7 @@ impl ExportVariableKind {
             | ExportVariableKind::Flex
             | ExportVariableKind::Box => Ok("div"),
             ExportVariableKind::Text => Ok("span"),
+            ExportVariableKind::Image => Ok("img"),
             ExportVariableKind::Button => Ok("button"),
             ExportVariableKind::Input => Ok("input"),
             ExportVariableKind::Css => Err("Css does not have a tag"),
@@ -37,6 +39,7 @@ impl ExportVariableKind {
             | ExportVariableKind::Button
             | ExportVariableKind::Css
             | ExportVariableKind::Text
+            | ExportVariableKind::Image
             | ExportVariableKind::Box => vec![],
             ExportVariableKind::Flex => vec![Static(ExtractStaticStyle {
                 value: "flex".to_string(),
@@ -93,6 +96,7 @@ impl TryFrom<String> for ExportVariableKind {
         match value.as_str() {
             "Box" => Ok(ExportVariableKind::Box),
             "Text" => Ok(ExportVariableKind::Text),
+            "Image" => Ok(ExportVariableKind::Image),
             "Button" => Ok(ExportVariableKind::Button),
             "Input" => Ok(ExportVariableKind::Input),
             "Flex" => Ok(ExportVariableKind::Flex),
@@ -118,6 +122,10 @@ mod tests {
             ExportVariableKind::try_from("Text".to_string()),
             Ok(ExportVariableKind::Text)
         );
+        assert_eq!(
+            ExportVariableKind::try_from("Image".to_string()),
+            Ok(ExportVariableKind::Image)
+        );
         assert_eq!(
             ExportVariableKind::try_from("Button".to_string()),
             Ok(ExportVariableKind::Button)
@@ -149,6 +157,7 @@ mod tests {
     fn test_to_tag() {
         assert_eq!(ExportVariableKind::Box.to_tag(), Ok("div"));
         assert_eq!(ExportVariableKind::Text.to_tag(), Ok("span"));
+        assert_eq!(ExportVariableKind::Image.to_tag(), Ok("img"));
         assert_eq!(ExportVariableKind::Button.to_tag(), Ok("button"));
         assert_eq!(ExportVariableKind::Input.to_tag(), Ok("input"));
         assert_eq!(ExportVariableKind::Flex.to_tag(), Ok("div"));
@@ -161,6 +170,7 @@ mod tests {
     fn test_extract_style_from_kind() {
         assert_eq!(ExportVariableKind::Box.extract(), vec![]);
         assert_eq!(ExportVariableKind::Text.extract(), vec![]);
+        assert_eq!(ExportVariableKind::Image.extract(), vec![]);
         assert_eq!(ExportVariableKind::Button.extract(), vec![]);
         assert_eq!(ExportVariableKind::Input.extract(), vec![]);
         assert_eq!(
diff --git a/libs/extractor/src/visit.rs b/libs/extractor/src/visit.rs
@@ -120,6 +120,8 @@ impl<'a> VisitMut<'a> for DevupVisitor<'a> {
                             || name == "role"
                             || name == "ref"
                             || name == "key"
+                            || name == "alt"
+                            || name == "src"
                             || name == "children"
                         {
                             continue;
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "type": "module",
   "scripts": {
     "lint": "pnpm -r lint",
-    "test": "cargo tarpaulin && vitest test --coverage --run",
+    "test": "cargo tarpaulin && vitest test --coverage --run && pnpm -r test",
     "build": "pnpm -r build",
     "dev": "pnpm -r dev"
   },
diff --git a/packages/next-plugin/package.json b/packages/next-plugin/package.json
@@ -7,8 +7,6 @@
     "next": "^15.1"
   },
   "scripts": {
-    "test": "vitest run --coverage",
-    "test:s": "vitest run -u",
     "lint": "eslint",
     "build": "tsc && vite build"
   },
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -7,8 +7,6 @@
     "csstype": "^3.1"
   },
   "scripts": {
-    "test": "vitest run --coverage",
-    "test:s": "vitest run -u",
     "lint": "eslint",
     "build": "vite build"
   },
diff --git a/packages/react/src/__tests__/index.test.ts b/packages/react/src/__tests__/index.test.ts
@@ -9,6 +9,7 @@ describe('export', () => {
       Input: expect.any(Function),
       Text: expect.any(Function),
       VStack: expect.any(Function),
+      Image: expect.any(Function),
 
       css: expect.any(Function),
     })
diff --git a/packages/react/src/components/Box.tsx b/packages/react/src/components/Box.tsx
@@ -1,9 +1,9 @@
 import type { DevupProps } from '../types/props'
 import type { Merge } from '../types/utils'
 
-export function Box(
+export function Box<T extends React.ElementType = 'div'>(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  props: Merge<React.ComponentProps<'div'>, DevupProps>,
+  props: Merge<React.ComponentProps<T>, DevupProps>,
 ): React.ReactElement {
   throw new Error('Cannot run on the runtime')
 }
diff --git a/packages/react/src/components/Button.tsx b/packages/react/src/components/Button.tsx
@@ -1,9 +1,9 @@
 import type { DevupProps } from '../types/props'
 import type { Merge } from '../types/utils'
 
-export function Button(
+export function Button<T extends React.ElementType = 'button'>(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  props: Merge<React.ComponentProps<'button'>, DevupProps>,
+  props: Merge<React.ComponentProps<T>, DevupProps>,
 ): React.ReactElement {
   throw new Error('Cannot run on the runtime')
 }
diff --git a/packages/react/src/components/Center.tsx b/packages/react/src/components/Center.tsx
@@ -1,9 +1,9 @@
 import type { DevupProps } from '../types/props'
 import type { Merge } from '../types/utils'
 
-export function Center(
+export function Center<T extends React.ElementType = 'div'>(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  props: Merge<React.ComponentProps<'div'>, DevupProps>,
+  props: Merge<React.ComponentProps<T>, DevupProps>,
 ): React.ReactElement {
   throw new Error('Cannot run on the runtime')
 }
diff --git a/packages/react/src/components/Flex.tsx b/packages/react/src/components/Flex.tsx
@@ -1,9 +1,9 @@
 import type { DevupProps } from '../types/props'
 import type { Merge } from '../types/utils'
 
-export function Flex(
+export function Flex<T extends React.ElementType = 'div'>(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  props: Merge<React.ComponentProps<'div'>, DevupProps>,
+  props: Merge<React.ComponentProps<T>, DevupProps>,
 ): React.ReactElement {
   throw new Error('Cannot run on the runtime')
 }
diff --git a/packages/react/src/components/Image.tsx b/packages/react/src/components/Image.tsx
@@ -0,0 +1,9 @@
+import type { DevupProps } from '../types/props'
+import type { Merge } from '../types/utils'
+
+export function Image<T extends React.ElementType = 'img'>(
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  props: Merge<React.ComponentProps<T>, DevupProps>,
+): React.ReactElement {
+  throw new Error('Cannot run on the runtime')
+}
diff --git a/packages/react/src/components/Input.tsx b/packages/react/src/components/Input.tsx
@@ -1,9 +1,9 @@
 import type { DevupProps } from '../types/props'
 import type { Merge } from '../types/utils'
 
-export function Input(
+export function Input<T extends React.ElementType = 'input'>(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  props: Merge<React.ComponentProps<'input'>, DevupProps>,
+  props: Merge<React.ComponentProps<T>, DevupProps>,
 ): React.ReactElement {
   throw new Error('Cannot run on the runtime')
 }
diff --git a/packages/react/src/components/Text.tsx b/packages/react/src/components/Text.tsx
@@ -1,9 +1,9 @@
 import type { DevupTypographyProps } from '../types/props'
 import type { Merge } from '../types/utils'
 
-export function Text(
+export function Text<T extends React.ElementType = 'span'>(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  props: Merge<React.ComponentProps<'span'>, DevupTypographyProps>,
+  props: Merge<React.ComponentProps<T>, DevupTypographyProps>,
 ): React.ReactElement {
   throw new Error('Cannot run on the runtime')
 }
diff --git a/packages/react/src/components/VStack.tsx b/packages/react/src/components/VStack.tsx
@@ -1,9 +1,9 @@
 import type { DevupProps } from '../types/props'
 import type { Merge } from '../types/utils'
 
-export function VStack(
+export function VStack<T extends React.ElementType = 'span'>(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  props: Merge<React.ComponentProps<'div'>, DevupProps>,
+  props: Merge<React.ComponentProps<T>, DevupProps>,
 ): React.ReactElement {
   throw new Error('Cannot run on the runtime')
 }
diff --git a/packages/react/src/components/__tests__/index.test.ts b/packages/react/src/components/__tests__/index.test.ts
@@ -2,6 +2,7 @@ import { Box } from '../Box'
 import { Button } from '../Button'
 import { Center } from '../Center'
 import { Flex } from '../Flex'
+import { Image } from '../Image'
 import { Input } from '../Input'
 import { Text } from '../Text'
 import { VStack } from '../VStack'
@@ -15,5 +16,6 @@ describe('Component', () => {
     expect(() => Input({})).toThrowError('Cannot run on the runtime')
     expect(() => Text({})).toThrowError('Cannot run on the runtime')
     expect(() => VStack({})).toThrowError('Cannot run on the runtime')
+    expect(() => Image({})).toThrowError('Cannot run on the runtime')
   })
 })
diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts
@@ -2,6 +2,7 @@ export { Box } from './components/Box'
 export { Button } from './components/Button'
 export { Center } from './components/Center'
 export { Flex } from './components/Flex'
+export { Image } from './components/Image'
 export { Input } from './components/Input'
 export { Text } from './components/Text'
 export { VStack } from './components/VStack'
diff --git a/packages/webpack-plugin/package.json b/packages/webpack-plugin/package.json
@@ -21,8 +21,6 @@
   ],
   "types": "./dist/index.d.ts",
   "scripts": {
-    "test": "vitest run --coverage",
-    "test:s": "vitest run -u",
     "lint": "eslint",
     "build": "tsc && vite build"
   },
diff --git a/packages/webpack-plugin/src/__tests__/loader.test.ts b/packages/webpack-plugin/src/__tests__/loader.test.ts
diff --git a/packages/webpack-plugin/src/loader.ts b/packages/webpack-plugin/src/loader.ts
diff --git a/packages/webpack-plugin/src/plugin.ts b/packages/webpack-plugin/src/plugin.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@devup-ui/webpack-plugin": patch
 +---
++
 +Fix hot reload issue
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@`
`25`	`25`	`"types": "./pkg/index.d.ts",`
`26`	`26`	`"scripts": {`
`27`	`27`	`"build": "wasm-pack build --target nodejs --out-dir ./pkg --out-name index",`
`28`		`- "test": "cargo test"`
	`28`	`+ "test": "wasm-pack test --node"`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ pub fn code_extract(`
`106`	`106`	`Err(error) => Err(JsValue::from_str(error.to_string().as_str())),`
`107`	`107`	`}`
`108`	`108`	`}`
`109`		`-fn object_to_typography(obj: Object, level: u8) -> Result<Typography, JsValue> {`
	`109`	`+pub fn object_to_typography(obj: Object, level: u8) -> Result<Typography, JsValue> {`
`110`	`110`	`Ok(Typography::new(`
`111`	`111`	`Reflect::get(&obj, &JsValue::from_str("fontFamily"))?`
`112`	`112`	`.as_string()`