refactor: use fs-extra

Author: yyx990803

lib/build.js

@@ -1,17 +1,12 @@
 module.exports = async function build (sourceDir, cliOptions = {}) {
  process.env.NODE_ENV = 'production'
 
- const fs = require('fs')
+ const fs = require('fs-extra')
  const path = require('path')
  const chalk = require('chalk')
  const webpack = require('webpack')
  const readline = require('readline')
- const { promisify } = require('util')
  const escape = require('escape-html')
- const rimraf = promisify(require('rimraf'))
- const mkdirp = promisify(require('mkdirp'))
- const readFile = promisify(fs.readFile)
- const writeFile = promisify(fs.writeFile)
 
  const prepare = require('./prepare')
  const createClientConfig = require('./webpack/createClientConfig')
@@ -26,7 +21,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
  }
 
  const { outDir } = options
- await rimraf(outDir)
+ await fs.remove(outDir)
 
  let clientConfig = createClientConfig(options, cliOptions).toConfig()
  let serverConfig = createServerConfig(options, cliOptions).toConfig()
@@ -48,7 +43,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
  const clientManifest = require(path.resolve(outDir, 'manifest/client.json'))
 
  // remove manifests after loading them.
- await rimraf(path.resolve(outDir, 'manifest'))
+ await fs.remove(path.resolve(outDir, 'manifest'))
 
  // find and remove empty style chunk caused by
  // https://github.com/webpack-contrib/mini-css-extract-plugin/issues/85
@@ -60,7 +55,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
  clientManifest,
  runInNewContext: false,
  inject: false,
- template: fs.readFileSync(path.resolve(__dirname, 'app/index.ssr.html'), 'utf-8')
+ template: await fs.readFile(path.resolve(__dirname, 'app/index.ssr.html'), 'utf-8')
  })
 
  // pre-render head tags from user config
@@ -154,8 +149,8 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
  }
  const filename = pagePath.replace(/\/$/, '/index.html').replace(/^\//, '')
  const filePath = path.resolve(outDir, filename)
- await mkdirp(path.dirname(filePath))
- await writeFile(filePath, html)
+ await fs.ensureDir(path.dirname(filePath))
+ await fs.writeFile(filePath, html)
  }
 
  function renderPageMeta (meta) {
@@ -174,15 +169,15 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
  return /styles\.\w{8}\.js$/.test(a.name)
  })
  const styleChunkPath = path.resolve(outDir, styleChunk.name)
- const styleChunkContent = await readFile(styleChunkPath, 'utf-8')
- await rimraf(styleChunkPath)
+ const styleChunkContent = await fs.readFile(styleChunkPath, 'utf-8')
+ await fs.remove(styleChunkPath)
  // prepend it to app.js.
  // this is necessary for the webpack runtime to work properly.
  const appChunk = stats.children[0].assets.find(a => {
  return /app\.\w{8}\.js$/.test(a.name)
  })
  const appChunkPath = path.resolve(outDir, appChunk.name)
- const appChunkContent = await readFile(appChunkPath, 'utf-8')
- await writeFile(appChunkPath, styleChunkContent + appChunkContent)
+ const appChunkContent = await fs.readFile(appChunkPath, 'utf-8')
+ await fs.writeFile(appChunkPath, styleChunkContent + appChunkContent)
  }
 }

lib/prepare.js

@@ -1,22 +1,18 @@
-const fs = require('fs')
+const fs = require('fs-extra')
 const path = require('path')
 const globby = require('globby')
-const mkdirp = require('mkdirp')
-const { promisify } = require('util')
-const readFile = promisify(fs.readFile)
-const writeFile = promisify(fs.writeFile)
 const yaml = require('yaml-front-matter')
 const tempPath = path.resolve(__dirname, 'app/.temp')
 const { inferTitle, extractHeaders } = require('./util')
 
-mkdirp(tempPath)
+fs.ensureDirSync(tempPath)
 
 const tempCache = new Map()
 async function writeTemp (file, content) {
  // cache write to avoid hitting the dist if it didn't change
  const cached = tempCache.get(file)
  if (cached !== content) {
- await writeFile(path.join(tempPath, file), content)
+ await fs.writeFile(path.join(tempPath, file), content)
  tempCache.set(file, content)
  }
 }
@@ -150,7 +146,7 @@ async function resolveOptions (sourceDir) {
  }
 
  // extract yaml frontmatter
- const content = await readFile(path.resolve(sourceDir, file), 'utf-8')
+ const content = await fs.readFile(path.resolve(sourceDir, file), 'utf-8')
  const frontmatter = yaml.loadFront(content)
  // infer title
  const title = inferTitle(frontmatter)

package.json

@@ -54,6 +54,7 @@
  "es6-promise": "^4.2.4",
  "escape-html": "^1.0.3",
  "file-loader": "^1.1.11",
+ "fs-extra": "^5.0.0",
  "globby": "^8.0.1",
  "html-webpack-plugin": "^3.2.0",
  "koa-connect": "^2.0.1",
@@ -67,15 +68,13 @@
  "markdown-it-emoji": "^1.4.0",
  "markdown-it-table-of-contents": "^0.3.3",
  "mini-css-extract-plugin": "^0.4.0",
- "mkdirp": "^0.5.1",
  "nprogress": "^0.2.0",
  "object-assign": "^4.1.1",
  "optimize-css-assets-webpack-plugin": "^4.0.0",
  "portfinder": "^1.0.13",
  "postcss-loader": "^2.1.3",
  "prismjs": "^1.13.0",
  "register-service-worker": "^1.2.0",
- "rimraf": "^2.6.2",
  "semver": "^5.5.0",
  "stylus": "^0.54.5",
  "stylus-loader": "^3.0.2",

yarn.lock

@@ -2021,6 +2021,14 @@ 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-write-stream-atomic@^1.0.8:
  version "1.0.10"
  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"