more robust solution for prepareFindSvelteComponent

Elderjs · Nov 26, 2020 · 7fccd19 · 7fccd19
1 parent 63479c7
commit 7fccd19
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/partialHydration/prepareFindSvelteComponent.ts b/src/partialHydration/prepareFindSvelteComponent.ts
@@ -15,19 +15,22 @@ export const removeHash = (pathWithHash) => {
 
 const prepareFindSvelteComponent = ({ ssrFolder, rootDir, clientComponents: clientFolder, distDir }) => {
   const rootDirFixed = windowsPathFix(rootDir);
-  const ssrComponents = glob.sync(`${ssrFolder}/**/*.js`);
+  const ssrComponents = glob.sync(`${ssrFolder}/**/*.js`).map(windowsPathFix);
   const clientComponents = glob
     .sync(`${clientFolder}/**/*.js`)
-    .map((c) => `${path.sep}${path.relative(windowsPathFix(distDir), c)}`);
+    .map((c) => windowsPathFix(`${path.sep}${path.relative(distDir, c)}`));
 
   const cache = new Map();
 
   const findComponent = (name, folder): SvelteComponentFiles => {
+    const nameFixed = windowsPathFix(name);
     const cacheKey = JSON.stringify({ name, folder });
     if (cache.has(cacheKey)) return cache.get(cacheKey);
 
+    console.log('findComponent: ', { nameFixed, folder });
+
     // abs path first
-    if (name.includes(rootDirFixed)) {
+    if (nameFixed.includes(rootDirFixed)) {
       const rel = windowsPathFix(path.relative(path.join(rootDirFixed, 'src'), name)).replace('.svelte', '.js');
       const parsed = path.parse(rel);
       const ssr = ssrComponents.find((c) => c.endsWith(rel));