pake-cli 1.0.0 → 1.2.1

package/README.md

@@ -60,10 +60,10 @@
         <td><img src=https://cdn.fliggy.com/upic/Ea5ZRw.png width=600/></td>
     </tr>
     <tr>
-        <td>Code 
-            <a href="https://github.com/tw93/Pake/releases/latest/download/Code.dmg">Mac</a>
-            <a href="https://github.com/tw93/Pake/releases/latest/download/Code_x64.msi">Windows</a>
-            <a href="https://github.com/tw93/Pake/releases/latest/download/Code_amd64.deb">Linux</a>
+        <td>ZLibrary
+            <a href="https://github.com/tw93/Pake/releases/latest/download/ZLibrary.dmg">Mac</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/ZLibrary_x64.msi">Windows</a>
+            <a href="https://github.com/tw93/Pake/releases/latest/download/ZLibrary_amd64.deb">Linux</a>
         </td>
          <td>Reference 
             <a href="https://github.com/tw93/Pake/releases/latest/download/Reference.dmg">Mac</a>
@@ -72,7 +72,7 @@
         </td>
     </tr>
     <tr>
-        <td><img src=https://cdn.fliggy.com/upic/EB1OYP.jpg width=600/></td>
+        <td><img src=https://cdn.fliggy.com/upic/XGilgr.png width=600/></td>
         <td><img src=https://cdn.fliggy.com/upic/KFsZIY.png width=600/></td>
     </tr>
         <tr>
@@ -95,7 +95,7 @@
 
 <details>
 
-<summary>🏂 更多应用如 Flomo / 语雀可去 <a href="https://github.com/tw93/Pake/releases">Release</a>下载，<b>此外点击可展开快捷键说明</b></summary>
+<summary>🏂 更多应用如 Flomo / 语雀 / RunCode 可去 <a href="https://github.com/tw93/Pake/releases">Release</a>下载，<b>此外点击可展开快捷键说明</b></summary>
 
 <br/>
 
@@ -262,21 +262,28 @@ Pake 的发展离不开这些 Hacker 们，一起贡献了大量能力，也欢
             <sub><b>Dengju Deng</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/Fechin">
+            <img src="https://avatars.githubusercontent.com/u/2541482?v=4" width="90;" alt="Fechin"/>
+            <br />
+            <sub><b>Fechin</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/princemaple">
             <img src="https://avatars.githubusercontent.com/u/1329716?v=4" width="90;" alt="princemaple"/>
             <br />
             <sub><b>Po Chen</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/houhoz">
             <img src="https://avatars.githubusercontent.com/u/19684376?v=4" width="90;" alt="houhoz"/>
             <br />
             <sub><b>Hyzhao</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/liusishan">
             <img src="https://avatars.githubusercontent.com/u/33129823?v=4" width="90;" alt="liusishan"/>

package/dist/cli.js

@@ -15,35 +15,35 @@ import ora from 'ora';
 import shelljs from 'shelljs';
 import updateNotifier from 'update-notifier';
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 }
 
 const DEFAULT_PAKE_OPTIONS = {
     icon: '',
-    height: 800,
-    width: 1280,
+    height: 780,
+    width: 1200,
     fullscreen: false,
     resizable: true,
     transparent: false,
@@ -1632,6 +1632,24 @@ function mergeTauriConfig(url, options, tauriConf) {
             transparent,
             resizable,
         };
+        // Package name is valid ?
+        // for Linux, package name must be a-z, 0-9 or "-", not allow to A-Z and other
+        if (process.platform === "linux") {
+            const reg = new RegExp(/[0-9]*[a-z]+[0-9]*\-?[0-9]*[a-z]*[0-9]*\-?[0-9]*[a-z]*[0-9]*/);
+            if (!reg.test(name) || reg.exec(name)[0].length != name.length) {
+                logger.error("package name is illegal， it must be lowercase letters, numbers, dashes, and it must contain the lowercase letters.");
+                logger.error("E.g com-123-xxx, 123pan, pan123,weread, we-read");
+                process.exit();
+            }
+        }
+        if (process.platform === "win32" || process.platform === "darwin") {
+            const reg = new RegExp(/([0-9]*[a-zA-Z]+[0-9]*)+/);
+            if (!reg.test(name) || reg.exec(name)[0].length != name.length) {
+                logger.error("package name is illegal， it must be letters, numbers, and it must contain the letters");
+                logger.error("E.g 123pan,123Pan,Pan123,weread,WeRead,WERead");
+                process.exit();
+            }
+        }
         Object.assign(tauriConf.tauri.windows[0], Object.assign({ url }, tauriConfWindowOptions));
         tauriConf.package.productName = name;
         tauriConf.tauri.bundle.identifier = identifier;
@@ -1734,38 +1752,6 @@ function getDefaultIcon() {
         return path.join(npmDirectory, iconPath);
     });
 }
