@lolyjs/core 0.2.0-alpha.12 → 0.2.0-alpha.14

package/dist/cli.js

@@ -1108,6 +1108,7 @@ import { rspack as rspack2 } from "@rspack/core";
 
 // modules/build/config/client.ts
 import path11 from "path";
+import fs11 from "fs";
 import { rspack } from "@rspack/core";
 
 // modules/build/utils/index.ts
@@ -1251,15 +1252,21 @@ function createClientConfig(projectRoot, mode) {
   const buildDir = path11.join(projectRoot, BUILD_FOLDER_NAME);
   const clientEntry = path11.join(buildDir, "boostrap.ts");
   const outDir = path11.join(buildDir, "client");
-  dotenv.config({
-    path: projectRoot
-  });
+  const envPath2 = path11.join(projectRoot, ".env");
+  if (fs11.existsSync(envPath2)) {
+    dotenv.config({
+      path: envPath2
+    });
+  }
   const publicEnv = {};
   for (const [key, value] of Object.entries(process.env)) {
     if (key.startsWith("PUBLIC_")) {
       publicEnv[`process.env.${key}`] = JSON.stringify(value ?? "");
     }
   }
+  if (!publicEnv["process.env.PUBLIC_WS_BASE_URL"]) {
+    publicEnv["process.env.PUBLIC_WS_BASE_URL"] = JSON.stringify(void 0);
+  }
   const config = {
     mode,
     entry: {
@@ -1308,7 +1315,8 @@ function createClientConfig(projectRoot, mode) {
     },
     plugins: [
       new rspack.DefinePlugin({
-        "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV),
+        // Always define NODE_ENV, using mode as fallback if not set
+        "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV || mode),
         ...publicEnv
       }),
       new rspack.CssExtractRspackPlugin({
@@ -1326,7 +1334,7 @@ function createClientConfig(projectRoot, mode) {
 // modules/build/bundler/client.ts
 init_globals();
 import path12 from "path";
-import fs11 from "fs";
+import fs12 from "fs";
 function startClientBundler(projectRoot, mode = "development") {
   const { config, outDir } = createClientConfig(projectRoot, mode);
   copyStaticAssets(projectRoot, outDir);
@@ -1417,7 +1425,7 @@ function buildClientBundle(projectRoot) {
       copyStaticAssets(projectRoot, outDir);
       const assetManifest = generateAssetManifest(outDir);
       const manifestPath = path12.join(projectRoot, BUILD_FOLDER_NAME, "asset-manifest.json");
-      fs11.writeFileSync(manifestPath, JSON.stringify(assetManifest, null, 2), "utf-8");
+      fs12.writeFileSync(manifestPath, JSON.stringify(assetManifest, null, 2), "utf-8");
       resolve3({ outDir });
     });
   });
@@ -1460,7 +1468,7 @@ function pathToOutDir(baseDir, urlPath) {
 }
 
 // modules/build/ssg/renderer.ts
-import fs12 from "fs";
+import fs13 from "fs";
 import path14 from "path";
 import { renderToString } from "react-dom/server";
 
@@ -1683,8 +1691,8 @@ async function renderStaticRoute(projectRoot, ssgOutDir, route, urlPath, params)
   ensureDir(dir);
   const htmlFile = path14.join(dir, "index.html");
   const dataFile = path14.join(dir, "data.json");
-  fs12.writeFileSync(htmlFile, html, "utf-8");
-  fs12.writeFileSync(dataFile, JSON.stringify(initialData, null, 2), "utf-8");
+  fs13.writeFileSync(htmlFile, html, "utf-8");
+  fs13.writeFileSync(dataFile, JSON.stringify(initialData, null, 2), "utf-8");
 }
 
 // modules/build/ssg/builder.ts
@@ -1739,12 +1747,12 @@ async function buildStaticPages(projectRoot, routes) {
 
 // modules/build/bundler/server.ts
 import path17 from "path";
-import fs14 from "fs";
+import fs15 from "fs";
 import esbuild from "esbuild";
 
 // modules/server/utils/server-dir.ts
 init_globals();
-import fs13 from "fs";
+import fs14 from "fs";
 import path16 from "path";
 var getServerFile = async (projectRoot, fileName) => {
   const fileTS = path16.join(projectRoot, `${fileName}.ts`);
@@ -1752,13 +1760,13 @@ var getServerFile = async (projectRoot, fileName) => {
   const isDev = process.env.NODE_ENV === "development";
   let mod = null;
   if (isDev) {
-    if (!fs13.existsSync(fileTS)) {
+    if (!fs14.existsSync(fileTS)) {
       return null;
     }
     __require("tsx/cjs");
     mod = __require(fileTS);
   } else {
-    if (!fs13.existsSync(fileJS)) {
+    if (!fs14.existsSync(fileJS)) {
       return null;
     }
     mod = __require(fileJS);
@@ -1851,7 +1859,7 @@ var SERVER_FILES = [INIT_FILE_NAME, CONFIG_FILE_NAME];
 function collectAppSources(appDir) {
   const entries = [];
   function walk(dir) {
-    const items = fs14.readdirSync(dir, { withFileTypes: true });
+    const items = fs15.readdirSync(dir, { withFileTypes: true });
     for (const item of items) {
       const full = path17.join(dir, item.name);
       if (item.isDirectory()) {
@@ -1894,7 +1902,7 @@ async function buildServerApp(projectRoot, appDir) {
   for (const fileName of SERVER_FILES) {
     const initTS = path17.join(projectRoot, `${fileName}.ts`);
     const initJS = path17.join(outDir, `${fileName}.js`);
-    if (fs14.existsSync(initTS)) {
+    if (fs15.existsSync(initTS)) {
       await esbuild.build({
         entryPoints: [initTS],
         outfile: initJS,
@@ -1918,7 +1926,7 @@ init_globals();
 // src/config.ts
 init_globals();
 import path18 from "path";
-import fs15 from "fs";
+import fs16 from "fs";
 var DEFAULT_CONFIG2 = {
   directories: {
     app: "app",
@@ -1980,10 +1988,10 @@ function loadConfig(projectRoot) {
   ];
   let userConfig = {};
   for (const configFile of configFiles) {
-    if (fs15.existsSync(configFile)) {
+    if (fs16.existsSync(configFile)) {
       try {
         if (configFile.endsWith(".json")) {
-          const content = fs15.readFileSync(configFile, "utf-8");
+          const content = fs16.readFileSync(configFile, "utf-8");
           userConfig = JSON.parse(content);
         } else {
           if (process.env.NODE_ENV === "development") {
@@ -2000,7 +2008,7 @@ function loadConfig(projectRoot) {
   }
   const config = deepMerge(DEFAULT_CONFIG2, userConfig);
   const appDir = path18.join(projectRoot, config.directories.app);
-  if (!fs15.existsSync(appDir) && process.env.NODE_ENV !== "test") {
+  if (!fs16.existsSync(appDir) && process.env.NODE_ENV !== "test") {
     console.warn(`[framework] App directory not found: ${appDir}`);
   }
   return config;
@@ -2061,7 +2069,7 @@ async function buildApp(options = {}) {
 }
 
 // src/server.ts
-import fs17 from "fs";
+import fs18 from "fs";
 import path24 from "path";
 
 // modules/server/setup.ts
@@ -4200,7 +4208,6 @@ function requestLoggerMiddleware(options = {}) {
       const startTime = Date.now();
       res.on("finish", () => {
         const duration = Date.now() - startTime;
-        const shouldLogSuccess = logRequests === true;
         if (res.statusCode >= 500) {
           reqLogger.error(`${req.method} ${req.path} ${res.statusCode}`, {
             statusCode: res.statusCode,
@@ -4211,11 +4218,6 @@ function requestLoggerMiddleware(options = {}) {
             statusCode: res.statusCode,
             duration: `${duration}ms`
           });
-        } else if (shouldLogSuccess) {
-          reqLogger.debug(`${req.method} ${req.path} ${res.statusCode}`, {
-            statusCode: res.statusCode,
-            duration: `${duration}ms`
-          });
         }
       });
     }
@@ -4369,7 +4371,7 @@ function handleNotFound(res, urlPath) {
 }
 
 // modules/server/handlers/ssg.ts
-import fs16 from "fs";
+import fs17 from "fs";
 import path22 from "path";
 var logger2 = createModuleLogger("ssg");
 function getSsgDirForPath(baseDir, urlPath) {
@@ -4386,7 +4388,7 @@ function getSsgDataPath(baseDir, urlPath) {
 }
 function tryServeSsgHtml(res, ssgOutDir, urlPath) {
   const ssgHtmlPath = getSsgHtmlPath(ssgOutDir, urlPath);
-  if (!fs16.existsSync(ssgHtmlPath)) {
+  if (!fs17.existsSync(ssgHtmlPath)) {
     return false;
   }
   logger2.info("Serving SSG HTML", { urlPath, ssgHtmlPath });
@@ -4396,17 +4398,17 @@ function tryServeSsgHtml(res, ssgOutDir, urlPath) {
   );
   res.statusCode = 200;
   res.setHeader("Content-Type", "text/html; charset=utf-8");
-  const stream = fs16.createReadStream(ssgHtmlPath, { encoding: "utf-8" });
+  const stream = fs17.createReadStream(ssgHtmlPath, { encoding: "utf-8" });
   stream.pipe(res);
   return true;
 }
 function tryServeSsgData(res, ssgOutDir, urlPath) {
   const ssgDataPath = getSsgDataPath(ssgOutDir, urlPath);
-  if (!fs16.existsSync(ssgDataPath)) {
+  if (!fs17.existsSync(ssgDataPath)) {
     return false;
   }
   try {
-    const raw = fs16.readFileSync(ssgDataPath, "utf-8");
+    const raw = fs17.readFileSync(ssgDataPath, "utf-8");
     res.setHeader("Content-Type", "application/json; charset=utf-8");
     res.status(200).end(raw);
     return true;
@@ -5045,7 +5047,12 @@ var setupApplication = async ({
 
 // src/server.ts
 import dotenv2 from "dotenv";
-dotenv2.config();
+var envPath = path24.join(process.cwd(), ".env");
+if (fs18.existsSync(envPath)) {
+  dotenv2.config({ path: envPath });
+} else {
+  dotenv2.config();
+}
 var logger3 = createModuleLogger("server");
 async function startServer(options = {}) {
   const isDev = options.isDev ?? process.env.NODE_ENV === "development";
@@ -5054,7 +5061,7 @@ async function startServer(options = {}) {
   const port = options.port ?? (process.env.PORT ? parseInt(process.env.PORT, 10) : void 0) ?? config.server.port;
   const host = process.env.HOST ?? (!isDev ? "0.0.0.0" : void 0) ?? config.server.host;
   const appDir = options.appDir ?? (isDev ? getAppDir(projectRoot, config) : path24.join(getBuildDir(projectRoot, config), "server"));
-  if (!isDev && !fs17.existsSync(appDir)) {
+  if (!isDev && !fs18.existsSync(appDir)) {
     logger3.error("Compiled directory not found", void 0, {
       buildDir: config.directories.build,
       appDir,
@@ -5091,26 +5098,22 @@ async function startServer(options = {}) {
   });
   httpServer.listen(port, host, () => {
     if (isDev) {
-      logger3.info("\u{1F680} Dev server running", {
-        url: `http://${host}:${port}`,
-        appDir
-      });
-      logger3.info("\u{1F9ED} Reading routes from", { appDir });
-      logger3.info("\u{1F4E6} Client served from /static/client.js");
+      const reset = "\x1B[0m";
+      const cyan = "\x1B[36m";
+      const green = "\x1B[32m";
+      const dim = "\x1B[2m";
+      const bold = "\x1B[1m";
+      const url = `http://${host === "0.0.0.0" ? "localhost" : host}:${port}`;
+      console.log();
+      console.log(`${bold}${green}\u2713${reset} ${bold}Dev server ready${reset}`);
+      console.log(`${dim}  Local:${reset}    ${cyan}${url}${reset}`);
+      if (routes.length > 0 || apiRoutes.length > 0 || wssRoutes.length > 0) {
+        console.log(`${dim}  Routes:${reset}  ${routes.length} pages, ${apiRoutes.length} API, ${wssRoutes.length} WSS`);
+      }
+      console.log();
     } else {
-      const buildDir = config.directories.build;
-      logger3.info("\u{1F680} Prod server running", {
-        url: `http://${host}:${port}`,
-        appDir,
-        buildDir
-      });
-      logger3.info("\u{1F9ED} Reading compiled routes from", { appDir });
-      logger3.info("\u{1F4E6} Client served from", {
-        path: `/static (${buildDir}/client)`
-      });
-      logger3.info("\u{1F4C4} SSG served from", {
-        path: `${buildDir}/ssg (if exists)`
-      });
+      const url = `http://${host}:${port}`;
+      console.log(`\u{1F680} Server running on ${url}`);
     }
   });
 }