From 35896211137dfbbd5a1ee9c0d0bb9de4dee15139 Mon Sep 17 00:00:00 2001 From: jsNewbee Date: Mon, 25 Mar 2019 19:07:35 +0800 Subject: [PATCH] =?UTF-8?q?refactor(cli):=20=E5=88=9B=E5=BB=BA=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8=20fs.ens?= =?UTF-8?q?ureDirSync=20(#2576)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-cli/src/build.js | 3 +-- packages/taro-cli/src/convertor.js | 2 +- packages/taro-cli/src/util/index.js | 2 +- packages/taro-cli/templates/default/index.js | 8 ++++---- packages/taro-cli/templates/mobx/index.js | 8 ++++---- packages/taro-cli/templates/redux/index.js | 16 ++++++++-------- packages/taro-cli/templates/wxcloud/index.js | 12 ++++++------ 7 files changed, 25 insertions(+), 26 deletions(-) diff --git a/packages/taro-cli/src/build.js b/packages/taro-cli/src/build.js index f2af9fb15762..7eb377843372 100644 --- a/packages/taro-cli/src/build.js +++ b/packages/taro-cli/src/build.js @@ -8,13 +8,12 @@ const CONFIG = require('./config') const appPath = process.cwd() - function build (args, buildConfig) { const { type, watch } = buildConfig const configDir = require(path.join(appPath, Util.PROJECT_CONFIG))(_.merge) const outputPath = path.join(appPath, configDir.outputRoot || CONFIG.OUTPUT_DIR) if (!fs.existsSync(outputPath)) { - fs.mkdirSync(outputPath) + fs.ensureDirSync(outputPath) } else { if (type !== Util.BUILD_TYPES.H5) { Util.emptyDirectory(outputPath) diff --git a/packages/taro-cli/src/convertor.js b/packages/taro-cli/src/convertor.js index 258751e26ea8..ded7251c9dcf 100644 --- a/packages/taro-cli/src/convertor.js +++ b/packages/taro-cli/src/convertor.js @@ -116,7 +116,7 @@ class Convertor { if (fs.existsSync(this.convertRoot)) { emptyDirectory(this.convertRoot, { excludes: ['node_modules'] }) } else { - fs.mkdirpSync(this.convertRoot) + fs.ensureDirSync(this.convertRoot) } } diff --git a/packages/taro-cli/src/util/index.js b/packages/taro-cli/src/util/index.js index afd0e639b209..54b8f2dd8b13 100644 --- a/packages/taro-cli/src/util/index.js +++ b/packages/taro-cli/src/util/index.js @@ -263,7 +263,7 @@ exports.getRootPath = function () { exports.getTaroPath = function () { const taroPath = path.join(exports.homedir(), '.taro') if (!fs.existsSync(taroPath)) { - fs.mkdirSync(taroPath) + fs.ensureDirSync(taroPath) } return taroPath } diff --git a/packages/taro-cli/templates/default/index.js b/packages/taro-cli/templates/default/index.js index 64bee0b4712d..fbd33ac6ba29 100644 --- a/packages/taro-cli/templates/default/index.js +++ b/packages/taro-cli/templates/default/index.js @@ -26,10 +26,10 @@ module.exports = function (creater, params, helper, cb) { } const currentStyleExt = styleExtMap[css] || 'css' - fs.mkdirSync(projectPath) - fs.mkdirSync(sourceDir) - fs.mkdirSync(configDir) - fs.mkdirSync(path.join(sourceDir, 'pages')) + fs.ensureDirSync(projectPath) + fs.ensureDirSync(sourceDir) + fs.ensureDirSync(configDir) + fs.ensureDirSync(path.join(sourceDir, 'pages')) creater.template(template, 'pkg', path.join(projectPath, 'package.json'), { description, diff --git a/packages/taro-cli/templates/mobx/index.js b/packages/taro-cli/templates/mobx/index.js index 96adeeac7e3e..2ad9207491de 100644 --- a/packages/taro-cli/templates/mobx/index.js +++ b/packages/taro-cli/templates/mobx/index.js @@ -26,10 +26,10 @@ module.exports = function (creater, params, helper, cb) { } const currentStyleExt = styleExtMap[css] || 'css' - fs.mkdirSync(projectPath) - fs.mkdirSync(sourceDir) - fs.mkdirSync(configDir) - fs.mkdirSync(path.join(sourceDir, 'pages')) + fs.ensureDirSync(projectPath) + fs.ensureDirSync(sourceDir) + fs.ensureDirSync(configDir) + fs.ensureDirSync(path.join(sourceDir, 'pages')) creater.template(template, 'pkg', path.join(projectPath, 'package.json'), { description, diff --git a/packages/taro-cli/templates/redux/index.js b/packages/taro-cli/templates/redux/index.js index 1cc64560eda8..d5e9f484e341 100644 --- a/packages/taro-cli/templates/redux/index.js +++ b/packages/taro-cli/templates/redux/index.js @@ -30,14 +30,14 @@ module.exports = function (creater, params, helper, cb) { } const currentStyleExt = styleExtMap[css] || 'css' - fs.mkdirSync(projectPath) - fs.mkdirSync(sourceDir) - fs.mkdirSync(configDir) - fs.mkdirSync(path.join(sourceDir, 'pages')) - fs.mkdirSync(constantsDir) - fs.mkdirSync(actionsDir) - fs.mkdirSync(reducersDir) - fs.mkdirSync(storeDir) + fs.ensureDirSync(projectPath) + fs.ensureDirSync(sourceDir) + fs.ensureDirSync(configDir) + fs.ensureDirSync(path.join(sourceDir, 'pages')) + fs.ensureDirSync(constantsDir) + fs.ensureDirSync(actionsDir) + fs.ensureDirSync(reducersDir) + fs.ensureDirSync(storeDir) creater.template(template, 'pkg', path.join(projectPath, 'package.json'), { description, diff --git a/packages/taro-cli/templates/wxcloud/index.js b/packages/taro-cli/templates/wxcloud/index.js index 5c1f8dca7d44..a6eff62324e4 100644 --- a/packages/taro-cli/templates/wxcloud/index.js +++ b/packages/taro-cli/templates/wxcloud/index.js @@ -30,12 +30,12 @@ module.exports = function (creater, params, helper, cb) { } const currentStyleExt = styleExtMap[css] || 'css' - fs.mkdirSync(projectPath) - fs.mkdirSync(projectClientPath) - fs.mkdirSync(projectCloudPath) - fs.mkdirSync(sourceDir) - fs.mkdirSync(configDir) - fs.mkdirSync(path.join(sourceDir, 'pages')) + fs.ensureDirSync(projectPath) + fs.ensureDirSync(projectClientPath) + fs.ensureDirSync(projectCloudPath) + fs.ensureDirSync(sourceDir) + fs.ensureDirSync(configDir) + fs.ensureDirSync(path.join(sourceDir, 'pages')) creater.template(template, path.join(clientDirName, 'pkg'), path.join(projectClientPath, 'package.json'), { description,