tmui-cli 1.1.7 → 1.1.9

package/bin/cmdTool.js

@@ -1,13 +1,12 @@
-import fs from "fs"
-import path from "path"
-import {
-	spawn,
-	exec
-} from "child_process"
-import process from "process"
-import codecs from "codecs"
-import psTree from "ps-tree"
-import iconv from "iconv-lite"
+
+const path  = require("path")
+const fs  = require("fs")
+const {spawn,exec}  = require("child_process")
+const process  = require("process")
+const codecs  = require("codecs")
+const psTree  = require("ps-tree")
+
+
 
 
 function detectEncoding(str) {
@@ -30,7 +29,7 @@ function send(ws, arg) {
 	})
 }
 
-export function execCmd(cb, end, command) {
+function execCmd(cb, end, command) {
 	try {
 		// const npmPath = path.join(process.env.APPDATA, 'npm', 'npm.cmd');
 		const spawnObj = exec(command, {
@@ -81,7 +80,7 @@ export function execCmd(cb, end, command) {
 	}
 }
 // 杀死子进程及其所有子孙进程
-export function killChildAndGrandChildren(pid) {
+function killChildAndGrandChildren(pid) {
 
 	if (process.platform === 'win32') {
 		// 在 Windows 系统上执行的代码
@@ -104,7 +103,7 @@ export function killChildAndGrandChildren(pid) {
 
 }
 
-export function devRunApp(ws, obj) {
+function devRunApp(ws, obj) {
 
 	const nowcd = process.cwd();
 	process.chdir(path.normalize(obj.data.path));
@@ -172,7 +171,7 @@ export function devRunApp(ws, obj) {
 	return childreProcess;
 }
 
-export function buildApp(ws, obj, end) {
+function buildApp(ws, obj, end) {
 
 	const nowcd = process.cwd();
 	process.chdir(path.normalize(obj.data.path));
@@ -220,4 +219,11 @@ export function buildApp(ws, obj, end) {
 	return childreProcess;
 }
 
+module.exports = {
+	execCmd,
+	killChildAndGrandChildren,
+	devRunApp,
+	buildApp
+}
+
 

package/bin/createTmui.js

@@ -1,7 +1,8 @@
-import path from "path";
-import fs from "fs"
-import compressing from "compressing"
-import { execCmd } from "./cmdTool.js";
+
+const path  = require("path")
+const {execCmd}  = require("./cmdTool.js")
+const fs  = require("fs")
+const compressing  = require("compressing")
 
 
 const uniappDevListVer = [
@@ -77,7 +78,7 @@ function writePackageJson(filepath, str) {
  * @param {(str)=>{}} call 
  * @param {()=>{}} end 
  */
-export async function UpdateTmui(arg, call, end) {
+async function UpdateTmui(arg, call, end) {
     let rootdir = path.normalize(arg.path)
     call('检测目录...')
     if (!fs.existsSync(rootdir)) {
@@ -204,7 +205,7 @@ export async function UpdateTmui(arg, call, end) {
  * @param {(str)=>{}} call 
  * @param {(str?:string)=>{}} end 
  */
-export async function createTmui(arg, call, end) {
+async function createTmui(arg, call, end) {
     let rootdir = path.normalize(arg.rootDir)
     call('检测目录...')
     if (!fs.existsSync(rootdir)) {
@@ -372,4 +373,9 @@ export async function createTmui(arg, call, end) {
 
     end(rootdir)
 
+}
+
+module.exports = {
+    createTmui,
+    UpdateTmui
 }

package/bin/dirTool.js

@@ -1,14 +1,7 @@
-import fs from "fs"
-import path from "path"
-import {
-	spawn,
-	exec
-} from "child_process"
-import process from "process"
-import os from "os"
+const path  = require("path")
+const fs  = require("fs")
 
-
-export function getJsonFiles(jsonPath) {
+function getJsonFiles(jsonPath) {
 	let jsonFiles = [];
 
 	function findJsonFile(www) {
@@ -28,7 +21,7 @@ export function getJsonFiles(jsonPath) {
 	return jsonFiles;
 }
 
-export function getJsonDir(basePath = './') {
+function getJsonDir(basePath = './') {
 	const dirPath = basePath;
 	const root = {
 		name: '',
@@ -71,6 +64,7 @@ export function getJsonDir(basePath = './') {
 		}
 
 	}
+	// @ts-ignore
 	root.children = tree;
 
 
@@ -78,7 +72,7 @@ export function getJsonDir(basePath = './') {
 }
 
 /**读取项目信息根据提供的路径。 */
-export function checkProject(obj) {
+function checkProject(obj) {
 	
 	// const {id,path,type} = obj;
 	let mainsetStrPath = "";
@@ -150,3 +144,9 @@ export function checkProject(obj) {
 	}
 }
 
+
+module.exports = {
+	getJsonFiles,
+	getJsonDir,
+	checkProject
+}

package/bin/hooks.js

@@ -1,13 +1,15 @@
+const figlet = require("figlet")
+const chalks = import("chalk")
+
+const {createTmui,UpdateTmui} = require("./createTmui.js")
+const {checkProject} = require("./dirTool.js")
+const {selectedDir} = require("./selectedDir.js")
+const osUtils = require("node-os-utils")
+const {WebSocketServer} = require("ws")
+const {execCmd, devRunApp, killChildAndGrandChildren, buildApp} = require("./cmdTool.js")
+
 
-import {WebSocketServer} from 'ws'
-import osUtils from 'node-os-utils'
-import { execCmd, devRunApp, killChildAndGrandChildren, buildApp } from './cmdTool.js'
-import { selectedDir } from './selectedDir.js'
-import { checkProject} from './dirTool.js'
-import { Chalk } from "chalk";
-import { createTmui,UpdateTmui } from './createTmui.js'
 
-let chalk = new Chalk()
 
 
 
@@ -54,7 +56,8 @@ function send(arg) {
         el.send(arg)
     })
 }
-wss.on('connection', function connection(ws) {
+wss.on('connection', async function connection(ws) {
+    const chalk = (await chalks).default;
 
     ws.uuid = uuid();
     wslist.push(ws)

package/bin/net.js

@@ -1,11 +1,8 @@
-import express from "express"
-import fs from "fs"
-import {spawn} from "child_process"
-import iconv from "iconv-lite"
-import BufferHelper from "bufferhelper"
-import open from "open"
-import bodyParser from "body-parser"
-import fetch from "node-fetch"
+const Open  = import("open")
+const bodyParser  = require("body-parser")
+const Fetch  = import("node-fetch")
+const express  = require("express")
+
 const app = express();
 
 var jsonParser = bodyParser.json()
@@ -31,6 +28,8 @@ app.all("/api/dirlist",(req,res)=>{
 })
 //获取tmui版本
 app.post("/api/cehckTmuiVer",async (req,res)=>{
+    const fetch = (await Fetch).default;
+    
     setResHeader(res)
     let type = req.body?.type??'uniapp'
 
@@ -42,6 +41,8 @@ app.post("/api/cehckTmuiVer",async (req,res)=>{
 })
 
 app.post("/api/checkUniappVer",async (req,res)=>{
+    const fetch = (await Fetch).default;
+
     setResHeader(res)
     // https://registry.npmjs.org/@dcloudio/uni-app
 	let resdata = await fetch(`https://mirrors.huaweicloud.com/repository/npm/@dcloudio/uni-app`,{method:'GET',headers:{'Content-Type':'text/plan'}})
@@ -74,12 +75,17 @@ app.post("/api/checkUniappVer",async (req,res)=>{
 
 
 
-export const createNet = ()=>{
+const createNet = async ()=>{
+    const open = (await Open).default;
+
     app.listen(6170,()=>{
         open('http://localhost:6170')
     })
 }
 
+module.exports = {
+    createNet
+}
 
 
 // open('http://localhost:6170')

package/bin/selectedDir.js

@@ -1,13 +1,9 @@
-import path from "path"
-import fs from "fs"
-
-import globalDirectories from "global-dirs"
-import {
-	getJsonDir
-} from "./dirTool.js"
+const path  = require("path")
+const globalDirectories  = require("global-dirs")
+const {getJsonDir} = require("./dirTool.js")
 
 /**读取项目目录 */
-export async function selectedDir(cb, end, pathStr) {
+async function selectedDir(cb, end, pathStr) {
 	try {
 		let dirpath = globalDirectories.npm.prefix
 		if (pathStr) {
@@ -26,3 +22,7 @@ export async function selectedDir(cb, end, pathStr) {
 }
 
 
+module.exports = {
+	selectedDir
+}
+

package/bin/tmui.js

@@ -1,10 +1,11 @@
-import { Chalk } from "chalk";
-import figlet from "figlet"
-import { createNet } from "./net.js";
-import "./hooks.js";
+const figlet = require("figlet")
+const chalks = import("chalk")
+const {createNet} = require("./net.js")
+require("./hooks.js")
 
-let chalk = new Chalk()
-const main = ()=>{
+const main = async ()=>{
+    const chalk = (await chalks).default;
+    
     figlet('TMUI for UniApp',function(err,d){
         if(err){
             console.log(chalk.red(err))

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "tmui-cli",
-  "version": "1.1.7",
-  "type": "module",
+  "version": "1.1.9",
+  "type": "commonjs",
   "description": "tmui2.0,3.0,4.0x,3.2",
   "main": "./bin/tmui.js",
   "scripts": {
-    "dev": "node ./bin/tmui.js"
+    "dev": "node ./bin/tmui.js",
+    "test": "node ./dist/tmui.js",
+    "build": "webpack --mode production"
   },
   "keywords": [
     "tmui"
@@ -13,6 +15,8 @@
   "author": "tmzdy",
   "license": "MIT",
   "dependencies": {
+    "@babel/runtime": "^7.25.7",
+    "babel-polyfill": "^6.26.0",
     "body-parser": "^1.20.3",
     "bufferhelper": "^0.2.1",
     "chalk": "^5.3.0",
@@ -27,5 +31,16 @@
     "open": "^10.1.0",
     "ps-tree": "^1.2.0",
     "ws": "^8.18.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.25.8",
+    "@babel/plugin-transform-modules-commonjs": "^7.25.7",
+    "@babel/plugin-transform-runtime": "^7.25.7",
+    "@babel/preset-env": "^7.25.8",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^9.2.1",
+    "webpack": "^5.95.0",
+    "webpack-cli": "^5.1.4",
+    "webpack-node-externals": "^3.0.0"
   }
 }

package/webpack.config.js

@@ -0,0 +1,17 @@
+const path = require("path");
+const nodeExternals = require('webpack-node-externals');
+module.exports = {
+    entry: './bin/tmui.js',
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'tmui.js',
+    },
+ 
+    resolve: {
+        extensions: ['.js'], // 解析扩展名
+    },
+    target: 'node',
+    externals: [
+        nodeExternals()
+    ],
+}