xanix 1.0.13 → 1.0.15

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/XanixReactRefresh.d.ts

@@ -1,2 +1,2 @@
 import type { Plugin } from "rollup";
-export default function xanixReactRefresh(): Plugin;
+export default function xanixReactRefresh(WebSocketPort: number): Plugin;

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

@@ -6,7 +6,7 @@ import generate from "@babel/generator";
 import * as t from "@babel/types";
 import { getClientRuntimeFile } from "../../include/utils.js";
 const root = process.cwd();
-export default function xanixReactRefresh() {
+export default function xanixReactRefresh(WebSocketPort) {
     return {
         name: "xanix-react-refresh",
         load(id) {
@@ -22,7 +22,7 @@ ${code}
   RefreshRuntime.injectIntoGlobalHook(window);
   window.$RefreshReg$ = RefreshRuntime.register;
   window.$RefreshSig$ = () => (type) => type;
-  const ws = new WebSocket("ws://localhost:8080");
+  const ws = new WebSocket("ws://localhost:" + ${WebSocketPort});
 
   
   ws.onmessage = async (event) => {

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

@@ -12,8 +12,7 @@ export default function xanixTsconfigAlias() {
     }
     const result = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
     if (result.error) {
-        const message = ts.flattenDiagnosticMessageText(result.error.messageText, "\n");
-        throw new Error(`[xanix] Failed to read tsconfig.json:\n${message}`);
+        throw new Error(`[xanix] Failed to read tsconfig.json:\n${ts.flattenDiagnosticMessageText(result.error.messageText, "\n")}`);
     }
     const config = result.config;
     const compilerOptions = config.compilerOptions ?? {};
@@ -25,7 +24,6 @@ export default function xanixTsconfigAlias() {
         const replacement = replacements?.[0];
         if (!replacement)
             return null;
-        // @components/*
         if (find.endsWith("/*")) {
             const findPrefix = find.slice(0, -2);
             const replacementPrefix = replacement.endsWith("/*")
@@ -33,17 +31,17 @@ export default function xanixTsconfigAlias() {
                 : replacement;
             return {
                 find: new RegExp(`^${escapeRegExp(findPrefix)}/(.+)$`),
-                replacement: `${path.resolve(basePath, replacementPrefix)}/$1`,
+                replacement: path.resolve(basePath, replacementPrefix) + "/$1",
             };
         }
-        // @foo
         return {
             find,
             replacement: path.resolve(basePath, replacement),
         };
     })
-        .filter((entry) => entry !== null);
+        .filter(Boolean);
     return alias({
+        customResolver: undefined,
         entries,
     });
 }

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

@@ -4,5 +4,6 @@ export interface XanixRollupOptions {
     development?: boolean;
     assetExternal?: boolean;
     onChange?: (entry: string, event?: string) => void;
+    WebSocketPort?: number;
 }
-export declare function xanixDefaultPlugins(options?: XanixRollupOptions): Plugin[];
+export declare function xanixDefaultPlugins(options: XanixRollupOptions): Plugin[];

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

@@ -11,7 +11,7 @@ import xanixReactRefresh from "./XanixReactRefresh.js";
 import XanixEnvPlugin from "./XanixEnv.js";
 import xanixUseDataId from "./xanixUseDataId.js";
 import XanixServerTransform from "./XanixServerTransform.js";
-export function xanixDefaultPlugins(options = {}) {
+export function xanixDefaultPlugins(options) {
     const target = options.target ?? "client";
     const development = options.development ?? true;
     const isClient = target === "client";
@@ -23,10 +23,11 @@ export function xanixDefaultPlugins(options = {}) {
     }
     else {
         if (development) {
-            _plugins.push(xanixReactRefresh());
+            _plugins.push(xanixReactRefresh(options.WebSocketPort));
         }
     }
     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/watchClient.d.ts

@@ -3,6 +3,7 @@ import { XanixClientEntry } from "../types.js";
 type Option = {
     onChange?: (entry: string, event?: string) => void;
     onBuildEnd?: () => void;
+    WebSocketPort: number;
 };
 declare const WatchClient: (entries: XanixClientEntry[], options: Option) => Promise<RollupWatcher>;
 export default WatchClient;

package/dist/bin/bundler/watchClient.js

@@ -33,6 +33,7 @@ const WatchClient = async (entries, options) => {
         plugins: [
             XanixResolveCacheDeps(buildCache, entries),
             ...xanixDefaultPlugins({
+                WebSocketPort: options.WebSocketPort,
                 target: "client",
                 development: true,
                 assetExternal: true,

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/bin/cli/dev.js

@@ -7,6 +7,7 @@ import logger from "../include/logger.js";
 import { getEntries } from "../include/entry.js";
 import { WebSocketServer } from "ws";
 import outdirs from "../../outdirs.js";
+import { getWebSocketPort } from "../include/utils.js";
 const root = process.cwd();
 let child;
 function start() {
@@ -20,8 +21,9 @@ function start() {
     });
 }
 const dev = async (rootEntry) => {
+    const WebSocketPort = getWebSocketPort();
     const wss = new WebSocketServer({
-        port: 8080,
+        port: WebSocketPort,
     });
     let sockets = new Set();
     const broadcast = (message) => {
@@ -51,6 +53,7 @@ const dev = async (rootEntry) => {
         let changedFiles = new Set();
         _clientWatcher?.close();
         _clientWatcher = await watchClient(entries, {
+            WebSocketPort,
             onChange: (entry) => {
                 const _entry = entries.find((e) => e.file === entry);
                 let buildFile = _entry

package/dist/bin/include/utils.d.ts

@@ -1,3 +1,4 @@
 export declare function uid(value: string, length?: number): string;
 export declare const getClientRuntimeFile: () => string;
 export declare const getClientRuntimeFileName: (mode: "development" | "production") => string;
+export declare function getWebSocketPort(): number;

package/dist/bin/include/utils.js

@@ -13,3 +13,6 @@ export const getClientRuntimeFileName = (mode) => {
     let n = "xanix-runtime";
     return mode === "development" ? n : uid(n, 16);
 };
+export function getWebSocketPort() {
+    return Math.floor(Math.random() * (65535 - 49152 + 1)) + 49152;
+}

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.13",
+  "version": "1.0.15",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",