@giteeteam/apps-cli 0.1.6 → 0.1.9

package/dist/index.js

@@ -5,7 +5,6 @@ var commander = require('commander');
 var appsBundler = require('@giteeteam/apps-bundler');
 var fse = require('fs-extra');
 var path = require('path');
-var fs = require('fs');
 var archiver = require('archiver');
 var ora = require('ora');
 var yaml = require('yaml');
@@ -20,7 +19,6 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var fse__default = /*#__PURE__*/_interopDefaultLegacy(fse);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var archiver__default = /*#__PURE__*/_interopDefaultLegacy(archiver);
 var ora__default = /*#__PURE__*/_interopDefaultLegacy(ora);
 var inquirer__default = /*#__PURE__*/_interopDefaultLegacy(inquirer);
@@ -28,7 +26,7 @@ var simpleGit__default = /*#__PURE__*/_interopDefaultLegacy(simpleGit);
 var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
 var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
 
-var version = "0.1.6";
+var version = "0.1.9";
 
 const packageApp = async (outputDir, manifest, _copyFiles = []) => {
     // add copy file manifest
@@ -49,20 +47,18 @@ const packageApp = async (outputDir, manifest, _copyFiles = []) => {
     }
 };
 
-const readPkgName = () => {
-    const fileBuffer = fs__default["default"].readFileSync(path__default["default"].resolve('./package.json'));
+const readPkgName = async () => {
+    const fileBuffer = await fse__default["default"].readFile(path__default["default"].resolve('./package.json'));
     const fileStr = fileBuffer.toString();
     const fileJson = JSON.parse(fileStr);
     return fileJson === null || fileJson === void 0 ? void 0 : fileJson.name;
 };
-const archiveApp = (archiveDir) => {
+const archiveApp = async (archiveDir) => {
+    const pkgName = await readPkgName();
+    const outputFile = path__default["default"].resolve(`./${pkgName}.zip`);
+    await fse__default["default"].remove(outputFile);
     return new Promise((resolve, reject) => {
-        const pkgName = readPkgName();
-        const outputFile = path__default["default"].resolve(`./${pkgName}.zip`);
-        if (fs__default["default"].existsSync(outputFile)) {
-            fse__default["default"].removeSync(outputFile);
-        }
-        const output = fs__default["default"].createWriteStream(outputFile);
+        const output = fse__default["default"].createWriteStream(outputFile);
         const archive = archiver__default["default"]('zip', {
             zlib: { level: 9 }, // Sets the compression level.
         });
@@ -169,16 +165,14 @@ var build = async (options) => {
     });
 };
 
-const fileExists = (profilePath) => fs__default["default"].existsSync(profilePath);
-
 const init = async (projectPath) => {
     const git = simpleGit__default["default"](projectPath);
     await git.init();
     return;
 };
 const clone = async (repoUrl, projectPath) => {
-    if (!fileExists(projectPath)) {
-        fs__default["default"].mkdirSync(projectPath);
+    if (!(await fse__default["default"].pathExists(projectPath))) {
+        await fse__default["default"].mkdir(projectPath);
     }
     const git = simpleGit__default["default"](projectPath);
     await git.clone(repoUrl, projectPath);
@@ -194,15 +188,11 @@ var TemplateType;
 // 重写替换文件内带模版的地方。格式为 {{field}}
 // options为字段变量
 const rewriteTemplateField = async (path, options) => {
-    return new Promise(resolve => {
-        if (!fileExists(path)) {
-            return resolve();
-        }
-        const content = fs__default["default"].readFileSync(path, { encoding: 'utf-8' });
-        fs__default["default"].writeFile(path, content.replace(/{{(\w+)}}/g, (match, key) => (typeof options[key] === 'string' ? options[key] : match)), () => {
-            resolve();
-        });
-    });
+    if (!(await fse__default["default"].pathExists(path))) {
+        return;
+    }
+    const content = await fse__default["default"].readFile(path, { encoding: 'utf-8' });
+    await fse__default["default"].writeFile(path, content.replace(/{{(\w+)}}/g, (match, key) => (typeof options[key] === 'string' ? options[key] : match)));
 };
 
 const toStartOfLine = (stream) => {
@@ -282,18 +272,19 @@ const dependenciesInstall = async (projectPath) => {
 var run = async (options) => {
     const { cwd, packageName } = options;
     const projectPath = path__default["default"].join(cwd, packageName);
-    if (fileExists(projectPath)) {
+    if (await fse__default["default"].pathExists(projectPath)) {
         console.error('项目文件夹已存在！请删除或者换个项目名');
         return;
     }
+    // 选择模板类型 micro or uikit
     const templateType = await selectTemplate();
+    // 从远程仓库clone模板
     await cloneRepo(templateURL, projectPath);
     // 将指定模板复制到跟目录
     await fse__default["default"].copy(path__default["default"].join(projectPath, templateType), projectPath);
     // 删除各个模板文件夹
-    for (const t of Object.values(TemplateType)) {
-        await fse__default["default"].remove(path__default["default"].join(projectPath, t));
-    }
+    await Promise.all(Object.values(TemplateType).map(t => fse__default["default"].remove(path__default["default"].join(projectPath, t))));
+    // 删除源远程仓库的git
     await fse__default["default"].remove(path__default["default"].join(projectPath, './.git'));
     const appId = uuid.v4();
     const files = [
@@ -305,12 +296,11 @@ var run = async (options) => {
         './static/micro/src/App.tsx',
         './static/micro/src/index.tsx',
     ];
-    for (let i = 0; i < files.length; i++) {
-        await rewriteTemplateField(path__default["default"].join(projectPath, files[i]), {
-            appId,
-            projectName: packageName,
-        });
-    }
+    // 模板替换
+    await Promise.all(files.map(file => rewriteTemplateField(path__default["default"].join(projectPath, file), {
+        appId,
+        projectName: packageName,
+    })));
     await dependenciesInstall(projectPath);
     await init(projectPath);
     console.log('项目初始化成功！');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-cli",
-  "version": "0.1.6",
+  "version": "0.1.9",
   "description": "Giteeteam Apps cli",
   "keywords": [
     "typescript",
@@ -38,7 +38,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@giteeteam/apps-bundler": "^0.1.5",
+    "@giteeteam/apps-bundler": "^0.1.6",
     "archiver": "^5.3.1",
     "chalk": "^4.1.2",
     "commander": "^9.3.0",
@@ -56,5 +56,5 @@
     "@types/inquirer": "^8.2.1",
     "@types/uuid": "^8.3.4"
   },
-  "gitHead": "1eb6c9e3d70c19faf81fc29da6a62c7fc22365c3"
+  "gitHead": "09a6b545da63b26d19524d653bf78a79c72de270"
 }