arcanajs 2.0.2 → 2.1.0

package/bin/arcanajs.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require("../framework/cli/index.js");

package/framework/cli/index.d.ts

@@ -0,0 +1 @@
+export {};

package/framework/cli/index.js

@@ -0,0 +1,107 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
+const path_1 = __importDefault(require("path"));
+const webpack_1 = __importDefault(require("webpack"));
+const webpack_config_1 = require("./webpack.config");
+const args = process.argv.slice(2);
+const command = args[0];
+if (!command) {
+    console.error("Please specify a command: dev, build, start");
+    process.exit(1);
+}
+const runCompiler = (compiler) => {
+    return new Promise((resolve, reject) => {
+        compiler.run((err, stats) => {
+            if (err) {
+                console.error(err);
+                return reject(err);
+            }
+            if (stats && stats.hasErrors()) {
+                console.error(stats.toString({ colors: true }));
+                return reject(new Error("Webpack build failed"));
+            }
+            console.log(stats?.toString({ colors: true }));
+            resolve();
+        });
+    });
+};
+let serverProcess = null;
+const startDevServer = () => {
+    if (serverProcess) {
+        serverProcess.kill();
+    }
+    const serverPath = path_1.default.resolve(process.cwd(), "dist/server.js");
+    serverProcess = (0, child_process_1.spawn)("node", [serverPath], { stdio: "inherit" });
+    serverProcess.on("close", (code) => {
+        if (code !== 0 && code !== null) {
+            console.error(`Dev server exited with code ${code}`);
+        }
+    });
+};
+const watchCompiler = (compiler, onBuildComplete) => {
+    compiler.watch({}, (err, stats) => {
+        if (err) {
+            console.error(err);
+            return;
+        }
+        console.log(stats?.toString({ colors: true }));
+        if (stats && !stats.hasErrors() && onBuildComplete) {
+            onBuildComplete();
+        }
+    });
+};
+const build = async () => {
+    process.env.NODE_ENV = "production";
+    console.log("Building for production...");
+    const clientConfig = (0, webpack_config_1.createClientConfig)();
+    const serverConfig = (0, webpack_config_1.createServerConfig)();
+    try {
+        await runCompiler((0, webpack_1.default)(clientConfig));
+        await runCompiler((0, webpack_1.default)(serverConfig));
+        console.log("Build complete.");
+    }
+    catch (error) {
+        console.error("Build failed:", error);
+        process.exit(1);
+    }
+};
+const dev = async () => {
+    process.env.NODE_ENV = "development";
+    console.log("Starting development server...");
+    const clientConfig = (0, webpack_config_1.createClientConfig)();
+    const serverConfig = (0, webpack_config_1.createServerConfig)();
+    // Watch client
+    watchCompiler((0, webpack_1.default)(clientConfig));
+    // Watch server and restart on build
+    watchCompiler((0, webpack_1.default)(serverConfig), () => {
+        console.log("Server build complete. Restarting server...");
+        startDevServer();
+    });
+};
+const start = () => {
+    process.env.NODE_ENV = "production";
+    const serverPath = path_1.default.resolve(process.cwd(), "dist/server.js");
+    console.log(`Starting server at ${serverPath}...`);
+    const child = (0, child_process_1.spawn)("node", [serverPath], { stdio: "inherit" });
+    child.on("close", (code) => {
+        process.exit(code || 0);
+    });
+};
+switch (command) {
+    case "build":
+        build();
+        break;
+    case "dev":
+        dev();
+        break;
+    case "start":
+        start();
+        break;
+    default:
+        console.error(`Unknown command: ${command}`);
+        process.exit(1);
+}

package/framework/cli/webpack.config.d.ts

@@ -0,0 +1,3 @@
+import webpack from "webpack";
+export declare const createClientConfig: () => webpack.Configuration;
+export declare const createServerConfig: () => webpack.Configuration;

package/framework/cli/webpack.config.js

