From 519f9935bd17e7b44af417271cc6b5cba2d3b5ba Mon Sep 17 00:00:00 2001 From: rhysd Date: Tue, 2 Nov 2021 21:53:27 +0900 Subject: [PATCH] fix `AboutWindowInfo` type is not found (fixes #71) --- src/index.ts | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/lib.d.ts | 45 --------------------------------------------- src/renderer.ts | 1 + 3 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 src/lib.d.ts diff --git a/src/index.ts b/src/index.ts index c463e33..3eaa37a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,6 +2,50 @@ import { app as appMain, BrowserWindow as BrowserWindowMain, shell, ipcMain } fr import { statSync } from 'fs'; import * as path from 'path'; +export interface LicenseEntry { + type: string; + url: string; +} + +export interface PackageJson { + productName?: string; + description?: string; + homepage?: string; + license?: string | LicenseEntry; + bugs?: { + url: string; + }; +} + +export interface AboutWindowInfo { + icon_path: string; + product_name?: string; + copyright?: string; + homepage?: string; + description?: string; + package_json_dir?: string; + about_page_dir?: string; + license?: string; + bug_report_url?: string; + css_path?: string | string[]; + adjust_window_size?: boolean; + win_options?: Electron.BrowserWindowConstructorOptions; + open_devtools?: boolean; + use_inner_html?: boolean; + bug_link_text?: string; + use_version_info?: boolean | [string, string][]; + show_close_button?: string; + app?: Electron.App; + BrowserWindow?: typeof Electron.BrowserWindow; + ipcMain?: Electron.IpcMain; +} + +declare namespace NodeJS { + interface ProcessVersions { + [name: string]: string; + } +} + function loadPackageJson(pkg_path: string): PackageJson { try { return require(pkg_path); diff --git a/src/lib.d.ts b/src/lib.d.ts deleted file mode 100644 index a91af1f..0000000 --- a/src/lib.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/// - -interface LicenseEntry { - type: string; - url: string; -} - -interface PackageJson { - productName?: string; - description?: string; - homepage?: string; - license?: string | LicenseEntry; - bugs?: { - url: string; - }; -} - -interface AboutWindowInfo { - icon_path: string; - product_name?: string; - copyright?: string; - homepage?: string; - description?: string; - package_json_dir?: string; - about_page_dir?: string; - license?: string; - bug_report_url?: string; - css_path?: string | string[]; - adjust_window_size?: boolean; - win_options?: Electron.BrowserWindowConstructorOptions; - open_devtools?: boolean; - use_inner_html?: boolean; - bug_link_text?: string; - use_version_info?: boolean | [string, string][]; - show_close_button?: string; - app?: Electron.App; - BrowserWindow?: typeof Electron.BrowserWindow; - ipcMain?: Electron.IpcMain; -} - -declare namespace NodeJS { - interface ProcessVersions { - [name: string]: string; - } -} diff --git a/src/renderer.ts b/src/renderer.ts index e86b2b9..54e39f9 100644 --- a/src/renderer.ts +++ b/src/renderer.ts @@ -1,4 +1,5 @@ import { ipcRenderer, shell } from 'electron'; +import type { AboutWindowInfo } from './index'; ipcRenderer.on('about-window:info', (_: any, info: AboutWindowInfo, app_name: string, version: string) => { // Note: app.getName() was replaced with app.name at Electron v7