Reorganize localpack

Author: ehmicky

gulp/utils/localpack-code/main.js

@@ -1,19 +1,9 @@
 // eslint-disable-next-line filenames/match-exported
 'use strict'
 
-const { resolve } = require('path')
-const { unlink, rename } = require('fs')
-const { promisify } = require('util')
-
-const execa = require('execa')
-const tar = require('tar')
-const { remove } = require('fs-extra')
-
-const pUnlink = promisify(unlink)
-const pRename = promisify(rename)
-
 const { getPackageRoot } = require('./root')
 const { getTempDir, cleanTempDir } = require('./temp')
+const { unpack } = require('./unpack')
 const { addDevChecks } = require('./dev_checks')
 
 // Runs `npm pack` then unpack it to `opts.output`
@@ -27,11 +17,13 @@ const localpack = async function({ output } = {}) {
 
   await unpack({ packageRoot, tempDir, output: outputA })
 
-  await addDevChecks({ output: outputA })
-
-  await cleanTempDir({ tempDir })
+  await Promise.all([
+    addDevChecks({ output: outputA }),
+    cleanTempDir({ tempDir }),
+  ])
 }
 
+// Retrieve where package is unpacked
 const getOutput = function({
   packageRoot,
   output = `${packageRoot}/${DEFAULT_OUTPUT}`,
@@ -41,28 +33,4 @@ const getOutput = function({
 
 const DEFAULT_OUTPUT = 'localpack'
 
-// Runs `npm pack` and unpack it to `output`
-const unpack = async function({ packageRoot, tempDir, output }) {
-  // We use `npm pack` instead of `require('./npm/lib/pack')`:
-  //  - to use the same `npm` version as the one globally installed,
-  //    so it mirrors what will be published
-  //  - to make code less likely to change with npm internal changes
-  // However this means this next line is 4 times slower (because it creates
-  // a new process)
-  const { stdout } = await execa.shell(
-    `npm pack --silent --no-update-notifier ${packageRoot}`,
-    { stderr: 'inherit', cwd: tempDir },
-  )
-  const tarball = resolve(tempDir, stdout)
-
-  await tar.x({ file: tarball, cwd: tempDir })
-
-  await pUnlink(tarball)
-
-  // Is silent when `output` does not exist
-  await remove(output)
-
-  await pRename(`${tempDir}/package`, output)
-}
-
 module.exports = localpack

gulp/utils/localpack-code/temp.js

@@ -7,7 +7,7 @@ const { promisify } = require('util')
 const pRmdir = promisify(rmdir)
 const pMkdir = promisify(mkdir)
 
-// `tempDir` is `/{tmpdir()}/localpack/RANDOM_ID`
+// `tempDir` is `/{tmpdir()}/localpack-RANDOM_ID`
 const getTempDir = async function() {
   const osTempDir = tmpdir()
   const randomId = getRandomId()

gulp/utils/localpack-code/unpack.js

@@ -0,0 +1,45 @@
+'use strict'
+
+const { resolve } = require('path')
+const { unlink, rename } = require('fs')
+const { promisify } = require('util')
+
+const execa = require('execa')
+const tar = require('tar')
+const { remove } = require('fs-extra')
+
+const pUnlink = promisify(unlink)
+const pRename = promisify(rename)
+
+// Runs `npm pack` and unpack it to `output`
+const unpack = async function({ packageRoot, tempDir, output }) {
+  await Promise.all([
+    tempUnpack({ packageRoot, tempDir }),
+    // Is silent when `output` does not exist
+    remove(output),
+  ])
+
+  await pRename(`${tempDir}/package`, output)
+}
+
+const tempUnpack = async function({ packageRoot, tempDir }) {
+  // We use `npm pack` instead of `require('./npm/lib/pack')`:
+  //  - to use the same `npm` version as the one globally installed,
+  //    so it mirrors what will be published
+  //  - to make code less likely to change with npm internal changes
+  // However this means this next line is 4 times slower (because it creates
+  // a new process)
+  const { stdout } = await execa.shell(
+    `npm pack --silent --no-update-notifier ${packageRoot}`,
+    { stderr: 'inherit', cwd: tempDir },
+  )
+  const tarball = resolve(tempDir, stdout)
+
+  await tar.x({ file: tarball, cwd: tempDir })
+
+  await pUnlink(tarball)
+}
+
+module.exports = {
+  unpack,
+}