-// export async function getIconFromPageUrl(url: string) {
-//   const icon = await pageIcon(url);
-//   console.log(icon);
-//   if (icon.ext === '.ico') {
-//     const a = await ICO.parse(icon.data);
-//     icon.data = Buffer.from(a[0].buffer);
-//   }
-//   const iconDir = (await dir()).path;
-//   const iconPath = path.join(iconDir, `/icon.icns`);
-//   const out = png2icons.createICNS(icon.data, png2icons.BILINEAR, 0);
-//   await fs.writeFile(iconPath, out);
-//   return iconPath;
-// }
-// export async function getIconFromMacosIcons(name: string) {
-//   const data = {
-//     query: name,
-//     filters: 'approved:true',
-//     hitsPerPage: 10,
-//     page: 1,
-//   };
-//   const res = await axios.post('https://p1txh7zfb3-2.algolianet.com/1/indexes/macOSicons/query?x-algolia-agent=Algolia%20for%20JavaScript%20(4.13.1)%3B%20Browser', data, {
-//     headers: {
-//       'x-algolia-api-key': '0ba04276e457028f3e11e38696eab32c',
-//       'x-algolia-application-id': 'P1TXH7ZFB3',
-//     },
-//   });
-//   if (!res.data.hits.length) {
-//     return '';
-//   } else {
-//     return downloadIcon(res.data.hits[0].icnsUrl);
-//   }
-// }
 function downloadIcon(iconUrl) {
     return __awaiter(this, void 0, void 0, function* () {
         let iconResponse;
@@ -1961,7 +1947,9 @@ var tauri = {
 				"libssl-dev",
 				"libgtk-3-dev",
 				"libayatana-appindicator3-dev",
-				"librsvg2-dev"
+				"librsvg2-dev",
+				"gnome-video-effects",
+				"gnome-video-effects-extra"
 			],
 			files: {
 				"/usr/share/applications/com-tw93-weread.desktop": "assets/com-tw93-weread.desktop"
@@ -2018,7 +2006,7 @@ class MacBuilder {
                 yield installRust();
             }
             else {
-                log.error('Error: Pake need Rust to package your webapp!!!');
+                log.error('Error: Pake need Rust to package your webapp!');
                 process.exit(2);
             }
         });
@@ -2028,16 +2016,10 @@ class MacBuilder {
             log.debug('PakeAppOptions', options);
             const { name } = options;
             yield mergeTauriConfig(url, options, tauriConf);
-            yield shellExec(`cd ${npmDirectory} && npm install && npm run build`);
-            let arch = "x64";
-            if (process.arch === "arm64") {
-                arch = "aarch64";
-            }
-            else {
-                arch = process.arch;
-            }
-            const dmgName = `${name}_${tauriConf.package.version}_${arch}.dmg`;
-            const appPath = this.getBuildedAppPath(npmDirectory, dmgName);
+            //这里直接使用 universal-apple-darwin 的打包，而非当前系统的包
+            yield shellExec(`cd ${npmDirectory} && npm install && npm run build:mac`);
+            const dmgName = `${name}_${tauriConf.package.version}_universal.dmg`;
+            const appPath = this.getBuildAppPath(npmDirectory, dmgName);
             const distPath = path.resolve(`${name}.dmg`);
             yield fs.copyFile(appPath, distPath);
             yield fs.unlink(appPath);
@@ -2045,8 +2027,8 @@ class MacBuilder {
             logger.success('You can find the app installer in', distPath);
         });
     }
-    getBuildedAppPath(npmDirectory, dmgName) {
-        return path.join(npmDirectory, 'src-tauri/target/release/bundle/dmg', dmgName);
+    getBuildAppPath(npmDirectory, dmgName) {
+        return path.join(npmDirectory, 'src-tauri/target/universal-apple-darwin/release/bundle/dmg', dmgName);
     }
 }
 
@@ -2082,7 +2064,7 @@ class WinBuilder {
             const language = tauriConf.tauri.bundle.windows.wix.language[0];
             const arch = process.arch;
             const msiName = `${name}_${tauriConf.package.version}_${arch}_${language}.msi`;
-            const appPath = this.getBuildedAppPath(npmDirectory, msiName);
+            const appPath = this.getBuildAppPath(npmDirectory, msiName);
             const distPath = path.resolve(`${name}.msi`);
             yield fs.copyFile(appPath, distPath);
             yield fs.unlink(appPath);
@@ -2090,7 +2072,7 @@ class WinBuilder {
             logger.success('You can find the app installer in', distPath);
         });
     }
