[id] for props mode && windows path bug fixed (temporary)

2nthony · Dec 14, 2018 · 544ac50 · 544ac50
1 parent e276627
commit 544ac50
Showing 1 changed file with 30 additions and 9 deletions.
diff --git a/lib/collect-fs-routes.js b/lib/collect-fs-routes.js
@@ -27,7 +27,7 @@ class FileCollector {
   add(path, props) {
     if (!this.lookup[path]) {
       this.lookup[path] = {
-        path: solveRoutePath(path)
+        path: dyanmicRoutePath(path)
       }
       this.records.push(this.lookup[path])
     }
@@ -42,12 +42,17 @@ class FileCollector {
   }
 }
 
-const solveRoutePath = path => path.replace('index', '').replace(/_/g, ':')
+const dyanmicRoutePath = path =>
+  path
+    .replace('index', '')
+    .replace(/\_/g, ':')
+    .replace(/\[(.*?)\]/g, ':$1')
+
 
-const filenamify = str =>
+const chunkNamify = str =>
   path
     .relative(process.cwd(), str)
-    .replace(/[^a-zA-Z0-9\-_]/g, '-')
+    .replace(/[^a-zA-Z0-9\-_\[\]]/g, '-')
     .replace(/^-+/, '')
 
 function renderRoutes(routes, { chunkPrefix = '' } = {}) {
@@ -57,15 +62,31 @@ function renderRoutes(routes, { chunkPrefix = '' } = {}) {
       .map(
         route => `
     {
-      path: ${JSON.stringify(route.path)},
-      component: () => import(/* webpackChunkName: "${chunkPrefix}${filenamify(
+      path: ${
+        JSON.stringify(route.path.replace(/\\/g, '/'))
+      },
+      ${
+        route.component.match(/\[(.*?)\]/g)
+          ? 'props: true,'
+          : ''
+      }
+      component: () => import(/* webpackChunkName: "${
+        chunkPrefix
+      }${
+        chunkNamify(
           route.component
-        )}" */ ${JSON.stringify(route.component)}),
-      ${route.children ? `children: ${renderRoutes(route.children)}` : ''}
+        )
+      }" */ ${JSON.stringify(route.component)}),
+      ${
+        route.children
+          ? `children: ${renderRoutes(route.children)}`
+          : ''
+      }
     }
     `
       )
-      .join(',')}
+      .join(',')
+    }
   ]
   `
 }