From 88655005934b5008632d02a6fe8bf0d7fed66a56 Mon Sep 17 00:00:00 2001 From: Tw93 Date: Fri, 23 Jun 2023 19:06:17 +0800 Subject: [PATCH] :art: Fix the packaging issue for Linux and Windows. --- bin/builders/BaseBuilder.ts | 4 ++-- bin/helpers/merge.ts | 2 +- dist/cli.js | 8 ++++---- package.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/builders/BaseBuilder.ts b/bin/builders/BaseBuilder.ts index e1c7aed..fc2bdfe 100644 --- a/bin/builders/BaseBuilder.ts +++ b/bin/builders/BaseBuilder.ts @@ -82,7 +82,7 @@ export default abstract class BaseBuilder { } protected getFileType(target: string): string { - return target.toLowerCase(); + return target; } abstract getFileName(): string; @@ -99,7 +99,7 @@ export default abstract class BaseBuilder { return path.join( npmDirectory, this.getBasePath(), - fileType, + fileType.toLowerCase(), `${fileName}.${fileType}` ); } diff --git a/bin/helpers/merge.ts b/bin/helpers/merge.ts index 195bcb8..7259588 100644 --- a/bin/helpers/merge.ts +++ b/bin/helpers/merge.ts @@ -15,7 +15,6 @@ export async function mergeConfig( height, fullscreen, transparent, - resizable, userAgent, showMenu, showSystemTray, @@ -23,6 +22,7 @@ export async function mergeConfig( iterCopyFile, identifier, name, + resizable = true, } = options; const { platform } = process; diff --git a/dist/cli.js b/dist/cli.js index e7dfa79..067b910 100644 --- a/dist/cli.js +++ b/dist/cli.js @@ -20,7 +20,7 @@ import isUrl from 'is-url'; import fs from 'fs'; var name = "pake-cli"; -var version = "2.1.3"; +var version = "2.1.4"; var description = "๐Ÿคฑ๐Ÿป Turn any webpage into a desktop app with Rust. ๐Ÿคฑ๐Ÿป ๅพˆ็ฎ€ๅ•็š„็”จ Rust ๆ‰“ๅŒ…็ฝ‘้กต็”Ÿๆˆๅพˆๅฐ็š„ๆกŒ้ข Appใ€‚"; var engines = { node: ">=16.0.0" @@ -464,7 +464,7 @@ function checkRustInstalled() { } async function mergeConfig(url, options, tauriConf) { - const { width, height, fullscreen, transparent, resizable, userAgent, showMenu, showSystemTray, systemTrayIcon, iterCopyFile, identifier, name, } = options; + const { width, height, fullscreen, transparent, userAgent, showMenu, showSystemTray, systemTrayIcon, iterCopyFile, identifier, name, resizable = true, } = options; const { platform } = process; // Set Windows parameters. const tauriConfWindowOptions = { @@ -675,7 +675,7 @@ class BaseBuilder { logger.success('โœ” App installer located in', distPath); } getFileType(target) { - return target.toLowerCase(); + return target; } getBuildCommand() { return "npm run build"; @@ -684,7 +684,7 @@ class BaseBuilder { return 'src-tauri/target/release/bundle/'; } getBuildAppPath(npmDirectory, fileName, fileType) { - return path.join(npmDirectory, this.getBasePath(), fileType, `${fileName}.${fileType}`); + return path.join(npmDirectory, this.getBasePath(), fileType.toLowerCase(), `${fileName}.${fileType}`); } } diff --git a/package.json b/package.json index c4c7839..cfa66d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pake-cli", - "version": "2.1.3", + "version": "2.1.4", "description": "๐Ÿคฑ๐Ÿป Turn any webpage into a desktop app with Rust. ๐Ÿคฑ๐Ÿป ๅพˆ็ฎ€ๅ•็š„็”จ Rust ๆ‰“ๅŒ…็ฝ‘้กต็”Ÿๆˆๅพˆๅฐ็š„ๆกŒ้ข Appใ€‚", "engines": { "node": ">=16.0.0"