xanix 1.0.8 → 1.0.10

package/dist/bin/bundler/buildClient.js

@@ -1,8 +1,9 @@
 import { rollup } from "rollup";
 import fs from "node:fs";
-import bundlerOutput, { outDir } from "./config/output.js";
+import bundlerOutput from "./config/output.js";
 import { getClientRuntimeFile, getClientRuntimeFileName, } from "../include/utils.js";
 import { xanixDefaultPlugins } from "./plugins/plugins.js";
+import outdirs from "../../outdirs.js";
 const buildClient = async (entries) => {
     const input = {};
     for (const entry of entries) {
@@ -10,11 +11,11 @@ const buildClient = async (entries) => {
     }
     const runtimeFileName = getClientRuntimeFileName("production");
     input[runtimeFileName] = getClientRuntimeFile();
-    fs.rmSync(outDir.client, {
+    fs.rmSync(outdirs.client, {
         recursive: true,
         force: true,
     });
-    fs.mkdirSync(outDir.client, {
+    fs.mkdirSync(outdirs.client, {
         recursive: true,
     });
     const build = await rollup({

package/dist/bin/bundler/buildServer.js

@@ -1,17 +1,18 @@
 import { rollup } from "rollup";
 import path from "node:path";
-import bundlerOutput, { outDir } from "./config/output.js";
+import bundlerOutput from "./config/output.js";
 import fs from "node:fs";
 import { createManifest } from "../include/manifest.js";
 import generateClientEntries from "./generateClientEntries.js";
 import { xanixDefaultPlugins } from "./plugins/plugins.js";
+import outdirs from "../../outdirs.js";
 const root = process.cwd();
 const BuildServer = async ({ rootEntry, onBuildEnd }) => {
-    fs.rmSync(outDir.server, {
+    fs.rmSync(outdirs.server, {
         recursive: true,
         force: true,
     });
-    fs.mkdirSync(outDir.server, {
+    fs.mkdirSync(outdirs.server, {
         recursive: true,
     });
     const entries = await generateClientEntries();

package/dist/bin/bundler/cacheNpmModules.js

@@ -7,6 +7,7 @@ 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";
 const require = createRequire(import.meta.url);
 const GenerateGraph = async (entries) => {
     const collector = new Map();
@@ -154,7 +155,7 @@ const BuildCache = async (entries) => {
             file: `${entryName}.js`,
         });
     }
-    const cacheDir = path.resolve(process.cwd(), ".xanix/cache");
+    const cacheDir = path.resolve(outdirs.server, "cache");
     await bundleDeps(input, cacheDir);
     return metadata;
 };

package/dist/bin/bundler/config/output.d.ts

@@ -1,9 +1,5 @@
 import { OutputOptions } from "rollup";
 import { XanixClientEntry } from "../../types";
-export declare const outDir: {
-    server: string;
-    client: string;
-};
 type Options = {
     isDev?: boolean;
 };

package/dist/bin/bundler/config/output.js

@@ -1,16 +1,12 @@
-import path from "node:path";
+import outdirs from "../../../outdirs.js";
 const root = process.cwd();
-export const outDir = {
-    server: path.resolve(root, ".xanix"),
-    client: path.resolve(root, ".xanix/client"),
-};
 const client = (entries, { isDev }) => {
     const _entries = {};
     for (const entry of entries) {
         _entries[entry.name] = entry;
     }
     const opt = {
-        dir: outDir.client,
+        dir: outdirs.client,
         format: "esm",
         entryFileNames: (id) => {
             const entry = _entries[id.name];
@@ -33,7 +29,7 @@ const client = (entries, { isDev }) => {
 };
 const server = (opt) => {
     return {
-        dir: outDir.server,
+        dir: outdirs.server,
         format: "esm",
         sourcemap: opt.isDev ?? true,
         entryFileNames: "[name].js",

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

@@ -4,6 +4,7 @@ import crypto from "node:crypto";
 import { parse } from "@babel/parser";
 import traverse from "@babel/traverse";
 import * as t from "@babel/types";
+import outdirs from "../../../../outdirs.js";
 const SOURCE_EXTENSIONS = [".tsx", ".ts", ".jsx", ".js", ".mjs", ".cjs"];
 function normalizeFilePath(file) {
     return path.resolve(file).split(path.sep).join("/");
@@ -140,7 +141,7 @@ export function entryFinder(code, id) {
             const root = process.cwd();
             const relativeSource = path.relative(root, componentFile);
             const parsed = path.parse(relativeSource);
-            const buildPath = normalizeFilePath(path.resolve(root, ".xanix", parsed.dir, `${parsed.name}.js`));
+            const buildPath = normalizeFilePath(path.resolve(root, outdirs.root, parsed.dir, `${parsed.name}.js`));
             const entry = {
                 id: clientId,
                 name: componentName,

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

@@ -23,6 +23,8 @@ ${code}
   window.$RefreshReg$ = RefreshRuntime.register;
   window.$RefreshSig$ = () => (type) => type;
   const ws = new WebSocket("ws://localhost:8080");
+
+  
   ws.onmessage = async (event) => {
     const files = JSON.parse(event.data);
 

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

@@ -1,5 +1,6 @@
 import path from "node:path";
 import BuildCache from "../../cacheNpmModules.js";
+import outdirs from "../../../../outdirs.js";
 function XanixResolveCacheDeps(metadata, entries) {
     if (!entries.length) {
         return {
@@ -14,12 +15,15 @@ function XanixResolveCacheDeps(metadata, entries) {
             }
             const dependency = metadata.get(source);
             if (dependency) {
-                return { id: `/.xanix/cache/${dependency.file}`, external: true };
+                return { id: `/${outdirs.cache}/${dependency.file}`, external: true };
             }
             const buildCache = await BuildCache(entries);
             const newDependency = buildCache.get(source);
             if (newDependency) {
-                return { id: `/.xanix/cache/${newDependency.file}`, external: true };
+                return {
+                    id: `/${outdirs.cache}/${newDependency.file}`,
+                    external: true,
+                };
             }
         },
     };

package/dist/bin/bundler/watchClient.js

@@ -1,10 +1,11 @@
 import { watch } from "rollup";
-import bundlerOutput, { outDir } from "./config/output.js";
+import bundlerOutput from "./config/output.js";
 import fs from "node:fs";
 import BuildCache from "./cacheNpmModules.js";
 import XanixResolveCacheDeps from "./plugins/XanixResolveCacheDeps/index.js";
 import { getClientRuntimeFile, getClientRuntimeFileName, } from "../include/utils.js";
 import { xanixDefaultPlugins } from "./plugins/plugins.js";
+import outdirs from "../../outdirs.js";
 const WatchClient = async (entries, options) => {
     const input = {};
     for (const entry of entries) {
@@ -12,11 +13,11 @@ const WatchClient = async (entries, options) => {
     }
     const runtimeFileName = getClientRuntimeFileName("development");
     input[runtimeFileName] = getClientRuntimeFile();
-    fs.rmSync(outDir.client, {
+    fs.rmSync(outdirs.client, {
         recursive: true,
         force: true,
     });
-    fs.mkdirSync(outDir.client, {
+    fs.mkdirSync(outdirs.client, {
         recursive: true,
     });
     let buildCache;

package/dist/bin/bundler/watchServer.js

@@ -3,16 +3,17 @@ import path from "node:path";
 import fs from "node:fs";
 import { createManifest, readManifest } from "../include/manifest.js";
 import generateClientEntries from "./generateClientEntries.js";
-import bundlerOutput, { outDir } from "./config/output.js";
+import bundlerOutput from "./config/output.js";
 import { entriesEqual } from "../include/entry.js";
 import { xanixDefaultPlugins } from "./plugins/plugins.js";
+import outdirs from "../../outdirs.js";
 const root = process.cwd();
 const watchServer = async ({ rootEntry, onChange, onBuildEnd, onServerChange, onClientEntryChange, }) => {
-    fs.rmSync(outDir.server, {
+    fs.rmSync(outdirs.server, {
         recursive: true,
         force: true,
     });
-    fs.mkdirSync(outDir.server, {
+    fs.mkdirSync(outdirs.server, {
         recursive: true,
     });
     const entries = await generateClientEntries();

package/dist/bin/cli/dev.js

@@ -5,14 +5,14 @@ import watchClient from "../bundler/watchClient.js";
 import pc from "picocolors";
 import logger from "../include/logger.js";
 import { getEntries } from "../include/entry.js";
-import { outDir } from "../bundler/config/output.js";
 import { WebSocketServer } from "ws";
+import outdirs from "../../outdirs.js";
 const root = process.cwd();
 let child;
 function start() {
     child?.kill();
     return new Promise((resolve) => {
-        const filePath = path.join(outDir.server, "index.js");
+        const filePath = path.join(outdirs.server, "index.js");
         child = spawn(process.execPath, [filePath], {
             stdio: !child ? "inherit" : "pipe",
         });

package/dist/bin/cli/start.js

@@ -1,9 +1,9 @@
 import path from "node:path";
 import { spawn } from "child_process";
-import { outDir } from "../bundler/config/output.js";
+import outdirs from "../../outdirs.js";
 let child;
 const start = async () => {
-    const filePath = path.join(outDir.server, "index.js");
+    const filePath = path.join(outdirs.server, "index.js");
     child = spawn(process.execPath, [filePath], {
         stdio: "inherit",
     });

package/dist/bin/include/manifest.js

@@ -1,5 +1,6 @@
 import path from "node:path";
 import fs from "node:fs";
+import outdirs from "../../outdirs.js";
 let readedManifest = null;
 export const createManifest = async (entries) => {
     const manifest = {
@@ -7,7 +8,7 @@ export const createManifest = async (entries) => {
         entries: [...entries.values()],
     };
     readedManifest = manifest;
-    const outDir = path.resolve(process.cwd(), ".xanix");
+    const outDir = path.resolve(process.cwd(), outdirs.root);
     fs.writeFileSync(path.resolve(outDir, "client-manifest.json"), JSON.stringify(manifest, null, 2));
 };
 export const readManifest = async () => readedManifest;

package/dist/bin/include/utils.js

@@ -10,8 +10,6 @@ export const getClientRuntimeFile = () => {
     return path.join(__dirname, "../../../client-runtime.js");
 };
 export const getClientRuntimeFileName = (mode) => {
-    if (mode === "development") {
-        return "xanix-runtime";
-    }
-    return uid("xanix-runtime", 32);
+    let n = "xanix-runtime";
+    return mode === "development" ? n : uid(n, 16);
 };

package/dist/client-runtime.js

@@ -1,12 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createRoot } from "react-dom/client";
+import outdirs from "./outdirs.js";
 const pages = new Map();
 const ROOT_KEY = "__xanix_root__";
 export const getPath = () => {
     const { pathname, search } = window.location;
     return search ? `${pathname}${search}` : pathname;
 };
-export const getImportUrl = (pageId) => `/.xanix/client/${pageId}.js`;
+export const getImportUrl = (pageId) => `/${outdirs.client}/${pageId}.js`;
 function getRoot() {
     let ele = document.body;
     if (!ele) {

package/dist/components/Head.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect } from "react";
 import useDocument from "../hooks/useDocument.js";
+import outdirs from "../outdirs.js";
 const Head = ({ children }) => {
     const { title, meta, pageId, props, params, pageData } = useDocument();
     if (__XANIX_CLIENT__) {
@@ -39,7 +40,7 @@ const Head = ({ children }) => {
                             request: null,
                         })};
         `,
-                    } }), _jsx("script", { type: "module", src: `/.xanix/client/${__XANIX_CLIENT_RUNTIME_FILE_NAME__}.js` })] }));
+                    } }), _jsx("script", { type: "module", src: `/${outdirs.client}/${__XANIX_CLIENT_RUNTIME_FILE_NAME__}.js` })] }));
     }
 };
 export default Head;

package/dist/dirs.js

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

package/dist/hooks/useData.js

@@ -2,6 +2,7 @@ import usePage from "./usePage.js";
 import React, { useEffect, useRef } from "react";
 import useDocument from "./useDocument.js";
 import loader from "../dataLoader.js";
+import outdirs from "../outdirs.js";
 const useData = (_callback, _args) => {
     return {};
 };
@@ -31,7 +32,7 @@ useData.register = (xanixId, callback) => {
             const init = useRef(false);
             const reload = async () => {
                 setLoading(true);
-                const res = await fetch(`/.xanix/__data__/${xanixId}`, {
+                const res = await fetch(`/${outdirs.root}/__data__/${xanixId}`, {
                     method: "POST",
                     headers: {
                         "Content-Type": "application/json",

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference path="./types/globals.d.ts" />
 /// <reference path="./types/express.d.ts" />
 /// <reference path="./types/assets.d.ts" />
+/// <reference path="./types/xanix-virtual.d.ts" />
 
 import Link from "./components/Link.js";
 import Document, { DocumentProps } from "./components/Document.js";

package/dist/navigate.js

@@ -3,12 +3,8 @@ export const navigate = (path, replace = false) => {
         detail: { path, replace },
     }));
 };
-export const back = () => {
-    window.history.back();
-};
-export const forward = () => {
-    window.history.forward();
-};
+export const back = () => window.history.back();
+export const forward = () => window.history.forward();
 export const preload = async (path) => {
     window.dispatchEvent(new CustomEvent(XANIX_PRELOAD, { detail: { path } }));
 };

package/dist/outdir.d.ts

@@ -0,0 +1,8 @@
+declare const outdir: {
+    root: string;
+    server: string;
+    client: string;
+    cache: string;
+    assets: string;
+};
+export default outdir;

package/dist/outdir.js

@@ -0,0 +1,9 @@
+const ourDirName = ".xanix";
+const outdir = {
+    root: ourDirName,
+    server: ourDirName,
+    client: `${ourDirName}/client`,
+    cache: `${ourDirName}/cache`,
+    assets: `${ourDirName}/assets`,
+};
+export default outdir;

package/dist/outdirs.d.ts

@@ -0,0 +1,8 @@
+declare const outdirs: {
+    root: string;
+    server: string;
+    client: string;
+    cache: string;
+    assets: string;
+};
+export default outdirs;

package/dist/outdirs.js

@@ -0,0 +1,9 @@
+const root = ".xanix";
+const outdirs = {
+    root,
+    server: root,
+    client: `${root}/client`,
+    cache: `${root}/cache`,
+    assets: `${root}/assets`,
+};
+export default outdirs;

package/dist/server/runtime/createServer.js

@@ -1,25 +1,26 @@
 import express from "express";
 import dataLoader from "../../dataLoader.js";
+import outdirs from "../../outdirs.js";
 function createXanixServer({ mode }) {
     const app = express();
     if (mode === "watch") {
-        app.use("/.xanix/client", express.static(".xanix/client"));
-        app.use("/assets", express.static(".xanix/assets"));
-        app.use("/.xanix/cache", express.static(".xanix/cache"));
+        app.use(`/${outdirs.client}`, express.static(`${outdirs.client}`));
+        app.use(`/assets`, express.static(outdirs.assets));
+        app.use(`/${outdirs.cache}`, express.static(`${outdirs.cache}`));
     }
     else {
-        app.use("/.xanix/client", express.static(".xanix/client", {
+        app.use(`/${outdirs.client}`, express.static(`${outdirs.client}`, {
             maxAge: "1y",
             immutable: true,
             etag: true,
         }));
-        app.use("/assets", express.static(".xanix/assets", {
+        app.use(`/assets`, express.static(outdirs.assets, {
             maxAge: "1y",
             immutable: true,
             etag: true,
         }));
     }
-    app.post("/.xanix/__data__/:xanixId", express.json(), async (req, res) => {
+    app.post(`/${outdirs.root}/__data__/:xanixId`, express.json(), async (req, res) => {
         const { xanixId } = req.params;
         const args = req.body;
         const data = await dataLoader.result(xanixId, args);

package/dist/server/runtime/readManifest.js

@@ -1,7 +1,8 @@
 import fs from "node:fs/promises";
 import path from "node:path";
+import outdirs from "../../outdirs";
 async function readManifest() {
-    const manifestPath = path.resolve(process.cwd(), ".xanix", "client-manifest.json");
+    const manifestPath = path.resolve(process.cwd(), outdirs.root, "client-manifest.json");
     const source = await fs.readFile(manifestPath, "utf8");
     return JSON.parse(source);
 }

package/dist/types/globals.d.ts

@@ -19,7 +19,6 @@ declare global {
   const XANIX_PRELOAD: string;
   const XANIX_PRELOAD_START: string;
   const XANIX_PRELOAD_END: string;
-
   const XANIX_NAVIGATE_RELOAD: string;
 }
 

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "xanix",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "./dist/index.d.ts",
-  "bin": "./dist/bin/index.js",
+  "bin": {
+    "xanix": "dist/bin/index.js"
+  },
   "type": "module",
   "files": [
     "dist"
@@ -22,10 +24,6 @@
     "./runtime": {
       "import": "./dist/server/runtime/index.js",
       "require": "./dist/server/runtime/index.js"
-    },
-    "./BaseDocument": {
-      "types": "./dist/components/BaseDocument.d.ts",
-      "import": "./dist/components/BaseDocument.js"
     }
   },
   "scripts": {
@@ -38,16 +36,12 @@
   "dependencies": {
     "@babel/generator": "^8.0.0",
     "@babel/parser": "^8.0.4",
-    "@babel/preset-react": "^8.0.1",
-    "@babel/preset-typescript": "^8.0.1",
     "@babel/traverse": "^8.0.4",
     "@rollup/plugin-alias": "^6.0.0",
-    "@rollup/plugin-babel": "^7.1.0",
     "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-replace": "^6.0.3",
-    "@rollup/plugin-typescript": "^12.3.0",
     "@rollup/plugin-url": "^8.0.2",
     "commander": "^15.0.0",
     "dotenv": "^17.4.2",