@@ -0,0 +1,198 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createServerConfig = exports.createClientConfig = void 0;
+const clean_webpack_plugin_1 = require("clean-webpack-plugin");
+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);
+const fs_1 = __importDefault(require("fs"));
+// Helper to find entry file with supported extensions
+const findEntry = (searchPaths) => {
+    const extensions = [".ts", ".tsx", ".js", ".jsx"];
+    for (const basePath of searchPaths) {
+        for (const ext of extensions) {
+            const fullPath = path_1.default.resolve(cwd, basePath + ext);
+            if (fs_1.default.existsSync(fullPath)) {
+                return fullPath;
+            }
+            // Also check for index files in directories
+            const indexPath = path_1.default.resolve(cwd, basePath, "index" + ext);
+            if (fs_1.default.existsSync(indexPath)) {
+                return indexPath;
+            }
+        }
+    }
+    // Fallback to example if not found (for internal framework dev) or throw error
+    // For now, we'll try the example paths as a last resort before failing
+    const exampleClient = path_1.default.resolve(cwd, "src/example/client/index.tsx");
+    const exampleServer = path_1.default.resolve(cwd, "src/example/server/index.ts");
+    if (searchPaths.some((p) => p.includes("client")) &&
+        fs_1.default.existsSync(exampleClient))
+        return exampleClient;
+    if (searchPaths.some((p) => p.includes("server")) &&
+        fs_1.default.existsSync(exampleServer))
+        return exampleServer;
+    throw new Error(`Could not find entry point. Searched in: ${searchPaths.join(", ")}`);
+};
+const createClientConfig = () => {
+    const clientEntry = findEntry([
+        "src/client",
+        "src/client/index",
+        "src/index",
+        "src/main",
+    ]);
+    return {
+        mode: isProduction ? "production" : "development",
+        target: "web",
+        entry: {
+            client: clientEntry,
+        },
+        output: {
+            path: path_1.default.resolve(cwd, "dist/public"),
+            filename: isProduction
+                ? "[name].[contenthash].bundle.js"
+                : "[name].bundle.js",
+            publicPath: "/",
+            assetModuleFilename: "assets/[hash][ext][query]",
+        },
+        resolve: {
+            extensions: [".ts", ".tsx", ".js", ".jsx"],
+        },
+        resolveLoader: {
+            modules: ["node_modules", path_1.default.resolve(__dirname, "../../node_modules")],
+        },
+        module: {
+            rules: [
+                {
+                    test: /\.(ts|tsx|js|jsx)$/,
+                    exclude: /node_modules/,
+                    use: {
+                        loader: resolveLoader("babel-loader"),
+                        options: {
+                            presets: [
+                                resolveLoader("@babel/preset-env"),
+                                resolveLoader("@babel/preset-react"),
+                                resolveLoader("@babel/preset-typescript"),
+                            ],
+                        },
+                    },
+                },
+                {
+                    test: /\.css$/,
+                    use: [
+                        isProduction
+                            ? mini_css_extract_plugin_1.default.loader
+                            : resolveLoader("style-loader"),
+                        resolveLoader("css-loader"),
+                        resolveLoader("postcss-loader"),
+                    ],
+                },
+                {
+                    test: /\.(png|jpg|jpeg|gif|svg|woff|woff2|eot|ttf|otf)$/i,
+                    type: "asset/resource",
+                },
+            ],
+        },
+        plugins: [
+            new clean_webpack_plugin_1.CleanWebpackPlugin(),
+            new html_webpack_plugin_1.default({
+                template: path_1.default.resolve(cwd, "src/lib/server/default-index.html"),
+                filename: "index.html",
+                inject: "body",
+                minify: isProduction
+                    ? {
+                        removeComments: false,
+                        collapseWhitespace: true,
+                        removeRedundantAttributes: true,
+                        useShortDoctype: true,
+                        removeEmptyAttributes: true,
+                        removeStyleLinkTypeAttributes: true,
+                        keepClosingSlash: true,
+                        minifyJS: true,
+                        minifyCSS: true,
+                        minifyURLs: true,
+                    }
+                    : false,
+            }),
+            new mini_css_extract_plugin_1.default({
+                filename: isProduction ? "[name].[contenthash].css" : "[name].css",
+            }),
+        ],
+        optimization: {
+            splitChunks: {
+                chunks: "all",
+                cacheGroups: {
+                    vendor: {
+                        test: /[\\/]node_modules[\\/]/,
+                        name: "vendors",
+                        chunks: "all",
+                    },
+                },
+            },
+        },
+        devtool: isProduction ? "source-map" : "eval-source-map",
+    };
+};
+exports.createClientConfig = createClientConfig;
+const createServerConfig = () => {
+    const serverEntry = findEntry([
+        "src/server",
+        "src/server/index",
+        "src/server/main",
+    ]);
+    return {
+        mode: isProduction ? "production" : "development",
+        target: "node",
+        entry: serverEntry,
+        output: {
+            path: path_1.default.resolve(cwd, "dist"),
+            filename: "server.js",
+        },
+        externals: [(0, webpack_node_externals_1.default)()],
+        resolve: {
+            extensions: [".ts", ".tsx", ".js", ".jsx"],
+        },
+        resolveLoader: {
+            modules: ["node_modules", path_1.default.resolve(__dirname, "../../node_modules")],
+        },
+        module: {
+            rules: [
+                {
+                    test: /\.(ts|tsx|js|jsx)$/,
+                    exclude: /node_modules/,
+                    use: {
+                        loader: resolveLoader("babel-loader"),
+                        options: {
+                            presets: [
+                                resolveLoader("@babel/preset-env"),
+                                resolveLoader("@babel/preset-react"),
+                                resolveLoader("@babel/preset-typescript"),
+                            ],
+                        },
+                    },
+                },
+                {
+                    test: /\.css$/,
+                    use: resolveLoader("null-loader"), // Ignore CSS on server side
+                },
+                {
+                    test: /\.(png|jpg|jpeg|gif|svg|woff|woff2|eot|ttf|otf)$/i,
+                    type: "asset/resource",
+                    generator: {
+                        emit: false,
+                    },
+                },
+            ],
+        },
+        devtool: isProduction ? "source-map" : "eval-source-map",
+    };
+};
+exports.createServerConfig = createServerConfig;

