refactor: use fs-extra

Author: yyx990803

package.json

@@ -55,6 +55,7 @@
     "puppeteer": "^1.0.0",
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
+    "rimraf": "^2.6.2",
     "yorkie": "^1.0.2"
   }
 }

packages/@vue/cli-service-global/__tests__/globalService.spec.js

@@ -1,18 +1,17 @@
 jest.setTimeout(40000)
 
-const fs = require('fs')
+const fs = require('fs-extra')
 const path = require('path')
 const portfinder = require('portfinder')
 const { createServer } = require('http-server')
-const mkdirp = require('mkdirp')
 const execa = require('execa')
 const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
 const cwd = path.resolve(__dirname, 'temp')
 const binPath = require.resolve('@vue/cli/bin/vue')
 const sleep = n => new Promise(resolve => setTimeout(resolve, n))
-const write = (file, content) => fs.writeFileSync(path.join(cwd, file), content)
+const write = (file, content) => fs.writeFile(path.join(cwd, file), content)
 
 const entryVue = fs.readFileSync(path.resolve(__dirname, 'entry.vue'), 'utf-8')
 
@@ -23,11 +22,11 @@ import App from './Other.vue'
 new Vue({ render: h => h(App) }).$mount('#app')
 `.trim()
 
-beforeAll(() => {
-  mkdirp.sync(cwd)
-  write('App.vue', entryVue)
-  write('Other.vue', entryVue)
-  write('foo.js', entryJs)
+beforeAll(async () => {
+  await fs.ensureDir(cwd)
+  await write('App.vue', entryVue)
+  await write('Other.vue', entryVue)
+  await write('foo.js', entryJs)
 })
 
 test('global serve', async () => {

packages/@vue/cli-service-global/__tests__/globalServiceBuildLib.spec.js

@@ -1,22 +1,21 @@
 jest.setTimeout(20000)
 
-const fs = require('fs')
+const fs = require('fs-extra')
 const path = require('path')
 const portfinder = require('portfinder')
 const { createServer } = require('http-server')
-const mkdirp = require('mkdirp')
 const execa = require('execa')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
 const cwd = path.resolve(__dirname, 'temp')
 const binPath = require.resolve('@vue/cli/bin/vue')
-const write = (file, content) => fs.writeFileSync(path.join(cwd, file), content)
+const write = (file, content) => fs.writeFile(path.join(cwd, file), content)
 
 const entryVue = fs.readFileSync(path.resolve(__dirname, 'entry.vue'), 'utf-8')
 
-beforeAll(() => {
-  mkdirp.sync(cwd)
-  write('testLib.vue', entryVue)
+beforeAll(async () => {
+  await fs.ensureDir(cwd)
+  await write('testLib.vue', entryVue)
 })
 
 let server, browser, page

packages/@vue/cli-service-global/__tests__/globalServiceBuildWc.spec.js

@@ -1,22 +1,21 @@
 jest.setTimeout(20000)
 
-const fs = require('fs')
+const fs = require('fs-extra')
 const path = require('path')
 const portfinder = require('portfinder')
 const { createServer } = require('http-server')
-const mkdirp = require('mkdirp')
 const execa = require('execa')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
 const cwd = path.resolve(__dirname, 'temp')
 const binPath = require.resolve('@vue/cli/bin/vue')
-const write = (file, content) => fs.writeFileSync(path.join(cwd, file), content)
+const write = (file, content) => fs.writeFile(path.join(cwd, file), content)
 
 const entryVue = fs.readFileSync(path.resolve(__dirname, 'entry.vue'), 'utf-8')
 
-beforeAll(() => {
-  mkdirp.sync(cwd)
-  write('my-wc.vue', entryVue)
+beforeAll(async () => {
+  await fs.ensureDir(cwd)
+  await write('my-wc.vue', entryVue)
 })
 
 let server, browser, page

packages/@vue/cli-service/lib/commands/build/index.js

@@ -30,10 +30,9 @@ module.exports = (api, options) => {
 
     api.setMode(args.mode)
 
-    const fs = require('fs')
+    const fs = require('fs-extra')
     const path = require('path')
     const chalk = require('chalk')
-    const rimraf = require('rimraf')
     const webpack = require('webpack')
     const formatStats = require('./formatStats')
     const {
@@ -124,7 +123,7 @@ module.exports = (api, options) => {
     }
 
     return new Promise((resolve, reject) => {
-      rimraf(targetDir, err => {
+      fs.remove(targetDir, err => {
         if (err) {
           return reject(err)
         }

packages/@vue/cli-service/package.json

@@ -37,6 +37,7 @@
     "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^1.1.11",
     "friendly-errors-webpack-plugin": "^1.6.1",
+    "fs-extra": "^5.0.0",
     "get-value": "^3.0.1",
     "globby": "^8.0.1",
     "html-webpack-plugin": "^3.2.0",
@@ -49,7 +50,6 @@
     "portfinder": "^1.0.13",
     "postcss-loader": "^2.1.1",
     "read-pkg": "^3.0.0",
-    "rimraf": "^2.6.2",
     "semver": "^5.5.0",
     "slash": "^2.0.0",
     "source-map-url": "^0.4.0",

packages/@vue/cli-test-utils/createTestProject.js

@@ -1,19 +1,14 @@
-const fs = require('fs')
+const fs = require('fs-extra')
 const path = require('path')
 const execa = require('execa')
-const { promisify } = require('util')
-const readFile = promisify(fs.readFile)
-const writeFile = promisify(fs.writeFile)
-const rmFile = promisify(fs.unlink)
-const mkdirp = promisify(require('mkdirp'))
 
 module.exports = function createTestProject (name, preset, cwd, initGit) {
   cwd = cwd || path.resolve(__dirname, '../../test')
 
   const projectRoot = path.resolve(cwd, name)
 
   const read = file => {
-    return readFile(path.resolve(projectRoot, file), 'utf-8')
+    return fs.readFile(path.resolve(projectRoot, file), 'utf-8')
   }
 
   const has = file => {
@@ -23,11 +18,11 @@ module.exports = function createTestProject (name, preset, cwd, initGit) {
   const write = (file, content) => {
     const targetPath = path.resolve(projectRoot, file)
     const dir = path.dirname(targetPath)
-    return mkdirp(dir).then(() => writeFile(targetPath, content))
+    return fs.ensureDir(dir).then(() => fs.writeFile(targetPath, content))
   }
 
   const rm = file => {
-    return rmFile(path.resolve(projectRoot, file))
+    return fs.remove(path.resolve(projectRoot, file))
   }
 
   const run = (command, args) => {

packages/@vue/cli/__tests__/Generator.spec.js

@@ -1,17 +1,16 @@
 jest.mock('fs')
 
-const fs = require('fs')
+const fs = require('fs-extra')
 const path = require('path')
 const Generator = require('../lib/Generator')
 const { logs } = require('@vue/cli-shared-utils')
 const stringifyJS = require('javascript-stringify')
 
 // prepare template fixtures
-const mkdirp = require('mkdirp')
 const templateDir = path.resolve(__dirname, 'template')
-mkdirp.sync(templateDir)
+fs.ensureDirSync(templateDir)
 fs.writeFileSync(path.resolve(templateDir, 'foo.js'), 'foo(<%- options.n %>)')
-mkdirp.sync(path.resolve(templateDir, 'bar'))
+fs.ensureDirSync(path.resolve(templateDir, 'bar'))
 fs.writeFileSync(path.resolve(templateDir, 'bar/bar.js'), 'bar(<%- m %>)')
 
 fs.writeFileSync(path.resolve(templateDir, 'replace.js'), `

