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

package/dist/index.cjs

@@ -115,7 +115,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/server.ts
-var import_fs17 = __toESM(require("fs"));
+var import_fs18 = __toESM(require("fs"));
 var import_path22 = __toESM(require("path"));
 
 // modules/server/utils/server-dir.ts
@@ -1190,6 +1190,7 @@ var import_core2 = require("@rspack/core");
 
 // modules/build/config/client.ts
 var import_path14 = __toESM(require("path"));
+var import_fs12 = __toESM(require("fs"));
 var import_core = require("@rspack/core");
 
 // modules/build/utils/index.ts
@@ -1333,15 +1334,21 @@ function createClientConfig(projectRoot, mode) {
   const buildDir = import_path14.default.join(projectRoot, BUILD_FOLDER_NAME);
   const clientEntry = import_path14.default.join(buildDir, "boostrap.ts");
   const outDir = import_path14.default.join(buildDir, "client");
-  import_dotenv.default.config({
-    path: projectRoot
-  });
+  const envPath2 = import_path14.default.join(projectRoot, ".env");
+  if (import_fs12.default.existsSync(envPath2)) {
+    import_dotenv.default.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: {
@@ -1390,7 +1397,8 @@ function createClientConfig(projectRoot, mode) {
     },
     plugins: [
       new import_core.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 import_core.rspack.CssExtractRspackPlugin({
@@ -1407,7 +1415,7 @@ function createClientConfig(projectRoot, mode) {
 
 // modules/build/bundler/client.ts
 var import_path15 = __toESM(require("path"));
-var import_fs12 = __toESM(require("fs"));
+var import_fs13 = __toESM(require("fs"));
 init_globals();
 function startClientBundler(projectRoot, mode = "development") {
   const { config, outDir } = createClientConfig(projectRoot, mode);
@@ -1499,14 +1507,14 @@ function buildClientBundle(projectRoot) {
       copyStaticAssets(projectRoot, outDir);
       const assetManifest = generateAssetManifest(outDir);
       const manifestPath = import_path15.default.join(projectRoot, BUILD_FOLDER_NAME, "asset-manifest.json");
-      import_fs12.default.writeFileSync(manifestPath, JSON.stringify(assetManifest, null, 2), "utf-8");
+      import_fs13.default.writeFileSync(manifestPath, JSON.stringify(assetManifest, null, 2), "utf-8");
       resolve3({ outDir });
     });
   });
 }
 
 // ../../node_modules/.pnpm/chokidar@4.0.3/node_modules/chokidar/esm/index.js
-var import_fs14 = require("fs");
+var import_fs15 = require("fs");
 var import_promises3 = require("fs/promises");
 var import_events = require("events");
 var sysPath2 = __toESM(require("path"), 1);
@@ -1731,7 +1739,7 @@ function readdirp(root, options = {}) {
 }
 
 // ../../node_modules/.pnpm/chokidar@4.0.3/node_modules/chokidar/esm/handler.js
-var import_fs13 = require("fs");
+var import_fs14 = require("fs");
 var import_promises2 = require("fs/promises");
 var sysPath = __toESM(require("path"), 1);
 var import_os = require("os");
@@ -2069,7 +2077,7 @@ function createFsWatchInstance(path25, options, listener, errHandler, emitRaw) {
     }
   };
   try {
-    return (0, import_fs13.watch)(path25, {
+    return (0, import_fs14.watch)(path25, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error) {
@@ -2152,7 +2160,7 @@ var setFsWatchFileListener = (path25, fullPath, options, handlers) => {
   let cont = FsWatchFileInstances.get(fullPath);
   const copts = cont && cont.options;
   if (copts && (copts.persistent < options.persistent || copts.interval > options.interval)) {
-    (0, import_fs13.unwatchFile)(fullPath);
+    (0, import_fs14.unwatchFile)(fullPath);
     cont = void 0;
   }
   if (cont) {
@@ -2163,7 +2171,7 @@ var setFsWatchFileListener = (path25, fullPath, options, handlers) => {
       listeners: listener,
       rawEmitters: rawEmitter,
       options,
-      watcher: (0, import_fs13.watchFile)(fullPath, options, (curr, prev) => {
+      watcher: (0, import_fs14.watchFile)(fullPath, options, (curr, prev) => {
         foreach(cont.rawEmitters, (rawEmitter2) => {
           rawEmitter2(EV.CHANGE, fullPath, { curr, prev });
         });
@@ -2180,7 +2188,7 @@ var setFsWatchFileListener = (path25, fullPath, options, handlers) => {
     delFromSet(cont, KEY_RAW, rawEmitter);
     if (isEmptySet(cont.listeners)) {
       FsWatchFileInstances.delete(fullPath);
-      (0, import_fs13.unwatchFile)(fullPath);
+      (0, import_fs14.unwatchFile)(fullPath);
       cont.options = cont.watcher = void 0;
       Object.freeze(cont);
     }
@@ -3023,7 +3031,7 @@ var FSWatcher = class extends import_events.EventEmitter {
     const now = /* @__PURE__ */ new Date();
     const writes = this._pendingWrites;
     function awaitWriteFinishFn(prevStat) {
-      (0, import_fs14.stat)(fullPath, (err, curStat) => {
+      (0, import_fs15.stat)(fullPath, (err, curStat) => {
         if (err || !writes.has(path25)) {
           if (err && err.code !== "ENOENT")
             awfEmit(err);
@@ -3270,7 +3278,7 @@ init_globals();
 
 // src/config.ts
 var import_path18 = __toESM(require("path"));
-var import_fs15 = __toESM(require("fs"));
+var import_fs16 = __toESM(require("fs"));
 init_globals();
 var DEFAULT_CONFIG = {
   directories: {
@@ -3333,10 +3341,10 @@ function loadConfig(projectRoot) {
   ];
   let userConfig = {};
   for (const configFile of configFiles) {
-    if (import_fs15.default.existsSync(configFile)) {
+    if (import_fs16.default.existsSync(configFile)) {
       try {
         if (configFile.endsWith(".json")) {
-          const content = import_fs15.default.readFileSync(configFile, "utf-8");
+          const content = import_fs16.default.readFileSync(configFile, "utf-8");
           userConfig = JSON.parse(content);
         } else {
           if (process.env.NODE_ENV === "development") {
@@ -3353,7 +3361,7 @@ function loadConfig(projectRoot) {
   }
   const config = deepMerge(DEFAULT_CONFIG, userConfig);
   const appDir = import_path18.default.join(projectRoot, config.directories.app);
-  if (!import_fs15.default.existsSync(appDir) && process.env.NODE_ENV !== "test") {
+  if (!import_fs16.default.existsSync(appDir) && process.env.NODE_ENV !== "test") {
     console.warn(`[framework] App directory not found: ${appDir}`);
   }
   return config;
@@ -3745,7 +3753,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,
@@ -3756,11 +3763,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`
-          });
         }
       });
     }
@@ -4062,7 +4064,7 @@ function handleNotFound(res, urlPath) {
 }
 
 // modules/server/handlers/ssg.ts
-var import_fs16 = __toESM(require("fs"));
+var import_fs17 = __toESM(require("fs"));
 var import_path20 = __toESM(require("path"));
 var logger2 = createModuleLogger("ssg");
 function getSsgDirForPath(baseDir, urlPath) {
@@ -4079,7 +4081,7 @@ function getSsgDataPath(baseDir, urlPath) {
 }
 function tryServeSsgHtml(res, ssgOutDir, urlPath) {
   const ssgHtmlPath = getSsgHtmlPath(ssgOutDir, urlPath);
-  if (!import_fs16.default.existsSync(ssgHtmlPath)) {
+  if (!import_fs17.default.existsSync(ssgHtmlPath)) {
     return false;
   }
   logger2.info("Serving SSG HTML", { urlPath, ssgHtmlPath });
@@ -4089,17 +4091,17 @@ function tryServeSsgHtml(res, ssgOutDir, urlPath) {
   );
   res.statusCode = 200;
   res.setHeader("Content-Type", "text/html; charset=utf-8");
-  const stream = import_fs16.default.createReadStream(ssgHtmlPath, { encoding: "utf-8" });
+  const stream = import_fs17.default.createReadStream(ssgHtmlPath, { encoding: "utf-8" });
   stream.pipe(res);
   return true;
 }
 function tryServeSsgData(res, ssgOutDir, urlPath) {
   const ssgDataPath = getSsgDataPath(ssgOutDir, urlPath);
-  if (!import_fs16.default.existsSync(ssgDataPath)) {
+  if (!import_fs17.default.existsSync(ssgDataPath)) {
     return false;
   }
   try {
-    const raw = import_fs16.default.readFileSync(ssgDataPath, "utf-8");
+    const raw = import_fs17.default.readFileSync(ssgDataPath, "utf-8");
     res.setHeader("Content-Type", "application/json; charset=utf-8");
     res.status(200).end(raw);
     return true;
@@ -4807,7 +4809,12 @@ var setupApplication = async ({
 
 // src/server.ts
 var import_dotenv2 = __toESM(require("dotenv"));
-import_dotenv2.default.config();
+var envPath = import_path22.default.join(process.cwd(), ".env");
+if (import_fs18.default.existsSync(envPath)) {
+  import_dotenv2.default.config({ path: envPath });
+} else {
+  import_dotenv2.default.config();
+}
 var logger3 = createModuleLogger("server");
 async function startServer(options = {}) {
   const isDev = options.isDev ?? process.env.NODE_ENV === "development";
@@ -4816,7 +4823,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) : import_path22.default.join(getBuildDir(projectRoot, config), "server"));
-  if (!isDev && !import_fs17.default.existsSync(appDir)) {
+  if (!isDev && !import_fs18.default.existsSync(appDir)) {
     logger3.error("Compiled directory not found", void 0, {
       buildDir: config.directories.build,
       appDir,
@@ -4853,26 +4860,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}`);
     }
   });
 }
@@ -4926,7 +4929,7 @@ function pathToOutDir(baseDir, urlPath) {
 }
 
 // modules/build/ssg/renderer.ts
-var import_fs18 = __toESM(require("fs"));
+var import_fs19 = __toESM(require("fs"));
 var import_path24 = __toESM(require("path"));
 var import_server3 = require("react-dom/server");
 init_globals();
@@ -4999,8 +5002,8 @@ async function renderStaticRoute(projectRoot, ssgOutDir, route, urlPath, params)
   ensureDir(dir);
   const htmlFile = import_path24.default.join(dir, "index.html");
   const dataFile = import_path24.default.join(dir, "data.json");
-  import_fs18.default.writeFileSync(htmlFile, html, "utf-8");
-  import_fs18.default.writeFileSync(dataFile, JSON.stringify(initialData, null, 2), "utf-8");
+  import_fs19.default.writeFileSync(htmlFile, html, "utf-8");
+  import_fs19.default.writeFileSync(dataFile, JSON.stringify(initialData, null, 2), "utf-8");
 }
 
 // modules/build/ssg/builder.ts
@@ -5055,14 +5058,14 @@ async function buildStaticPages(projectRoot, routes) {
 
 // modules/build/bundler/server.ts
 var import_path28 = __toESM(require("path"));
-var import_fs19 = __toESM(require("fs"));
+var import_fs20 = __toESM(require("fs"));
 var import_esbuild = __toESM(require("esbuild"));
 init_globals();
 var SERVER_FILES = [INIT_FILE_NAME, CONFIG_FILE_NAME];
 function collectAppSources(appDir) {
   const entries = [];
   function walk(dir) {
-    const items = import_fs19.default.readdirSync(dir, { withFileTypes: true });
+    const items = import_fs20.default.readdirSync(dir, { withFileTypes: true });
     for (const item of items) {
       const full = import_path28.default.join(dir, item.name);
       if (item.isDirectory()) {
@@ -5105,7 +5108,7 @@ async function buildServerApp(projectRoot, appDir) {
   for (const fileName of SERVER_FILES) {
     const initTS = import_path28.default.join(projectRoot, `${fileName}.ts`);
     const initJS = import_path28.default.join(outDir, `${fileName}.js`);
-    if (import_fs19.default.existsSync(initTS)) {
+    if (import_fs20.default.existsSync(initTS)) {
       await import_esbuild.default.build({
         entryPoints: [initTS],
         outfile: initJS,
@@ -5848,7 +5851,7 @@ async function loadInitialRoute(initialUrl, initialData, routes, notFoundRoute,
   };
 }
 function setupHotReload2() {
-  const nodeEnv = typeof process !== "undefined" && process?.env?.NODE_ENV || "production";
+  const nodeEnv = typeof process !== "undefined" && process.env?.NODE_ENV || "production";
   const isDev = nodeEnv !== "production";
   if (!isDev) {
     return;