pake-cli 0.0.1-beta.12 → 0.0.1-beta.14

package/bin/builders/MacBuilder.ts

@@ -8,6 +8,8 @@ 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';
+import { packageDirectory } from 'pkg-dir';
+import { fileURLToPath } from 'url';
 
 export default class MacBuilder implements IBuilder {
   async prepare() {
@@ -55,12 +57,14 @@ export default class MacBuilder implements IBuilder {
     const configJsonPath = `${dirPath}/config.json`;
     await fs.writeFile(configJsonPath, Buffer.from(JSON.stringify(tauriConf), 'utf-8'));
 
-    const code = await shellExec('../node_modules/@tauri-apps/cli/tauri.js build --config ${configJsonPath} --target universal-apple-darwin');
+    const npmDirectory = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
+    const code = await shellExec(`${path.join(npmDirectory, 'node_modules/@tauri-apps/cli/tauri.js')} build --config ${configJsonPath} --target universal-apple-darwin`);
     const dmgName = `${name}_${'0.2.0'}_universal.dmg`;
-    await fs.copyFile(this.getBuildedAppPath(dmgName), path.resolve(dmgName));
+    const appPath = this.getBuildedAppPath(npmDirectory, dmgName);
+    await fs.copyFile(appPath, path.resolve(dmgName));
   }
 
-  getBuildedAppPath(dmgName: string) {
-    return `../src-tauri/target/universal-apple-darwin/release/bundle/dmg/${dmgName}`
+  getBuildedAppPath(npmDirectory: string, dmgName: string) {
+    return path.join(npmDirectory, 'src-tauri/target/universal-apple-darwin/release/bundle/dmg', dmgName);
   }
 }

package/dist/cli.js

@@ -1,6 +1,6 @@
 import * as Commander from 'commander';
 import { program } from 'commander';
-import url from 'url';
+import url, { fileURLToPath } from 'url';
 import isurl from 'is-url';
 import crypto from 'crypto';
 import axios from 'axios';
@@ -359,13 +359,15 @@ class MacBuilder {
             const { path: dirPath } = yield dir();
             const configJsonPath = `${dirPath}/config.json`;
             yield fs.writeFile(configJsonPath, Buffer.from(JSON.stringify(tauriConf), 'utf-8'));
-            yield shellExec('../node_modules/@tauri-apps/cli/tauri.js build --config ${configJsonPath} --target universal-apple-darwin');
+            const npmDirectory = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
+            yield shellExec(`${path.join(npmDirectory, 'node_modules/@tauri-apps/cli/tauri.js')} build --config ${configJsonPath} --target universal-apple-darwin`);
             const dmgName = `${name}_${'0.2.0'}_universal.dmg`;
-            yield fs.copyFile(this.getBuildedAppPath(dmgName), path.resolve(dmgName));
+            const appPath = this.getBuildedAppPath(npmDirectory, dmgName);
+            yield fs.copyFile(appPath, path.resolve(dmgName));
         });
     }
-    getBuildedAppPath(dmgName) {
-        return `../src-tauri/target/universal-apple-darwin/release/bundle/dmg/${dmgName}`;
+    getBuildedAppPath(npmDirectory, dmgName) {
+        return path.join(npmDirectory, 'src-tauri/target/universal-apple-darwin/release/bundle/dmg', dmgName);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "0.0.1-beta.12",
+  "version": "0.0.1-beta.14",
   "description": "用 Rust 来打包你的 App，底层使用 Tauri，当前支持微信读书、Flomo、Vercel",
   "bin": {
     "pake": "./cli.js"
@@ -26,6 +26,7 @@
   "license": "MIT",
   "dependencies": {
     "@tauri-apps/api": "^1.0.2",
+    "@tauri-apps/cli": "^1.0.2",
     "app-root-path": "^3.1.0",
     "axios": "^1.1.3",
     "commander": "^9.4.1",
@@ -34,6 +35,7 @@
     "is-url": "^1.2.4",
     "ora": "^6.1.2",
     "page-icon": "^0.4.0",
+    "pkg-dir": "^7.0.0",
     "png2icons": "^2.0.1",
     "prompts": "^2.4.2",
     "shelljs": "^0.8.5",
@@ -44,7 +46,6 @@
     "@rollup/plugin-commonjs": "^23.0.2",
     "@rollup/plugin-json": "^5.0.1",
     "@rollup/plugin-typescript": "^9.0.2",
-    "@tauri-apps/cli": "^1.0.2",
     "@types/is-url": "^1.2.30",
     "@types/page-icon": "^0.3.4",
     "@types/prompts": "^2.4.1",