Merge pull request #58 from FEMessage/dev

release

Author: levy9527

README.md

@@ -46,7 +46,17 @@ yarn build
 
 ### `-u, --upgrade`
 
-更新当前组件配置
+更新当前项目基本配置
+
+### `--files`
+
+- Type: `string`
+
+额外更新的文件, 以更新组件为例:
+
+```sh
+npx vue-sfc-cli --upgrade --files package.json
+```
 
 ## Notice
 

init.js

@@ -11,12 +11,13 @@ const fs = require('fs-extra')
 const argv = parseArgs(process.argv.slice(2))
 
 let pkg = {}
+let pkgName = ''
 /**
  * Prompt user for input to populate template files
  */
-let npmName
-let ownerName
-const OWNER_NAME = 'femessage'
+let npmName = argv.get('npm')
+let ownerName = argv.get('owner')
+const OWNER_NAME = 'FEMessage'
 
 function isUpgrade() {
   return argv.has('u') || argv.has('upgrade')
@@ -25,8 +26,7 @@ function isUpgrade() {
 if (isUpgrade()) {
   try {
     pkg = require(path.join(process.cwd(), 'package.json'))
-    npmName = pkg.name.replace(/^@[\w-]*\//, '')
-    ownerName = pkg.name.replace(/^@([\w-]*)\/[\w-]*/, '$1')
+    pkgName = pkg.name.replace(/^@[\w-]*\//, '')
   } catch {}
 }
 
@@ -36,14 +36,17 @@ if (argv.has('test')) {
 }
 
 const promptAngle = kleur.dim('> ')
+
 if (!npmName) {
   console.log(
-    'The component name:'
+    `The component name: ${pkgName ? kleur.dim(`(${pkgName})`) : ''}`
   )
   npmName = readline.prompt({
+    defaultInput: pkgName,
     prompt: promptAngle
   })
 }
+
 if (!ownerName) {
   console.log(
     `The owner: ${kleur.dim(`(${OWNER_NAME})`)}`

lib/fileActions.js

@@ -84,24 +84,29 @@ module.exports = class FileActions {
         this.opts,
         {
           source: fs.readFileSync(path.join(this.opts.templatesDir, 'package-json'), 'utf8'),
+          includePkg: files.includes('package.json')
         }
       )
     )
   }
 }
 
-function upgradePackageJson({ pkg, source, componentName, ownerName }) {
+function upgradePackageJson({ pkg, source, componentName, ownerName, includePkg }) {
   const properties = ['scripts', 'devDependencies']
   const cliVersion = require('../package.json').version
 
   const templatePkg = JSON.parse(parseContent(source, { componentName, ownerName }))
   const currentPkg = pkg
 
-  properties.forEach(key => {
-    currentPkg[key] = Object.assign(pkg[key], templatePkg[key])
-  })
+  if (currentPkg['vue-sfc-cli']) {
+    currentPkg['vue-sfc-cli'] = cliVersion
+  }
 
-  currentPkg['vue-sfc-cli'] = cliVersion
+  if (includePkg) {
+    properties.forEach(key => {
+      currentPkg[key] = Object.assign(pkg[key], templatePkg[key])
+    })
+  }
 
   fs.outputJSONSync(path.join(process.cwd(), 'package.json'), currentPkg, {
     spaces: 2

templates/.all-contributorsrc

@@ -0,0 +1,14 @@
+{
+  "projectName": "{{componentName}}",
+  "projectOwner": "{{ownerName}}",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "commitConvention": "angular",
+  "contributors": [],
+  "contributorsPerLine": 7
+}

templates/README.md

@@ -1,9 +1,9 @@
 # {{componentName}}
 
 [![Build Status](https://travis-ci.com/{{ownerName}}/{{componentName}}.svg?branch=master)](https://travis-ci.com/{{ownerName}}/{{componentName}})
-[![NPM Download](https://img.shields.io/npm/dm/@{{ownerName}}/{{componentName}}.svg)](https://www.npmjs.com/package/@{{ownerName}}/{{componentName}})
-[![NPM Version](https://img.shields.io/npm/v/@{{ownerName}}/{{componentName}}.svg)](https://www.npmjs.com/package/@{{ownerName}}/{{componentName}})
-[![NPM License](https://img.shields.io/npm/l/@{{ownerName}}/{{componentName}}.svg)](https://github.com/{{ownerName}}/{{componentName}}/blob/master/LICENSE)
+[![NPM Download](https://img.shields.io/npm/dm/@{{ownerNameLowerCase}}/{{componentName}}.svg)](https://www.npmjs.com/package/@{{ownerNameLowerCase}}/{{componentName}})
+[![NPM Version](https://img.shields.io/npm/v/@{{ownerNameLowerCase}}/{{componentName}}.svg)](https://www.npmjs.com/package/@{{ownerNameLowerCase}}/{{componentName}})
+[![NPM License](https://img.shields.io/npm/l/@{{ownerNameLowerCase}}/{{componentName}}.svg)](https://github.com/{{ownerName}}/{{componentName}}/blob/master/LICENSE)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/{{ownerName}}/{{componentName}}/pulls)
 [![Automated Release Notes by gren](https://img.shields.io/badge/%F0%9F%A4%96-release%20notes-00B2EE.svg)](https://github-tools.github.io/github-release-notes/)
 
@@ -17,6 +17,7 @@
 - [Install](#install)
 - [Example](#example)
 - [Reference](#reference)
+- [Contributors](#contributors)
 - [License](#license)
 
 ## Introduction
@@ -45,6 +46,18 @@
 
 [⬆ Back to Top](#table-of-contents)
 
+## Contributors
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore -->
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
+
+[⬆ Back to Top](#table-of-contents)
+
 ## License
 
 [MIT](./LICENSE)

templates/package-json

@@ -1,5 +1,5 @@
 {
-  "name": "@{{ownerName}}/{{componentName}}",
+  "name": "@{{ownerNameLowerCase}}/{{componentName}}",
   "version": "1.0.0",
   "description": "",
   "author": "https://github.com/{{ownerName}}",

utils/index.js

@@ -11,6 +11,7 @@ exports.parseContent = (content, { componentName, ownerName }) => {
     .replace(createRegExp('componentNamePascal'), pascalify(componentName))
     .replace(createRegExp('componentName'), kebabcasify(componentName))
     .replace(createRegExp('ownerName'), ownerName)
+    .replace(createRegExp('ownerNameLowerCase'), ownerName.toLowerCase())
     .replace(createRegExp('cliVersion'), require('../package.json').version)
     .replace(createRegExp('licenseYear'), new Date().getFullYear())
 }