arcanajs 2.1.3 → 2.1.5

package/framework/cli/webpack.config.js

@@ -9,7 +9,6 @@ const html_webpack_plugin_1 = __importDefault(require("html-webpack-plugin"));
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 const path_1 = __importDefault(require("path"));
 const webpack_node_externals_1 = __importDefault(require("webpack-node-externals"));
-const isProduction = process.env.NODE_ENV === "production";
 const cwd = process.cwd();
 // Helper to resolve loaders from the framework's node_modules
 const resolveLoader = (loader) => require.resolve(loader);
@@ -43,6 +42,7 @@ const findEntry = (searchPaths) => {
     throw new Error(`Could not find entry point. Searched in: ${searchPaths.join(", ")}`);
 };
 const createClientConfig = () => {
+    const isProduction = process.env.NODE_ENV === "production";
     const clientEntry = findEntry([
         "src/client",
         "src/client/index",
@@ -79,7 +79,10 @@ const createClientConfig = () => {
                         options: {
                             presets: [
                                 resolveLoader("@babel/preset-env"),
-                                resolveLoader("@babel/preset-react"),
+                                [
+                                    resolveLoader("@babel/preset-react"),
+                                    { runtime: "automatic" },
+                                ],
                                 resolveLoader("@babel/preset-typescript"),
                             ],
                         },
@@ -143,11 +146,26 @@ const createClientConfig = () => {
 };
 exports.createClientConfig = createClientConfig;
 const createServerConfig = () => {
+    const isProduction = process.env.NODE_ENV === "production";
     const serverEntry = findEntry([
         "src/server",
         "src/server/index",
         "src/server/main",
     ]);
+    // View Injection Logic
+    const viewsDir = path_1.default.resolve(cwd, "src/views");
+    const hasViews = fs_1.default.existsSync(viewsDir);
+    const viewsLoaderPath = path_1.default.resolve(__dirname, "../../node_modules/.cache/arcanajs/views-loader.js");
+    // Ensure cache directory exists
+    const cacheDir = path_1.default.dirname(viewsLoaderPath);
+    if (!fs_1.default.existsSync(cacheDir)) {
+        fs_1.default.mkdirSync(cacheDir, { recursive: true });
+    }
+    // Generate the loader file
+    const loaderContent = hasViews
+        ? `module.exports = require.context('${viewsDir}', true, /\\.(tsx|jsx)$/);`
+        : `module.exports = null;`;
+    fs_1.default.writeFileSync(viewsLoaderPath, loaderContent);
     return {
         mode: isProduction ? "production" : "development",
         target: "node",
@@ -156,9 +174,16 @@ const createServerConfig = () => {
             path: path_1.default.resolve(cwd, "dist"),
             filename: "server.js",
         },
-        externals: [(0, webpack_node_externals_1.default)()],
+        externals: [
+            (0, webpack_node_externals_1.default)({
+                allowlist: [/^arcanajs/],
+            }),
+        ],
         resolve: {
             extensions: [".ts", ".tsx", ".js", ".jsx"],
+            alias: {
+                "arcana-views": viewsLoaderPath,
+            },
         },
         resolveLoader: {
             modules: ["node_modules", path_1.default.resolve(__dirname, "../../node_modules")],
@@ -173,7 +198,10 @@ const createServerConfig = () => {
                         options: {
                             presets: [
                                 resolveLoader("@babel/preset-env"),
-                                resolveLoader("@babel/preset-react"),
+                                [
+                                    resolveLoader("@babel/preset-react"),
+                                    { runtime: "automatic" },
+                                ],
                                 resolveLoader("@babel/preset-typescript"),
                             ],
                         },

package/framework/lib/client/index.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hydrateArcanaJS = void 0;
-const react_1 = __importDefault(require("react"));
+const jsx_runtime_1 = require("react/jsx-runtime");
 const client_1 = require("react-dom/client");
 const HeadContext_1 = require("../shared/context/HeadContext");
 const ArcanaJSApp_1 = require("../shared/core/ArcanaJSApp");
@@ -29,8 +26,7 @@ const hydrateArcanaJS = (viewsOrContext, layout) => {
     if (container && dataScript) {
         try {
             const { page, data, params, csrfToken } = JSON.parse(dataScript.textContent || "{}");
-            (0, client_1.hydrateRoot)(container, react_1.default.createElement(HeadContext_1.HeadContext.Provider, { value: headManager },
-                react_1.default.createElement(ArcanaJSApp_1.ArcanaJSApp, { initialPage: page, initialData: data, initialParams: params, csrfToken: csrfToken, views: views, layout: layout })));
+            (0, client_1.hydrateRoot)(container, (0, jsx_runtime_1.jsx)(HeadContext_1.HeadContext.Provider, { value: headManager, children: (0, jsx_runtime_1.jsx)(ArcanaJSApp_1.ArcanaJSApp, { initialPage: page, initialData: data, initialParams: params, csrfToken: csrfToken, views: views, layout: layout }) }));
         }
         catch (e) {
             console.error("Failed to parse initial data", e);

package/framework/lib/server/ArcanaJSServer.js

@@ -30,8 +30,22 @@ class ArcanaJSServer {
             });
         }
         if (!views) {
-            // Auto-discovery using fs (Server-side only)
-            views = this.discoverViews();
+            // Try to load from injected alias (Webpack)
+            try {
+                // @ts-ignore - This alias is injected by Webpack
+                const injectedViews = require("arcana-views");
+                if (injectedViews) {
+                    views = {};
+                    injectedViews.keys().forEach((key) => {
+                        const viewName = key.replace(/^\.\/(.*)\.tsx$/, "$1");
+                        views[viewName] = injectedViews(key).default;
+                    });
+                }
+            }
+            catch (e) {
+                // Fallback to auto-discovery using fs (Server-side only, non-bundled)
+                views = this.discoverViews();
+            }
         }
         if (!views || Object.keys(views).length === 0) {
             console.warn("No views found. Please check your views directory.");

package/framework/lib/shared/components/Body.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Body = void 0;
-const react_1 = __importDefault(require("react"));
+const jsx_runtime_1 = require("react/jsx-runtime");
 const Body = ({ children }) => {
-    return react_1.default.createElement(react_1.default.Fragment, null, children);
+    return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children });
 };
 exports.Body = Body;

package/framework/lib/shared/components/Link.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Link = void 0;
-const react_1 = __importDefault(require("react"));
+const jsx_runtime_1 = require("react/jsx-runtime");
 const useRouter_1 = require("../hooks/useRouter");
 const Link = ({ href, children, ...props }) => {
     const { navigateTo } = (0, useRouter_1.useRouter)();
@@ -12,6 +9,6 @@ const Link = ({ href, children, ...props }) => {
         e.preventDefault();
         navigateTo(href);
     };
-    return (react_1.default.createElement("a", { href: href, onClick: handleClick, ...props }, children));
+    return ((0, jsx_runtime_1.jsx)("a", { href: href, onClick: handleClick, ...props, children: children }));
 };
 exports.Link = Link;

package/framework/lib/shared/components/NavLink.js

@@ -1,16 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NavLink = void 0;
-const react_1 = __importDefault(require("react"));
+const jsx_runtime_1 = require("react/jsx-runtime");
 const Link_1 = require("./Link");
 const useRouter_1 = require("../hooks/useRouter");
 const NavLink = ({ href, activeClassName = "active", className = "", exact = false, children, ...props }) => {
     const { currentUrl } = (0, useRouter_1.useRouter)();
     const isActive = exact ? currentUrl === href : currentUrl.startsWith(href);
     const combinedClassName = `${className} ${isActive ? activeClassName : ""}`.trim();
-    return (react_1.default.createElement(Link_1.Link, { href: href, className: combinedClassName, ...props }, children));
+    return ((0, jsx_runtime_1.jsx)(Link_1.Link, { href: href, className: combinedClassName, ...props, children: children }));
 };
 exports.NavLink = NavLink;

package/framework/lib/shared/components/Page.js

@@ -1,16 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Page = void 0;
-const react_1 = __importDefault(require("react"));
+const jsx_runtime_1 = require("react/jsx-runtime");
 const PageContext_1 = require("../context/PageContext");
 const Head_1 = require("./Head");
 const Page = ({ data, title, children }) => {
-    return (react_1.default.createElement(PageContext_1.PageContext.Provider, { value: data },
-        title && (react_1.default.createElement(Head_1.Head, null,
-            react_1.default.createElement("title", null, title))),
-        children));
+    return ((0, jsx_runtime_1.jsxs)(PageContext_1.PageContext.Provider, { value: data, children: [title && ((0, jsx_runtime_1.jsx)(Head_1.Head, { children: (0, jsx_runtime_1.jsx)("title", { children: title }) })), children] }));
 };
 exports.Page = Page;

package/framework/lib/shared/context/RouterContext.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RouterProvider = exports.RouterContext = void 0;
-const react_1 = __importDefault(require("react"));
+const jsx_runtime_1 = require("react/jsx-runtime");
 const createSingletonContext_1 = require("../utils/createSingletonContext");
 exports.RouterContext = (0, createSingletonContext_1.createSingletonContext)("RouterContext", null);
 const RouterProvider = ({ value, children }) => {
-    return (react_1.default.createElement(exports.RouterContext.Provider, { value: value }, children));
+    return ((0, jsx_runtime_1.jsx)(exports.RouterContext.Provider, { value: value, children: children }));
 };
 exports.RouterProvider = RouterProvider;

package/framework/lib/shared/core/ArcanaJSApp.js

@@ -1,40 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArcanaJSApp = void 0;
-const react_1 = __importStar(require("react"));
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
 const Page_1 = require("../components/Page");
 const RouterContext_1 = require("../context/RouterContext");
 const ArcanaJSApp = ({ initialPage, initialData, initialParams = {}, initialUrl, csrfToken, views, layout: Layout, }) => {
@@ -82,17 +50,16 @@ const ArcanaJSApp = ({ initialPage, initialData, initialParams = {}, initialUrl,
         }
     };
     const renderPage = () => {
-        const Component = views[page] || views["NotFoundPage"] || (() => react_1.default.createElement("div", null, "404 Not Found"));
-        return (react_1.default.createElement(Page_1.Page, { data: data },
-            react_1.default.createElement(Component, { data: data, navigateTo: navigateTo, params: params })));
+        const Component = views[page] || views["NotFoundPage"] || (() => (0, jsx_runtime_1.jsx)("div", { children: "404 Not Found" }));
+        return ((0, jsx_runtime_1.jsx)(Page_1.Page, { data: data, children: (0, jsx_runtime_1.jsx)(Component, { data: data, navigateTo: navigateTo, params: params }) }));
     };
     const content = renderPage();
-    return (react_1.default.createElement(RouterContext_1.RouterProvider, { value: {
+    return ((0, jsx_runtime_1.jsx)(RouterContext_1.RouterProvider, { value: {
             navigateTo,
             currentPage: page,
             currentUrl: url,
             params,
             csrfToken,
-        } }, Layout ? react_1.default.createElement(Layout, null, content) : react_1.default.createElement(react_1.default.Fragment, null, content)));
+        }, children: Layout ? (0, jsx_runtime_1.jsx)(Layout, { children: content }) : (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: content }) }));
 };
 exports.ArcanaJSApp = ArcanaJSApp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcanajs",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "ArcanaJS Framework",
   "main": "framework/lib/index.js",
   "types": "framework/lib/index.d.ts",

package/framework/lib/shared/ArcanaJSApp.d.ts

@@ -1,11 +0,0 @@
-import React from "react";
-export interface ArcanaJSAppProps {
-    initialPage: string;
-    initialData: any;
-    initialUrl?: string;
-    views: Record<string, React.FC<any>>;
-    layout?: React.FC<{
-        children: React.ReactNode;
-    }>;
-}
-export declare const ArcanaJSApp: React.FC<ArcanaJSAppProps>;

package/framework/lib/shared/ArcanaJSApp.js

@@ -1,79 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArcanaJSApp = void 0;
-const react_1 = __importStar(require("react"));
-const Page_1 = require("./components/Page");
-const RouterContext_1 = require("./context/RouterContext");
-const ArcanaJSApp = ({ initialPage, initialData, initialUrl, views, layout: Layout, }) => {
-    const [page, setPage] = (0, react_1.useState)(initialPage);
-    const [data, setData] = (0, react_1.useState)(initialData);
-    const [url, setUrl] = (0, react_1.useState)(initialUrl ||
-        (typeof window !== "undefined" ? window.location.pathname : "/"));
-    (0, react_1.useEffect)(() => {
-        const handlePopState = (event) => {
-            if (event.state) {
-                setPage(event.state.page);
-                setData(event.state.data);
-                setUrl(window.location.pathname);
-            }
-        };
-        window.addEventListener("popstate", handlePopState);
-        return () => window.removeEventListener("popstate", handlePopState);
-    }, []);
-    const navigateTo = async (newUrl) => {
-        try {
-            const response = await fetch(newUrl, {
-                headers: { "x-arcanajs-request": "true" },
-            });
-            const json = await response.json();
-            setPage(json.page);
-            setData(json.data);
-            setUrl(newUrl);
-            window.history.pushState({ page: json.page, data: json.data }, "", newUrl);
-        }
-        catch (error) {
-            console.error("Navigation failed", error);
-        }
-    };
-    const renderPage = () => {
-        const Component = views[page] || views["NotFoundPage"] || (() => react_1.default.createElement("div", null, "404 Not Found"));
-        return (react_1.default.createElement(Page_1.Page, { data: data },
-            react_1.default.createElement(Component, { data: data, navigateTo: navigateTo })));
-    };
-    const content = renderPage();
-    return (react_1.default.createElement(RouterContext_1.RouterProvider, { value: { navigateTo, currentPage: page, currentUrl: url, params: {} } }, Layout ? react_1.default.createElement(Layout, null, content) : react_1.default.createElement(react_1.default.Fragment, null, content)));
-};
-exports.ArcanaJSApp = ArcanaJSApp;