@ffflorian/electron-icon-generator 1.5.4 → 1.6.0

package/README.md

@@ -9,7 +9,7 @@ Based on https://github.com/jaretburkett/electron-icon-maker.
 
 ## Installation
 
-ℹ️ This is a hybrid [CommonJS](https://nodejs.org/docs/latest/api/modules.html#modules-commonjs-modules) / [ESM](https://nodejs.org/api/esm.html#introduction) module.
+ℹ️ This is a pure [ESM](https://nodejs.org/api/esm.html#introduction) module.
 
 Run `yarn global add @ffflorian/electron-icon-generator` or `npm i -g @ffflorian/electron-icon-generator`
 

package/dist/{esm/cli.js → cli.js}

@@ -1,9 +1,13 @@
 #!/usr/bin/env node
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { program as commander } from 'commander';
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
 import { IconGenerator } from './index.js';
-const { bin, description, version } = require('../package.json');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const packageJsonPath = path.join(__dirname, '../package.json');
+const { bin, description, version } = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
 commander
     .description(description)
     .name(Object.keys(bin)[0])

package/dist/{esm/index.js → index.js}

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
+import path from 'node:path';
 import * as fs from 'fs-extra';
 import Jimp from 'jimp';
-import path from 'path';
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-const icongen = require('icon-gen');
+import icongen from 'icon-gen';
 // eslint-disable-next-line no-magic-numbers
 const pngSizes = [16, 24, 32, 48, 64, 128, 256, 512, 1024];
 export class IconGenerator {
@@ -40,7 +38,7 @@ export class IconGenerator {
             const macIconsDir = path.join(this.iconsDir, 'mac');
             const winIconsDir = path.join(this.iconsDir, 'win');
             await fs.ensureDir(macIconsDir);
-            await icongen(this.PNGoutputDir, macIconsDir, {
+            await icongen.default(this.PNGoutputDir, macIconsDir, {
                 icns: {
                     name: 'icon',
                     sizes: pngSizes,
@@ -48,7 +46,7 @@ export class IconGenerator {
                 report: !this.options.silent,
             });
             await fs.ensureDir(winIconsDir);
-            await icongen(this.PNGoutputDir, winIconsDir, {
+            await icongen.default(this.PNGoutputDir, winIconsDir, {
                 icns: {
                     name: 'icon',
                     sizes: pngSizes,

package/package.json

@@ -1,27 +1,22 @@
 {
   "author": "Florian Imdahl <git@ffflorian.de>",
-  "bin": "dist/cjs/index.js",
+  "bin": "dist/index.js",
   "dependencies": {
     "commander": "12.1.0",
     "fs-extra": "11.2.0",
-    "icon-gen": "4.0.0",
+    "icon-gen": "5.0.0",
     "jimp": "0.22.12"
   },
   "description": "An icon generator to generate all the icon files needed for electron packaging",
   "devDependencies": {
     "@types/fs-extra": "11.0.4",
-    "rimraf": "5.0.7",
-    "typescript": "5.4.5"
+    "rimraf": "6.0.1",
+    "typescript": "5.5.4"
   },
   "engines": {
     "node": ">= 18.0"
   },
-  "exports": {
-    ".": {
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js"
-    }
-  },
+  "exports": "./dist/index.js",
   "files": [
     "dist"
   ],
@@ -33,21 +28,17 @@
     "ico"
   ],
   "license": "GPL-3.0",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "module": "dist/index.js",
   "name": "@ffflorian/electron-icon-generator",
   "repository": "https://github.com/ffflorian/node-packages/tree/main/packages/electron-icon-generator",
   "scripts": {
-    "build": "yarn build:cjs && yarn build:esm && yarn generate:packagejson",
-    "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:esm": "tsc -p tsconfig.json",
+    "build": "tsc -p tsconfig.json",
     "clean": "rimraf dist",
     "dist": "yarn clean && yarn build",
-    "generate:packagejson": "../../bin/generate-hybrid-package-json.sh",
     "start": "node --loader ts-node/esm src/cli.ts",
     "test": "exit 0"
   },
   "type": "module",
-  "version": "1.5.4",
-  "gitHead": "28c184f53a87d8eb082cc27c923ef7b352bbe875"
+  "version": "1.6.0",
+  "gitHead": "f1a74d8ec9721d5b52a00e41b2ec73278e048290"
 }

package/dist/cjs/cli.js

@@ -1,26 +0,0 @@
-#!/usr/bin/env node
-import { program as commander } from 'commander';
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-import { IconGenerator } from './index.js';
-const { bin, description, version } = require('../package.json');
-commander
-    .description(description)
-    .name(Object.keys(bin)[0])
-    .version(version)
-    .option('-i, --input <file>', 'Input PNG file (recommended size: 1024x1024)', './icon.png')
-    .option('-o, --output <folder>', 'Folder to output new icons folder', './')
-    .option('-s, --silent', `Don't log anything beside errors`, false)
-    .parse(process.argv);
-const commanderOptions = commander.opts();
-new IconGenerator({
-    input: commanderOptions.input,
-    output: commanderOptions.output,
-    silent: commanderOptions.silent,
-})
-    .start()
-    .then(() => process.exit())
-    .catch(error => {
-    console.error(error);
-    process.exit(1);
-});

package/dist/cjs/index.js

@@ -1,98 +0,0 @@
-#!/usr/bin/env node
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import * as fs from 'fs-extra';
-import Jimp from 'jimp';
-import path from 'path';
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-const icongen = require('icon-gen');
-// eslint-disable-next-line no-magic-numbers
-const pngSizes = [16, 24, 32, 48, 64, 128, 256, 512, 1024];
-export class IconGenerator {
-    constructor(options) {
-        this.options = options;
-        this.logConsole(options);
-        this.options.input = path.resolve(this.options.input);
-        this.options.output = path.resolve(this.options.output);
-        this.iconsDir = path.join(this.options.output, 'icons');
-        this.PNGoutputDir = path.join(this.iconsDir, 'png');
-    }
-    start() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.createPNGs(0);
-        });
-    }
-    createPNG(size) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fileName = `${size.toString()}.png`;
-            yield fs.ensureDir(this.options.output);
-            yield fs.ensureDir(this.iconsDir);
-            yield fs.ensureDir(this.PNGoutputDir);
-            const image = yield Jimp.read(this.options.input);
-            const resizeFile = path.join(this.PNGoutputDir, fileName);
-            yield new Promise((resolve, reject) => image.resize(size, size, (error, result) => (error ? reject(error) : resolve(result))));
-            yield image.writeAsync(resizeFile);
-            return `Created "${resizeFile}"`;
-        });
-    }
-    createPNGs(position) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const info = yield this.createPNG(pngSizes[position]);
-            this.logConsole(info);
-            if (position < pngSizes.length - 1) {
-                yield this.createPNGs(position + 1);
-            }
-            else {
-                const macIconsDir = path.join(this.iconsDir, 'mac');
-                const winIconsDir = path.join(this.iconsDir, 'win');
-                yield fs.ensureDir(macIconsDir);
-                yield icongen(this.PNGoutputDir, macIconsDir, {
-                    icns: {
-                        name: 'icon',
-                        sizes: pngSizes,
-                    },
-                    report: !this.options.silent,
-                });
-                yield fs.ensureDir(winIconsDir);
-                yield icongen(this.PNGoutputDir, winIconsDir, {
-                    icns: {
-                        name: 'icon',
-                        sizes: pngSizes,
-                    },
-                    report: !this.options.silent,
-                });
-                this.logConsole('Renaming PNGs to Electron Format');
-                yield this.renamePNGs(0);
-            }
-        });
-    }
-    logConsole(...messages) {
-        if (!this.options.silent) {
-            console.info(...messages);
-        }
-    }
-    renamePNGs(position) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const startName = `${pngSizes[position]}.png`;
-            const endName = `${pngSizes[position]}x${pngSizes[position]}.png`;
-            const startFile = path.join(this.PNGoutputDir, startName);
-            const endFile = path.join(this.PNGoutputDir, endName);
-            yield fs.rename(startFile, endFile);
-            this.logConsole(`Renamed "${startName}" to "${endName}".`);
-            if (position < pngSizes.length - 1) {
-                yield this.renamePNGs(position + 1);
-            }
-            else {
-                this.logConsole('\nAll done');
-            }
-        });
-    }
-}

package/dist/cjs/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}

package/dist/esm/cli.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/esm/index.d.ts

@@ -1,17 +0,0 @@
-#!/usr/bin/env node
-export interface Options {
-    input: string;
-    output: string;
-    silent?: boolean;
-}
-export declare class IconGenerator {
-    private readonly iconsDir;
-    private readonly options;
-    private readonly PNGoutputDir;
-    constructor(options: Options);
-    start(): Promise<void>;
-    private createPNG;
-    private createPNGs;
-    private logConsole;
-    private renamePNGs;
-}

package/dist/esm/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "module"
-}