tmui-cli 1.1.9 → 1.2.1

package/README.md

@@ -22,7 +22,7 @@ sudo pm -g install tmui-cli
 ## 1.1.6及以上的使用方式
 
 ```npm
-在命令行中输入:tmui
+在命令行中输入:tmui dev
 会打开默认浏览器,出现可视化安装界面,可以选择导入和管理你的项目.
 
 ```

package/bin/cmdTool.js

@@ -24,7 +24,7 @@ function detectEncoding(str) {
 
 
 function send(ws, arg) {
-	ws.forEach(el => {
+	ws.forEach(function(el){
 		el.send(arg)
 	})
 }
@@ -51,7 +51,7 @@ function execCmd(cb, end, command) {
 				cb(cleanStr, spawnObj.pid || 0)
 			}
 		});
-		spawnObj.addListener('error', (err) => {
+		spawnObj.addListener('error', function(err) {
 			if (end) {
 				cb(err)
 				end('error')
@@ -63,7 +63,7 @@ function execCmd(cb, end, command) {
 				end('end')
 			}
 		})
-		spawnObj.on('exit', (code) => {
+		spawnObj.on('exit', function(code){
 			// console.log('exit code : ' + code);
 			if (end) {
 				end('end')
@@ -85,7 +85,7 @@ function killChildAndGrandChildren(pid) {
 	if (process.platform === 'win32') {
 		// 在 Windows 系统上执行的代码
 		const command = `taskkill /T /F /PID ${pid}`;
-		exec(command, (err, stdout, stderr) => {
+		exec(command, function(err, stdout, stderr){
 			if (err) {
 				console.error(`服务进程退出失败！不要担心，当你关闭主进程时，未退出的子进程会一并关闭哦`);
 			}
@@ -94,10 +94,10 @@ function killChildAndGrandChildren(pid) {
 		});
 	} else {
 		// 在 Linux/Unix/Mac 系统上执行的代码
-		psTree(pid, (err, children) => {
+		psTree(pid, function(err, children){
 			// 使用 kill 命令杀死所有子孙进程
 			console.log(5555)
-			exec(`kill -TERM ${pid} ${children.map(c => c.PID).join(' ')}`);
+			exec(`kill -TERM ${pid} ${children.map(function(c) {return c.PID}).join(' ')}`);
 		});
 	}
 

package/bin/createTmui.js

@@ -3,6 +3,7 @@ const path  = require("path")
 const {execCmd}  = require("./cmdTool.js")
 const fs  = require("fs")
 const compressing  = require("compressing")
+const Fetch  = import("node-fetch")
 
 
 const uniappDevListVer = [
@@ -75,10 +76,10 @@ function writePackageJson(filepath, str) {
 /**
  * 更新项目.
  * @param {{path,type,uvue,tmui,uniappver}} arg 
- * @param {(str)=>{}} call 
- * @param {()=>{}} end 
  */
 async function UpdateTmui(arg, call, end) {
+    const fetch = (await Fetch).default;
+
     let rootdir = path.normalize(arg.path)
     call('检测目录...')
     if (!fs.existsSync(rootdir)) {
@@ -170,7 +171,7 @@ async function UpdateTmui(arg, call, end) {
         let initjson = readPackageJson(packjsonDir)
         if (initjson['dependencies']['@dcloudio/uni-app'] != arg.uniappver) {
             call(`检测到cli版本与你选中的不一样,正在设置你选中的版本号`)
-            uniappDevListVer.forEach(el => {
+            uniappDevListVer.forEach( function(el) {
                 if (initjson['dependencies'][el]) {
                     initjson['dependencies'][el] = arg.uniappver
                 }
@@ -182,9 +183,9 @@ async function UpdateTmui(arg, call, end) {
 
             writePackageJson(packjsonDir, JSON.stringify(initjson, null, 4))
 
-            execCmd((datastr) => {
+            execCmd(function (datastr){
                 call(datastr)
-            }, () => {
+            }, function () {
                 end()
             }, 'npm install --save --registry=https://registry.npmmirror.com/')
 
@@ -202,10 +203,10 @@ async function UpdateTmui(arg, call, end) {
 /**
  * 
  * @param {{name,rootDir,type,ver,uniappver,uniappBuildType,machine}} arg 
- * @param {(str)=>{}} call 
- * @param {(str?:string)=>{}} end 
  */
 async function createTmui(arg, call, end) {
+    const fetch = (await Fetch).default;
+
     let rootdir = path.normalize(arg.rootDir)
     call('检测目录...')
     if (!fs.existsSync(rootdir)) {
@@ -342,7 +343,7 @@ async function createTmui(arg, call, end) {
         let initjson = readPackageJson(packjsonDir)
         
         
-        uniappDevListVer.forEach(el => {
+        uniappDevListVer.forEach(function (el) {
             if (initjson['dependencies'][el]) {
                 initjson['dependencies'][el] = arg.uniappver
             }
@@ -360,9 +361,9 @@ async function createTmui(arg, call, end) {
       
         writePackageJson(packjsonDir, JSON.stringify(initjson, null, 4))
 
-        execCmd((datastr) => {
+        execCmd(function (datastr) {
             call(datastr)
-        }, () => {
+        }, function () {
             end(rootdir)
         }, 'npm install --save --registry=https://registry.npmmirror.com/')
 
@@ -377,5 +378,6 @@ async function createTmui(arg, call, end) {
 
 module.exports = {
     createTmui,
-    UpdateTmui
+    UpdateTmui,
+    delFile
 }

package/bin/hooks.js

@@ -46,13 +46,13 @@ function uuid(len = 24, radix) {
     return uuid.join('');
 }
 function removeWs(id) {
-    const index = wslist.findIndex(el => el.uuid == id)
+    const index = wslist.findIndex(function(el) {return el.uuid == id})
     if (index > -1) {
         wslist.splice(index, 1)
     }
 }
 function send(arg) {
-    wslist.forEach(el => {
+    wslist.forEach(function(el) {
         el.send(arg)
     })
 }
@@ -101,7 +101,7 @@ wss.on('connection', async function connection(ws) {
                 // 查询目录项目的信息
             } else if (obj.event == '17') {
                 let result = checkProject(obj.command)
-                let runfl = runAppInfoList.filter(el => el.id == result.id)
+                let runfl = runAppInfoList.filter(function(el){ return el.id == result.id})
                 send(JSON.stringify({
                     event: '17',
                     data: result,
@@ -127,12 +127,12 @@ wss.on('connection', async function connection(ws) {
                     if (!obj.command) return;
                     // process.kill(Number(obj.command||0))
                     const pid = Number(obj.command || 0);
-                    const index = processList.findIndex(el => el.pid == pid)
+                    const index = processList.findIndex(function(el){ return el.pid == pid})
                     if (index > -1) {
                         // process.kill(sflit[0].pid)
                         killChildAndGrandChildren(processList[index].pid)
                         processList.splice(index, 1)
-                        const index2 = runAppInfoList.findIndex(el => el.pid == pid)
+                        const index2 = runAppInfoList.findIndex(function(el){ return el.pid == pid})
                         runAppInfoList.splice(index2, 1)
                     }
                 } catch (error) {
@@ -141,8 +141,8 @@ wss.on('connection', async function connection(ws) {
                 /**编译应用build:xx */
             } else if (obj.event == '3') {
                 const id = obj.command.data.id;
-                const childrenProcess = buildApp(wslist, obj.command, () => {
-                    const index2 = runAppInfoList.findIndex(el => el.id == id)
+                const childrenProcess = buildApp(wslist, obj.command, function() {
+                    const index2 = runAppInfoList.findIndex(function(el){ return el.id == id})
                     console.log("编译结束")
                     if (index2 > -1) {
                         runAppInfoList.splice(index2, 1)
@@ -150,7 +150,7 @@ wss.on('connection', async function connection(ws) {
                 })
                 /**保存当前运行的用户信息。 */
             } else if (obj.event == 'saveRunInfo') {
-                const index2 = runAppInfoList.findIndex(el => el.id == obj.command.id)
+                const index2 = runAppInfoList.findIndex(function(el){return el.id == obj.command.id})
                 if (index2 > -1) {
                     runAppInfoList.splice(index2, 1, obj.command)
                 } else {
@@ -160,7 +160,7 @@ wss.on('connection', async function connection(ws) {
             } else if (obj.event == 'getCpu') {
                 
                Promise.all([osUtils.mem.info(),osUtils.cpu.usage()])
-               .then(arg=>{
+               .then(function(arg){
                     send(JSON.stringify({
                         event: 'getCpu',
                         data: {
@@ -171,13 +171,13 @@ wss.on('connection', async function connection(ws) {
                })
             }else if(obj.event=='21'){
                 // npm view @dcloudio/uni-app versions --json
-                UpdateTmui(obj.command,(str)=>{
+                UpdateTmui(obj.command,function(str){
                     send(JSON.stringify({
                         event: 'info',
                         flag:'',
                         data: str
                     }))
-                },()=>{
+                },function(){
                     send(JSON.stringify({
                         event: '21',
                         flag:'end',
@@ -187,13 +187,13 @@ wss.on('connection', async function connection(ws) {
                 // 创建项目.
             }else if(obj.event=='22'){
                 // npm view @dcloudio/uni-app versions --json
-                createTmui(obj.command,(str)=>{
+                createTmui(obj.command,function(str){
                     send(JSON.stringify({
                         event: 'info',
                         flag:'',
                         data: str
                     }))
-                },(prejectdir)=>{
+                },function(prejectdir){
                     send(JSON.stringify({
                         event: '22',
                         flag:'end',
@@ -208,7 +208,7 @@ wss.on('connection', async function connection(ws) {
 			console.log(chalk.red(error))
         }
     });
-    ws.on('close', () => {
+    ws.on('close', function() {
         removeWs(ws.uuid)
     })
     send('something');

package/bin/net.js

@@ -19,7 +19,7 @@ function setResHeader(res){
 app.use(express.static('website'))
 app.use('/store', express.static('websitemod'))
 
-app.all("/api/dirlist",(req,res)=>{
+app.all("/api/dirlist",function (req,res){
     setResHeader(res)
     // const ls = getJsonFiles( __dirname )
     // res.json(ls)
@@ -27,7 +27,7 @@ app.all("/api/dirlist",(req,res)=>{
     res.json({'code':0})
 })
 //获取tmui版本
-app.post("/api/cehckTmuiVer",async (req,res)=>{
+app.post("/api/cehckTmuiVer",async function (req,res){
     const fetch = (await Fetch).default;
     
     setResHeader(res)
@@ -40,7 +40,7 @@ app.post("/api/cehckTmuiVer",async (req,res)=>{
     
 })
 
-app.post("/api/checkUniappVer",async (req,res)=>{
+app.post("/api/checkUniappVer",async function (req,res){
     const fetch = (await Fetch).default;
 
     setResHeader(res)
@@ -65,7 +65,7 @@ app.post("/api/checkUniappVer",async (req,res)=>{
 
    
     lis = lis.slice(0,40)
-    lis = lis.filter(el=>el[0]!='2')
+    lis = lis.filter(function(el){ return el[0]!='2'})
     obj.versions = lis
     res.json({'code':0,'data':obj})
     
@@ -75,11 +75,13 @@ app.post("/api/checkUniappVer",async (req,res)=>{
 
 
 
-const createNet = async ()=>{
-    const open = (await Open).default;
+function createNet (){
+   
 
-    app.listen(6170,()=>{
+    app.listen(6170,async function (){
+        const open = (await Open).default;
         open('http://localhost:6170')
+        
     })
 }
 

package/bin/selectedDir.js

@@ -1,9 +1,9 @@
-const path  = require("path")
-const globalDirectories  = require("global-dirs")
-const {getJsonDir} = require("./dirTool.js")
+const path = require("path")
+const globalDirectories = require("global-dirs")
+const { getJsonDir } = require("./dirTool.js")
 
 /**读取项目目录 */
-async function selectedDir(cb, end, pathStr) {
+function selectedDir(cb, end, pathStr) {
 	try {
 		let dirpath = globalDirectories.npm.prefix
 		if (pathStr) {

package/bin/tmui.js

@@ -1,23 +1,32 @@
 const figlet = require("figlet")
 const chalks = import("chalk")
-const {createNet} = require("./net.js")
+const { createNet } = require("./net.js")
+const { Command } = require('commander');
+const program = new Command();
+
 require("./hooks.js")
 
-const main = async ()=>{
-    const chalk = (await chalks).default;
-    
-    figlet('TMUI for UniApp',function(err,d){
-        if(err){
+chalks.then(v => {
+    const chalk = new v.Chalk()
+    figlet('TMUI for UniApp', function (err, d) {
+        if (err) {
             console.log(chalk.red(err))
             console.dir(err)
             return
         }
-        console.log(chalk.green(d))
-        console.log(chalk.yellow('请注意浏览器打开状态，如果打开失败'))
-        console.log(chalk.yellow('请访问：http://localhost:6170'))
-        createNet()
-    })
-}
-
-main();
+        console.log(chalk.green('请输入tmui dev'))
 
+        program.version(require('../package.json').version)
+        
+        program.command('dev')
+            .description('可视化创建TMUI UniApp项目')
+            .action(function (type, name) {
+                console.log(chalk.green(d))
+                console.log(chalk.yellow('请注意浏览器打开状态，如果打开失败'))
+                console.log(chalk.yellow('请访问：http://localhost:6170'))
+                createNet()
+            })
+     
+        program.parse(process.argv)
+    })
+})

package/dist/tmui.js

@@ -0,0 +1 @@
+(()=>{var e,t,o={895:e=>{"use strict";e.exports=require("chalk")},679:e=>{"use strict";e.exports=require("figlet")}},r={};function n(e){var t=r[e];if(void 0!==t)return t.exports;var l=r[e]={exports:{}};return o[e](l,l.exports,n),l.exports}t=Object.getPrototypeOf?e=>Object.getPrototypeOf(e):e=>e.__proto__,n.t=function(o,r){if(1&r&&(o=this(o)),8&r)return o;if("object"==typeof o&&o){if(4&r&&o.__esModule)return o;if(16&r&&"function"==typeof o.then)return o}var l=Object.create(null);n.r(l);var i={};e=e||[null,t({}),t([]),t(t)];for(var c=2&r&&o;"object"==typeof c&&!~e.indexOf(c);c=t(c))Object.getOwnPropertyNames(c).forEach((e=>i[e]=()=>o[e]));return i.default=()=>o,n.d(l,i),l},n.d=(e,t)=>{for(var o in t)n.o(t,o)&&!n.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:t[o]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),n.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};const l=n(679);Promise.resolve().then(n.t.bind(n,895,23)).then((e=>{const t=new e.Chalk;l("TMUI for UniApp",(function(e,o){if(e)return console.log(t.red(e)),void console.dir(e);console.log(t.green(o)),console.log(t.yellow("请注意浏览器打开状态，如果打开失败")),console.log(t.yellow("请访问：http://localhost:6170"))}))}))})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmui-cli",
-  "version": "1.1.9",
+  "version": "1.2.1",
   "type": "commonjs",
   "description": "tmui2.0,3.0,4.0x,3.2",
   "main": "./bin/tmui.js",