Duplicate getPluginPath()

ehmicky · Feb 13, 2022 · b965217 · b965217
1 parent cebd241
commit b965217
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/config/load/resolvers.js b/src/config/load/resolvers.js
@@ -1,4 +1,6 @@
-import { getPluginPath } from '../plugin/lib/import.js'
+import { createRequire } from 'module'
+
+import { wrapError } from '../../error/wrap.js'
 
 // The `config` can be:
 //  - a file path
@@ -31,8 +33,19 @@ const isNpmResolver = function (configOpt) {
 
 export const CONFIG_NPM_PREFIX = 'spyd-config-'
 
+// TODO: use import.meta.resolve() when available
 const resolveNpm = function (configOpt, base) {
-  return getPluginPath(configOpt, base)
+  const { resolve } = createRequire(new URL(base, import.meta.url))
+
+  try {
+    return resolve(configOpt)
+  } catch (error) {
+    throw wrapError(
+      error,
+      `must be a valid package name: "${configOpt}".
+This Node module was not found, please ensure it is installed.\n\n`,
+    )
+  }
 }
 
 // Additional resolvers.

diff --git a/src/config/plugin/lib/import.js b/src/config/plugin/lib/import.js
@@ -75,7 +75,7 @@ const safeGetPluginPath = function (id, propName, modulePrefix) {
 }
 
 // TODO: use import.meta.resolve() when available
-export const getPluginPath = function (moduleName, base) {
+const getPluginPath = function (moduleName, base) {
   const { resolve } = createRequire(new URL(base, import.meta.url))
 
   try {