make it better

Author: huseeiin

packages/start/src/config/dev-server.ts

@@ -54,7 +54,7 @@ export function devServer(): Array<PluginOption> {
             try {
               const serverEntry: {
                 default: { fetch: (req: Request) => Promise<Response> };
-              } = await serverEnv.runner.import(`./src/entry-server${START_ENTRY_EXTENSION}`);
+              } = await serverEnv.runner.import(START_HANDLERS.server);
 
               const webRes = await serverEntry.default.fetch(webReq);
 

packages/start/src/config/index.ts

@@ -56,10 +56,10 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
   if (!appEntryPath) {
     throw new Error(`Could not find an app jsx/tsx entry in ${start.appRoot}.`);
   }
-  globalThis.START_ENTRY_EXTENSION = extname(appEntryPath);
-  const handlers = {
-    client: `${start.appRoot}/entry-client${START_ENTRY_EXTENSION}`,
-    server: `${start.appRoot}/entry-server${START_ENTRY_EXTENSION}`,
+  const entryExtension = extname(appEntryPath);
+  globalThis.START_HANDLERS = {
+    client: `${start.appRoot}/entry-client${entryExtension}`,
+    server: `${start.appRoot}/entry-server${entryExtension}`,
   };
   return [
     {
@@ -74,7 +74,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
         };
       },
       async config(_, env) {
-        const clientInput = [handlers.client];
+        const clientInput = [START_HANDLERS.client];
         if (env.command === "build") {
           const clientRouter: BaseFileSystemRouter = (globalThis as any).ROUTERS.client;
           for (const route of await clientRouter.getRoutes()) {
@@ -113,7 +113,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
                 manifest: true,
                 copyPublicDir: false,
                 rollupOptions: {
-                  input: `~/entry-server${START_ENTRY_EXTENSION}`,
+                  input: `~/entry-server.tsx`,
                 },
                 outDir: "dist/server",
                 commonjsOptions: {
@@ -124,7 +124,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
           },
           resolve: {
             alias: {
-              "@solidjs/start/server/entry": handlers.server,
+              "@solidjs/start/server/entry": START_HANDLERS.server,
               "~": join(process.cwd(), start.appRoot),
               ...(!start.ssr
                 ? {
@@ -140,7 +140,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
             // Use JSON.stringify so backslashes on Windows are escaped and
             // esbuild receives a valid JS string literal for the define value
             "import.meta.env.START_APP_ENTRY": JSON.stringify(appEntryPath),
-            "import.meta.env.START_CLIENT_ENTRY": JSON.stringify(handlers.client),
+            "import.meta.env.START_CLIENT_ENTRY": JSON.stringify(START_HANDLERS.client),
             "import.meta.env.START_DEV_OVERLAY": JSON.stringify(start.devOverlay),
             "import.meta.env.SEROVAL_MODE": JSON.stringify(start.serialization?.mode || "json"),
           },
@@ -217,8 +217,8 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
         const { filename, query } = parseIdQuery(id);
 
         let base;
-        if (filename === VIRTUAL_MODULES.clientEntry) base = handlers.client;
-        if (filename === VIRTUAL_MODULES.serverEntry) base = handlers.server;
+        if (filename === VIRTUAL_MODULES.clientEntry) base = START_HANDLERS.client;
+        if (filename === VIRTUAL_MODULES.serverEntry) base = START_HANDLERS.server;
         if (filename === VIRTUAL_MODULES.app) base = appEntryPath;
 
         if (base) {