update img2ico

Author: nini22P

packages/origine2/package.json

@@ -37,10 +37,9 @@
     "@types/parse-path": "^7.1.0",
     "@uiw/react-json-view": "^2.0.0-alpha.12",
     "axios": "^1.6.0",
-    "buffer": "^6.0.3",
     "classnames": "^2.5.1",
     "cloudlogjs": "^1.0.11",
-    "img2ico": "^1.1.5",
+    "img2ico": "^1.3.0",
     "lodash": "^4.17.21",
     "material-icon-theme": "^4.27.0",
     "mitt": "^3.0.1",

packages/origine2/src/components/IconCreator/IconCreator.tsx

@@ -8,8 +8,6 @@ import axios from 'axios';
 import { ColorPickerPopup } from '../ColorPickerPopup/ColorPickerPopup';
 import img2ico from 'img2ico';
 import Transformer from '../Transformer/Transformer';
-import { Buffer } from 'buffer';
-window.Buffer = Buffer;
 
 type IIconShape = 'circle' | 'square' | 'rounded-rectangle';
 type IBackgroundStyle = 'color' | 'image';
@@ -306,7 +304,7 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto
     let timeoutId: ReturnType<typeof setTimeout> | null = null;
 
     if (activeIndex === 1) {
-      const ANIMATION_DURATION = 1000; 
+      const ANIMATION_DURATION = 750; 
 
       timeoutId = setTimeout(() => {
         generateAllIcons().then(() => {
@@ -483,16 +481,15 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto
 
     const webIconBlob = await resizeCanvasToBlob(webIconCanvas, 256);
     const webIconArrayBuffer = await webIconBlob.arrayBuffer();
-    const webIconBuffer = Buffer.from(webIconArrayBuffer);
-    const icoBuffer = await img2ico(webIconBuffer);
-    const icoBlob = new Blob([icoBuffer], { type: 'image/x-icon' });
-    const icoUrl = URL.createObjectURL(icoBlob);
+    const icoResult = await img2ico(webIconArrayBuffer);
+    const icoDataUrl = icoResult.toDataUrl();
+    const icoBlob = await fetch(icoDataUrl).then(res => res.blob());
 
     const previewIcons: IIcons = {
-      ico: { name: 'Ico', src: icoUrl },
+      ico: { name: 'Ico', src: icoDataUrl },
       web: { name: 'Web', src: webIconCanvas.toDataURL() },
       webMaskable: { name: 'Web Maskable', src: maskableCanvas.toDataURL() },
-      desktop: { name: 'Desktop', src: icoUrl },
+      desktop: { name: 'Desktop', src: icoDataUrl },
       androidForeground: { name: 'Android Foreground', src: androidForegroundCanvas.toDataURL() },
       androidBackground: { name: 'Android Background', src: androidBackgroundCanvas.toDataURL() },
       androidFullBleed: { name: 'Android Full Bleed', src: compositeCanvas.toDataURL() },
@@ -634,6 +631,7 @@ const IconCreator = ({ gameDir, triggerButton }: { gameDir: string, triggerButto
               <Carousel
                 groupSize={1}
                 activeIndex={activeIndex}
+                motion='fade'
               >
                 <CarouselViewport draggable={false}>
                   <CarouselSlider>

packages/origine2/vite.config.ts

@@ -26,6 +26,10 @@ export default defineConfig({
       '@': resolve('src'),
     },
   },
+  optimizeDeps: {
+    include: ['buffer'],
+    exclude: ['img2ico'],
+  },
   server: {
     port: WEBGAL_PORT,
     proxy: {

yarn.lock

@@ -8148,11 +8148,12 @@ image-q@^4.0.0:
   dependencies:
     "@types/node" "16.9.1"
 
-img2ico@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/img2ico/-/img2ico-1.1.5.tgz#0927cd34f43c9666edd1621060e4f81428ac569e"
-  integrity sha512-Zz1hd2Z5XNih1qpDdAbKRNhgkh5gUFhWIXOmWabcjvrf9G429PELO3m9E7F2S7RdWWruJVZtd2gy8dKPi2Wu6Q==
+img2ico@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/img2ico/-/img2ico-1.3.0.tgz#b879ff6abb91fff5e6dada8fba892014e13c5ac6"
+  integrity sha512-lknA3SgeDrz7b2Erd6s0JyEQMSp8Ay2SSMggop32SkzlN9HgM0CddnB7+FkzBAxMoJTzYafHbkp6IIJ3wNJ2Og==
   dependencies:
+    buffer "^6.0.3"
     commander "^14.0.0"
     jimp "^1.6.0"