diff --git a/packages/create-vant-cli-app/generators/templates/.eslintignore b/packages/create-vant-cli-app/generators/templates/eslintignore.tpl similarity index 100% rename from packages/create-vant-cli-app/generators/templates/.eslintignore rename to packages/create-vant-cli-app/generators/templates/eslintignore.tpl diff --git a/packages/create-vant-cli-app/generators/templates/.gitignore b/packages/create-vant-cli-app/generators/templates/gitignore.tpl similarity index 100% rename from packages/create-vant-cli-app/generators/templates/.gitignore rename to packages/create-vant-cli-app/generators/templates/gitignore.tpl diff --git a/packages/create-vant-cli-app/generators/templates/package.json b/packages/create-vant-cli-app/generators/templates/package.json.tpl similarity index 100% rename from packages/create-vant-cli-app/generators/templates/package.json rename to packages/create-vant-cli-app/generators/templates/package.json.tpl diff --git a/packages/create-vant-cli-app/package.json b/packages/create-vant-cli-app/package.json index a6a196ca3..150c82981 100644 --- a/packages/create-vant-cli-app/package.json +++ b/packages/create-vant-cli-app/package.json @@ -1,6 +1,6 @@ { "name": "create-vant-cli-app", - "version": "1.0.0", + "version": "0.0.1", "description": "Create Vant Cli App", "main": "lib/index.js", "bin": { @@ -14,6 +14,10 @@ "type": "git", "url": "https://github.com/youzan/vant/tree/dev/packages/create-vant-cli-app" }, + "files": [ + "lib", + "generators" + ], "keywords": [ "vant" ], diff --git a/packages/create-vant-cli-app/src/generator.ts b/packages/create-vant-cli-app/src/generator.ts index 839f7e09d..571b4c4df 100644 --- a/packages/create-vant-cli-app/src/generator.ts +++ b/packages/create-vant-cli-app/src/generator.ts @@ -44,21 +44,21 @@ export class VanGenerator extends Generator { this.fs.copy(join(TEMPLATES, from), this.destinationPath(to || from)); }; - const copyTpl = (name: string) => { + const copyTpl = (name: string, target?: string) => { this.fs.copyTpl( join(TEMPLATES, name), - this.destinationPath(name), + this.destinationPath(target || name), this.inputs ); }; - copy('.gitignore'); - copy('.eslintignore'); + copyTpl('package.json.tpl', 'package.json'); + copyTpl('vant.config.js'); copy('babel.config.js'); + copy('gitignore.tpl', '.gitignore'); + copy('eslintignore.tpl', '.eslintignore'); copy('src/**/*', 'src'); copy('docs/**/*', 'docs'); - copyTpl('package.json'); - copyTpl('vant.config.js'); } install() { diff --git a/packages/create-vant-cli-app/src/index.ts b/packages/create-vant-cli-app/src/index.ts index 3d33b5c01..560c9be5c 100644 --- a/packages/create-vant-cli-app/src/index.ts +++ b/packages/create-vant-cli-app/src/index.ts @@ -1,5 +1,7 @@ +#!/usr/bin/env node + import inquirer from 'inquirer'; -import { mkdirSync, existsSync } from 'fs-extra'; +import { ensureDir } from 'fs-extra'; import { VanGenerator } from './generator'; const PROMPTS = [ @@ -13,15 +15,10 @@ const PROMPTS = [ export default async function run() { const { name } = await inquirer.prompt(PROMPTS); - if (!existsSync(name)) { - mkdirSync(name); - } + ensureDir(name); const generator = new VanGenerator(name); - - return new Promise(resolve => { - generator.run(resolve); - }); + generator.run(); } run(); diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json index 25ba98f78..9a9f70945 100644 --- a/packages/vant-cli/package.json +++ b/packages/vant-cli/package.json @@ -21,8 +21,7 @@ "lib", "site", "template", - "preset.js", - "generators" + "preset.js" ], "keywords": [ "vant" @@ -41,7 +40,6 @@ "@types/postcss-load-config": "^2.0.1", "@types/sass": "^1.16.0", "@types/shelljs": "^0.8.6", - "@types/source-map": "^0.5.7", "@types/webpack": "^4.41.2", "@types/webpack-dev-server": "^3.9.0", "@types/webpack-merge": "^4.1.5" @@ -124,13 +122,5 @@ "global-require": 0, "import/no-dynamic-require": 0 } - }, - "stylelint": { - "extends": [ - "@vant/stylelint-config" - ] - }, - "prettier": { - "singleQuote": true } }