package/{lib → framework/lib}/server/ArcanaJSServer.js

@@ -99,12 +99,9 @@ class ArcanaJSServer {
                 if (stat.isDirectory()) {
                     traverse(fullPath);
                 }
-                else if (file.endsWith(".tsx") ||
-                    file.endsWith(".jsx") ||
-                    file.endsWith(".js") ||
-                    file.endsWith(".ts")) {
+                else if (file.endsWith(".tsx") || file.endsWith(".jsx")) {
                     const relativePath = path_1.default.relative(viewsDir, fullPath);
-                    const viewName = relativePath.replace(/\.(tsx|jsx|js|ts)$/, "");
+                    const viewName = relativePath.replace(/\.(tsx|jsx)$/, "");
                     try {
                         // Use __non_webpack_require__ if available to avoid Webpack bundling issues
                         // or standard require if running in Node directly
@@ -118,7 +115,7 @@ class ArcanaJSServer {
                                 requireFunc("ts-node/register");
                             }
                             catch (e) {
-                                console.warn("ts-node/register failed. Ensure ts-node is installed if you are using .tsx/.ts views in runtime.");
+                                // Ignore if already registered or not found (might be pre-compiled)
                             }
                         }
                         const pageModule = requireFunc(fullPath);

package/package.json

@@ -1,33 +1,35 @@
 {
   "name": "arcanajs",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "ArcanaJS Framework",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "main": "framework/lib/index.js",
+  "types": "framework/lib/index.d.ts",
   "exports": {
-    ".": "./lib/index.js",
-    "./server": "./lib/server.js"
+    ".": "./framework/lib/index.js",
+    "./server": "./framework/lib/server.js"
+  },
+  "bin": {
+    "arcanajs": "./bin/arcanajs.js"
   },
   "files": [
-    "lib",
-    "webpack.client.js",
-    "webpack.server.js",
-    "tsconfig.json",
-    "babel.config.js",
-    "postcss.config.js",
-    "tailwind.config.js"
+    "framework",
+    "bin"
   ],
   "scripts": {
-    "build": "tsc -p tsconfig.lib.json",
-    "build:app": "cross-env NODE_ENV=production webpack --config webpack.server.js && cross-env NODE_ENV=production webpack --config webpack.client.js",
-    "dev:server": "cross-env NODE_ENV=development webpack --config webpack.server.js --watch",
-    "dev:server:tsx": "tsx watch src/example/server/index.ts",
-    "dev:client": "cross-env NODE_ENV=development webpack --config webpack.client.js --watch",
-    "dev": "concurrently \"npm run dev:server\" \"npm run dev:client\"",
-    "dev:tsx": "concurrently \"npm run dev:server:tsx\" \"npm run dev:client\"",
-    "start": "cross-env NODE_ENV=production node dist/server.js"
+    "build:lib": "tsc -p tsconfig.lib.json",
+    "build": "node bin/arcanajs.js build",
+    "dev": "node bin/arcanajs.js dev",
+    "start": "node bin/arcanajs.js start",
+    "lint": "eslint"
   },
   "dependencies": {
+    "compression": "^1.8.1",
+    "cookie-parser": "^1.4.7",
+    "cross-env": "^10.1.0",
+    "express": "^5.1.0",
+    "helmet": "^8.1.0",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
     "@babel/core": "^7.23.0",
     "@babel/preset-env": "^7.23.0",
     "@babel/preset-react": "^7.22.15",
@@ -36,36 +38,28 @@
     "autoprefixer": "^10.4.22",
     "babel-loader": "^10.0.0",
     "clean-webpack-plugin": "^4.0.0",
-    "compression": "^1.8.1",
     "concurrently": "^9.2.1",
-    "cookie-parser": "^1.4.7",
-    "cross-env": "^10.1.0",
     "css-loader": "^7.1.2",
-    "express": "^5.1.0",
-    "helmet": "^8.1.0",
     "html-webpack-plugin": "^5.6.5",
     "mini-css-extract-plugin": "^2.9.4",
     "null-loader": "^4.0.1",
     "postcss": "^8.5.6",
     "postcss-loader": "^8.2.0",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
     "style-loader": "^4.0.0",
     "tailwindcss": "^4.1.17",
     "ts-loader": "^9.4.4",
-    "typescript": "^5.2.2",
-    "webpack": "^5.88.2",
+    "ts-node": "^10.9.2",
+    "tsx": "^4.20.6",
+    "typescript": "^5.9.3",
+    "webpack": "^5.103.0",
     "webpack-cli": "^6.0.1",
-    "webpack-node-externals": "^3.0.0"
-  },
-  "devDependencies": {
-    "@types/compression": "^1.8.1",
-    "@types/cookie-parser": "^1.4.10",
+    "webpack-node-externals": "^3.0.0",
     "@types/express": "^5.0.5",
     "@types/node": "^24.10.1",
+    "@types/compression": "^1.8.1",
+    "@types/cookie-parser": "^1.4.10",
     "@types/react": "^19.2.7",
-    "@types/react-dom": "^19.2.3",
-    "ts-node": "^10.9.2",
-    "tsx": "^4.20.6"
-  }
+    "@types/react-dom": "^19.2.3"
+  },
+  "devDependencies": {}
 }

package/babel.config.js

@@ -1,7 +0,0 @@
-module.exports = {
-  presets: [
-    "@babel/preset-env",
-    "@babel/preset-react",
-    "@babel/preset-typescript",
-  ],
-};

package/postcss.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    "@tailwindcss/postcss": {},
-    autoprefixer: {},
-  },
-};

