xanix 1.0.7 → 1.0.9

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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,162 @@
+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/cacheNpmModules.js

@@ -3,7 +3,7 @@ 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 { getClientRuntimeFile } from "../include/utils.js";
 import esbuild from "rollup-plugin-esbuild";
 import url from "@rollup/plugin-url";
 import XanixDocument from "./plugins/XanixDocument/index.js";
@@ -15,11 +15,9 @@ const GenerateGraph = async (entries) => {
         input.push(entry.file);
     }
     input.push(getClientRuntimeFile());
-    input.push(await getDocumentFile());
     const bundle = await rollup({
         input,
         plugins: [
-            // XanixTsconfigAlias(),
             nodeResolve({
                 extensions: [".mjs", ".js", ".jsx", ".json", ".ts", ".tsx"],
             }),
@@ -100,7 +98,7 @@ const buildWrappers = (input) => {
             namedExports = Object.keys(mod).filter((key) => key !== "__esModule" && key !== "default");
         }
         catch (err) {
-            console.log(err);
+            // console.log(err);
         }
         const lines = [`import * as __mod from ${JSON.stringify(resolved)};`];
         if (hasDefault) {

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

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import dotenv from "dotenv";
 import replace from "@rollup/plugin-replace";
-import { getClientRuntimeFileName, getDocumentFileName, } from "../../include/utils.js";
+import { getClientRuntimeFileName } from "../../include/utils.js";
 export default function XanixEnvPlugin(options = {}) {
     const root = process.cwd();
     const mode = options.mode ?? "development";
@@ -34,9 +34,6 @@ export default function XanixEnvPlugin(options = {}) {
         "process.env.NODE_ENV": JSON.stringify(mode),
         ...(isClient ? clientEnv : serverEnv),
         __XANIX_CLIENT_RUNTIME_FILE_NAME__: JSON.stringify(getClientRuntimeFileName(mode)),
-        __XANIX_DOCUMENT_FILE_NAME__: JSON.stringify(getDocumentFileName(mode)),
-        // XANIX Data
-        XANIXDT: JSON.stringify("globalThis.$XANIXDT"),
         __XANIX_CLIENT__: JSON.stringify(isClient),
         __XANIX_SERVER__: JSON.stringify(!isClient),
         __XANIX_DEV__: JSON.stringify(mode === "development"),

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

@@ -4,9 +4,7 @@ import { parse } from "@babel/parser";
 import traverse from "@babel/traverse";
 import generate from "@babel/generator";
 import * as t from "@babel/types";
-import { createRequire } from "node:module";
 import { getClientRuntimeFile } from "../../include/utils.js";
-const require = createRequire(import.meta.url);
 const root = process.cwd();
 export default function xanixReactRefresh() {
     return {
@@ -21,14 +19,12 @@ import * as RefreshRuntime from "react-refresh/runtime";
 
 ${code}
 
-if (typeof window !== "undefined") {
   RefreshRuntime.injectIntoGlobalHook(window);
-
   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);
 
@@ -48,7 +44,6 @@ if (typeof window !== "undefined") {
     RefreshRuntime.performReactRefresh();
     ws.send("reload")
   };
-}
 `;
             return {
                 code: refreshCode,
@@ -59,7 +54,7 @@ if (typeof window !== "undefined") {
             if (path.resolve(id) === getClientRuntimeFile()) {
                 return null;
             }
-            if (id.includes("node_modules") || id.includes("xanix\\dist")) {
+            if (id.includes("node_modules")) {
                 return null;
             }
             if (!/\.(tsx?|jsx?)$/.test(id)) {

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

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

package/dist/bin/include/utils.js

@@ -1,4 +1,3 @@
-import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import crypto from "node:crypto";
@@ -11,21 +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);
-};
-export const getDocumentFile = async () => {
-    const documentEntry = path.join(process.cwd(), "Document.tsx");
-    if (fs.existsSync(documentEntry)) {
-        return documentEntry;
-    }
-    return path.join(__dirname, "../../../components/BaseDocument.js");
-};
-export const getDocumentFileName = (mode) => {
-    if (mode === "development") {
-        return "xanix-documents";
-    }
-    return uid("xanix-document", 32);
+    let n = "xanix-runtime";
+    return mode === "development" ? n : uid(n, 16);
 };

package/dist/client-runtime.js

@@ -1,6 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createRoot } from "react-dom/client";
-import Document from "virtual:xanix-document";
 const pages = new Map();
 const ROOT_KEY = "__xanix_root__";
 export const getPath = () => {
@@ -42,8 +41,7 @@ export const getPage = async (path) => {
 export async function mount(path, Component, doc) {
     const root = getRoot();
     pages.set(path, doc);
-    // const Document = (await import(getImportUrl(__XANIX_DOCUMENT_FILE_NAME__)))
-    //   .default;
+    const Document = (await import("virtual:xanix-document")).default;
     root.render(_jsx(Document, { document: doc, children: _jsx(Component, { ...doc.props }) }));
 }
 if (__XANIX_CLIENT__) {

package/dist/components/BaseDocument.d.ts

@@ -1,3 +1,3 @@
-import { type DocumentProps } from "../index.js";
+import { type DocumentProps } from "xanix";
 declare const BaseDocument: ({ document, children }: DocumentProps) => import("react").JSX.Element;
 export default BaseDocument;

package/dist/components/BaseDocument.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Head, Body, Document } from "../index.js";
+import { Head, Body, Document } from "xanix";
 const BaseDocument = ({ document, children }) => {
     return (_jsxs(Document, { document: document, children: [_jsxs(Head, { children: [_jsx("meta", { charSet: "UTF-8" }), _jsx("meta", { name: "viewport", content: "width=device-width, initial-scale=1.0" })] }), _jsx(Body, { children: children })] }));
 };

package/dist/dataLoader.js

@@ -1,8 +1,5 @@
-let global = typeof __XANIX_SERVER__ !== "undefined" && __XANIX_SERVER__
-    ? globalThis
-    : typeof window !== "undefined"
-        ? window
-        : {};
+import { IS_SERVER } from "./utils.js";
+let global = IS_SERVER ? globalThis : {};
 global.$XANIXDT_INITIALED = new Map();
 global.$XANIXDT = new Map();
 global.$XANIXDT_PAGES = new Map();

package/dist/index.d.ts

@@ -17,6 +17,7 @@ import useRequest from "./hooks/useRequest.js";
 import useHeaders from "./hooks/useHeaders.js";
 import useCookies from "./hooks/useCookies.js";
 import useData from "./hooks/useData.js";
+export * from "./utils.js";
 import { navigate, back, forward, preload, onNavigateStart, onNavigateEnd, reload } from "./navigate.js";
 export { Link, Document, Head, Body, Script, useDocument, useLocation, useParams, usePathname, useSearchParams, usePage, useRequest, useHeaders, useCookies, useData, navigate, back, forward, preload, onNavigateStart, onNavigateEnd, reload, };
 export type { DocumentProps };

package/dist/index.js

@@ -17,6 +17,7 @@ import useRequest from "./hooks/useRequest.js";
 import useHeaders from "./hooks/useHeaders.js";
 import useCookies from "./hooks/useCookies.js";
 import useData from "./hooks/useData.js";
+export * from "./utils.js";
 // navigate
 import { navigate, back, forward, preload, onNavigateStart, onNavigateEnd, reload, } from "./navigate.js";
 export { Link, Document, Head, Body, Script, 

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/server/runtime/xanixPage.js

@@ -3,7 +3,6 @@ import { renderToPipeableStream, renderToString } from "react-dom/server";
 import readManifest from "./readManifest.js";
 import { PassThrough } from "node:stream";
 import dataLoader from "../../dataLoader.js";
-import Document from "virtual:xanix-document";
 function renderPage(element) {
     return new Promise((resolve, reject) => {
         let html = "";
@@ -47,6 +46,7 @@ export default async function xanixPage({ pageId, req, res, Component, props, })
         res.status(404).send("Page Not Found");
         return;
     }
+    const Document = (await import("virtual:xanix-document")).default;
     if (!dataLoader.isInit(pageId)) {
         renderToString(_jsx(Document, { document: {
                 pageId,

package/dist/types/globals.d.ts

@@ -1,6 +1,5 @@
 declare global {
   const __XANIX_CLIENT_RUNTIME_FILE_NAME__: string;
-  const __XANIX_DOCUMENT_FILE_NAME__: string;
   const __XANIX_CLIENT__: boolean;
   const __XANIX_SERVER__: boolean;
   const __XANIX_DEV__: boolean;

package/dist/utils.d.ts

@@ -0,0 +1,4 @@
+export declare const IS_SERVER: boolean;
+export declare const IS_CLIENT: boolean;
+export declare const IS_DEVELOPMENT: boolean;
+export declare const IS_PRODUCTION: boolean;

package/dist/utils.js

@@ -0,0 +1,4 @@
+export const IS_SERVER = typeof __XANIX_SERVER__ !== "undefined" && __XANIX_SERVER__;
+export const IS_CLIENT = !IS_SERVER;
+export const IS_DEVELOPMENT = typeof __XANIX_DEV__ !== "undefined" && __XANIX_DEV__;
+export const IS_PRODUCTION = typeof __XANIX_PROD__ !== "undefined" && __XANIX_PROD__;

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "xanix",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "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": {