@giteeteam/apps-cli 0.1.12 → 0.1.15

package/dist/index.js

@@ -26,11 +26,9 @@ var simpleGit__default = /*#__PURE__*/_interopDefaultLegacy(simpleGit);
 var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
 var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
 
-var version = "0.1.12";
+var version = "0.1.15";
 
-const packageApp = async (outputDir, manifest, _copyFiles = []) => {
-    // add copy file manifest
-    const copyFiles = ['manifest.yml', ..._copyFiles];
+const packageApp = async ({ outputDir, manifest, copyFiles }) => {
     const { resources } = manifest;
     if (resources) {
         for (const { key, path: resourcePath } of resources) {
@@ -47,15 +45,8 @@ const packageApp = async (outputDir, manifest, _copyFiles = []) => {
     }
 };
 
-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 = async (archiveDir) => {
-    const pkgName = await readPkgName();
-    const outputFile = path__default["default"].resolve(`./${pkgName}.zip`);
+const archiveApp = async (archiveDir, pkgName) => {
+    const outputFile = path__default["default"].resolve(pkgName);
     await fse__default["default"].remove(outputFile);
     return new Promise((resolve, reject) => {
         const output = fse__default["default"].createWriteStream(outputFile);
@@ -133,9 +124,17 @@ const getManifestObject = async () => {
     return obj;
 };
 
-var run$1 = async (opts) => {
-    const { outputDir, inputDir, prod, copyFiles, zip } = opts;
+var run$1 = async ({ outputDir, inputDir, prod, copyFiles, zip }) => {
     const manifest = await getManifestObject();
+    const { app: { version, key }, } = manifest;
+    if (!key) {
+        console.error('manifest app key is required');
+        return;
+    }
+    if (!version) {
+        console.error('manifest app version is required');
+        return;
+    }
     // clear output dir
     await fse__default["default"].emptyDir(outputDir);
     // bundle
@@ -149,24 +148,26 @@ var run$1 = async (opts) => {
         start: 'start package',
         error: 'package failed',
         succeed: 'package success',
-    }, () => packageApp(outputDir, manifest, copyFiles));
+    }, () => packageApp({ outputDir, manifest, copyFiles }));
     if (zip) {
+        const pkgName = `${key}_${version}.zip`;
         // archive
         await execActionWithSpinner({
             start: 'start archive',
             error: 'archive failed',
             succeed: 'archive success',
-        }, () => archiveApp(outputDir));
+        }, () => archiveApp(outputDir, pkgName));
     }
 };
 
+const defaultCopyFiles = ['manifest.yml'];
 var build = async (options) => {
-    const { input = 'src', output = 'dist', prod, copy, zip } = options;
+    const { input = 'src', output = 'dist', prod, copy = [], zip } = options;
     await run$1({
         outputDir: path__default["default"].resolve(output),
         inputDir: path__default["default"].resolve(input),
         prod: !!prod,
-        copyFiles: copy,
+        copyFiles: [...defaultCopyFiles, ...copy],
         zip: zip,
     });
 };
@@ -189,7 +190,7 @@ const templateURL = 'https://github.com/moriahq/apps-template.git';
 var TemplateType;
 (function (TemplateType) {
     TemplateType["micro"] = "micro";
-    TemplateType["uikit"] = "uikit";
+    // 'uikit' = 'uikit',
 })(TemplateType || (TemplateType = {}));
 // 重写替换文件内带模版的地方。格式为 {{field}}
 // options为字段变量
@@ -256,30 +257,30 @@ const selectTemplate = async () => {
     const prompt = inquirer__default["default"].createPromptModule();
     const result = await prompt({
         type: 'list',
-        name: '请选择插件类型',
+        name: 'Please select template type',
         choices: Object.keys(TemplateType),
     });
     return Object.values(result)[0];
 };
 const cloneRepo = async (repoUrl, projectPath) => {
     await execActionWithSpinner({
-        start: '开始克隆仓库',
-        error: '仓库克隆失败',
-        succeed: '仓库克隆完毕',
+        start: 'Start clone repository',
+        error: 'Clone repository failed!',
+        succeed: 'Clone repository success!',
     }, () => clone(repoUrl, projectPath));
 };
 const dependenciesInstall = async (projectPath) => {
     await execActionWithSpinner({
-        start: '开始安装依赖',
-        error: '依赖安装失败',
-        succeed: '依赖安装成功',
+        start: 'Start install dependencies',
+        error: 'Install dependencies failed!',
+        succeed: 'Install dependencies success!',
     }, () => command.executeCommand('yarn', ['install'], projectPath));
 };
 var run = async (options) => {
     const { cwd, packageName } = options;
     const projectPath = path__default["default"].join(cwd, packageName);
     if (await fse__default["default"].pathExists(projectPath)) {
-        console.error('项目文件夹已存在！请删除或者换个项目名');
+        console.error('Project path already exists!');
         return;
     }
     // 选择模板类型 micro or uikit
@@ -296,6 +297,10 @@ var run = async (options) => {
     const files = [
         './manifest.yml',
         './package.json',
+        './webpack.config.js',
+        './public/index.html',
+        './src/App.tsx',
+        './src/index.tsx',
         './static/micro/package.json',
         './static/micro/webpack.config.js',
         './static/micro/public/index.html',
@@ -309,8 +314,8 @@ var run = async (options) => {
     })));
     await dependenciesInstall(projectPath);
     await init(projectPath);
-    console.log('项目初始化成功！');
-    console.log('项目路径：' + projectPath);
+    console.log('Project init success!');
+    console.log('Project path:' + projectPath);
 };
 
 var create = async (packageName) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-cli",
-  "version": "0.1.12",
+  "version": "0.1.15",
   "description": "Giteeteam Apps cli",
   "keywords": [
     "typescript",
@@ -8,7 +8,7 @@
     "cli"
   ],
   "bin": {
-    "giteeteam-apps-cli": "./dist/index.js"
+    "giteeteam-apps": "./dist/index.js"
   },
   "license": "ISC",
   "main": "./dist/index.js",
@@ -56,5 +56,5 @@
     "@types/inquirer": "^8.2.1",
     "@types/uuid": "^8.3.4"
   },
-  "gitHead": "0030d0a92683b04230c31a1f27b747a5c73480cb"
+  "gitHead": "e6150c7c1dd0a090fb03c0b506bd530ae19976a3"
 }