tt-minigame-ide-cli 0.0.1-beta.0 → 0.0.1-beta.3

package/README.en.md

@@ -1,6 +1,6 @@
 # tmg-cli
 
-> `tmg` cli is the official tool for bytedance microapp development.
+> `tmg` cli is the official tool for bytedance minigame development.
 
 [中文](./README.md)
 
@@ -9,8 +9,8 @@
 
 - [Installation](#installation)
 - [Usage](#usage)
-  - [Create Project](#create-project)
-  - [Open existing project](#open-existing-project)
+  <!-- - [Create Project](#create-project)
+  - [Open existing project](#open-existing-project) -->
   - [Login](#login)
   - [Login by email](#login-by-email)
   - [Preview project](#preview-project)
@@ -23,12 +23,12 @@
 It's recommended to install `tmg` globally.
 
 ```
-npm install -g tt-ide-cli
+npm install -g tt-minigame-ide-cli
 ```
 
 ## Usage
 
-### Create Project
+<!-- ### Create Project
 
 Create a new blank miniprogram project with given name in current folder.
 
@@ -41,9 +41,9 @@ Options:
 
   -f, --force        Overwrite target directory if it exists
   -h, --help         Output usage information
-```
+``` -->
 
-### Open existing project
+<!-- ### Open existing project
 
 Open existing project with given path in microapp IDE.
 
@@ -53,7 +53,7 @@ If the path is not available, start up the IDE only.
 Usage: tmg open <project-path>
 
 Open target project by path
-```
+``` -->
 
 ### Login
 
@@ -99,6 +99,7 @@ Options:
   -c, --copy           Copy remote url to clipboard
   -p, --proxy <proxy>  Preview with proxy
   -h, --help           output usage information
+  -o, --output <path>  QRCode image output path
 ```
 
 ### Upload project
@@ -116,4 +117,5 @@ Options:
   -p, --proxy <proxy>          Update request proxy
   -cp, --copy                  Copy remote url to clipboard
   -h, --help                   output usage information
+  -o, --output <path>          QRCode image output path
 ```

package/README.md

@@ -1,6 +1,6 @@
 # tmg-cli
 
-> `tmg` 是字节跳动小程序官方提供的命令行工具。
+> `tmg` 是字节跳动小小游戏官方提供的命令行工具。
 
 [English](./README.en.md)
 
@@ -9,11 +9,11 @@
 
 - [安装](#%E5%AE%89%E8%A3%85)
 - [使用](#%E4%BD%BF%E7%94%A8)
-  - [创建新项目](#%E5%88%9B%E5%BB%BA%E6%96%B0%E9%A1%B9%E7%9B%AE)
-  - [打开已有项目](#%E6%89%93%E5%BC%80%E5%B7%B2%E6%9C%89%E9%A1%B9%E7%9B%AE)
+  <!-- - [创建新项目](#%E5%88%9B%E5%BB%BA%E6%96%B0%E9%A1%B9%E7%9B%AE)
+  - [打开已有项目](#%E6%89%93%E5%BC%80%E5%B7%B2%E6%9C%89%E9%A1%B9%E7%9B%AE) -->
   - [登录](#%E7%99%BB%E5%BD%95)
   - [通过 email 登录](#%E9%80%9A%E8%BF%87-email-%E7%99%BB%E5%BD%95)
-  - [预览小程序](#%E9%A2%84%E8%A7%88%E5%B0%8F%E7%A8%8B%E5%BA%8F)
+  - [预览小游戏](#%E9%A2%84%E8%A7%88%E5%B0%8F%E7%A8%8B%E5%BA%8F)
   - [上传项目](#%E4%B8%8A%E4%BC%A0%E9%A1%B9%E7%9B%AE)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -23,12 +23,12 @@
 建议在全局安装 `tmg` 。
 
 ```
-npm install -g tt-ide-cli
+npm install -g tt-minigame-ide-cli
 ```
 
 ## 使用
 
-### 创建新项目
+<!-- ### 创建新项目
 
 在当前目录下，以给定的项目名字创建一个空白的小程序项目。
 
@@ -41,9 +41,9 @@ Options:
 
   -f, --force        Overwrite target directory if it exists
   -h, --help         Output usage information
-```
+``` -->
 
-### 打开已有项目
+<!-- ### 打开已有项目
 
 在小程序开发者工具中打开给定目录的项目。
 
@@ -53,7 +53,7 @@ Options:
 Usage: tmg open <project-path>
 
 Open target project by path
-```
+``` -->
 
 ### 登录
 
@@ -84,9 +84,9 @@ Options:
 
 ```
 
-### 预览小程序
+### 预览小游戏
 
-将项目上传后，扫码二维码来预览小程序。
+将项目上传后，扫码二维码来预览小游戏。
 
 ```
 Usage: tmg preview [options] [entry]
@@ -100,6 +100,7 @@ Options:
   -c, --copy           Copy remote url to clipboard
   -p, --proxy <proxy>  Preview with proxy
   -h, --help           output usage information
+  -o, --output <path>  QRCode image output path
 ```
 
 ### 上传项目
@@ -117,4 +118,5 @@ Options:
   -p, --proxy <proxy>          Update request proxy
   -cp, --copy                  Copy remote url to clipboard
   -h, --help                   output usage information
+  -o, --output <path>          QRCode image output path
 ```

package/bin/tmg.js

@@ -15,50 +15,50 @@ program.version(getVersion(), '-V, --version', 'Output the current version');
 
 //#region open project
 
-program
-  .command('open <project-path>')
-  .description('Open target project by path')
-  .action((projectPath) => {
-    const isMac = process.platform === 'darwin',
-      IDE_SCHEMA = 'bytedanceide:';
-    const openCmd = isMac ? `open ${IDE_SCHEMA}` : `explorer ${IDE_SCHEMA}`;
-    let openPath;
-    if (!path.isAbsolute(projectPath)) {
-      projectPath = path.join(process.cwd(), projectPath);
-    }
-    if (fs.existsSync(projectPath)) {
-      // open project with existing path
-      console.log(chalk.green(`open projectPath: ${projectPath}`));
-      openPath = `${openCmd}?path=${projectPath}`;
-    } else {
-      // project folder not exist,
-      // open IDE
-      console.log(chalk.green(`open IDE`));
-      openPath = openCmd;
-    }
-
-    cp.exec(openPath, (error) => {
-      if (!error) {
-        console.log('打开IDE成功');
-      } else {
-        console.log(chalk.red('打开IDE失败', error));
-      }
-    });
-  });
+// program
+//   .command('open <project-path>')
+//   .description('Open target project by path')
+//   .action((projectPath) => {
+//     const isMac = process.platform === 'darwin',
+//       IDE_SCHEMA = 'bytedanceide:';
+//     const openCmd = isMac ? `open ${IDE_SCHEMA}` : `explorer ${IDE_SCHEMA}`;
+//     let openPath;
+//     if (!path.isAbsolute(projectPath)) {
+//       projectPath = path.join(process.cwd(), projectPath);
+//     }
+//     if (fs.existsSync(projectPath)) {
+//       // open project with existing path
+//       console.log(chalk.green(`open projectPath: ${projectPath}`));
+//       openPath = `${openCmd}?path=${projectPath}`;
+//     } else {
+//       // project folder not exist,
+//       // open IDE
+//       console.log(chalk.green(`open IDE`));
+//       openPath = openCmd;
+//     }
+
+//     cp.exec(openPath, (error) => {
+//       if (!error) {
+//         console.log('打开IDE成功');
+//       } else {
+//         console.log(chalk.red('打开IDE失败', error));
+//       }
+//     });
+//   });
 
 //#endregion
 
 //#region create new project
 
-program
-  .command('create <project-name>')
-  .description('Create a new project with given name in current folder')
-  .option('-f, --force', 'Overwrite target directory if it exists')
-  .action((name, cmd) => {
-    const options = cleanArgs(cmd);
-    checkArgNum(1);
-    require('../lib/create')(name, options);
-  });
+// program
+//   .command('create <project-name>')
+//   .description('Create a new project with given name in current folder')
+//   .option('-f, --force', 'Overwrite target directory if it exists')
+//   .action((name, cmd) => {
+//     const options = cleanArgs(cmd);
+//     checkArgNum(1);
+//     require('../lib/create')(name, options);
+//   });
 
 //#endregion
 
@@ -105,6 +105,7 @@ program
   .option('-s, --small', 'Use small QR Code, it may fail in some environments')
   .option('-c, --copy', 'Copy remote url to clipboard')
   .option('-p, --proxy <proxy>', 'Preview with proxy')
+  .option('-o, --output <path>', 'QRCode image output path')
   .action((entry, cmd) => {
     const options = cleanArgs(cmd);
     checkArgNum(1);
@@ -139,6 +140,7 @@ program
   .requiredOption('-c, --app-changelog <log>', 'Changelog for this version')
   .option('-p, --proxy <proxy>', 'Update request proxy')
   .option('-cp, --copy', 'Copy remote url to clipboard')
+  .option('-o, --output <path>', 'QRCode image output path')
   .action((entry, cmd) => {
     const options = cleanArgs(cmd);
     checkArgNum(1);

package/lib/util/helper.js

@@ -51,8 +51,8 @@ async function verifySubPackageSize(projectConfigJson, isMiniProgram, sourcePath
   // 做大小比较全拿字节数，精确
   const packageSizeConfig = {
     mainPackageMaxSize: 4 * 1024 * 1024,
-    subPackageSize: (this.isGame ? 4 : 2) * 1024 * 1024,
-    totalSize: 16 * 1024 * 1024,
+    subPackageSize: Infinity,
+    totalSize: 20 * 1024 * 1024,
   };
   // console.log('校验', projectConfigJson, packageSizeConfig);
   // 开放数据域文件校验，可以认为开放数据域也作为一个子包
@@ -72,9 +72,9 @@ async function verifySubPackageSize(projectConfigJson, isMiniProgram, sourcePath
   const totalPackageSize = await getFolderSize(sourcePath);
   if (totalPackageSize > packageSizeConfig.totalSize) {
     console.error(
-      `小${this.isGame ? '游戏' : '程序'}包大小为 ${getFormattedSize(
+      `小游戏包大小为 ${getFormattedSize(
                     totalPackageSize,
-                )} MB, 超过 16 MB，请调整包大小后再进行上传`,
+                )} MB, 超过 20 MB，请调整包大小后再进行上传`,
     );
     return false;
   }
@@ -205,6 +205,10 @@ function getCachedPreviewResult(type, hash) {
 }
 
 function getFolderSize(folderPath, options = {}) {
+  const stat = fs.statSync(folderPath);
+  if (stat.isFile()) {
+    return Promise.resolve(stat.size);
+  }
   return new Promise((resolve, reject) => {
     glob(
       '**', 

package/lib/util/qrcode.js

@@ -1,17 +1,32 @@
-const qrcode = require('qrcode-terminal');
+const QRCode = require('qrcode');
 const chalk = require('chalk');
+
 function generateQrCode(url, options) {
-    // sometimes can not use small type, see: https://github.com/gtanner/qrcode-terminal/issues/21
-    qrcode.generate(url, { small: options.small });
-    let copied = '';
+    if (options.small) {
+        console.log(`${chalk.yellow('small QR Code may not work in some environments')}\n`);
+    }
+
+    QRCode.toString(url, { type: 'terminal', small: options.small }, function (err, str) {
+        if (err) {
+            throw Error(err);
+        }
+        console.log(str);
+    })
+
     if (options.copy) {
         require('clipboardy').writeSync(url);
         copied = chalk.dim('(copied to clipboard)');
+        console.log(`${chalk.cyan(JSON.stringify(url))} ${copied}`);
     }
-    if (options.small) {
-        console.log(`${chalk.yellow('small QR Code may not work in some environments')}\n`);
+
+    if (options.output) {
+        QRCode.toFile(options.output, url, { type: 'png' }, function (err) {
+            console.log(chalk.yellow(`Save qrcode image to ${options.output}`));
+            if (err) {
+                throw Error(err);
+            }
+        })
     }
-    console.log(`${chalk.cyan(JSON.stringify(url))} ${copied}`);
 }
 
 module.exports = {

package/lib/util/request.js

@@ -191,6 +191,8 @@ exports.uploadProject = function ({
             },
             url: path,
             form,
+            maxBodyLength: Infinity,
+            maxContentLength: Infinity,
         }
         if (proxy && proxy.indexOf(':') > -1) {
             const proxySplitArr = proxy.split(':');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-minigame-ide-cli",
-  "version": "0.0.1-beta.0",
+  "version": "0.0.1-beta.3",
   "description": "Command line interface for micro app development",
   "main": "lib/index.js",
   "bin": {
@@ -24,7 +24,7 @@
     "glob": "^7.2.0",
     "inquirer": "^7.0.4",
     "minimist": "^1.2.0",
-    "qrcode-terminal": "^0.12.0",
+    "qrcode": "^1.5.0",
     "semver": "^7.3.5",
     "tunnel": "^0.0.6",
     "unzipper": "^0.10.11"

package/template/app.js

@@ -1,5 +0,0 @@
-App({
-  onLaunch: function () {
-
-  }
-})

package/template/app.json

@@ -1,11 +0,0 @@
-{
-  "pages":[
-    "pages/index/index"
-  ],
-  "window":{
-    "backgroundTextStyle":"light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "Mini Program",
-    "navigationBarTextStyle":"black"
-  }
-}

package/template/pages/index/index.js

@@ -1,10 +0,0 @@
-const app = getApp()
-
-Page({
-  data: {
-
-  },
-  onLoad: function () {
-    console.log('Welcome to Mini Program')
-  },
-})

package/template/pages/index/index.ttml

@@ -1 +0,0 @@
-<view class="intro">Welcome to Mini Program</view>

package/template/pages/index/index.ttss

@@ -1,4 +0,0 @@
-.intro {
-  margin: 30px;
-  text-align: center;
-}