-    getBuildedAppPath(npmDirectory, dmgName) {
+    getBuildAppPath(npmDirectory, dmgName) {
         return path.join(npmDirectory, 'src-tauri/target/release/bundle/msi', dmgName);
     }
 }
@@ -2124,7 +2106,7 @@ class LinuxBuilder {
             const { name } = options;
             yield mergeTauriConfig(url, options, tauriConf);
             yield shellExec(`cd ${npmDirectory} && npm install && npm run build`);
-            let arch = "";
+            let arch;
             if (process.arch === "x64") {
                 arch = "amd64";
             }
@@ -2132,21 +2114,21 @@ class LinuxBuilder {
                 arch = process.arch;
             }
             const debName = `${name}_${tauriConf.package.version}_${arch}.deb`;
-            const appPath = this.getBuildedAppPath(npmDirectory, "deb", debName);
+            const appPath = this.getBuildAppPath(npmDirectory, "deb", debName);
             const distPath = path.resolve(`${name}.deb`);
             yield fs.copyFile(appPath, distPath);
             yield fs.unlink(appPath);
             const appImageName = `${name}_${tauriConf.package.version}_${arch}.AppImage`;
-            const appImagePath = this.getBuildedAppPath(npmDirectory, "appimage", appImageName);
+            const appImagePath = this.getBuildAppPath(npmDirectory, "appimage", appImageName);
             const distAppPath = path.resolve(`${name}.AppImage`);
             yield fs.copyFile(appImagePath, distAppPath);
             yield fs.unlink(appImagePath);
             logger.success('Build success!');
             logger.success('You can find the deb app installer in', distPath);
-            logger.success('You can find the Appimage app installer in', distAppPath);
+            logger.success('You can find the AppImage app installer in', distAppPath);
         });
     }
-    getBuildedAppPath(npmDirectory, packageType, packageName) {
+    getBuildAppPath(npmDirectory, packageType, packageName) {
         return path.join(npmDirectory, 'src-tauri/target/release/bundle/', packageType, packageName);
     }
 }
@@ -2167,8 +2149,11 @@ class BuilderFactory {
 }
 
 var name = "pake-cli";
-var version = "0.1.2";
+var version = "1.2.1";
 var description = "🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App 🤱🏻 A simple way to make any web page a desktop application using Rust.";
