Small changes

VdanielVPL · VdanielVPL · commit 1ca8fd34a158 · 2025-02-24T20:44:35.000+01:00
- Updated go packages
- Updated frontend deps
diff --git a/app.go b/app.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"rmbg/utils"
 	"rmbg/utils/image"
+	goruntime "runtime"
 	"syscall"
 
 	"github.com/wailsapp/wails/v2/pkg/runtime"
@@ -49,14 +50,12 @@ func (a *App) startup(ctx context.Context) {
 	if langData, err := utils.LoadLang(a.kernel32); err == nil {
 		a.LangStrings = langData
 	} else {
-		// runtime.LogError(ctx, "Error loading lang file:"+err.Error())
 		runtime.EventsEmit(ctx, "alert", err.Error())
 	}
 
 	if accentColor, err := utils.GetAccentColor(); err == nil {
 		a.AccentColor = accentColor
 	} else {
-		// runtime.LogError(ctx, "Error getting accent color:"+err.Error())
 		runtime.EventsEmit(ctx, "alert", err.Error())
 	}
 
@@ -68,7 +67,6 @@ func (a *App) startup(ctx context.Context) {
 			CF_PNG: image.RegisterClipboardFormat(formatName, a.user32),
 		}
 	} else {
-		// runtime.LogError(ctx, "Error getting clipboard format:"+err.Error())
 		runtime.EventsEmit(ctx, "alert", err.Error())
 	}
 }
@@ -306,7 +304,10 @@ func (a *App) ClearImageMem(Imagetype string) {
 		a.imgData.pngcropimgpath = ""
 		a.imgData.jpgcropimg = nil
 		a.imgData.jpgcropimgpath = ""
+	} else {
+		return
 	}
+	goruntime.GC()
 }
 
 func (a *App) CropImage(left, right, top, bottom float32, isJPG bool) []string {
diff --git a/frontend/package.json b/frontend/package.json
@@ -9,20 +9,21 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.6.0",
-    "@fortawesome/free-regular-svg-icons": "^6.6.0",
-    "@fortawesome/free-solid-svg-icons": "^6.6.0",
+    "@fortawesome/fontawesome-svg-core": "^6.7.2",
+    "@fortawesome/free-regular-svg-icons": "^6.7.2",
+    "@fortawesome/free-solid-svg-icons": "^6.7.2",
     "@fortawesome/react-fontawesome": "^0.2.2",
-    "motion": "^11.13.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-router-dom": "^6.27.0"
+    "motion": "^12.4.7",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "react-router-dom": "^7.2.0"
   },
   "devDependencies": {
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
-    "@vitejs/plugin-react": "^4.3.3",
-    "typescript": "^5.6.3",
-    "vite": "^5.4.10"
+    "@types/react": "^19.0.10",
+    "@types/react-dom": "^19.0.4",
+    "@vitejs/plugin-react": "^4.3.4",
+    "babel-plugin-react-compiler": "^19.0.0-beta-e1e972c-20250221",
+    "typescript": "^5.7.3",
+    "vite": "^6.1.1"
   }
 }
diff --git a/frontend/src/components/CropEditor.tsx b/frontend/src/components/CropEditor.tsx
@@ -3,7 +3,7 @@ import { ImageContext } from "./contexts";
 
 type CropEditorProps = {
     rect: DOMRect | null;
-    imageRef: RefObject<HTMLImageElement>;
+    imageRef: RefObject<HTMLImageElement | null>;
     isImageDark: boolean;
 };
 
@@ -27,7 +27,7 @@ export default function CropEditor(props: CropEditorProps) {
                 setImageHeight(props.imageRef.current.naturalHeight / props.rect.height);
             }
         }
