pake-cli 0.0.1-beta.13 → 0.0.1-beta.15

package/bin/builders/MacBuilder.ts

@@ -9,6 +9,7 @@ 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() {
@@ -52,12 +53,10 @@ export default class MacBuilder implements IBuilder {
     tauriConf.tauri.bundle.identifier = identifier;
     tauriConf.tauri.bundle.icon = [options.icon];
 
-    const { path: dirPath } = await dir();
-    const configJsonPath = `${dirPath}/config.json`;
+    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'));
 
-    const npmDirectory = await packageDirectory();
-    console.log(npmDirectory)
     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`;
     const appPath = this.getBuildedAppPath(npmDirectory, dmgName);
@@ -65,6 +64,6 @@ export default class MacBuilder implements IBuilder {
   }
 
   getBuildedAppPath(npmDirectory: string, dmgName: string) {
-    return path.join(appRootPath.path, 'src-tauri/target/universal-apple-darwin/release/bundle/dmg', dmgName);
+    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';
@@ -14,8 +14,6 @@ import fs from 'fs/promises';
 import prompts from 'prompts';
 import ora from 'ora';
 import shelljs from 'shelljs';
-import appRootPath from 'app-root-path';
-import { packageDirectory } from 'pkg-dir';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -358,11 +356,9 @@ class MacBuilder {
             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`;
+            const npmDirectory = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
+            const configJsonPath = path.join(npmDirectory, 'src-tauri/tauri.conf.json');
             yield fs.writeFile(configJsonPath, Buffer.from(JSON.stringify(tauriConf), 'utf-8'));
-            const npmDirectory = yield packageDirectory();
-            console.log(npmDirectory);
             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`;
             const appPath = this.getBuildedAppPath(npmDirectory, dmgName);
@@ -370,7 +366,7 @@ class MacBuilder {
         });
     }
     getBuildedAppPath(npmDirectory, dmgName) {
-        return path.join(appRootPath.path, 'src-tauri/target/universal-apple-darwin/release/bundle/dmg', 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.13",
+  "version": "0.0.1-beta.15",
   "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",
@@ -45,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",