Update dependencies

* Update to [`vfile@5`](https://github.com/vfile/vfile/releases/tag/5.0.0).
  Notable: Rename `vfile.contents` -> `vfile.value`
* Update to [`load-plugin@4`](https://github.com/wooorm/load-plugin/releases/tag/4.0.0)
  Notable: Node’s new module resolution is now used: before you could
  use `x` to load `x.js` or `x/index.js`, now you must be explicit.
* Update to [`unist-util-inspect@6`](https://github.com/syntax-tree/unist-util-inspect/releases/tag/6.0.0)
  and [`unist-util-inspect@7`](https://github.com/syntax-tree/unist-util-inspect/releases/tag/7.0.0)
  Notable: Using `inspect: true` now gives improved insights

Author: wooorm

lib/configuration.js

@@ -2,9 +2,9 @@ import path from 'path'
 import jsYaml from 'js-yaml'
 import parseJson from 'parse-json'
 import createDebug from 'debug'
-import loadPlugin from 'load-plugin'
+import {resolvePlugin} from 'load-plugin'
 import isPlainObj from 'is-plain-obj'
-import fault from 'fault'
+import {fault} from 'fault'
 import {FindUp} from './find-up.js'
 
 const debug = createDebug('unified-engine:configuration')
@@ -81,26 +81,26 @@ async function create(buf, filePath) {
   const fn = (filePath && loaders[path.extname(filePath)]) || defaultLoader
   const options = {prefix: this.pluginPrefix, cwd: this.cwd}
   const result = {settings: {}, plugins: []}
-  let contents
+  let value
 
   if (filePath) {
-    contents = await Reflect.apply(fn, this, arguments)
+    value = await fn.call(this, buf, filePath)
   }
 
-  if (this.configTransform && contents !== undefined) {
-    contents = this.configTransform(contents, filePath)
+  if (this.configTransform && value !== undefined) {
+    value = this.configTransform(value, filePath)
   }
 
   // Exit if we did find a `package.json`, but it does not have configuration.
   if (
     buf &&
-    contents === undefined &&
+    value === undefined &&
     path.basename(filePath) === 'package.json'
   ) {
     return
   }
 
-  if (contents === undefined) {
+  if (value === undefined) {
     if (this.defaultConfig) {
       await merge(
         result,
@@ -111,7 +111,7 @@ async function create(buf, filePath) {
   } else {
     await merge(
       result,
-      contents,
+      value,
       Object.assign({}, options, {root: path.dirname(filePath)})
     )
   }
@@ -126,7 +126,7 @@ function loadScriptOrModule(_, filePath) {
 }
 
 function loadYaml(buf, filePath) {
-  return jsYaml.safeLoad(buf, {filename: path.basename(filePath)})
+  return jsYaml.load(buf, {filename: path.basename(filePath)})
 }
 
 function loadJson(buf, filePath) {
@@ -201,34 +201,37 @@ async function merge(target, raw, options) {
   }
 
   async function addModule(id, value) {
-    let fp = loadPlugin.resolve(id, {cwd: options.root, prefix: options.prefix})
-    let result
-
-    if (fp) {
-      result = await loadFromAbsolutePath(fp, options.root)
-
-      try {
-        if (typeof result === 'function') {
-          addPlugin(result, value)
-        } else {
-          await merge(
-            target,
-            result,
-            Object.assign({}, options, {root: path.dirname(fp)})
-          )
-        }
-      } catch {
-        throw fault(
-          'Error: Expected preset or plugin, not %s, at `%s`',
+    let fp
+
+    try {
+      fp = await resolvePlugin(id, {
+        cwd: options.root,
+        prefix: options.prefix
+      })
+    } catch (error) {
+      addPlugin(() => {
+        throw fault('Could not find module `%s`\n%s', id, error.stack)
+      }, value)
+      return
+    }
+
+    const result = await loadFromAbsolutePath(fp, options.root)
+
+    try {
+      if (typeof result === 'function') {
+        addPlugin(result, value)
+      } else {
+        await merge(
+          target,
           result,
-          path.relative(options.root, fp)
+          Object.assign({}, options, {root: path.dirname(fp)})
         )
       }
-    } else {
-      fp = path.relative(options.cwd, path.resolve(options.root, id))
-      addPlugin(
-        failingModule(fp, new Error('Could not find module `' + id + '`')),
-        value
+    } catch {
+      throw fault(
+        'Error: Expected preset or plugin, not %s, at `%s`',
+        result,
+        path.relative(options.root, fp)
       )
     }
   }
@@ -262,26 +265,13 @@ function find(entries, plugin) {
   }
 }
 
-function failingModule(id, error) {
-  const cache = failingModule.cache || (failingModule.cache = {})
-  const submodule = own.call(cache, id) ? cache[id] : (cache[id] = fail)
-  return submodule
-  function fail() {
-    throw error
-  }
-}
-
 async function loadFromAbsolutePath(fp, base) {
   let result
 
   try {
     result = (await import(fp)).default
   } catch (error) {
-    throw fault(
-      'Cannot parse script `%s`\n%s',
-      path.relative(base, fp),
-      error.stack
-    )
+    throw fault('Cannot import `%s`\n%s', path.relative(base, fp), error.stack)
   }
 
   if (result && typeof result === 'object' && result.__esModule) {

lib/file-pipeline/configure.js

@@ -1,5 +1,5 @@
 import createDebug from 'debug'
-import statistics from 'vfile-statistics'
+import {statistics} from 'vfile-statistics'
 import isEmpty from 'is-empty'
 
 const debug = createDebug('unified-engine:file-pipeline:configure')