feat: 完善一波代码 & 支持win（待测试验证）

bin/builders/BuilderFactory.ts

@@ -1,6 +1,7 @@
 import { IS_MAC } from '@/utils/platform.js';
 import { IBuilder } from './base.js';
 import MacBuilder from './MacBuilder.js';
+import WinBuilder from './WinBulider.js';
 
 export default class BuilderFactory {
   static create(): IBuilder {

bin/builders/MacBuilder.ts

@@ -7,8 +7,10 @@ import { IBuilder } from './base.js';
 import { shellExec } from '@/utils/shell.js';
 // @ts-expect-error 加上resolveJsonModule rollup会打包报错
 import tauriConf from '../../src-tauri/tauri.conf.json';
-import { fileURLToPath } from 'url';
 import log from 'loglevel';
+import { mergeTauriConfig } from './common.js';
+import { npmDirectory } from '@/utils/dir.js';
+import logger from '@/options/logger.js';
 
 export default class MacBuilder implements IBuilder {
   async prepare() {
@@ -33,34 +35,26 @@ export default class MacBuilder implements IBuilder {
 
   async build(url: string, options: PakeAppOptions) {
     log.debug('PakeAppOptions', options);
+    const { name } = options;
 
-    const { width, height, fullscreen, transparent, resizable, identifier, name } = options;
-
-    const tauriConfWindowOptions = {
-      width,
-      height,
-      fullscreen,
-      transparent,
-      resizable,
-    };
-
-    // TODO 下面这块逻辑还可以再拆 目前比较简单
-    Object.assign(tauriConf.tauri.windows[0], { url, ...tauriConfWindowOptions });
-    tauriConf.package.productName = name;
-    tauriConf.tauri.bundle.identifier = identifier;
-    tauriConf.tauri.bundle.icon = [options.icon];
-
-    const npmDirectory = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
-    const configJsonPath = path.join(npmDirectory, 'src-tauri/tauri.conf.json');
-    await fs.writeFile(configJsonPath, Buffer.from(JSON.stringify(tauriConf), 'utf-8'));
+    await mergeTauriConfig(url, options, tauriConf);
 
     const code = await shellExec(`cd ${npmDirectory} && npm run build`);
     const dmgName = `${name}_${tauriConf.package.version}_universal.dmg`;
     const appPath = this.getBuildedAppPath(npmDirectory, dmgName);
-    await fs.copyFile(appPath, path.resolve(`${name}_universal.dmg`));
+    const distPath = path.resolve(`${name}_universal.dmg`);
+    await fs.copyFile(appPath, distPath);
+    await fs.unlink(appPath);
+
+    logger.success('Build success!');
+    logger.success('You can find the app installer in', distPath);
   }
 
   getBuildedAppPath(npmDirectory: string, dmgName: string) {
-    return path.join(npmDirectory, 'src-tauri/target/universal-apple-darwin/release/bundle/dmg', dmgName);
+    return path.join(
+      npmDirectory,
+      'src-tauri/target/universal-apple-darwin/release/bundle/dmg',
+      dmgName
+    );
   }
 }

bin/builders/WinBulider.ts

@@ -0,0 +1,60 @@
+import fs from 'fs/promises';
+import path from 'path';
+import prompts from 'prompts';
+import { checkRustInstalled, installRust } from '@/helpers/rust.js';
+import { PakeAppOptions } from '@/types.js';
+import { IBuilder } from './base.js';
+import { shellExec } from '@/utils/shell.js';
+// @ts-expect-error 加上resolveJsonModule rollup会打包报错
+import tauriConf from '../../src-tauri/tauri.conf.json';
+import { fileURLToPath } from 'url';
+import logger from '@/options/logger.js';
+import { mergeTauriConfig } from './common.js';
+import { npmDirectory } from '@/utils/dir.js';
+
+export default class WinBuilder implements IBuilder {
+  async prepare() {
+    logger.info(
+      'To build the Windows app, you need to install Rust and VS Build Tools.'
+    );
+    logger.info(
+      'See more in https://tauri.app/v1/guides/getting-started/prerequisites#installing\n'
+    );
+    if (checkRustInstalled()) {
+      return;
+    }
+
+    const res = await prompts({
+      type: 'confirm',
+      message: 'We detected that you have not installed Rust. Install it now?',
+      name: 'value',
+    });
+
+    if (res.value) {
+      // TODO 国内有可能会超时
+      await installRust();
+    } else {
+      logger.error('Error: Pake needs Rust to package your webapp!!!');
+      process.exit(2);
+    }
+  }
+
+  async build(url: string, options: PakeAppOptions) {
+    logger.debug('PakeAppOptions', options);
+
+    await mergeTauriConfig(url, options, tauriConf);
+
+    const code = await shellExec(`cd ${npmDirectory} && npm run build:windows`);
+    // const dmgName = `${name}_${tauriConf.package.version}_universal.dmg`;
+    // const appPath = this.getBuildedAppPath(npmDirectory, dmgName);
+    // await fs.copyFile(appPath, path.resolve(`${name}_universal.dmg`));
+  }
+
+  getBuildedAppPath(npmDirectory: string, dmgName: string) {
+    return path.join(
+      npmDirectory,
+      'src-tauri/target/universal-apple-darwin/release/bundle/dmg',
+      dmgName
+    );
+  }
+}

bin/builders/common.ts

@@ -1,4 +1,8 @@
+import { PakeAppOptions } from '@/types.js';
 import prompts from 'prompts';
+import path from 'path';
+import fs from 'fs/promises';
+import { npmDirectory } from '@/utils/dir.js';
 
 export async function promptText(message: string, initial?: string) {
   const response = await prompts({
@@ -9,3 +13,39 @@ export async function promptText(message: string, initial?: string) {
   });
   return response.content;
 }
+
+export async function mergeTauriConfig(
+  url: string,
+  options: PakeAppOptions,
+  tauriConf: any
+) {
+  const {
+    width,
+    height,
+    fullscreen,
+    transparent,
+    resizable,
+    identifier,
+    name,
+  } = options;
+
+  const tauriConfWindowOptions = {
+    width,
+    height,
+    fullscreen,
+    transparent,
+    resizable,
+  };
+
+  Object.assign(tauriConf.tauri.windows[0], { url, ...tauriConfWindowOptions });
+  tauriConf.package.productName = name;
+  tauriConf.tauri.bundle.identifier = identifier;
+  tauriConf.tauri.bundle.icon = [options.icon];
+
+
+  const configJsonPath = path.join(npmDirectory, 'src-tauri/tauri.conf.json');
+  await fs.writeFile(
+    configJsonPath,
+    Buffer.from(JSON.stringify(tauriConf), 'utf-8')
+  );
+}