fix: resolve wxt modules from the root

packages/wxt/package.json

@@ -104,6 +104,7 @@
     "get-port-please": "^3.1.2",
     "giget": "^1.2.3",
     "hookable": "^5.5.3",
+    "import-meta-resolve": "^4.1.0",
     "is-wsl": "^3.1.0",
     "jiti": "^1.21.6",
     "json5": "^2.2.3",

packages/wxt/src/core/resolve-config.ts

@@ -1,5 +1,5 @@
 import { loadConfig } from 'c12';
-import { createRequire } from 'node:module';
+import { resolve as esmResolve } from 'import-meta-resolve';
 import {
   InlineConfig,
   ResolvedConfig,
@@ -29,6 +29,7 @@ import { getEslintVersion } from './utils/eslint';
 import { safeStringToNumber } from './utils/number';
 import { loadEnv } from './utils/env';
 import { getPort } from 'get-port-please';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 
 /**
  * Given an inline config, discover the config file if necessary, merge the results, resolve any
@@ -157,10 +158,7 @@ export async function resolveConfig(
   }
 
   const userModules = await resolveWxtUserModules(
-    path.resolve(
-      root,
-      inlineConfig.configFile ? path.dirname(inlineConfig.configFile) : '.',
-    ),
+    root,
     modulesDir,
     mergedConfig.modules,
   );
@@ -426,17 +424,21 @@ async function getUnimportEslintOptions(
  * Returns the path to `node_modules/wxt`.
  */
 function resolveWxtModuleDir() {
-  // TODO: Use this once we're fully running in ESM, see https://github.com/wxt-dev/wxt/issues/277
-  // const url = import.meta.resolve('wxt', import.meta.url);
-  // resolve() returns the "wxt/dist/index.mjs" file, not the package's root
-  // directory, which we want to return from this function.
-  // return path.resolve(fileURLToPath(url), '../..');
-
-  const nodeRequire = globalThis.require ?? createRequire(import.meta.url);
-
-  // resolve() returns the "wxt/dist/index.mjs" file, not the package's root
+  // TODO: Drop the __filename expression once we're fully running in ESM
+  // (see https://github.com/wxt-dev/wxt/issues/277)
+  const importer =
+    typeof __filename === 'string'
+      ? pathToFileURL(__filename).href
+      : import.meta.url;
+
+  // TODO: Switch to import.meta.resolve() once the parent argument is unflagged
+  // (e.g. --experimental-import-meta-resolve) and all Node.js versions we support
+  // have it.
+  const url = esmResolve('wxt', importer);
+
+  // esmResolve() returns the "wxt/dist/index.mjs" file, not the package's root
   // directory, which we want to return from this function.
-  return path.resolve(nodeRequire.resolve('wxt'), '../..');
+  return path.resolve(fileURLToPath(url), '../..');
 }
 
 async function isDirMissing(dir: string) {
@@ -481,18 +483,20 @@ export async function mergeBuilderConfig(
 }
 
 export async function resolveWxtUserModules(
-  rootDir: string,
+  root: string,
   modulesDir: string,
   modules: string[] = [],
 ): Promise<WxtModuleWithMetadata<any>[]> {
-  const nodeRequire = createRequire(path.join(rootDir, 'index.js'));
+  const importer = pathToFileURL(path.join(root, 'index.js')).href;
 
   // Resolve node_modules modules
   const npmModules = await Promise.all<WxtModuleWithMetadata<any>>(
     modules.map(async (moduleId) => {
-      const resolvedModuleId = nodeRequire.resolve(moduleId);
+      // Resolve before importing to allow for a local WXT clone to be
+      // symlinked into a project.
+      const resolvedModulePath = esmResolve(moduleId, importer);
       const mod: { default: WxtModule<any> } = await import(
-        /* @vite-ignore */ resolvedModuleId
+        /* @vite-ignore */ resolvedModulePath
       );
       if (mod.default == null) {
         throw Error('Module missing default export: ' + moduleId);