Add impoved ESM loading of contributors

index.js

@@ -245,12 +245,12 @@ async function indexContributors(cwd, contributors) {
       path = resolve.sync(contributors, {basedir: process.cwd()})
     }
 
-    const exported = (await import(path)).default
+    const exported = await import(path)
 
-    if (Array.isArray(exported)) {
-      contributors = exported
-    } else if (typeof exported === 'object' && exported !== null) {
-      contributors = exported.contributors || exported.default
+    if (Array.isArray(exported.contributors)) {
+      contributors = exported.contributors
+    } else if (Array.isArray(exported.default)) {
+      contributors = exported.default
     }
   }
 

readme.md

@@ -91,8 +91,8 @@ To augment user metadata, configure the plugin in your `package.json`:
 Where `contributors` is either:
 
 *   An array in the form of `[{ email, name, … }, … ]`;
-*   A module id or path to a file that exports `contributors` or
-    `{ contributors }`.
+*   A module id or path to a file that exports `contributors` as either the
+    default export or as a `contributors` named export specifier.
 
 Note that `remark-git-contributors` excludes people that are not in Git history.
 This way the `contributors` metadata can be reused in multiple projects.

test/fixture/contributors-default.js

@@ -1 +1,5 @@
-exports.default = [{email: 'test@localhost', github: 'test', twitter: 'test'}]
+const contributors = [
+  {email: 'test@localhost', github: 'test', twitter: 'test'}
+]
+
+export default contributors

test/fixture/contributors-duplicates.js

@@ -1 +1,3 @@
-exports.default = ['test <test@localhost>', 'test two <test@localhost>']
+const contributors = ['test <test@localhost>', 'test two <test@localhost>']
+
+export default contributors

test/fixture/contributors-invalid-exports.js

@@ -1 +1,3 @@
-module.exports = false
+const contributors = false
+
+export default contributors

test/fixture/contributors-main.js

@@ -1 +1,5 @@
-module.exports = [{email: 'test@localhost', github: 'test', twitter: 'test'}]
+const contributors = [
+  {email: 'test@localhost', github: 'test', twitter: 'test'}
+]
+
+export default contributors

test/fixture/contributors-named.js

@@ -1,3 +1,3 @@
-exports.contributors = [
+export const contributors = [
   {email: 'test@localhost', github: 'test', twitter: 'test'}
 ]

test/fixture/contributors-string.js

@@ -1 +1,3 @@
-exports.default = ['test <test@localhost>']
+const contributors = ['test <test@localhost>']
+
+export default contributors

test/index.js

@@ -391,21 +391,20 @@ function run(fixture, options_, test) {
     execFileSync('git', ['init', '.'], {cwd, stdio: 'ignore'})
   }
 
-  if (pkgAuthor || pkgContributors || pkgBroken) {
-    let pkg = JSON.stringify({
-      name: 'example',
-      private: true,
-      author: pkgAuthor,
-      contributors: pkgContributors
-    })
-
-    if (pkgBroken) {
-      pkg = pkg.slice(1)
-    }
+  let pkg = JSON.stringify({
+    name: 'example',
+    type: 'module',
+    private: true,
+    author: pkgAuthor,
+    contributors: pkgContributors
+  })
 
-    fs.writeFileSync(path.join(cwd, 'package.json'), pkg)
+  if (pkgBroken) {
+    pkg = pkg.slice(1)
   }
 
+  fs.writeFileSync(path.join(cwd, 'package.json'), pkg)
+
   let index = -1
   while (++index < gitUsers.length) {
     const [name, email] = gitUsers[index]