Add the automatic replacement of domestic source function of pake-cli
This commit is contained in:
19
bin/builders/LinuxBuilder.ts
vendored
19
bin/builders/LinuxBuilder.ts
vendored
@@ -5,6 +5,7 @@ import { checkRustInstalled, installRust } from '@/helpers/rust.js';
|
||||
import { PakeAppOptions } from '@/types.js';
|
||||
import { IBuilder } from './base.js';
|
||||
import { shellExec } from '@/utils/shell.js';
|
||||
import {isChinaDomain} from '@/utils/ip_addr.js';
|
||||
// @ts-expect-error 加上resolveJsonModule rollup会打包报错
|
||||
// import tauriConf from '../../src-tauri/tauri.windows.conf.json';
|
||||
import tauriConf from './tauriConf.js';
|
||||
@@ -44,9 +45,23 @@ export default class LinuxBuilder implements IBuilder {
|
||||
async build(url: string, options: PakeAppOptions) {
|
||||
logger.debug('PakeAppOptions', options);
|
||||
const { name } = options;
|
||||
|
||||
await mergeTauriConfig(url, options, tauriConf);
|
||||
const _ = await shellExec(`cd ${npmDirectory} && npm install && npm run build`);
|
||||
const isChina = isChinaDomain("www.npmjs.com")
|
||||
|
||||
if (isChina) {
|
||||
// crates.io也顺便换源
|
||||
const rust_project_dir = path.join(npmDirectory, 'src-tauri', ".cargo");
|
||||
const project_cn_conf = path.join(rust_project_dir, "cn_config.bak");
|
||||
const project_conf = path.join(rust_project_dir, "config");
|
||||
fs.copyFile(project_cn_conf, project_conf);
|
||||
fs.unlink(project_cn_conf);
|
||||
|
||||
const _ = await shellExec(
|
||||
`cd ${npmDirectory} && npm install --registry=https://registry.npmmirror.com && npm run build`
|
||||
);
|
||||
} else {
|
||||
const _ = await shellExec(`cd ${npmDirectory} && npm install && npm run build`);
|
||||
}
|
||||
let arch: string;
|
||||
if (process.arch === "x64") {
|
||||
arch = "amd64";
|
||||
|
||||
26
bin/builders/MacBuilder.ts
vendored
26
bin/builders/MacBuilder.ts
vendored
@@ -11,6 +11,7 @@ import tauriConf from './tauriConf.js';
|
||||
import log from 'loglevel';
|
||||
import { mergeTauriConfig } from './common.js';
|
||||
import { npmDirectory } from '@/utils/dir.js';
|
||||
import {isChinaDomain} from '@/utils/ip_addr.js';
|
||||
import logger from '@/options/logger.js';
|
||||
|
||||
export default class MacBuilder implements IBuilder {
|
||||
@@ -41,10 +42,31 @@ export default class MacBuilder implements IBuilder {
|
||||
await mergeTauriConfig(url, options, tauriConf);
|
||||
let dmgName: string;
|
||||
if (options.multiArch) {
|
||||
await shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build:mac`);
|
||||
const isChina = isChinaDomain("www.npmjs.com")
|
||||
if (isChina) {
|
||||
// crates.io也顺便换源
|
||||
const rust_project_dir = path.join(npmDirectory, 'src-tauri', ".cargo");
|
||||
const project_cn_conf = path.join(rust_project_dir, "cn_config.bak");
|
||||
const project_conf = path.join(rust_project_dir, "config");
|
||||
fs.copyFile(project_cn_conf, project_conf);
|
||||
fs.unlink(project_cn_conf);
|
||||
|
||||
const _ = await shellExec(
|
||||
`cd ${npmDirectory} && npm install --registry=https://registry.npmmirror.com && npm run build:mac`
|
||||
);
|
||||
} else {
|
||||
const _ = await shellExec(`cd ${npmDirectory} && npm install && npm run build:mac`);
|
||||
}
|
||||
dmgName = `${name}_${tauriConf.package.version}_universal.dmg`;
|
||||
} else {
|
||||
await shellExec(`cd "${npmDirectory}" && npm install --verbose && npm run build`);
|
||||
const isChina = isChinaDomain("www.npmjs.com")
|
||||
if (isChina) {
|
||||
const _ = await shellExec(
|
||||
`cd ${npmDirectory} && npm install --registry=https://registry.npmmirror.com && npm run build`
|
||||
);
|
||||
} else {
|
||||
const _ = await shellExec(`cd ${npmDirectory} && npm install && npm run build`);
|
||||
}
|
||||
let arch = "x64";
|
||||
if (process.arch === "arm64") {
|
||||
arch = "aarch64";
|
||||
|
||||
17
bin/builders/WinBulider.ts
vendored
17
bin/builders/WinBulider.ts
vendored
@@ -13,6 +13,7 @@ import { fileURLToPath } from 'url';
|
||||
import logger from '@/options/logger.js';
|
||||
import { mergeTauriConfig } from './common.js';
|
||||
import { npmDirectory } from '@/utils/dir.js';
|
||||
import {isChinaDomain} from '@/utils/ip_addr.js';
|
||||
|
||||
export default class WinBuilder implements IBuilder {
|
||||
async prepare() {
|
||||
@@ -47,7 +48,21 @@ export default class WinBuilder implements IBuilder {
|
||||
|
||||
await mergeTauriConfig(url, options, tauriConf);
|
||||
|
||||
const _ = await shellExec(`cd ${npmDirectory} && npm install && npm run build`);
|
||||
const isChina = isChinaDomain("www.npmjs.com")
|
||||
if (isChina) {
|
||||
// crates.io也顺便换源
|
||||
const rust_project_dir = path.join(npmDirectory, 'src-tauri', ".cargo");
|
||||
const project_cn_conf = path.join(rust_project_dir, "cn_config.bak");
|
||||
const project_conf = path.join(rust_project_dir, "config");
|
||||
fs.copyFile(project_cn_conf, project_conf);
|
||||
fs.unlink(project_cn_conf);
|
||||
|
||||
const _ = await shellExec(
|
||||
`cd ${npmDirectory} && npm install --registry=https://registry.npmmirror.com && npm run build`
|
||||
);
|
||||
} else {
|
||||
const _ = await shellExec(`cd ${npmDirectory} && npm install && npm run build`);
|
||||
}
|
||||
const language = tauriConf.tauri.bundle.windows.wix.language[0];
|
||||
const arch = process.arch;
|
||||
const msiName = `${name}_${tauriConf.package.version}_${arch}_${language}.msi`;
|
||||
|
||||
Reference in New Issue
Block a user