xanix 1.0.5 → 1.0.8

package/dist/bin/bundler/buildClient.js

@@ -1,15 +1,15 @@
 import { rollup } from "rollup";
 import fs from "node:fs";
 import bundlerOutput, { outDir } from "./config/output.js";
-import { getDocumentFile, getClientRuntimeFile } from "../include/utils.js";
+import { getClientRuntimeFile, getClientRuntimeFileName, } from "../include/utils.js";
 import { xanixDefaultPlugins } from "./plugins/plugins.js";
 const buildClient = async (entries) => {
     const input = {};
     for (const entry of entries) {
         input[entry.name] = entry.file;
     }
-    input["xanix-runtime"] = getClientRuntimeFile();
-    input["xanix-document"] = await getDocumentFile();
+    const runtimeFileName = getClientRuntimeFileName("production");
+    input[runtimeFileName] = getClientRuntimeFile();
     fs.rmSync(outDir.client, {
         recursive: true,
         force: true,

package/dist/bin/bundler/buildServer.js

@@ -4,7 +4,6 @@ import bundlerOutput, { outDir } from "./config/output.js";
 import fs from "node:fs";
 import { createManifest } from "../include/manifest.js";
 import generateClientEntries from "./generateClientEntries.js";
-import { getDocumentFile } from "../include/utils.js";
 import { xanixDefaultPlugins } from "./plugins/plugins.js";
 const root = process.cwd();
 const BuildServer = async ({ rootEntry, onBuildEnd }) => {
@@ -19,7 +18,6 @@ const BuildServer = async ({ rootEntry, onBuildEnd }) => {
     await createManifest(entries);
     const input = {
         index: path.resolve(root, rootEntry),
-        "xanix-document": await getDocumentFile(),
     };
     const build = await rollup({
         input,
@@ -43,7 +41,8 @@ const BuildServer = async ({ rootEntry, onBuildEnd }) => {
                 path.isAbsolute(id) ||
                 id === "@" ||
                 id.startsWith("@/") ||
-                id.startsWith("xanix")) {
+                id.startsWith("xanix") ||
+                id === "virtual:xanix-document") {
                 return false;
             }
             return true;

package/dist/bin/bundler/{buildCache.js → cacheNpmModules copy.js }

@@ -1,31 +1,59 @@
 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 xanixAssets from "./plugins/XanixAssets/index.js";
-import rollupEsbuild from "./plugins/rollupEsbuild.js";
-import { getDocumentFile } from "../include/utils.js";
+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 = {};
+    const input = [];
     for (const entry of entries) {
-        input[entry.name] = entry.file;
+        input.push(entry.file);
     }
-    input["xanix-runtime"] = require.resolve("xanix/runtime");
-    input["xanix-document"] = await getDocumentFile();
+    input.push(getClientRuntimeFile());
+    input.push(await getDocumentFile());
     const bundle = await rollup({
         input,
         plugins: [
-            xanixAssets({
-                external: true,
+            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,
             }),
-            rollupEsbuild({
-                sourceMap: true,
+            XanixDocument(),
+            esbuild({
+                target: "es2022",
+                jsx: "automatic",
+                tsconfig: false,
             }),
         ],
         external(id) {
-            if (id.startsWith(".") || path.isAbsolute(id)) {
+            if (id.startsWith(".") ||
+                path.isAbsolute(id) ||
+                id === "@" ||
+                id.startsWith("@/") ||
+                id === "virtual:xanix-document") {
                 return false;
             }
             collector.set(id, {
@@ -61,22 +89,38 @@ const buildWrappers = (input) => {
     for (const [name, resolved] of Object.entries(input)) {
         const key = `${name}?cjs-wrapper`;
         let namedExports = [];
+        let hasDefault = false;
         try {
             const mod = require(resolved);
-            namedExports = Object.keys(mod).filter((k) => k !== "__esModule" && k !== "default");
+            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;`);
         }
-        catch { }
-        const lines = [
-            `import __mod from ${JSON.stringify(resolved)};`,
-            `export default __mod;`,
-        ];
-        if (namedExports.length > 0) {
-            lines.push(`export const { ${namedExports.join(", ")} } = __mod;`);
+        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 };
+    return {
+        wrappers,
+        wrappedInput,
+    };
 };
 const bundleDeps = async (input, outdir) => {
     const { wrappers, wrappedInput } = buildWrappers(input);
@@ -91,6 +135,12 @@ const bundleDeps = async (input, outdir) => {
         chunkNames: "chunks/[hash]",
         platform: "browser",
         sourcemap: true,
+        define: {
+            __XANIX_CLIENT__: "true",
+            __XANIX_SERVER__: "false",
+            __XANIX_DEV__: "true",
+            __XANIX_PROD__: "false",
+        },
         plugins: [makeCjsWrapperPlugin(wrappers)],
     });
 };

package/dist/bin/bundler/cacheNpmModules.js

@@ -3,9 +3,10 @@ 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";
 const require = createRequire(import.meta.url);
 const GenerateGraph = async (entries) => {
     const collector = new Map();
@@ -14,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"],
             }),
@@ -41,6 +40,7 @@ const GenerateGraph = async (entries) => {
                 fileName: "assets/[name]-[hash][extname]",
                 emitFiles: false,
             }),
+            XanixDocument(),
             esbuild({
                 target: "es2022",
                 jsx: "automatic",
@@ -51,7 +51,8 @@ const GenerateGraph = async (entries) => {
             if (id.startsWith(".") ||
                 path.isAbsolute(id) ||
                 id === "@" ||
-                id.startsWith("@/")) {
+                id.startsWith("@/") ||
+                id === "virtual:xanix-document") {
                 return false;
             }
             collector.set(id, {
@@ -96,7 +97,9 @@ const buildWrappers = (input) => {
                     "default" in mod;
             namedExports = Object.keys(mod).filter((key) => key !== "__esModule" && key !== "default");
         }
-        catch { }
+        catch (err) {
+            // console.log(err);
+        }
         const lines = [`import * as __mod from ${JSON.stringify(resolved)};`];
         if (hasDefault) {
             lines.push(`export default __mod.default;`);
@@ -104,6 +107,7 @@ const buildWrappers = (input) => {
         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)}];`);

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

@@ -37,8 +37,16 @@ const server = (opt) => {
         format: "esm",
         sourcemap: opt.isDev ?? true,
         entryFileNames: "[name].js",
-        chunkFileNames: "chunks/[hash].js",
+        chunkFileNames: "chunks/[name].js",
         assetFileNames: "assets/[hash][extname]",
+        // manualChunks(id) {
+        //   const filename = path.basename(id);
+        //   return filename.split(".")[0];
+        //   return "vendor";
+        //   if (id.includes("virtual:xanix-document")) {
+        //     return "vendor";
+        //   }
+        // },
     };
 };
 const bundlerOutput = {

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

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

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

@@ -0,0 +1,35 @@
+import fs from "node:fs";
+import path from "node:path";
+import { createRequire } from "node:module";
+import { fileURLToPath } from "node:url";
+const __dirname = fileURLToPath(import.meta.url);
+const require = createRequire(import.meta.url);
+const VIRTUAL_ID = "virtual:xanix-document";
+const RESOLVED_ID = "\0virtual:xanix-document";
+export default function xanixDocument() {
+    const root = process.cwd();
+    const userDocument = path.resolve(root, "Document.tsx");
+    const baseDocument = require.resolve("../../../../../dist/components/BaseDocument.js");
+    return {
+        name: "xanix-document",
+        resolveId(id) {
+            if (id === VIRTUAL_ID) {
+                return RESOLVED_ID;
+            }
+            return null;
+        },
+        load(id) {
+            if (id !== RESOLVED_ID) {
+                return null;
+            }
+            const document = fs.existsSync(userDocument)
+                ? userDocument
+                : baseDocument;
+            return `
+import Document from ${JSON.stringify(document)};
+
+export default Document;
+      `;
+        },
+    };
+}

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

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import dotenv from "dotenv";
 import replace from "@rollup/plugin-replace";
+import { getClientRuntimeFileName } from "../../include/utils.js";
 export default function XanixEnvPlugin(options = {}) {
     const root = process.cwd();
     const mode = options.mode ?? "development";
@@ -31,13 +32,19 @@ export default function XanixEnvPlugin(options = {}) {
     }
     const envs = {
         "process.env.NODE_ENV": JSON.stringify(mode),
-        // "typeof window": isClient ? '"object"' : '"undefined"',
-        // "typeof document": isClient ? '"object"' : '"undefined"',
+        ...(isClient ? clientEnv : serverEnv),
+        __XANIX_CLIENT_RUNTIME_FILE_NAME__: JSON.stringify(getClientRuntimeFileName(mode)),
         __XANIX_CLIENT__: JSON.stringify(isClient),
         __XANIX_SERVER__: JSON.stringify(!isClient),
         __XANIX_DEV__: JSON.stringify(mode === "development"),
         __XANIX_PROD__: JSON.stringify(mode === "production"),
-        ...(isClient ? clientEnv : serverEnv),
+        XANIX_NAVIGATE: JSON.stringify("xanix:navigate"),
+        XANIX_NAVIGATE_START: JSON.stringify("xanix:navigate:start"),
+        XANIX_NAVIGATE_END: JSON.stringify("xanix:navigate:end"),
+        XANIX_NAVIGATE_RELOAD: JSON.stringify("xanix:navigate:reload"),
+        XANIX_PRELOAD: JSON.stringify("xanix:preload"),
+        XANIX_PRELOAD_START: JSON.stringify("xanix:preload:start"),
+        XANIX_PRELOAD_END: JSON.stringify("xanix:preload:end"),
     };
     return replace({
         preventAssignment: true,

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 {
@@ -16,39 +14,34 @@ export default function xanixReactRefresh() {
                 return null;
             }
             const code = fs.readFileSync(id, "utf8");
-            const refreshCode = `
-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);
-
-    for (const file of files) {
-      if (!file.endsWith(".js")) {
-        continue;
-      }
-
-      const url =
-        getImportUrl(file.replace(/\\.js$/, "")) +
-        "?t=" +
-        Date.now();
-
-      await import(url);
-    }
-
-    RefreshRuntime.performReactRefresh();
-    ws.send("reload")
-  };
-}
+            const refreshCode = `
+import * as RefreshRuntime from "react-refresh/runtime";
+
+${code}
+
+  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);
+
+    for (const file of files) {
+      if (!file.endsWith(".js")) {
+        continue;
+      }
+
+      const url =
+        getImportUrl(file.replace(/\\.js$/, "")) +
+        "?t=" +
+        Date.now();
+
+      await import(url);
+    }
+
+    RefreshRuntime.performReactRefresh();
+    ws.send("reload")
+  };
 `;
             return {
                 code: refreshCode,
@@ -59,7 +52,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/bundler/plugins/XanixTransform/transformer copy.d.ts

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