update pake-cli to 1.2.9
This commit is contained in:
2
bin/builders/LinuxBuilder.ts
vendored
2
bin/builders/LinuxBuilder.ts
vendored
@@ -46,7 +46,7 @@ export default class LinuxBuilder implements IBuilder {
|
|||||||
const { name } = options;
|
const { name } = options;
|
||||||
|
|
||||||
await mergeTauriConfig(url, options, tauriConf);
|
await mergeTauriConfig(url, options, tauriConf);
|
||||||
await shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
|
await shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build`);
|
||||||
|
|
||||||
let arch: string;
|
let arch: string;
|
||||||
if (process.arch === "x64") {
|
if (process.arch === "x64") {
|
||||||
|
|||||||
4
bin/builders/MacBuilder.ts
vendored
4
bin/builders/MacBuilder.ts
vendored
@@ -41,10 +41,10 @@ export default class MacBuilder implements IBuilder {
|
|||||||
await mergeTauriConfig(url, options, tauriConf);
|
await mergeTauriConfig(url, options, tauriConf);
|
||||||
let dmgName: string;
|
let dmgName: string;
|
||||||
if (options.multiArch) {
|
if (options.multiArch) {
|
||||||
await shellExec(`cd "${npmDirectory}" && npm install && npm run build:mac`);
|
await shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build:mac`);
|
||||||
dmgName = `${name}_${tauriConf.package.version}_universal.dmg`;
|
dmgName = `${name}_${tauriConf.package.version}_universal.dmg`;
|
||||||
} else {
|
} else {
|
||||||
await shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
|
await shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build`);
|
||||||
let arch = "x64";
|
let arch = "x64";
|
||||||
if (process.arch === "arm64") {
|
if (process.arch === "arm64") {
|
||||||
arch = "aarch64";
|
arch = "aarch64";
|
||||||
|
|||||||
2
bin/builders/WinBulider.ts
vendored
2
bin/builders/WinBulider.ts
vendored
@@ -45,7 +45,7 @@ export default class WinBuilder implements IBuilder {
|
|||||||
|
|
||||||
await mergeTauriConfig(url, options, tauriConf);
|
await mergeTauriConfig(url, options, tauriConf);
|
||||||
|
|
||||||
await shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
|
await shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build`);
|
||||||
const language = tauriConf.tauri.bundle.windows.wix.language[0];
|
const language = tauriConf.tauri.bundle.windows.wix.language[0];
|
||||||
const arch = process.arch;
|
const arch = process.arch;
|
||||||
const msiName = `${name}_${tauriConf.package.version}_${arch}_${language}.msi`;
|
const msiName = `${name}_${tauriConf.package.version}_${arch}_${language}.msi`;
|
||||||
|
|||||||
13
bin/builders/common.ts
vendored
13
bin/builders/common.ts
vendored
@@ -63,6 +63,14 @@ export async function mergeTauriConfig(
|
|||||||
const exists = await fs.stat(options.icon)
|
const exists = await fs.stat(options.icon)
|
||||||
.then(() => true)
|
.then(() => true)
|
||||||
.catch(() => false);
|
.catch(() => false);
|
||||||
|
if (process.platform === "linux") {
|
||||||
|
if (["all", "deb", "appimage"].includes(options.targets)) {
|
||||||
|
tauriConf.tauri.bundle.targets = [options.targets];
|
||||||
|
} else {
|
||||||
|
logger.warn("targets must be 'all', 'deb', 'appimage', we will use default 'all'");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (exists) {
|
if (exists) {
|
||||||
let updateIconPath = true;
|
let updateIconPath = true;
|
||||||
let customIconExt = path.extname(options.icon).toLowerCase();
|
let customIconExt = path.extname(options.icon).toLowerCase();
|
||||||
@@ -82,11 +90,6 @@ export async function mergeTauriConfig(
|
|||||||
updateIconPath = false;
|
updateIconPath = false;
|
||||||
logger.warn(`icon file in Linux must be 512 * 512 pix with .png type, but you give ${customIconExt}`);
|
logger.warn(`icon file in Linux must be 512 * 512 pix with .png type, but you give ${customIconExt}`);
|
||||||
}
|
}
|
||||||
if (["all", "deb", "appimage"].includes(options.targets)) {
|
|
||||||
tauriConf.tauri.bundle.targets = [options.targets];
|
|
||||||
} else {
|
|
||||||
logger.warn("targets must be 'all', 'deb', 'appimage', we will use default 'all'");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (process.platform === "darwin" && customIconExt !== ".icns") {
|
if (process.platform === "darwin" && customIconExt !== ".icns") {
|
||||||
|
|||||||
24
dist/cli.js
vendored
24
dist/cli.js
vendored
@@ -1658,6 +1658,14 @@ function mergeTauriConfig(url, options, tauriConf) {
|
|||||||
const exists = yield fs.stat(options.icon)
|
const exists = yield fs.stat(options.icon)
|
||||||
.then(() => true)
|
.then(() => true)
|
||||||
.catch(() => false);
|
.catch(() => false);
|
||||||
|
if (process.platform === "linux") {
|
||||||
|
if (["all", "deb", "appimage"].includes(options.targets)) {
|
||||||
|
tauriConf.tauri.bundle.targets = [options.targets];
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
logger.warn("targets must be 'all', 'deb', 'appimage', we will use default 'all'");
|
||||||
|
}
|
||||||
|
}
|
||||||
if (exists) {
|
if (exists) {
|
||||||
let updateIconPath = true;
|
let updateIconPath = true;
|
||||||
let customIconExt = path.extname(options.icon).toLowerCase();
|
let customIconExt = path.extname(options.icon).toLowerCase();
|
||||||
@@ -1678,12 +1686,6 @@ function mergeTauriConfig(url, options, tauriConf) {
|
|||||||
updateIconPath = false;
|
updateIconPath = false;
|
||||||
logger.warn(`icon file in Linux must be 512 * 512 pix with .png type, but you give ${customIconExt}`);
|
logger.warn(`icon file in Linux must be 512 * 512 pix with .png type, but you give ${customIconExt}`);
|
||||||
}
|
}
|
||||||
if (["all", "deb", "appimage"].includes(options.targets)) {
|
|
||||||
tauriConf.tauri.bundle.targets = [options.targets];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
logger.warn("targets must be 'all', 'deb', 'appimage', we will use default 'all'");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (process.platform === "darwin" && customIconExt !== ".icns") {
|
if (process.platform === "darwin" && customIconExt !== ".icns") {
|
||||||
updateIconPath = false;
|
updateIconPath = false;
|
||||||
@@ -2025,11 +2027,11 @@ class MacBuilder {
|
|||||||
yield mergeTauriConfig(url, options, tauriConf);
|
yield mergeTauriConfig(url, options, tauriConf);
|
||||||
let dmgName;
|
let dmgName;
|
||||||
if (options.multiArch) {
|
if (options.multiArch) {
|
||||||
yield shellExec(`cd "${npmDirectory}" && npm install && npm run build:mac`);
|
yield shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build:mac`);
|
||||||
dmgName = `${name}_${tauriConf.package.version}_universal.dmg`;
|
dmgName = `${name}_${tauriConf.package.version}_universal.dmg`;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
yield shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
|
yield shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build`);
|
||||||
let arch = "x64";
|
let arch = "x64";
|
||||||
if (process.arch === "arm64") {
|
if (process.arch === "arm64") {
|
||||||
arch = "aarch64";
|
arch = "aarch64";
|
||||||
@@ -2087,7 +2089,7 @@ class WinBuilder {
|
|||||||
logger.debug('PakeAppOptions', options);
|
logger.debug('PakeAppOptions', options);
|
||||||
const { name } = options;
|
const { name } = options;
|
||||||
yield mergeTauriConfig(url, options, tauriConf);
|
yield mergeTauriConfig(url, options, tauriConf);
|
||||||
yield shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
|
yield shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build`);
|
||||||
const language = tauriConf.tauri.bundle.windows.wix.language[0];
|
const language = tauriConf.tauri.bundle.windows.wix.language[0];
|
||||||
const arch = process.arch;
|
const arch = process.arch;
|
||||||
const msiName = `${name}_${tauriConf.package.version}_${arch}_${language}.msi`;
|
const msiName = `${name}_${tauriConf.package.version}_${arch}_${language}.msi`;
|
||||||
@@ -2132,7 +2134,7 @@ class LinuxBuilder {
|
|||||||
logger.debug('PakeAppOptions', options);
|
logger.debug('PakeAppOptions', options);
|
||||||
const { name } = options;
|
const { name } = options;
|
||||||
yield mergeTauriConfig(url, options, tauriConf);
|
yield mergeTauriConfig(url, options, tauriConf);
|
||||||
yield shellExec(`cd "${npmDirectory}" && npm install && npm run build`);
|
yield shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build`);
|
||||||
let arch;
|
let arch;
|
||||||
if (process.arch === "x64") {
|
if (process.arch === "x64") {
|
||||||
arch = "amd64";
|
arch = "amd64";
|
||||||
@@ -2181,7 +2183,7 @@ class BuilderFactory {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var name = "pake-cli";
|
var name = "pake-cli";
|
||||||
var version = "1.2.8";
|
var version = "1.2.9";
|
||||||
var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。";
|
var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。";
|
||||||
var engines = {
|
var engines = {
|
||||||
node: ">=16.0.0"
|
node: ">=16.0.0"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pake-cli",
|
"name": "pake-cli",
|
||||||
"version": "1.2.8",
|
"version": "1.2.9",
|
||||||
"description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。",
|
"description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=16.0.0"
|
"node": ">=16.0.0"
|
||||||
|
|||||||
Reference in New Issue
Block a user