@lolyjs/core 0.2.0-alpha.11 → 0.2.0-alpha.13

package/README.md

@@ -84,10 +84,7 @@ export const getServerSideProps: ServerLoader = async (ctx) => {
 
 ```tsx
 // app/page.tsx
-import { usePageProps } from "@lolyjs/core/hooks";
-
-export default function Home() {
-  const { props } = usePageProps();
+export default function Home({ props }) {
   return <h1>{props.data}</h1>;
 }
 ```
@@ -519,15 +516,12 @@ export const events = [
 ];
 ```
 
-### Client Hooks
+### Client Cache
 
 ```tsx
-import { usePageProps } from "@lolyjs/core/hooks";
 import { revalidate } from "@lolyjs/core/client-cache";
 
-export default function Page() {
-  const { params, props } = usePageProps();
-
+export default function Page({ props }) {
   const handleRefresh = async () => {
     await revalidate(); // Refresh current page data
   };
@@ -730,7 +724,6 @@ import { logger, createModuleLogger, getRequestLogger } from "@lolyjs/core";
 
 // Client
 import { Link } from "@lolyjs/core/components";
-import { usePageProps } from "@lolyjs/core/hooks";
 import { lolySocket } from "@lolyjs/core/sockets";
 import { revalidate, revalidatePath } from "@lolyjs/core/client-cache";
 ```

package/dist/cli.cjs

@@ -1113,6 +1113,7 @@ var import_core2 = require("@rspack/core");
 
 // modules/build/config/client.ts
 var import_path13 = __toESM(require("path"));
+var import_fs11 = __toESM(require("fs"));
 var import_core = require("@rspack/core");
 
 // modules/build/utils/index.ts
@@ -1256,15 +1257,21 @@ function createClientConfig(projectRoot, mode) {
   const buildDir = import_path13.default.join(projectRoot, BUILD_FOLDER_NAME);
   const clientEntry = import_path13.default.join(buildDir, "boostrap.ts");
   const outDir = import_path13.default.join(buildDir, "client");
-  import_dotenv.default.config({
-    path: projectRoot
-  });
+  const envPath2 = import_path13.default.join(projectRoot, ".env");
+  if (import_fs11.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: {
@@ -1313,7 +1320,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({
@@ -1330,7 +1338,7 @@ function createClientConfig(projectRoot, mode) {
 
 // modules/build/bundler/client.ts
 var import_path14 = __toESM(require("path"));
-var import_fs11 = __toESM(require("fs"));
+var import_fs12 = __toESM(require("fs"));
 init_globals();
 function startClientBundler(projectRoot, mode = "development") {
   const { config, outDir } = createClientConfig(projectRoot, mode);
@@ -1422,7 +1430,7 @@ function buildClientBundle(projectRoot) {
       copyStaticAssets(projectRoot, outDir);
       const assetManifest = generateAssetManifest(outDir);
       const manifestPath = import_path14.default.join(projectRoot, BUILD_FOLDER_NAME, "asset-manifest.json");
-      import_fs11.default.writeFileSync(manifestPath, JSON.stringify(assetManifest, null, 2), "utf-8");
+      import_fs12.default.writeFileSync(manifestPath, JSON.stringify(assetManifest, null, 2), "utf-8");
       resolve3({ outDir });
     });
   });
@@ -1465,7 +1473,7 @@ function pathToOutDir(baseDir, urlPath) {
 }
 
 // modules/build/ssg/renderer.ts
-var import_fs12 = __toESM(require("fs"));
+var import_fs13 = __toESM(require("fs"));
 var import_path16 = __toESM(require("path"));
 var import_server = require("react-dom/server");
 
@@ -1688,8 +1696,8 @@ async function renderStaticRoute(projectRoot, ssgOutDir, route, urlPath, params)
   ensureDir(dir);
   const htmlFile = import_path16.default.join(dir, "index.html");
   const dataFile = import_path16.default.join(dir, "data.json");
-  import_fs12.default.writeFileSync(htmlFile, html, "utf-8");
-  import_fs12.default.writeFileSync(dataFile, JSON.stringify(initialData, null, 2), "utf-8");
+  import_fs13.default.writeFileSync(htmlFile, html, "utf-8");
+  import_fs13.default.writeFileSync(dataFile, JSON.stringify(initialData, null, 2), "utf-8");
 }
 
 // modules/build/ssg/builder.ts
@@ -1744,11 +1752,11 @@ async function buildStaticPages(projectRoot, routes) {
 
 // modules/build/bundler/server.ts
 var import_path21 = __toESM(require("path"));
-var import_fs14 = __toESM(require("fs"));
+var import_fs15 = __toESM(require("fs"));
 var import_esbuild = __toESM(require("esbuild"));
 
 // modules/server/utils/server-dir.ts
-var import_fs13 = __toESM(require("fs"));
+var import_fs14 = __toESM(require("fs"));
 var import_path20 = __toESM(require("path"));
 init_globals();
 var getServerFile = async (projectRoot, fileName) => {
@@ -1757,13 +1765,13 @@ var getServerFile = async (projectRoot, fileName) => {
   const isDev = process.env.NODE_ENV === "development";
   let mod = null;
   if (isDev) {
-    if (!import_fs13.default.existsSync(fileTS)) {
+    if (!import_fs14.default.existsSync(fileTS)) {
       return null;
     }
     require("tsx/cjs");
     mod = require(fileTS);
   } else {
-    if (!import_fs13.default.existsSync(fileJS)) {
+    if (!import_fs14.default.existsSync(fileJS)) {
       return null;
     }
     mod = require(fileJS);
@@ -1856,7 +1864,7 @@ var SERVER_FILES = [INIT_FILE_NAME, CONFIG_FILE_NAME];
 function collectAppSources(appDir) {
   const entries = [];
   function walk(dir) {
-    const items = import_fs14.default.readdirSync(dir, { withFileTypes: true });
+    const items = import_fs15.default.readdirSync(dir, { withFileTypes: true });
     for (const item of items) {
       const full = import_path21.default.join(dir, item.name);
       if (item.isDirectory()) {
@@ -1899,7 +1907,7 @@ async function buildServerApp(projectRoot, appDir) {
   for (const fileName of SERVER_FILES) {
     const initTS = import_path21.default.join(projectRoot, `${fileName}.ts`);
     const initJS = import_path21.default.join(outDir, `${fileName}.js`);
-    if (import_fs14.default.existsSync(initTS)) {
+    if (import_fs15.default.existsSync(initTS)) {
       await import_esbuild.default.build({
         entryPoints: [initTS],
         outfile: initJS,
@@ -1922,7 +1930,7 @@ init_globals();
 
 // src/config.ts
 var import_path22 = __toESM(require("path"));
-var import_fs15 = __toESM(require("fs"));
+var import_fs16 = __toESM(require("fs"));
 init_globals();
 var DEFAULT_CONFIG2 = {
   directories: {
@@ -1985,10 +1993,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") {
@@ -2005,7 +2013,7 @@ function loadConfig(projectRoot) {
   }
   const config = deepMerge(DEFAULT_CONFIG2, userConfig);
   const appDir = import_path22.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;
@@ -2066,7 +2074,7 @@ async function buildApp(options = {}) {
 }
 
 // src/server.ts
-var import_fs19 = __toESM(require("fs"));
+var import_fs20 = __toESM(require("fs"));
 var import_path28 = __toESM(require("path"));
 
 // modules/server/setup.ts
@@ -2074,7 +2082,7 @@ var import_express = __toESM(require("express"));
 var import_path25 = __toESM(require("path"));
 
 // ../../node_modules/.pnpm/chokidar@4.0.3/node_modules/chokidar/esm/index.js
-var import_fs17 = require("fs");
+var import_fs18 = require("fs");
 var import_promises3 = require("fs/promises");
 var import_events = require("events");
 var sysPath2 = __toESM(require("path"), 1);
@@ -2299,7 +2307,7 @@ function readdirp(root, options = {}) {
 }
 
 // ../../node_modules/.pnpm/chokidar@4.0.3/node_modules/chokidar/esm/handler.js
-var import_fs16 = require("fs");
+var import_fs17 = require("fs");
 var import_promises2 = require("fs/promises");
 var sysPath = __toESM(require("path"), 1);
 var import_os = require("os");
@@ -2637,7 +2645,7 @@ function createFsWatchInstance(path26, options, listener, errHandler, emitRaw) {
     }
   };
   try {
-    return (0, import_fs16.watch)(path26, {
+    return (0, import_fs17.watch)(path26, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error) {
@@ -2720,7 +2728,7 @@ var setFsWatchFileListener = (path26, 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_fs16.unwatchFile)(fullPath);
+    (0, import_fs17.unwatchFile)(fullPath);
     cont = void 0;
   }
   if (cont) {
@@ -2731,7 +2739,7 @@ var setFsWatchFileListener = (path26, fullPath, options, handlers) => {
       listeners: listener,
       rawEmitters: rawEmitter,
       options,
-      watcher: (0, import_fs16.watchFile)(fullPath, options, (curr, prev) => {
+      watcher: (0, import_fs17.watchFile)(fullPath, options, (curr, prev) => {
         foreach(cont.rawEmitters, (rawEmitter2) => {
           rawEmitter2(EV.CHANGE, fullPath, { curr, prev });
         });
@@ -2748,7 +2756,7 @@ var setFsWatchFileListener = (path26, fullPath, options, handlers) => {
     delFromSet(cont, KEY_RAW, rawEmitter);
     if (isEmptySet(cont.listeners)) {
       FsWatchFileInstances.delete(fullPath);
-      (0, import_fs16.unwatchFile)(fullPath);
+      (0, import_fs17.unwatchFile)(fullPath);
       cont.options = cont.watcher = void 0;
       Object.freeze(cont);
     }
@@ -3591,7 +3599,7 @@ var FSWatcher = class extends import_events.EventEmitter {
     const now = /* @__PURE__ */ new Date();
     const writes = this._pendingWrites;
     function awaitWriteFinishFn(prevStat) {
-      (0, import_fs17.stat)(fullPath, (err, curStat) => {
+      (0, import_fs18.stat)(fullPath, (err, curStat) => {
         if (err || !writes.has(path26)) {
           if (err && err.code !== "ENOENT")
             awfEmit(err);
@@ -4374,7 +4382,7 @@ function handleNotFound(res, urlPath) {
 }
 
 // modules/server/handlers/ssg.ts
-var import_fs18 = __toESM(require("fs"));
+var import_fs19 = __toESM(require("fs"));
 var import_path26 = __toESM(require("path"));
 var logger2 = createModuleLogger("ssg");
 function getSsgDirForPath(baseDir, urlPath) {
@@ -4391,7 +4399,7 @@ function getSsgDataPath(baseDir, urlPath) {
 }
 function tryServeSsgHtml(res, ssgOutDir, urlPath) {
   const ssgHtmlPath = getSsgHtmlPath(ssgOutDir, urlPath);
-  if (!import_fs18.default.existsSync(ssgHtmlPath)) {
+  if (!import_fs19.default.existsSync(ssgHtmlPath)) {
     return false;
   }
   logger2.info("Serving SSG HTML", { urlPath, ssgHtmlPath });
@@ -4401,17 +4409,17 @@ function tryServeSsgHtml(res, ssgOutDir, urlPath) {
   );
   res.statusCode = 200;
   res.setHeader("Content-Type", "text/html; charset=utf-8");
-  const stream = import_fs18.default.createReadStream(ssgHtmlPath, { encoding: "utf-8" });
+  const stream = import_fs19.default.createReadStream(ssgHtmlPath, { encoding: "utf-8" });
   stream.pipe(res);
   return true;
 }
 function tryServeSsgData(res, ssgOutDir, urlPath) {
   const ssgDataPath = getSsgDataPath(ssgOutDir, urlPath);
-  if (!import_fs18.default.existsSync(ssgDataPath)) {
+  if (!import_fs19.default.existsSync(ssgDataPath)) {
     return false;
   }
   try {
-    const raw = import_fs18.default.readFileSync(ssgDataPath, "utf-8");
+    const raw = import_fs19.default.readFileSync(ssgDataPath, "utf-8");
     res.setHeader("Content-Type", "application/json; charset=utf-8");
     res.status(200).end(raw);
     return true;
@@ -5050,7 +5058,12 @@ var setupApplication = async ({
 
 // src/server.ts
 var import_dotenv2 = __toESM(require("dotenv"));
-import_dotenv2.default.config();
+var envPath = import_path28.default.join(process.cwd(), ".env");
+if (import_fs20.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";
@@ -5059,7 +5072,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_path28.default.join(getBuildDir(projectRoot, config), "server"));
-  if (!isDev && !import_fs19.default.existsSync(appDir)) {
+  if (!isDev && !import_fs20.default.existsSync(appDir)) {
     logger3.error("Compiled directory not found", void 0, {
       buildDir: config.directories.build,
       appDir,