Replace del with rimraf package (vercel#6411)

Author: dav-is

packages/next/build/webpack/plugins/unlink-file-plugin.js

@@ -1,5 +1,5 @@
 import { join } from 'path'
-import promisify from '../../../lib/promisify'
+import { promisify } from 'util'
 import fs from 'fs'
 import { IS_BUNDLED_PAGE_REGEX } from 'next-server/constants'
 

packages/next/client/source-map-support.js renamed to packages/next/client/source-map-support.ts

@@ -1,20 +1,20 @@
 const filenameRE = /\(([^)]+\.js):(\d+):(\d+)\)$/
 
-export function rewriteStacktrace (e, distDir) {
+export function rewriteStacktrace(e: Error, distDir: string) {
   if (!e || typeof e.stack !== 'string') {
     return
   }
 
   const lines = e.stack.split('\n')
 
-  const result = lines.map((line) => {
+  const result = lines.map((line: string) => {
     return rewriteTraceLine(line, distDir)
   })
 
   e.stack = result.join('\n')
 }
 
-function rewriteTraceLine (trace, distDir) {
+function rewriteTraceLine(trace: string, distDir: string) {
   const m = trace.match(filenameRE)
   if (m == null) {
     return trace

packages/next/export/index.js

@@ -1,4 +1,4 @@
-import del from 'del'
+import rimrafModule from 'rimraf'
 import { cpus } from 'os'
 import { fork } from 'child_process'
 import cp from 'recursive-copy'
@@ -11,6 +11,7 @@ import createProgress from 'tty-aware-progress'
 import { promisify } from 'util'
 
 const mkdirp = promisify(mkdirpModule)
+const rimraf = promisify(rimrafModule)
 
 export default async function (dir, options, configuration) {
   function log (message) {
@@ -52,7 +53,7 @@ export default async function (dir, options, configuration) {
 
   // Initialize the output directory
   const outDir = options.outdir
-  await del(join(outDir, '*'))
+  await rimraf(join(outDir, '*'))
   await mkdirp(join(outDir, '_next', buildId))
 
   // Copy static directory

packages/next/lib/constants.js renamed to packages/next/lib/constants.ts

@@ -61,7 +61,6 @@
     "case-sensitive-paths-webpack-plugin": "2.1.2",
     "chalk": "2.4.2",
     "cross-spawn": "5.1.0",
-    "del": "3.0.0",
     "event-source-polyfill": "0.0.12",
     "find-cache-dir": "2.0.0",
     "find-up": "2.1.0",
@@ -79,6 +78,7 @@
     "react-is": "16.6.3",
     "recursive-copy": "2.0.6",
     "resolve": "1.5.0",
+    "rimraf": "2.6.3",
     "serialize-javascript": "1.4.0",
     "source-map": "0.6.1",
     "strip-ansi": "3.0.1",

packages/next/lib/promisify.js

@@ -2,7 +2,7 @@ import { join, normalize } from 'path'
 import WebpackDevMiddleware from 'webpack-dev-middleware'
 import WebpackHotMiddleware from 'webpack-hot-middleware'
 import errorOverlayMiddleware from './lib/error-overlay-middleware'
-import del from 'del'
+import rimrafModule from 'rimraf'
 import onDemandEntryHandler, { normalizePage } from './on-demand-entry-handler'
 import webpack from 'webpack'
 import getBaseWebpackConfig from '../build/webpack-config'
@@ -14,6 +14,7 @@ import { createPagesMapping, createEntrypoints } from '../build/entries'
 import { watchCompiler } from '../build/output'
 
 const glob = promisify(globModule)
+const rimraf = promisify(rimrafModule)
 
 export async function renderScriptError (res, error) {
   // Asks CDNs and others to not to cache the errored page
@@ -161,7 +162,7 @@ export default class HotReloader {
   }
 
   async clean () {
-    return del(join(this.dir, this.config.distDir), { force: true })
+    return rimraf(join(this.dir, this.config.distDir), { force: true })
   }
 
   async getWebpackConfig () {

packages/next/package.json

@@ -3,7 +3,7 @@ import { EventEmitter } from 'events'
 import { join } from 'path'
 import { parse } from 'url'
 import fs from 'fs'
-import promisify from '../lib/promisify'
+import { promisify } from 'util'
 import globModule from 'glob'
 import { pageNotFoundError } from 'next-server/dist/server/require'
 import { normalizePagePath } from 'next-server/dist/server/normalize-page-path'

packages/next/server/hot-reloader.js

@@ -4207,18 +4207,6 @@ deglob@^2.1.0:
     run-parallel "^1.1.2"
     uniq "^1.0.1"
 
-del@3.0.0, del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
-  dependencies:
-    globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
-
 del@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
@@ -4232,6 +4220,18 @@ del@^2.2.0:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
+    rimraf "^2.2.8"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -10539,7 +10539,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
+rimraf@2, rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==