Merge pull request #15 from greym0uth/jg/use-resolver

Use require.resolve for modules
nshen · May 20, 2022 · e8016a3 · e8016a3
2 parents 8ce9d1b + 902cf4f
commit e8016a3
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -56,8 +56,9 @@ function vitePluginWasmPack(
   // 'my_crate_bg.wasm': { path: 'node_modules/my_crate/my_crate_bg.wasm', isNodeModule: true }
   modulePaths.forEach((cratePath) => {
     const wasmFile = wasmFilename(cratePath);
+    const wasmDirectory = path.dirname(require.resolve(cratePath));
     wasmMap.set(wasmFile, {
-      path: path.join('node_modules', cratePath, wasmFile),
+      path: path.join(wasmDirectory, wasmFile),
       isNodeModule: true
     });
   });
@@ -95,7 +96,7 @@ function vitePluginWasmPack(
     async buildStart(_inputOptions) {
       const prepareBuild = async (cratePath: string, isNodeModule: boolean) => {
         const pkgPath = isNodeModule
-          ? path.join('node_modules', cratePath)
+          ? path.dirname(require.resolve(cratePath))
           : path.join(cratePath, pkg);
         const crateName = path.basename(cratePath);
         if (!fs.existsSync(pkgPath)) {
@@ -132,7 +133,10 @@ function vitePluginWasmPack(
          * crateName === 'test'
          */
 
-        const jsPath = path.join('./node_modules', isNodeModule ? cratePath : crateName, jsName);
+        let jsPath = path.join('./node_modules', crateName, jsName);
+        if (isNodeModule) {
+          jsPath = path.join(pkgPath, jsName);
+        }
         const regex = /input = new URL\('(.+)'.+;/g;
         let code = fs.readFileSync(path.resolve(jsPath), { encoding: 'utf-8' });
         code = code.replace(regex, (_match, group1) => {