@dcoder-x/plugin-shared 0.1.10 → 0.1.11

package/dist/extractors/ComponentExtractor.js

@@ -97,8 +97,13 @@ class ComponentExtractor {
         return this.walkRollupGraph(entryFilePath, this.source.moduleGraph);
     }
     walkWebpackGraph(entryFilePath, compilation) {
+        // Normalise to relative forward-slash paths so visited keys and injectedMap
+        // keys are consistent across macOS and Windows.
+        const toRelFwd = (p) => path_1.default.isAbsolute(p)
+            ? path_1.default.relative(process.cwd(), p).replace(/\\/g, '/')
+            : p.replace(/\\/g, '/');
         const visited = new Set();
-        const queue = [entryFilePath];
+        const queue = [toRelFwd(entryFilePath)];
         while (queue.length > 0) {
             const current = queue.shift();
             if (visited.has(current))
@@ -109,26 +114,31 @@ class ComponentExtractor {
             if (mod) {
                 for (const depPath of this.getWebpackDependencyPaths(compilation, mod)) {
                     if (depPath && !depPath.includes('node_modules')) {
-                        queue.push(depPath);
+                        queue.push(toRelFwd(depPath));
                         queuedFromWebpackGraph = true;
                     }
                 }
             }
             // Fallback for webpack variants where moduleGraph helpers are unavailable.
             if (!queuedFromWebpackGraph) {
+                // getFileImportPaths resolves to absolute paths via resolveImportFile;
+                // normalise them before queuing.
                 for (const depPath of this.getFileImportPaths(current)) {
                     if (depPath && !depPath.includes('node_modules')) {
-                        queue.push(depPath);
+                        queue.push(toRelFwd(depPath));
                     }
                 }
             }
         }
         return Array.from(visited);
     }
-    findWebpackModule(compilation, filePath) {
+    findWebpackModule(compilation, relFilePath) {
+        // relFilePath is already a relative forward-slash path; convert to the
+        // absolute path that webpack stores so its graph lookup succeeds.
+        const absFilePath = path_1.default.resolve(process.cwd(), relFilePath);
         const graph = compilation?.moduleGraph;
         if (graph?.getModuleByIdentifier) {
-            const byIdentifier = graph.getModuleByIdentifier(filePath);
+            const byIdentifier = graph.getModuleByIdentifier(absFilePath);
             if (byIdentifier)
                 return byIdentifier;
         }
@@ -139,10 +149,10 @@ class ComponentExtractor {
                 : [];
         for (const mod of modules) {
             const resource = normalizeModulePath(mod?.resource || mod?.userRequest);
-            if (resource === filePath)
+            if (resource === absFilePath)
                 return mod;
             const id = normalizeModulePath(typeof mod?.identifier === 'function' ? mod.identifier() : mod?.id);
-            if (id === filePath)
+            if (id === absFilePath)
                 return mod;
         }
         return null;
@@ -226,8 +236,13 @@ class ComponentExtractor {
         return resolved;
     }
     walkRollupGraph(entryFilePath, graph) {
+        // Normalise the entry to a relative forward-slash path so it matches the
+        // keys stored by ClippyVitePlugin (which also normalises to relative).
+        const toRelFwd = (p) => path_1.default.isAbsolute(p)
+            ? path_1.default.relative(process.cwd(), p).replace(/\\/g, '/')
+            : p.replace(/\\/g, '/');
         const visited = new Set();
-        const queue = [entryFilePath];
+        const queue = [toRelFwd(entryFilePath)];
         while (queue.length > 0) {
             const current = queue.shift();
             if (visited.has(current))
@@ -237,9 +252,9 @@ class ComponentExtractor {
             if (!mod)
                 continue;
             for (const importId of mod.importedIds) {
-                const importPath = normalizeModulePath(importId, current);
-                if (importPath && !importPath.includes('node_modules')) {
-                    queue.push(importPath);
+                // importedIds are already relative keys after the vite plugin normalised them
+                if (importId && !importId.includes('node_modules')) {
+                    queue.push(toRelFwd(importId));
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcoder-x/plugin-shared",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "private": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",