+var engines = {
+	node: "^14.13 || >=16.0.0"
+};
 var bin = {
 	pake: "./cli.js"
 };
@@ -2180,6 +2165,14 @@ var author = {
 	name: "Tw93",
 	email: "tw93@qq.com"
 };
+var keywords = [
+	"pake",
+	"pake-cli",
+	"rust",
+	"tauri",
+	"no-electron",
+	"productivity"
+];
 var files = [
 	"dist",
 	"src-tauri",
@@ -2190,19 +2183,20 @@ var scripts = {
 	dev: "npm run tauri dev",
 	"dev:debug": "npm run tauri dev -- --features devtools",
 	build: "npm run tauri build --release",
+	"build:mac": "npm run tauri build -- --target universal-apple-darwin",
 	"build:all-unix": "chmod +x ./script/build.sh && ./script/build.sh",
 	"build:all-windows": ".\\script\\build.bat",
 	tauri: "tauri",
 	cli: "rollup -c rollup.config.js --watch",
 	"cli:build": "cross-env NODE_ENV=production rollup -c rollup.config.js",
-	"cli:publish": "npm run cli:build && npm publish"
+	prepublishOnly: "npm run cli:build"
 };
 var type = "module";
 var exports = "./dist/pake.js";
 var license = "MIT";
 var dependencies = {
 	"@tauri-apps/api": "^1.2.0",
-	"@tauri-apps/cli": "^1.2.1",
+	"@tauri-apps/cli": "^1.2.2",
 	axios: "^1.1.3",
 	chalk: "^5.1.2",
 	commander: "^9.4.1",
@@ -2238,9 +2232,11 @@ var packageJson = {
 	name: name,
 	version: version,
 	description: description,
+	engines: engines,
 	bin: bin,
 	repository: repository,
 	author: author,
+	keywords: keywords,
 	files: files,
 	scripts: scripts,
 	type: type,
@@ -2269,7 +2265,7 @@ program
     .option('--transparent', 'transparent title bar', DEFAULT_PAKE_OPTIONS.transparent)
     .option('--debug', 'debug', DEFAULT_PAKE_OPTIONS.transparent)
     .action((url, options) => __awaiter(void 0, void 0, void 0, function* () {
-    checkUpdateTips();
+    yield checkUpdateTips();
     if (!url) {
         // 直接 pake 不需要出现url提示
         program.help();
@@ -2281,6 +2277,6 @@ program
     const builder = BuilderFactory.create();
     yield builder.prepare();
     const appOptions = yield handleOptions(options, url);
-    builder.build(url, appOptions);
+    yield builder.build(url, appOptions);
 }));
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "1.0.0",
+  "version": "1.2.1",
   "description": "🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App 🤱🏻 A simple way to make any web page a desktop application using Rust.",
   "engines": {
     "node": "^14.13 || >=16.0.0"
@@ -40,7 +40,7 @@
     "tauri": "tauri",
     "cli": "rollup -c rollup.config.js --watch",
     "cli:build": "cross-env NODE_ENV=production rollup -c rollup.config.js",
-    "cli:publish": "npm run cli:build && npm publish"
+    "prepublishOnly": "npm run cli:build"
   },
   "type": "module",
   "exports": "./dist/pake.js",

package/src-tauri/src/pake.js

@@ -51,10 +51,14 @@ window.addEventListener("DOMContentLoaded", (_event) => {
       display: none !important;
     }
 
-    #page .main_header, .cb-layout-basic--navbar{
+    #page .main_header, .cb-layout-basic--navbar {
       padding-top: 20px;
     }
 
+    .chakra-ui-light #app .chakra-heading, .chakra-ui-dark #app .chakra-heading, .chakra-ui-light #app .chakra-stack, .chakra-ui-dark #app .chakra-stack {
+       padding-top: 10px;
+    }
+
     #__next .overflow-hidden .flex.flex-1.flex-col {
         padding-left: 0;
     }