xanix 1.0.12 → 1.0.14

package/dist/bin/bundler/buildServer.js

@@ -15,7 +15,7 @@ const BuildServer = async ({ rootEntry, onBuildEnd }) => {
     fs.mkdirSync(outdirs.server, {
         recursive: true,
     });
-    const entries = await generateClientEntries();
+    const entries = await generateClientEntries({ rootEntry });
     await createManifest(entries);
     const input = {
         index: path.resolve(root, rootEntry),

package/dist/bin/bundler/cacheNpmModules.js

@@ -1,13 +1,10 @@
 import path from "node:path";
 import { rollup } from "rollup";
-import { nodeResolve } from "@rollup/plugin-node-resolve";
 import { build } from "esbuild";
 import { createRequire } from "node:module";
 import { getClientRuntimeFile } from "../include/utils.js";
-import esbuild from "rollup-plugin-esbuild";
-import url from "@rollup/plugin-url";
-import XanixDocument from "./plugins/XanixDocument/index.js";
 import outdirs from "../../outdirs.js";
+import { xanixDefaultPlugins } from "./plugins/plugins.js";
 const require = createRequire(import.meta.url);
 const GenerateGraph = async (entries) => {
     const collector = new Map();
@@ -19,33 +16,10 @@ const GenerateGraph = async (entries) => {
     const bundle = await rollup({
         input,
         plugins: [
-            nodeResolve({
-                extensions: [".mjs", ".js", ".jsx", ".json", ".ts", ".tsx"],
-            }),
-            url({
-                include: [
-                    "**/*.jpg",
-                    "**/*.jpeg",
-                    "**/*.png",
-                    "**/*.gif",
-                    "**/*.webp",
-                    "**/*.svg",
-                    "**/*.ico",
-                    "**/*.woff",
-                    "**/*.woff2",
-                    "**/*.ttf",
-                    "**/*.eot",
-                    "**/*.css",
-                ],
-                limit: 0,
-                fileName: "assets/[name]-[hash][extname]",
-                emitFiles: false,
-            }),
-            XanixDocument(),
-            esbuild({
-                target: "es2022",
-                jsx: "automatic",
-                tsconfig: false,
+            ...xanixDefaultPlugins({
+                target: "client",
+                development: true,
+                assetExternal: true,
             }),
         ],
         external(id) {

package/dist/bin/bundler/generateClientEntries.d.ts

@@ -1,3 +1,5 @@
 import { type XanixClientEntry } from "../types.js";
-declare const generateClientEntries: () => Promise<XanixClientEntry[]>;
+declare const generateClientEntries: ({ rootEntry, }: {
+    rootEntry: string;
+}) => Promise<XanixClientEntry[]>;
 export default generateClientEntries;

package/dist/bin/bundler/generateClientEntries.js

@@ -1,46 +1,20 @@
 import { rollup } from "rollup";
 import path from "node:path";
 import { XanixEntryFinder } from "./plugins/XanixEntryFinder/index.js";
-import url from "@rollup/plugin-url";
-import esbuild from "rollup-plugin-esbuild";
-import XanixTsconfigAlias from "./plugins/XanixTsconfigAlias.js";
-import { nodeResolve } from "@rollup/plugin-node-resolve";
+import { xanixDefaultPlugins } from "./plugins/plugins.js";
 const root = process.cwd();
-const generateClientEntries = async () => {
+const generateClientEntries = async ({ rootEntry, }) => {
     const entries = new Map();
     const bundle = await rollup({
-        input: path.resolve(root, "index.tsx"),
+        input: path.resolve(root, rootEntry),
         plugins: [
-            XanixTsconfigAlias(),
-            nodeResolve({
-                extensions: [".mjs", ".js", ".jsx", ".json", ".ts", ".tsx"],
-            }),
             XanixEntryFinder({
                 entries,
             }),
-            url({
-                include: [
-                    "**/*.jpg",
-                    "**/*.jpeg",
-                    "**/*.png",
-                    "**/*.gif",
-                    "**/*.webp",
-                    "**/*.svg",
-                    "**/*.ico",
-                    "**/*.woff",
-                    "**/*.woff2",
-                    "**/*.ttf",
-                    "**/*.eot",
-                    "**/*.css",
-                ],
-                limit: 0,
-                fileName: "assets/[name]-[hash][extname]",
-                emitFiles: true,
-            }),
-            esbuild({
-                target: "es2022",
-                jsx: "automatic",
-                tsconfig: false,
+            ...xanixDefaultPlugins({
+                target: "server",
+                development: true,
+                assetExternal: true,
             }),
         ],
         external(id) {

package/dist/bin/bundler/plugins/XanixTsconfigAlias.js

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import alias from "@rollup/plugin-alias";
+import ts from "typescript";
 export default function xanixTsconfigAlias() {
     const root = process.cwd();
     const tsconfigPath = path.resolve(root, "tsconfig.json");
@@ -9,14 +10,11 @@ export default function xanixTsconfigAlias() {
             name: "xanix-tsconfig-alias",
         };
     }
-    let config;
-    try {
-        const content = fs.readFileSync(tsconfigPath, "utf8");
-        config = parseJsonc(content);
-    }
-    catch (error) {
-        throw new Error(`[xanix] Failed to read tsconfig.json:\n${error.message}`);
+    const result = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
+    if (result.error) {
+        throw new Error(`[xanix] Failed to read tsconfig.json:\n${ts.flattenDiagnosticMessageText(result.error.messageText, "\n")}`);
     }
+    const config = result.config;
     const compilerOptions = config.compilerOptions ?? {};
     const baseUrl = compilerOptions.baseUrl ?? ".";
     const basePath = path.resolve(path.dirname(tsconfigPath), baseUrl);
@@ -26,12 +24,14 @@ export default function xanixTsconfigAlias() {
         const replacement = replacements?.[0];
         if (!replacement)
             return null;
-        if (find.includes("*")) {
-            const findPrefix = find.replace(/\/?\*$/, "");
-            const replacementPrefix = replacement.replace(/\/?\*$/, "");
+        if (find.endsWith("/*")) {
+            const findPrefix = find.slice(0, -2);
+            const replacementPrefix = replacement.endsWith("/*")
+                ? replacement.slice(0, -2)
+                : replacement;
             return {
                 find: new RegExp(`^${escapeRegExp(findPrefix)}/(.+)$`),
-                replacement: `${path.resolve(basePath, replacementPrefix)}/$1`,
+                replacement: path.resolve(basePath, replacementPrefix) + "/$1",
             };
         }
         return {
@@ -41,19 +41,10 @@ export default function xanixTsconfigAlias() {
     })
         .filter(Boolean);
     return alias({
+        customResolver: undefined,
         entries,
     });
 }
 function escapeRegExp(value) {
     return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-function parseJsonc(content) {
-    const withoutComments = content
-        // Remove /* block comments */
-        .replace(/\/\*[\s\S]*?\*\//g, "")
-        // Remove // comments
-        .replace(/\/\/.*$/gm, "");
-    // Remove trailing commas
-    const withoutTrailingCommas = withoutComments.replace(/,\s*([}\]])/g, "$1");
-    return JSON.parse(withoutTrailingCommas);
-}

package/dist/bin/bundler/plugins/plugins.js

@@ -27,6 +27,7 @@ export function xanixDefaultPlugins(options = {}) {
         }
     }
     return [
+        XanixTsconfigAlias(),
         {
             name: "watch",
             async watchChange(id, change) {
@@ -53,7 +54,6 @@ export function xanixDefaultPlugins(options = {}) {
             fileName: "assets/[name]-[hash][extname]",
             emitFiles: !(options?.assetExternal ?? false),
         }),
-        XanixTsconfigAlias(),
         XanixEnvPlugin({
             mode: development ? "development" : "production",
             isClient,

package/dist/bin/bundler/watchServer.js

@@ -16,7 +16,7 @@ const watchServer = async ({ rootEntry, onChange, onBuildEnd, onServerChange, on
     fs.mkdirSync(outdirs.server, {
         recursive: true,
     });
-    const entries = await generateClientEntries();
+    const entries = await generateClientEntries({ rootEntry });
     await createManifest(entries);
     const input = {
         index: path.resolve(root, rootEntry),
@@ -62,7 +62,7 @@ const watchServer = async ({ rootEntry, onChange, onBuildEnd, onServerChange, on
                         for (const entry of changedFiles) {
                             const isClientEntry = Array.from(manifest.entries.values()).find((e) => e.file === entry);
                             if (!isClientEntry) {
-                                const entries = await generateClientEntries();
+                                const entries = await generateClientEntries({ rootEntry });
                                 const isEqual = await entriesEqual(entries);
                                 if (!isEqual) {
                                     await createManifest(entries);

package/dist/theme.d.ts

@@ -0,0 +1,3 @@
+declare const lightTheme: import("@xanui/core").ThemeOptions;
+declare const darkTheme: import("@xanui/core").ThemeOptions;
+export { lightTheme, darkTheme };

package/dist/theme.js

@@ -0,0 +1,10 @@
+import { createTheme } from "@xanui/core";
+const lightTheme = createTheme({
+    mode: "light",
+    name: "light",
+});
+const darkTheme = createTheme({
+    mode: "dark",
+    name: "dark",
+});
+export { lightTheme, darkTheme };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xanix",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -52,7 +52,8 @@
     "rollup": "^4.62.5",
     "rollup-plugin-esbuild": "^6.2.1",
     "tslib": "^2.8.1",
-    "ws": "^8.21.3"
+    "ws": "^8.21.3",
+    "typescript": "^5.9.3"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -67,7 +68,6 @@
     "@xanui/icons": "^1.1.14",
     "@xanui/ui": "^1.2.24",
     "react": "^19.2.8",
-    "react-dom": "^19.2.8",
-    "typescript": "^5.9.3"
+    "react-dom": "^19.2.8"
   }
 }

package/dist/bin/bundler/cacheNpmModules copy.d.ts

@@ -1,11 +0,0 @@
-import { XanixClientEntry } from "../types";
-export type DependencyInfo = {
-    source: string;
-    resolved: string;
-    packageName: string;
-};
-export type CacheMetadata = Map<string, {
-    file: string;
-}>;
-declare const BuildCache: (entries: XanixClientEntry[]) => Promise<CacheMetadata>;
-export default BuildCache;

package/dist/bin/bundler/cacheNpmModules copy.js

@@ -1,162 +0,0 @@
-import path from "node:path";
-import { rollup } from "rollup";
-import { nodeResolve } from "@rollup/plugin-node-resolve";
-import { build } from "esbuild";
-import { createRequire } from "node:module";
-import { getClientRuntimeFile, getDocumentFile } from "../include/utils.js";
-import esbuild from "rollup-plugin-esbuild";
-import url from "@rollup/plugin-url";
-import XanixDocument from "./plugins/XanixDocument/index.js";
-const require = createRequire(import.meta.url);
-const GenerateGraph = async (entries) => {
-    const collector = new Map();
-    const input = [];
-    for (const entry of entries) {
-        input.push(entry.file);
-    }
-    input.push(getClientRuntimeFile());
-    input.push(await getDocumentFile());
-    const bundle = await rollup({
-        input,
-        plugins: [
-            nodeResolve({
-                extensions: [".mjs", ".js", ".jsx", ".json", ".ts", ".tsx"],
-            }),
-            url({
-                include: [
-                    "**/*.jpg",
-                    "**/*.jpeg",
-                    "**/*.png",
-                    "**/*.gif",
-                    "**/*.webp",
-                    "**/*.svg",
-                    "**/*.ico",
-                    "**/*.woff",
-                    "**/*.woff2",
-                    "**/*.ttf",
-                    "**/*.eot",
-                    "**/*.css",
-                ],
-                limit: 0,
-                fileName: "assets/[name]-[hash][extname]",
-                emitFiles: false,
-            }),
-            XanixDocument(),
-            esbuild({
-                target: "es2022",
-                jsx: "automatic",
-                tsconfig: false,
-            }),
-        ],
-        external(id) {
-            if (id.startsWith(".") ||
-                path.isAbsolute(id) ||
-                id === "@" ||
-                id.startsWith("@/") ||
-                id === "virtual:xanix-document") {
-                return false;
-            }
-            collector.set(id, {
-                source: id,
-                resolved: require.resolve(id, {
-                    paths: [process.cwd()],
-                }),
-                packageName: id,
-            });
-            return true;
-        },
-    });
-    await bundle.close();
-    return collector;
-};
-// Wraps each CJS dep in a virtual ESM file that re-exports named exports detected via require()
-const makeCjsWrapperPlugin = (wrappers) => ({
-    name: "cjs-named-exports",
-    setup(build) {
-        build.onResolve({ filter: /\?cjs-wrapper$/ }, (args) => ({
-            path: args.path,
-            namespace: "cjs-wrapper",
-        }));
-        build.onLoad({ filter: /.*/, namespace: "cjs-wrapper" }, (args) => {
-            const contents = wrappers.get(args.path);
-            return { contents, resolveDir: process.cwd() };
-        });
-    },
-});
-const buildWrappers = (input) => {
-    const wrappers = new Map();
-    const wrappedInput = {};
-    for (const [name, resolved] of Object.entries(input)) {
-        const key = `${name}?cjs-wrapper`;
-        let namedExports = [];
-        let hasDefault = false;
-        try {
-            const mod = require(resolved);
-            hasDefault =
-                mod &&
-                    (typeof mod === "object" || typeof mod === "function") &&
-                    "default" in mod;
-            namedExports = Object.keys(mod).filter((key) => key !== "__esModule" && key !== "default");
-        }
-        catch (err) {
-            // console.log(err);
-        }
-        const lines = [`import * as __mod from ${JSON.stringify(resolved)};`];
-        if (hasDefault) {
-            lines.push(`export default __mod.default;`);
-        }
-        else {
-            lines.push(`export default __mod;`);
-        }
-        lines.push("");
-        for (const exportName of namedExports) {
-            if (/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(exportName)) {
-                lines.push(`export const ${exportName} = __mod[${JSON.stringify(exportName)}];`);
-            }
-        }
-        wrappers.set(key, lines.join("\n"));
-        wrappedInput[name] = key;
-    }
-    return {
-        wrappers,
-        wrappedInput,
-    };
-};
-const bundleDeps = async (input, outdir) => {
-    const { wrappers, wrappedInput } = buildWrappers(input);
-    await build({
-        entryPoints: wrappedInput,
-        bundle: true,
-        splitting: true,
-        format: "esm",
-        target: "es2022",
-        outdir,
-        entryNames: "[name]",
-        chunkNames: "chunks/[hash]",
-        platform: "browser",
-        sourcemap: true,
-        define: {
-            __XANIX_CLIENT__: "true",
-            __XANIX_SERVER__: "false",
-            __XANIX_DEV__: "true",
-            __XANIX_PROD__: "false",
-        },
-        plugins: [makeCjsWrapperPlugin(wrappers)],
-    });
-};
-const metadata = new Map();
-const BuildCache = async (entries) => {
-    const input = {};
-    const dependencies = await GenerateGraph(entries);
-    for (const dependency of dependencies.values()) {
-        const entryName = dependency.source.replace(/^@/, "").replace(/\//g, "-");
-        input[entryName] = dependency.resolved;
-        metadata.set(dependency.source, {
-            file: `${entryName}.js`,
-        });
-    }
-    const cacheDir = path.resolve(process.cwd(), ".xanix/cache");
-    await bundleDeps(input, cacheDir);
-    return metadata;
-};
-export default BuildCache;

package/dist/bin/bundler/plugins/XanixPageTransform.js

@@ -1 +0,0 @@
-"use strict";

package/dist/bin/bundler/plugins/XanixTransform/index.d.ts

@@ -1,2 +0,0 @@
-import type { Plugin } from "rollup";
-export declare function XanixTransform(): Plugin;

package/dist/bin/bundler/plugins/XanixTransform/index.js

@@ -1,19 +0,0 @@
-import { transformer } from "./transformer.js";
-export function XanixTransform() {
-    return {
-        name: "xanix-transform",
-        async transform(code, id) {
-            if (id.includes("node_modules") || !/\.(tsx?|jsx?)$/.test(id)) {
-                return null;
-            }
-            const result = transformer(code, id);
-            if (!result) {
-                return null;
-            }
-            return {
-                code: result.code,
-                map: result.map,
-            };
-        },
-    };
-}

package/dist/bin/bundler/plugins/XanixTransform/transformer copy.d.ts

@@ -1,16 +0,0 @@
-import * as t from "@babel/types";
-export interface XanixTransformResult {
-    code: string;
-    map: any;
-}
-export declare function resolveFile(file: string): string;
-export declare function resolveComponentFile(importer: string, importPath: string): string;
-export declare function createPageId(file: string): string;
-export declare function getJSXComponentName(node: t.JSXElement): string | null;
-export declare function findComponentImport(ast: t.File, componentName: string): {
-    file: string;
-    export: string;
-    declaration: t.ImportDeclaration;
-    specifier: t.ImportSpecifier | t.ImportDefaultSpecifier;
-} | null;
-export declare function transformer(code: string, id: string, mode: "watch" | "start"): XanixTransformResult | null;