packages/@vue/cli/lib/create.js

@@ -1,7 +1,6 @@
-const fs = require('fs')
+const fs = require('fs-extra')
 const path = require('path')
 const chalk = require('chalk')
-const rimraf = require('rimraf')
 const inquirer = require('inquirer')
 const Creator = require('./Creator')
 const clearConsole = require('./util/clearConsole')
@@ -28,7 +27,7 @@ async function create (projectName, options) {
 
   if (fs.existsSync(targetDir)) {
     if (options.force) {
-      rimraf.sync(targetDir)
+      await fs.remove(targetDir)
     } else {
       await clearConsole()
       if (inCurrent) {
@@ -58,7 +57,7 @@ async function create (projectName, options) {
         if (!action) {
           return
         } else if (action === 'overwrite') {
-          rimraf.sync(targetDir)
+          await fs.remove(targetDir)
         }
       }
     }

packages/@vue/cli/lib/util/linkBin.js

@@ -1,12 +1,8 @@
 // cross-platform executable link, mostly for Windows
 
-const fs = require('fs')
+const fs = require('fs-extra')
 const path = require('path')
 const { promisify } = require('util')
-
-const chmod = promisify(fs.chmod)
-const symlink = promisify(fs.symlink)
-const mkdirp = promisify(require('mkdirp'))
 const cmdShim = promisify(require('cmd-shim'))
 
 exports.linkBin = async (src, dest) => {
@@ -18,8 +14,8 @@ exports.linkBin = async (src, dest) => {
     // src will not be modified
     await cmdShim(src, dest)
   } else {
-    await mkdirp(path.dirname(dest))
-    await symlink(src, dest)
-    await chmod(dest, '755')
+    await fs.ensureDir(path.dirname(dest))
+    await fs.symlink(src, dest)
+    await fs.chmod(dest, '755')
   }
 }

packages/@vue/cli/lib/util/writeFileTree.js

@@ -1,18 +1,15 @@
-const fs = require('fs')
+const fs = require('fs-extra')
 const path = require('path')
-const { promisify } = require('util')
-const unlink = promisify(fs.unlink)
-const mkdirp = promisify(require('mkdirp'))
-const write = promisify(fs.writeFile)
 
-async function deleteRemovedFiles (directory, newFiles, previousFiles) {
+function deleteRemovedFiles (directory, newFiles, previousFiles) {
   // get all files that are not in the new filesystem and are still existing
   const filesToDelete = Object.keys(previousFiles)
     .filter(filename => !newFiles[filename])
 
   // delete each of these files
-  const unlinkPromises = filesToDelete.map(filename => unlink(path.join(directory, filename)))
-  return Promise.all(unlinkPromises)
+  return Promise.all(filesToDelete.map(filename => {
+    return fs.unlink(path.join(directory, filename))
+  }))
 }
 
 module.exports = async function writeFileTree (dir, files, previousFiles) {
@@ -24,7 +21,7 @@ module.exports = async function writeFileTree (dir, files, previousFiles) {
   }
   return Promise.all(Object.keys(files).map(async (name) => {
     const filePath = path.join(dir, name)
-    await mkdirp(path.dirname(filePath))
-    await write(filePath, files[name])
+    await fs.ensureDir(path.dirname(filePath))
+    await fs.writeFile(filePath, files[name])
   }))
 }

packages/@vue/cli/package.json

@@ -35,6 +35,7 @@
     "download-git-repo": "^1.0.2",
     "ejs": "^2.5.7",
     "execa": "^0.8.0",
+    "fs-extra": "^5.0.0",
     "globby": "^8.0.1",
     "import-global": "^0.1.0",
     "inquirer": "^4.0.1",
@@ -44,12 +45,10 @@
     "klaw-sync": "^3.0.2",
     "lodash.clonedeep": "^4.5.0",
     "minimist": "^1.2.0",
-    "mkdirp": "^0.5.1",
     "recast": "^0.13.0",
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
     "resolve": "^1.5.0",
-    "rimraf": "^2.6.2",
     "semver": "^5.4.1",
     "slash": "^1.0.0",
     "validate-npm-package-name": "^3.0.0",

yarn.lock

@@ -4324,6 +4324,14 @@ [email protected], fs-extra@^4.0.1, fs-extra@^4.0.2:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-extra@~0.26.5:
   version "0.26.7"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"