From 63dfdccd72722140e9397170f14f931b75e06202 Mon Sep 17 00:00:00 2001
From: Simon Chan <1330321+yume-chan@users.noreply.github.com>
Date: Wed, 30 Aug 2023 02:07:38 +0800
Subject: [PATCH] fix: pass solid compiler options to route pages (#1029)

Co-authored-by: Ryan Carniato <ryansolid@gmail.com>
---
 packages/start/vite/plugin.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/start/vite/plugin.js b/packages/start/vite/plugin.js
index 80ab2c5f0..274542673 100644
--- a/packages/start/vite/plugin.js
+++ b/packages/start/vite/plugin.js
@@ -160,8 +160,8 @@ function solidStartConfig(options) {
   };
 }
 /**
- * @returns {import('node_modules/vite').Plugin}
- * @param {{ delay?: number; babel?: any }} options
+ * @returns {import('vite').Plugin}
+ * @param {{ delay?: number } & Partial<import("vite-plugin-solid").Options>} options
  */
 function solidStartFileSystemRouter(options) {
   /** @type {import('./plugin').ViteConfig} */
@@ -260,7 +260,6 @@ function solidStartFileSystemRouter(options) {
         /** @type {string} */ id,
         /** @type {any} */ fn
       ) => {
-        // @ts-ignore
         let plugin = solid({
           ...(options ?? {}),
           ssr: process.env.START_SPA_CLIENT === "true" ? false : true,
@@ -599,7 +598,7 @@ function expand(target, source = {}, parse = v => v) {
 
           // Avoid recursion
           if (parents.includes(key)) {
-            consola.warn(
+            console.warn(
               `Please avoid recursive environment variables ( loop: ${parents.join(
                 " > "
               )} > ${key} )`
@@ -635,7 +634,7 @@ const findAny = (path, name, exts = [".js", ".ts", ".jsx", ".tsx", ".mjs", ".mts
 
 /**
  * @param {import('./plugin').Options} options
- * @returns {import('node_modules/vite').PluginOption[]}
+ * @returns {import('vite').PluginOption[]}
  */
 export default function solidStart(options) {
   options = Object.assign(
@@ -667,7 +666,7 @@ export default function solidStart(options) {
 
   return [
     solidStartConfig(options),
-    solidStartFileSystemRouter({ delay: 500 }),
+    solidStartFileSystemRouter({ delay: 500, typescript: options.typescript, solid: options.solid }),
     !options.ssr && solidStartCsrDev(options),
     options.inspect ? inspect({ outDir: join(".solid", "inspect") }) : undefined,
     options.experimental.islands ? islands() : undefined,