@dcoder-x/vite 0.1.10 → 0.1.11

package/dist/ClippyVitePlugin.js

@@ -1,3 +1,4 @@
+import path from 'path';
 import { RouteExtractor } from '@dcoder-x/plugin-shared/extractors/RouteExtractor';
 import { ComponentExtractor } from '@dcoder-x/plugin-shared/extractors/ComponentExtractor';
 import { SelectorGenerator } from '@dcoder-x/plugin-shared/extractors/SelectorGenerator';
@@ -6,6 +7,10 @@ import { PackageBuilder } from '@dcoder-x/plugin-shared/upload/PackageBuilder';
 import { PackageWriter } from '@dcoder-x/plugin-shared/upload/PackageWriter';
 import { Uploader } from '@dcoder-x/plugin-shared/upload/Uploader';
 import { injectClippyIds, deriveBuildId, performUpload, inferRouteFromFilePath } from '@dcoder-x/plugin-shared';
+/** Convert any absolute or backslash path to a forward-slash path relative to cwd. */
+function toRelKey(absPath) {
+    return path.relative(process.cwd(), absPath).replace(/\\/g, '/');
+}
 export function clippyVitePlugin(options) {
     const moduleGraph = new Map();
     const injectedMap = new Map();
@@ -17,9 +22,11 @@ export function clippyVitePlugin(options) {
         enforce: 'pre',
         moduleParsed(moduleInfo) {
             if (moduleInfo.id && !moduleInfo.id.includes('node_modules')) {
-                moduleGraph.set(moduleInfo.id, {
-                    id: moduleInfo.id,
-                    importedIds: moduleInfo.importedIds,
+                const relId = toRelKey(moduleInfo.id.split('?')[0]);
+                moduleGraph.set(relId, {
+                    id: relId,
+                    // importedIds come from Vite as absolute paths; normalise them too
+                    importedIds: moduleInfo.importedIds.map((imp) => imp.includes('node_modules') ? imp : toRelKey(imp.split('?')[0])),
                 });
             }
         },
@@ -31,8 +38,9 @@ export function clippyVitePlugin(options) {
             const result = injectClippyIds(source, cleanId, routePath);
             if (result.injectedCount === 0)
                 return null;
+            // Store under the relative key so it matches ComponentExtractor's filePath values
             if (result.injected && result.injected.length)
-                injectedMap.set(cleanId, result.injected);
+                injectedMap.set(toRelKey(cleanId), result.injected);
             return {
                 code: result.source,
                 map: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcoder-x/vite",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -18,7 +18,7 @@
     }
   },
   "dependencies": {
-    "@dcoder-x/plugin-shared": "^0.1.10"
+    "@dcoder-x/plugin-shared": "^0.1.11"
   },
   "peerDependencies": {
     "vite": ">=4.0.0",