-    },[props.imageRef.current, props.rect]);
+    },[props.imageRef, props.rect]);
 
     useLayoutEffect(() => {
 
diff --git a/frontend/src/components/CropImageContainer.tsx b/frontend/src/components/CropImageContainer.tsx
@@ -208,7 +208,9 @@ export function InputImageContainer() {
 
     return (
         <div ref={imageContainer} className='imageContainer imageContainerCrop' onDrop={handleURLDrop} style={{'--wails-drop-target': 'drop', backgroundColor: cropImage!="" && "rgba(255,255,255,0)", cursor: cropImage!="" && 'auto'} as CSSProperties} onClick={openDialog}>
-            <img ref={imageRef} src={cropImage} style={{userSelect: 'none', pointerEvents: 'none', filter: cropImage&& 'brightness(0.5)'}} draggable={false} onLoad={onImageLoad}></img>
+            {cropImage!="" && 
+                <img ref={imageRef} src={cropImage} style={{userSelect: 'none', pointerEvents: 'none', filter: 'brightness(0.5)'}} draggable={false} onLoad={onImageLoad}></img>
+            }
             <div style={{position: 'absolute', height: '100%', width: '100%', color: 'black', display: 'flex', justifyContent: 'center', alignItems: 'center', zIndex: -1, opacity: cropImage!=""?0:1}}>
                 <FontAwesomeIcon icon={faCloudArrowUp} color="lightgray" style={{width: '60%', height: '60%', fontSize: '60%', maxHeight: '200px', maxWidth: '200px'}} />
             </div>
diff --git a/frontend/src/components/InputRMBGImageContainer.tsx b/frontend/src/components/InputRMBGImageContainer.tsx
@@ -18,7 +18,7 @@ export function InputImageContainer() {
                     HandleDrop("RMBG", paths[0], false).then(([base64, fileType]) => {
                         if (base64 == "" || fileType == "") {
                             setInputRMBGImage("");
-                        }else{
+                        } else {
                             setInputRMBGImage(`data:${fileType};base64,${base64}`);
                         }
                     });
@@ -46,12 +46,12 @@ export function InputImageContainer() {
                         HandleDrop("RMBG", data, true).then(([base64, fileType]) => {
                             if (base64 == "" || fileType == "") {
                                 setInputRMBGImage("");
-                            }else{
+                            } else {
                                 setInputRMBGImage(`data:${fileType};base64,${base64}`);
                             }
                         });
                         imageContainer.current?.classList.remove('wails-drop-target-active');
-                    }else if (data.startsWith('data:')){
+                    } else if (data.startsWith('data:')) {
                         imageContainer.current?.classList.remove('wails-drop-target-active');
                     }
                 });
@@ -65,7 +65,7 @@ export function InputImageContainer() {
             const [base64, fileType] = result;
             if (base64 == "" || fileType == "") {
                 setInputRMBGImage("");
-            }else{
+            } else {
                 setInputRMBGImage(`data:${fileType};base64,${base64}`);
             }
         }
@@ -85,7 +85,7 @@ export function InputImageContainer() {
 
     return (
         <div ref={imageContainer} className='imageContainer' onDrop={handleURLDrop} style={{'--wails-drop-target': 'drop'} as CSSProperties} onClick={openDialog}>
-            <img ref={imgRef} src={inputRMBGImage} style={{userSelect: 'none', pointerEvents: 'none'}} draggable={false}></img>
+            {inputRMBGImage!="" && <img ref={imgRef} src={inputRMBGImage} style={{userSelect: 'none', pointerEvents: 'none'}} draggable={false}></img>}
             <div style={{position: 'absolute', height: '100%', width: '100%', color: 'black', display: 'flex', justifyContent: 'center', alignItems: 'center', zIndex: -1,}}>
                 <FontAwesomeIcon icon={faCloudArrowUp} color="lightgray" style={{width: '60%', height: '60%', fontSize: '60%'}} />
             </div>
diff --git a/frontend/src/components/views/RMBGView.tsx b/frontend/src/components/views/RMBGView.tsx
@@ -35,11 +35,11 @@ function OutputImageContainer() {
     const imgRef = useRef<HTMLImageElement>(null);
 
     useLayoutEffect(() => {  
-        if(imgRef.current){
+        if (imgRef.current) {
             if (outputRMBGImage != "") {
                 imgRef.current.style.width = '100%';
                 imgRef.current.style.height = '100%';
-            }else{
+            } else {
                 imgRef.current.style.width = 'auto';
                 imgRef.current.style.height = 'auto';
             }
@@ -48,7 +48,7 @@ function OutputImageContainer() {
     
     return (
         <div className="imageContainer" style={{cursor: 'auto'}}>
-            <img ref={imgRef} src={outputRMBGImage} style={{userSelect: 'none', pointerEvents: 'none'}} draggable={false}></img>
+            {outputRMBGImage!="" && <img ref={imgRef} src={outputRMBGImage} style={{userSelect: 'none', pointerEvents: 'none'}} draggable={false}></img>}
             <div style={{position: 'absolute', height: '100%', width: '100%', color: 'black', display: 'flex', justifyContent: 'center', alignItems: 'center', zIndex: -2, backgroundColor: 'white'}}>
                 {removingBG?
                     <FontAwesomeIcon icon={faSpinner} color='lightgray' spinPulse style={{height: '50%', width: '50%', fontSize: '50%'}} />
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
@@ -3,5 +3,11 @@ import react from '@vitejs/plugin-react'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [react()]
+  plugins: [react({
+    babel: {
+      plugins: [
+        ["babel-plugin-react-compiler"],
+      ],
+    },
+  })],
 })
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.24.0
 
 require (
 	github.com/disintegration/imaging v1.6.2
-	github.com/wailsapp/wails/v2 v2.10.0
+	github.com/wailsapp/wails/v2 v2.10.1
 	golang.org/x/image v0.24.0
 	golang.org/x/sys v0.30.0
 )
@@ -32,7 +32,7 @@ require (
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/wailsapp/go-webview2 v1.0.19 // indirect
 	github.com/wailsapp/mimetype v1.4.1 // indirect
-	golang.org/x/crypto v0.33.0 // indirect
+	golang.org/x/crypto v0.35.0 // indirect
 	golang.org/x/net v0.35.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -56,10 +56,10 @@ github.com/wailsapp/go-webview2 v1.0.19 h1:7U3QcDj1PrBPaxJNCui2k1SkWml+Q5kvFUFyT
 github.com/wailsapp/go-webview2 v1.0.19/go.mod h1:qJmWAmAmaniuKGZPWwne+uor3AHMB5PFhqiK0Bbj8kc=
 github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
 github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
-github.com/wailsapp/wails/v2 v2.10.0 h1:kfpWnfdNL1nXq0PyqAVPPDQY2pxkqcqWab01NGh3a6w=
-github.com/wailsapp/wails/v2 v2.10.0/go.mod h1:zrebnFV6MQf9kx8HI4iAv63vsR5v67oS7GTEZ7Pz1TY=
-golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+github.com/wailsapp/wails/v2 v2.10.1 h1:QWHvWMXII2nI/nXz77gpPG8P3ehl6zKe+u4su5BWIns=
+github.com/wailsapp/wails/v2 v2.10.1/go.mod h1:zrebnFV6MQf9kx8HI4iAv63vsR5v67oS7GTEZ7Pz1TY=
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ=
 golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8=
diff --git a/utils/image/rembg.go b/utils/image/rembg.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"os/exec"
+	"runtime"
 	"syscall"
 )
 
@@ -25,6 +26,7 @@ func RemBG(model string, path string, img []byte) ([]byte, error) {
 			return nil, err
 		}
 		cmd = nil
+		runtime.GC()
 		return out.Bytes(), nil
 	} else if img != nil {
 		cmd := exec.Command("rembg", "i", "-m", model, "-", "-")
@@ -44,6 +46,7 @@ func RemBG(model string, path string, img []byte) ([]byte, error) {
 			return nil, err
 		}
 		cmd = nil
+		runtime.GC()
 		return out.Bytes(), nil
 	}
 	return nil, errors.New("NO_IMAGE")

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"os"`
`6`	`6`	`"rmbg/utils"`
`7`	`7`	`"rmbg/utils/image"`
	`8`	`+ goruntime "runtime"`
`8`	`9`	`"syscall"`
`9`	`10`
`10`	`11`	`"github.com/wailsapp/wails/v2/pkg/runtime"`
`@@ -49,14 +50,12 @@ func (a *App) startup(ctx context.Context) {`
`49`	`50`	`if langData, err := utils.LoadLang(a.kernel32); err == nil {`
`50`	`51`	`a.LangStrings = langData`
`51`	`52`	`} else {`
`52`		`- // runtime.LogError(ctx, "Error loading lang file:"+err.Error())`
`53`	`53`	`runtime.EventsEmit(ctx, "alert", err.Error())`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if accentColor, err := utils.GetAccentColor(); err == nil {`
`57`	`57`	`a.AccentColor = accentColor`
`58`	`58`	`} else {`
`59`		`- // runtime.LogError(ctx, "Error getting accent color:"+err.Error())`
`60`	`59`	`runtime.EventsEmit(ctx, "alert", err.Error())`
`61`	`60`	`}`
`62`	`61`
`@@ -68,7 +67,6 @@ func (a *App) startup(ctx context.Context) {`
`68`	`67`	`CF_PNG: image.RegisterClipboardFormat(formatName, a.user32),`
`69`	`68`	`}`
`70`	`69`	`} else {`
`71`		`- // runtime.LogError(ctx, "Error getting clipboard format:"+err.Error())`
`72`	`70`	`runtime.EventsEmit(ctx, "alert", err.Error())`
`73`	`71`	`}`
`74`	`72`	`}`
`@@ -306,7 +304,10 @@ func (a *App) ClearImageMem(Imagetype string) {`
`306`	`304`	`a.imgData.pngcropimgpath = ""`
`307`	`305`	`a.imgData.jpgcropimg = nil`
`308`	`306`	`a.imgData.jpgcropimgpath = ""`
	`307`	`+ } else {`
	`308`	`+ return`
`309`	`309`	`}`
	`310`	`+ goruntime.GC()`
`310`	`311`	`}`
`311`	`312`
`312`	`313`	`func (a *App) CropImage(left, right, top, bottom float32, isJPG bool) []string {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { ImageContext } from "./contexts";`
`3`	`3`
`4`	`4`	`type CropEditorProps = {`
`5`	`5`	`rect: DOMRect \| null;`
`6`		`- imageRef: RefObject<HTMLImageElement>;`
	`6`	`+ imageRef: RefObject<HTMLImageElement \| null>;`
`7`	`7`	`isImageDark: boolean;`
`8`	`8`	`};`
`9`	`9`
`@@ -27,7 +27,7 @@ export default function CropEditor(props: CropEditorProps) {`
`27`	`27`	`setImageHeight(props.imageRef.current.naturalHeight / props.rect.height);`
`28`	`28`	`}`
`29`	`29`	`}`
`30`		`- },[props.imageRef.current, props.rect]);`
	`30`	`+ },[props.imageRef, props.rect]);`
`31`	`31`
`32`	`32`	`useLayoutEffect(() => {`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"errors"`
`6`	`6`	`"os/exec"`
	`7`	`+ "runtime"`
`7`	`8`	`"syscall"`
`8`	`9`	`)`
`9`	`10`
`@@ -25,6 +26,7 @@ func RemBG(model string, path string, img []byte) ([]byte, error) {`
`25`	`26`	`return nil, err`
`26`	`27`	`}`
`27`	`28`	`cmd = nil`
	`29`	`+ runtime.GC()`
`28`	`30`	`return out.Bytes(), nil`
`29`	`31`	`} else if img != nil {`
`30`	`32`	`cmd := exec.Command("rembg", "i", "-m", model, "-", "-")`
`@@ -44,6 +46,7 @@ func RemBG(model string, path string, img []byte) ([]byte, error) {`
`44`	`46`	`return nil, err`
`45`	`47`	`}`
`46`	`48`	`cmd = nil`
	`49`	`+ runtime.GC()`
`47`	`50`	`return out.Bytes(), nil`
`48`	`51`	`}`
`49`	`52`	`return nil, errors.New("NO_IMAGE")`