@giteeteam/apps-cli 0.2.11 → 0.2.12

package/dist/index.js

@@ -10,7 +10,6 @@ var archiver = require('archiver');
 var ora = require('ora');
 var yaml = require('yaml');
 var inquirer = require('inquirer');
-var uuid = require('uuid');
 var simpleGit = require('simple-git');
 var chalk = require('chalk');
 var readline = require('readline');
@@ -31,7 +30,7 @@ var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
 var child_process__default = /*#__PURE__*/_interopDefaultLegacy(child_process);
 var chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 
-var version = "0.2.11";
+var version = "0.2.12";
 
 const packageApp = async ({ outputDir, manifest, copyFiles }) => {
     const { resources } = manifest;
@@ -273,7 +272,7 @@ var build$1 = async (options) => {
     });
 };
 
-const init = async (projectPath) => {
+const init$1 = async (projectPath) => {
     const git = simpleGit__default["default"](projectPath);
     await git.init();
     return;
@@ -354,14 +353,47 @@ const command = {
     executeCommand,
 };
 
-const selectTemplate = async () => {
+// interface PromptResult {
+//   [key: string]: string;
+// }
+// const selectTemplate = async (): Promise<TemplateType> => {
+//   const prompt = inquirer.createPromptModule();
+//   const result: PromptResult = await prompt({
+//     type: 'list',
+//     name: 'Please select template type',
+//     choices: [TemplateType.micro],
+//   });
+//   return Object.values(result)[0] as TemplateType;
+// };
+const enterAppName = async () => {
     const prompt = inquirer__default["default"].createPromptModule();
     const result = await prompt({
-        type: 'list',
-        name: 'Please select template type',
-        choices: [TemplateType.micro],
+        type: 'input',
+        name: 'App Name',
+        message: 'Please enter an app name',
+        validate: (input) => {
+            return !!input;
+        },
     });
-    return Object.values(result)[0];
+    return result['App Name'];
+};
+const enterAppKey = async () => {
+    const prompt = inquirer__default["default"].createPromptModule();
+    const result = await prompt({
+        type: 'input',
+        name: 'App key',
+        message: 'Please enter a valid app key',
+        validate: (input) => {
+            if (!/^[a-z][a-z0-9_]*$/.test(input)) {
+                // 需要一个空行来换行输出
+                console.log('');
+                console.log('only supports letters, numbers, underscores and starts with letters');
+                return false;
+            }
+            return true;
+        },
+    });
+    return result['App key'];
 };
 const cloneRepo = async (repoUrl, projectPath) => {
     await execActionWithSpinner({
@@ -378,14 +410,18 @@ const dependenciesInstall = async (projectPath) => {
     }, () => command.executeCommand('yarn', ['install'], projectPath));
 };
 var run$1 = async (options) => {
-    const { cwd, packageName } = options;
-    const projectPath = path__default["default"].join(cwd, packageName);
+    const { cwd } = options;
+    // 选择模板类型 micro or uikit
+    // const templateType = await selectTemplate();
+    // 暂时写死micro
+    const templateType = 'micro';
+    const appName = await enterAppName();
+    const appKey = await enterAppKey();
+    const projectPath = path__default["default"].join(cwd, appKey);
     if (await fse__default["default"].pathExists(projectPath)) {
-        console.error('Project path already exists!');
+        console.error(`Project path already exists: ${projectPath}`);
         return;
     }
-    // 选择模板类型 micro or uikit
-    const templateType = await selectTemplate();
     // 从远程仓库clone模板
     await cloneRepo(templateURL, projectPath);
     // 将指定模板复制到跟目录
@@ -394,7 +430,6 @@ var run$1 = async (options) => {
     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 = [
         './manifest.yml',
         './package.json',
@@ -402,32 +437,22 @@ var run$1 = async (options) => {
         './public/index.html',
         './src/App.tsx',
         './src/index.tsx',
-        './static/micro/package.json',
-        './static/micro/webpack.config.js',
-        './static/micro/public/index.html',
-        './static/micro/src/App.tsx',
-        './static/micro/src/index.tsx',
     ];
     // 模板替换
     await Promise.all(files.map(file => rewriteTemplateField(path__default["default"].join(projectPath, file), {
-        appId,
-        projectName: packageName,
+        appName,
+        appKey,
     })));
     await dependenciesInstall(projectPath);
-    await init(projectPath);
+    await init$1(projectPath);
     console.log('Project init success!');
     console.log('Project path:' + projectPath);
 };
 
-var create = async (packageName) => {
+var init = async () => {
     const cwd = process.cwd();
-    if (!packageName) {
-        console.error('Please input your project name');
-        return;
-    }
     await run$1({
         cwd,
-        packageName,
     });
 };
 
@@ -571,7 +596,7 @@ program
     .option('-i --input [dir]', 'input dir')
     .option('-o --output [dir]', 'output dir')
     .action(build$1);
-program.command('create [name]').action(create);
+program.command('init').action(init);
 program
     .command('dev')
     .option('-i --input [dir]', 'input dir')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-cli",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "Giteeteam Apps cli",
   "keywords": [
     "typescript",
@@ -26,10 +26,10 @@
   "scripts": {
     "dev": "tsc -w",
     "build": "rimraf dist && rollup -c",
-    "prepare": "npm run build",
+    "prepare": "pnpm build",
     "unlink": "yarn unlink",
     "link": "chmod +x ./dist/index.js && yarn link && yarn link '@giteeteam/apps-cli' -g",
-    "build-link": "yarn run build && yarn run link"
+    "build-link": "pnpm build && yarn run link"
   },
   "publishConfig": {
     "allowBranch": "master",
@@ -50,7 +50,6 @@
     "inquirer": "^8.2.4",
     "ora": "^5.4.1",
     "simple-git": "^3.7.1",
-    "uuid": "^8.3.2",
     "yaml": "^2.1.1"
   },
   "devDependencies": {
@@ -59,5 +58,5 @@
     "@types/inquirer": "^8.2.1",
     "@types/uuid": "^8.3.4"
   },
-  "gitHead": "d6b537aee52468febfa5803c744f4b9f06379c5d"
+  "gitHead": "6ab5133ce2217630a7c35225248ef1cba1efa26c"
 }