pake-cli 0.0.1-beta.7 → 0.0.1-beta.9

package/bin/builders/MacBuilder.ts

@@ -6,6 +6,8 @@ import { PakeAppOptions } from '@/types.js';
 import { IBuilder } from './base.js';
 import appRootPath from 'app-root-path';
 import { shellExec } from '@/utils/shell.js';
+import tauriConf from '../../src-tauri/tauri.conf.json';
+import { dir } from 'tmp-promise';
 
 export default class MacBuilder implements IBuilder {
   async prepare() {
@@ -32,35 +34,30 @@ export default class MacBuilder implements IBuilder {
 
   async build(url: string, options: PakeAppOptions) {
     console.log('PakeAppOptions', options);
-    const tauriConfPath = path.join(appRootPath.path, 'src-tauri/tauri.conf.json');
-    const tauriConfString = await fs.readFile(tauriConfPath, 'utf-8');
-    try {
-      const tauriConf = JSON.parse(tauriConfString);
 
-      const { width, height, fullscreen, transparent, title, resizable, identifier, name } = options;
+    const { width, height, fullscreen, transparent, title, resizable, identifier, name } = options;
 
-      const tauriConfWindowOptions = {
-        width,
-        height,
-        fullscreen,
-        transparent,
-        title,
-        resizable,
-      };
+    const tauriConfWindowOptions = {
+      width,
+      height,
+      fullscreen,
+      transparent,
+      title,
+      resizable,
+    };
 
-      Object.assign(tauriConf.tauri.windows[0], { url, ...tauriConfWindowOptions });
-      tauriConf.package.productName = name;
-      tauriConf.tauri.bundle.identifier = identifier;
-      tauriConf.tauri.bundle.icon = [options.icon];
+    Object.assign(tauriConf.tauri.windows[0], { url, ...tauriConfWindowOptions });
+    tauriConf.package.productName = name;
+    tauriConf.tauri.bundle.identifier = identifier;
+    tauriConf.tauri.bundle.icon = [options.icon];
 
-      await fs.writeFile(tauriConfPath, JSON.stringify(tauriConf, null, 2));
-      const code = await shellExec(`${path.join(appRootPath.path, '/node_modules/.bin/tauri')} build --config ${tauriConfPath} --target universal-apple-darwin`);
-      const dmgName = `${name}_${'0.2.0'}_universal.dmg`;
-      await fs.copyFile(this.getBuildedAppPath(dmgName), path.resolve(dmgName));
-    } catch (error) {
-      console.error('handle tauri.conf.json error', error);
-      return;
-    }
+    const { path: dirPath } = await dir();
+    const configJsonPath = `${dirPath}/config.json`;
+    await fs.writeFile(configJsonPath, Buffer.from(JSON.stringify(tauriConf), 'utf-8'));
+
+    const code = await shellExec(`npx tauri build --config ${configJsonPath} --target universal-apple-darwin`);
+    const dmgName = `${name}_${'0.2.0'}_universal.dmg`;
+    await fs.copyFile(this.getBuildedAppPath(dmgName), path.resolve(dmgName));
   }
 
   getBuildedAppPath(dmgName: string) {

package/bin/builders/common.ts

@@ -1,28 +1,5 @@
 import path from 'path';
-import { checkRustInstalled, installRust } from '@/helpers/rust.js';
 import appRootPath from 'app-root-path';
-import prompts from 'prompts';
-
-export async function prepareCheck() {
-  if (checkRustInstalled()) {
-    console.log('Rust has been installed');
-    return;
-  }
-
-  console.warn('Rust is not installed, show prompt');
-  const res = await prompts({
-    type: 'confirm',
-    message: 'Detect you have not installed Rust, install it now?',
-    name: 'value',
-  });
-
-  if (res.value) {
-    await installRust();
-  } else {
-    console.error('Error: Pake need Rust to package your webapp!!!');
-    process.exit(2);
-  }
-}
 
 export function getBuildedAppPath(name: string, version: string) {
   return path.join(appRootPath.path, 'src-tauri/target/universal-apple-darwin/release/bundle/dmg', `${name}_${version}_universal.dmg`);

package/bin/cli.ts

@@ -5,7 +5,7 @@ import { validateNumberInput, validateUrlInput } from './utils/validate.js';
 import handleInputOptions from './options/index.js';
 import BuilderFactory from './builders/BuilderFactory.js';
 
-program.version('0.0.1').description('A cli application can build website to app, driven by tauri');
+program.version('0.0.1').description('A cli application can build app from website, driven by tauri');
 
 program
   .argument('<url>', 'the web url you want to package', validateUrlInput)

package/dist/cli.js

@@ -248,6 +248,76 @@ function checkRustInstalled() {
     return shelljs.exec('rustc --version', { silent: true }).code === 0;
 }
 
+var tauri = {
+	windows: [
+		{
+			url: "https://baidu.com",
+			transparent: false,
+			fullscreen: false,
+			width: 1280,
+			height: 800,
+			resizable: true,
+			title: "百度一下，你就知道"
+		}
+	],
+	allowlist: {
+		all: true
+	},
+	bundle: {
+		icon: [
+			"/var/folders/vd/8qqrr2yd6gbf23bgx5vhdzrm0000gn/T/tmp-91408-NUAYXSkVg43n/icon.icns"
+		],
+		active: true,
+		category: "DeveloperTool",
+		copyright: "",
+		deb: {
+			depends: [
+			]
+		},
+		externalBin: [
+		],
+		identifier: "pake-bb6e08",
+		longDescription: "",
+		macOS: {
+			entitlements: null,
+			exceptionDomain: "",
+			frameworks: [
+			],
+			providerShortName: null,
+			signingIdentity: null
+		},
+		resources: [
+		],
+		shortDescription: "",
+		targets: "all",
+		windows: {
+			certificateThumbprint: null,
+			digestAlgorithm: "sha256",
+			timestampUrl: ""
+		}
+	},
+	security: {
+		csp: null
+	},
+	updater: {
+		active: false
+	}
+};
+var build = {
+	devPath: "../dist",
+	distDir: "../dist",
+	beforeBuildCommand: "",
+	beforeDevCommand: ""
+};
+var tauriConf = {
+	"package": {
+	productName: "baidu",
+	version: "0.2.0"
+},
+	tauri: tauri,
+	build: build
+};
+
 class MacBuilder {
     prepare() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -274,32 +344,25 @@ class MacBuilder {
     build(url, options) {
         return __awaiter(this, void 0, void 0, function* () {
             console.log('PakeAppOptions', options);
-            const tauriConfPath = path.join(appRootPath.path, 'src-tauri/tauri.conf.json');
-            const tauriConfString = yield fs.readFile(tauriConfPath, 'utf-8');
-            try {
-                const tauriConf = JSON.parse(tauriConfString);
-                const { width, height, fullscreen, transparent, title, resizable, identifier, name } = options;
-                const tauriConfWindowOptions = {
-                    width,
-                    height,
-                    fullscreen,
-                    transparent,
-                    title,
-                    resizable,
-                };
-                Object.assign(tauriConf.tauri.windows[0], Object.assign({ url }, tauriConfWindowOptions));
-                tauriConf.package.productName = name;
-                tauriConf.tauri.bundle.identifier = identifier;
-                tauriConf.tauri.bundle.icon = [options.icon];
-                yield fs.writeFile(tauriConfPath, JSON.stringify(tauriConf, null, 2));
-                const code = yield shellExec(`${path.join(appRootPath.path, '/node_modules/.bin/tauri')} build --config ${tauriConfPath} --target universal-apple-darwin`);
-                const dmgName = `${name}_${'0.2.0'}_universal.dmg`;
-                yield fs.copyFile(this.getBuildedAppPath(dmgName), path.resolve(dmgName));
-            }
-            catch (error) {
-                console.error('handle tauri.conf.json error', error);
-                return;
-            }
+            const { width, height, fullscreen, transparent, title, resizable, identifier, name } = options;
+            const tauriConfWindowOptions = {
+                width,
+                height,
+                fullscreen,
+                transparent,
+                title,
+                resizable,
+            };
+            Object.assign(tauriConf.tauri.windows[0], Object.assign({ url }, tauriConfWindowOptions));
+            tauriConf.package.productName = name;
+            tauriConf.tauri.bundle.identifier = identifier;
+            tauriConf.tauri.bundle.icon = [options.icon];
+            const { path: dirPath } = yield dir();
+            const configJsonPath = `${dirPath}/config.json`;
+            yield fs.writeFile(configJsonPath, Buffer.from(JSON.stringify(tauriConf), 'utf-8'));
+            yield shellExec(`${path.join(appRootPath.path, '/node_modules/.bin/tauri')} build --config ${configJsonPath} --target universal-apple-darwin`);
+            const dmgName = `${name}_${'0.2.0'}_universal.dmg`;
+            yield fs.copyFile(this.getBuildedAppPath(dmgName), path.resolve(dmgName));
         });
     }
     getBuildedAppPath(dmgName) {
@@ -316,7 +379,7 @@ class BuilderFactory {
     }
 }
 
-program.version('0.0.1').description('A cli application can build website to app, driven by tauri');
+program.version('0.0.1').description('A cli application can build app from website, driven by tauri');
 program
     .argument('<url>', 'the web url you want to package', validateUrlInput)
     .option('--name <string>', 'application name')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "0.0.1-beta.7",
+  "version": "0.0.1-beta.9",
   "description": "用 Rust 来打包你的 App，底层使用 Tauri，当前支持微信读书、Flomo、Vercel",
   "bin": {
     "pake": "./cli.js"
@@ -18,7 +18,7 @@
     "dev": "npm run tauri dev",
     "build": "npm run tauri build -- --target universal-apple-darwin",
     "tauri": "tauri",
-    "cli": "tsc && (concurrently \"tsc -w\" \"tsc-alias -w\")",
+    "cli": "rollup -c rollup.config.js --watch",
     "cli:build": "rollup -c rollup.config.js"
   },
   "type": "module",
@@ -28,6 +28,7 @@
     "@tauri-apps/api": "^1.0.2",
     "app-root-path": "^3.1.0",
     "axios": "^1.1.3",
+    "commander": "^9.4.1",
     "file-type": "^18.0.0",
     "icojs": "^0.17.0",
     "is-url": "^1.2.4",
@@ -35,9 +36,8 @@
     "page-icon": "^0.4.0",
     "png2icons": "^2.0.1",
     "prompts": "^2.4.2",
-    "tmp-promise": "^3.0.3",
-    "commander": "^9.4.1",
-    "shelljs": "^0.8.5"
+    "shelljs": "^0.8.5",
+    "tmp-promise": "^3.0.3"
   },
   "devDependencies": {
     "@rollup/plugin-alias": "^4.0.2",
@@ -52,7 +52,9 @@
     "@types/tmp": "^0.2.3",
     "concurrently": "^7.5.0",
     "rollup": "^3.3.0",
+    "rollup-plugin-typescript2": "^0.34.1",
     "tsc-alias": "^1.7.1",
+    "tslib": "^2.4.1",
     "typescript": "^4.8.4"
   }
 }

package/rollup.config.js

@@ -4,6 +4,7 @@ import typescript from '@rollup/plugin-typescript';
 import alias from '@rollup/plugin-alias';
 import commonjs from '@rollup/plugin-commonjs';
 import json from '@rollup/plugin-json';
+
 export default {
   input: 'bin/cli.ts',
   output: {