package/tailwind.config.js

@@ -1,8 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  content: ["./src/**/*.{js,jsx,ts,tsx}"],
-  theme: {
-    extend: {},
-  },
-  plugins: [],
-};

package/tsconfig.json

@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "CommonJS",
-    "lib": ["DOM", "ES2020"],
-    "jsx": "react",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "outDir": "./dist",
-    "rootDir": "./src",
-    "moduleResolution": "node"
-  },
-  "include": ["src/**/*"]
-}

package/webpack.client.js

@@ -1,71 +0,0 @@
-const path = require("path");
-const { CleanWebpackPlugin } = require("clean-webpack-plugin");
-const HtmlWebpackPlugin = require("html-webpack-plugin");
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-
-const isProduction = process.env.NODE_ENV === "production";
-
-module.exports = {
-  mode: isProduction ? "production" : "development",
-  target: "web",
-  entry: {
-    client: "./src/example/client/index.tsx",
-  },
-  output: {
-    path: path.resolve(__dirname, "dist/public"),
-    filename: isProduction
-      ? "[name].[contenthash].bundle.js"
-      : "[name].bundle.js",
-    publicPath: "/",
-    assetModuleFilename: "assets/[hash][ext][query]",
-  },
-  resolve: {
-    extensions: [".ts", ".tsx", ".js", ".jsx"],
-  },
-  module: {
-    rules: [
-      {
-        test: /\.(ts|tsx|js|jsx)$/,
-        exclude: /node_modules/,
-        use: "babel-loader",
-      },
-      {
-        test: /\.css$/,
-        use: [
-          isProduction ? MiniCssExtractPlugin.loader : "style-loader",
-          "css-loader",
-          "postcss-loader",
-        ],
-      },
-      {
-        test: /\.(png|jpg|jpeg|gif|svg|woff|woff2|eot|ttf|otf)$/i,
-        type: "asset/resource",
-      },
-    ],
-  },
-  plugins: [
-    new CleanWebpackPlugin(),
-    new HtmlWebpackPlugin({
-      template: "./src/lib/server/default-index.html",
-      filename: "index.html",
-      inject: "body",
-      minify: isProduction,
-    }),
-    new MiniCssExtractPlugin({
-      filename: isProduction ? "[name].[contenthash].css" : "[name].css",
-    }),
-  ],
-  optimization: {
-    splitChunks: {
-      chunks: "all",
-      cacheGroups: {
-        vendor: {
-          test: /[\\/]node_modules[\\/]/,
-          name: "vendors",
-          chunks: "all",
-        },
-      },
-    },
-  },
-  devtool: isProduction ? "source-map" : "eval-source-map",
-};

package/webpack.server.js

@@ -1,39 +0,0 @@
-const path = require("path");
-const nodeExternals = require("webpack-node-externals");
-
-const isProduction = process.env.NODE_ENV === "production";
-
-module.exports = {
-  mode: isProduction ? "production" : "development",
-  target: "node",
-  entry: "./src/example/server/index.ts",
-  output: {
-    path: path.resolve(__dirname, "dist"),
-    filename: "server.js",
-  },
-  externals: [nodeExternals()],
-  resolve: {
-    extensions: [".ts", ".tsx", ".js", ".jsx"],
-  },
-  module: {
-    rules: [
-      {
-        test: /\.(ts|tsx|js|jsx)$/,
-        exclude: /node_modules/,
-        use: "babel-loader",
-      },
-      {
-        test: /\.css$/,
-        use: "null-loader", // Ignore CSS on server side
-      },
-      {
-        test: /\.(png|jpg|jpeg|gif|svg|woff|woff2|eot|ttf|otf)$/i,
-        type: "asset/resource",
-        generator: {
-          emit: false, // Don't emit files for server build, just get paths
-        },
-      },
-    ],
-  },
-  devtool: isProduction ? "source-map" : "eval-source-map",
-};