Merge branch 'develop'

# Conflicts:
#	template/react-webpack/tsconfig.json
#	template/react-webpack/webpack.config.js

Author: SystemLight

bin/hardoor.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 const commander = require("commander");
 const fs = require("fs-extra");
-const pt = require("path");
+const ph = require("path");
 const {install} = require("./npmInstall");
 const hardoor = require("../package.json");
 
@@ -23,10 +23,10 @@ commander
     .option('-a, --auto', "Run `npm i` to install automatically")
     .option('-f, --force', "Force overwrite existing files")
     .action(function (template, {auto, force}) {
-        let sourceDir = pt.join(__dirname, "../template/");
+        let sourceDir = ph.join(__dirname, "../template/");
         let dir = fs.readdirSync(sourceDir);
         if (dir.includes(template)) {
-            let sourcePath = pt.join(sourceDir, template);
+            let sourcePath = ph.join(sourceDir, template);
             let targetPath = process.cwd();
             fs.copy(sourcePath, targetPath, {overwrite: !!force, errorOnExist: !!!force})
                 .then(function () {
@@ -46,8 +46,12 @@ commander
     .command('list')
     .description('View a list of currently available templates')
     .action(function () {
-        let dir = fs.readdirSync(pt.join(__dirname, "../template/"));
-        console.log(dir.join("\n"));
+        let templatePath = ph.join(__dirname, "../template/");
+        let templates = fs.readdirSync(templatePath);
+        templates.forEach(template => {
+            let description = require(ph.join(templatePath, template, "package.json")).description;
+            console.log("[" + template + "]", "---", description, "\n")
+        });
         childFlag = true;
     });
 

template/common-browser/README.md

@@ -1,6 +1,6 @@
 # common-browser
 
-common-browser是一个web项目模板采用原生html开发模式
+一个采用原生html开发模式web项目模板
 
 ## 技术栈
 

template/jquery/lib/jquery.min.js renamed to template/common-browser/lib/jquery.min.js

@@ -1,7 +1,7 @@
 {
   "name": "@template/common-browser",
   "version": "1.0.0",
-  "description": "",
+  "description": "A web project template using native html development mode",
   "private": true,
   "scripts": {
     "test": "echo \"no test\" && exit 0"

template/common-browser/package.json

@@ -1,6 +1,6 @@
 # project
 
-project是一个web项目模板
+一个最简单的web项目模板
 
 ## 技术栈
 

template/common/README.md

@@ -1,7 +1,7 @@
 {
   "name": "@template/common",
   "version": "1.0.0",
-  "description": "",
+  "description": "One of the simplest web project templates",
   "private": true,
   "scripts": {
     "test": "echo \"no test\" && exit 0"