@rpcbase/router 0.30.0 → 0.32.0

package/dist/applyRouteLoaders.d.ts

@@ -1,4 +1,4 @@
-import { Request } from "express";
-import { StaticHandlerContext } from "./index";
+import { Request } from 'express';
+import { StaticHandlerContext } from './index';
 export declare function applyRouteLoaders(req: Request, dataRoutes: any[]): Promise<StaticHandlerContext>;
 //# sourceMappingURL=applyRouteLoaders.d.ts.map

package/dist/applyRouteLoaders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"applyRouteLoaders.d.ts","sourceRoot":"","sources":["../../../../pkg/router/src/applyRouteLoaders.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAE/B,OAAO,EACL,oBAAoB,EAMrB,MAAM,SAAS,CAAA;AAsDhB,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,GAAG,EAAE,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAkG/B"}
+{"version":3,"file":"applyRouteLoaders.d.ts","sourceRoot":"","sources":["../src/applyRouteLoaders.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAE/B,OAAO,EACL,oBAAoB,EAMrB,MAAM,SAAS,CAAA;AAsDhB,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,GAAG,EAAE,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAkG/B"}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-export * from "react-router";
-export * from "./applyRouteLoaders";
-export * from "./loadRoute";
-export * from "./useApplyMeta";
+export * from 'react-router';
+export * from './applyRouteLoaders';
+export * from './loadRoute';
+export * from './useApplyMeta';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../pkg/router/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,qBAAqB,CAAA;AACnC,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,qBAAqB,CAAA;AACnC,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA"}

package/dist/index.js

@@ -1,4 +1,178 @@
+import { createPath, matchRoutes, parsePath, useLocation } from "react-router";
 export * from "react-router";
-export * from "./applyRouteLoaders";
-export * from "./loadRoute";
-export * from "./useApplyMeta";
+import { lazy, useEffect } from "react";
+function createLocation(current, to, state = null, key) {
+  const location = {
+    pathname: current,
+    search: "",
+    hash: "",
+    ...typeof to === "string" ? parsePath(to) : to,
+    state,
+    // TODO: This could be cleaned up.  push/replace should probably just take
+    // full Locations now and avoid the need to run through this flow at all
+    // But that's a pretty big refactor to the current test suite so going to
+    // keep as is for the time being and just let any incoming keys take precedence
+    key: to && to.key || key
+  };
+  return location;
+}
+function getShortCircuitMatches(routes) {
+  const route = routes.length === 1 ? routes[0] : routes.find((r) => r.index || !r.path || r.path === "/") || {
+    id: "__shim-error-route__"
+  };
+  return {
+    matches: [
+      {
+        params: {},
+        pathname: "",
+        pathnameBase: "",
+        route
+      }
+    ],
+    route
+  };
+}
+async function applyRouteLoaders(req, dataRoutes) {
+  const baseUrl = `${req.protocol}://${req.get("host")}`;
+  const url = new URL(req.originalUrl, baseUrl);
+  const method = req.method;
+  const location = createLocation("", createPath(url), null, "default");
+  const baseContext = {
+    basename: "",
+    location,
+    loaderHeaders: {},
+    actionHeaders: {}
+  };
+  const matches = matchRoutes(dataRoutes, location) || [];
+  if (!matches) {
+    const error = {
+      status: 404,
+      message: `No route matches URL: ${req.originalUrl}`
+    };
+    const { matches: notFoundMatches, route } = getShortCircuitMatches(dataRoutes);
+    return {
+      ...baseContext,
+      matches: notFoundMatches,
+      loaderData: {},
+      actionData: null,
+      errors: { [route.id]: error },
+      statusCode: 404
+    };
+  }
+  if (method !== "GET") {
+    return {
+      ...baseContext,
+      matches,
+      loaderData: {},
+      actionData: null,
+      errors: null,
+      statusCode: 200
+    };
+  }
+  const loaderPromisesResults = await Promise.allSettled(
+    matches.map(async (match) => {
+      const { route, params } = match;
+      if (!route.loader) return null;
+      try {
+        return {
+          id: route.id,
+          data: await route.loader({
+            params,
+            ctx: { req }
+          })
+        };
+      } catch (error) {
+        throw { id: route.id, reason: error };
+      }
+    })
+  );
+  const loaderData = {};
+  let errors = null;
+  for (const result of loaderPromisesResults) {
+    if (result.status === "fulfilled") {
+      if (result.value) {
+        loaderData[result.value.id] = result.value.data;
+      }
+    } else if (result.status === "rejected") {
+      const id = result.reason?.id;
+      if (!id) {
+        throw new Error(`missing route ID in error: ${result.reason}`);
+      }
+      if (!errors) {
+        errors = {};
+      }
+      errors[id] = result.reason;
+    }
+  }
+  return {
+    ...baseContext,
+    matches,
+    loaderData,
+    actionData: null,
+    errors,
+    statusCode: Object.keys(errors || {}).length > 0 ? 500 : 200
+  };
+}
+const loadRoute = (importPromise) => {
+  const Component = lazy(async () => {
+    const module = await importPromise;
+    return { default: module.default };
+  });
+  const loader = async (args) => {
+    const module = await importPromise;
+    if (!module.loader) return null;
+    return module.loader(args);
+  };
+  return { Component, loader };
+};
+const useApplyMeta = () => {
+  const location = useLocation();
+  useEffect(() => {
+    const loadMeta = async () => {
+      let defaultTitle = "";
+      let defaultMeta = [];
+      let pagesMeta = {};
+      try {
+        const importPath = "@/static/meta";
+        const module = await import(importPath);
+        defaultTitle = module.defaultTitle || defaultTitle;
+        defaultMeta = module.defaultMeta || defaultMeta;
+        pagesMeta = module.pagesMeta || pagesMeta;
+      } catch (error) {
+        return;
+      }
+      let pageMeta = pagesMeta[location.pathname];
+      if (!pageMeta) {
+        pageMeta = { title: defaultTitle, meta: defaultMeta };
+      }
+      document.title = pageMeta.title;
+      document.querySelectorAll("[data-react-meta]").forEach((tag) => tag.remove());
+      pageMeta.meta.forEach((meta) => {
+        const metaElement = document.createElement("meta");
+        metaElement.setAttribute("data-react-meta", "true");
+        Object.entries(meta).forEach(([key, value]) => {
+          if (value) {
+            metaElement.setAttribute(key, value.toString());
+          }
+        });
+        document.head.appendChild(metaElement);
+      });
+      const canonicalUrl = `${window.location.origin}${location.pathname}`;
+      const existingCanonical = document.querySelector('link[rel="canonical"]');
+      if (existingCanonical) {
+        existingCanonical.remove();
+      }
+      const canonicalLink = document.createElement("link");
+      canonicalLink.setAttribute("rel", "canonical");
+      canonicalLink.setAttribute("href", canonicalUrl);
+      canonicalLink.setAttribute("data-react-meta", "true");
+      document.head.appendChild(canonicalLink);
+    };
+    loadMeta();
+  }, [location.pathname]);
+};
+export {
+  applyRouteLoaders,
+  loadRoute,
+  useApplyMeta
+};

package/dist/loadRoute.d.ts

@@ -1,5 +1,5 @@
-import { LoaderFunction } from "react-router";
-import { Loader } from "@rpcbase/client";
+import { LoaderFunction } from 'react-router';
+import { Loader } from '../../client/src';
 type RouteModule = {
     default: React.ComponentType<unknown>;
     loader?: Loader;

package/dist/loadRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadRoute.d.ts","sourceRoot":"","sources":["../../../../pkg/router/src/loadRoute.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAc,MAAM,iBAAiB,CAAA;AAGpD,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;IACrC,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,SAAS,EAAE,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;IAClE,MAAM,CAAC,EAAE,cAAc,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,eAAe,OAAO,CAAC,WAAW,CAAC,KAAG,eAa/D,CAAA"}
+{"version":3,"file":"loadRoute.d.ts","sourceRoot":"","sources":["../src/loadRoute.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAc,MAAM,iBAAiB,CAAA;AAGpD,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;IACrC,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,SAAS,EAAE,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;IAClE,MAAM,CAAC,EAAE,cAAc,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,eAAe,OAAO,CAAC,WAAW,CAAC,KAAG,eAa/D,CAAA"}

package/dist/useApplyMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useApplyMeta.d.ts","sourceRoot":"","sources":["../../../../pkg/router/src/useApplyMeta.tsx"],"names":[],"mappings":"AAkBA,eAAO,MAAM,YAAY,YAoExB,CAAA"}
+{"version":3,"file":"useApplyMeta.d.ts","sourceRoot":"","sources":["../src/useApplyMeta.tsx"],"names":[],"mappings":"AAkBA,eAAO,MAAM,YAAY,YAoExB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/router",
-  "version": "0.30.0",
+  "version": "0.32.0",
   "type": "module",
   "files": [
     "dist"
@@ -13,12 +13,12 @@
   },
   "wireit": {
     "build": {
-      "command": "node ../../scripts/build-package.js router",
+      "command": "../../node_modules/.bin/vite build",
       "files": [
         "src/**/*",
         "../../tsconfig.json",
         "../../tsconfig.base.json",
-        "../../scripts/build-package.js"
+        "../../scripts/vite.config-pkg.js"
       ],
       "output": [
         "dist/"
@@ -41,8 +41,6 @@
       }
     }
   },
-  "dependencies": {
-    "react-router": "7.8.2"
-  },
+  "dependencies": {},
   "devDependencies": {}
 }

package/dist/applyRouteLoaders.js

@@ -1,126 +0,0 @@
-import { matchRoutes, createPath, parsePath, } from "./index";
-function createKey() {
-    return Math.random().toString(36).substring(2, 10);
-}
-function createLocation(current, to, state = null, key) {
-    const location = {
-        pathname: typeof current === "string" ? current : current.pathname,
-        search: "",
-        hash: "",
-        ...(typeof to === "string" ? parsePath(to) : to),
-        state,
-        // TODO: This could be cleaned up.  push/replace should probably just take
-        // full Locations now and avoid the need to run through this flow at all
-        // But that's a pretty big refactor to the current test suite so going to
-        // keep as is for the time being and just let any incoming keys take precedence
-        key: (to && to.key) || key || createKey(),
-    };
-    return location;
-}
-function getShortCircuitMatches(routes) {
-    // Prefer a root layout route if present, otherwise shim in a route object
-    const route = routes.length === 1
-        ? routes[0]
-        : routes.find((r) => r.index || !r.path || r.path === "/") || {
-            id: "__shim-error-route__",
-        };
-    return {
-        matches: [
-            {
-                params: {},
-                pathname: "",
-                pathnameBase: "",
-                route,
-            },
-        ],
-        route,
-    };
-}
-export async function applyRouteLoaders(req, dataRoutes) {
-    const baseUrl = `${req.protocol}://${req.get("host")}`;
-    const url = new URL(req.originalUrl, baseUrl);
-    const method = req.method;
-    const location = createLocation("", createPath(url), null, "default");
-    const baseContext = {
-        basename: "",
-        location,
-        loaderHeaders: {},
-        actionHeaders: {},
-    };
-    // Match routes to the current location
-    const matches = matchRoutes(dataRoutes, location) || [];
-    // Handle 404 (no matches)
-    if (!matches) {
-        const error = {
-            status: 404,
-            message: `No route matches URL: ${req.originalUrl}`,
-        };
-        const { matches: notFoundMatches, route } = getShortCircuitMatches(dataRoutes);
-        return {
-            ...baseContext,
-            matches: notFoundMatches,
-            loaderData: {},
-            actionData: null,
-            errors: { [route.id]: error },
-            statusCode: 404,
-        };
-    }
-    // Skip if anything but GET
-    if (method !== "GET") {
-        return {
-            ...baseContext,
-            matches,
-            loaderData: {},
-            actionData: null,
-            errors: null,
-            statusCode: 200,
-        };
-    }
-    // Collect loader data and errors
-    const loaderPromisesResults = await Promise.allSettled(matches.map(async (match) => {
-        const { route, params } = match;
-        if (!route.loader)
-            return null;
-        try {
-            return {
-                id: route.id,
-                data: await route.loader({
-                    params,
-                    ctx: { req },
-                }),
-            };
-        }
-        catch (error) {
-            // Include the route ID in the error for better traceability
-            throw { id: route.id, reason: error };
-        }
-    }));
-    const loaderData = {};
-    // TODO: add i18n error handling
-    let errors = null;
-    for (const result of loaderPromisesResults) {
-        if (result.status === "fulfilled") {
-            if (result.value) {
-                loaderData[result.value.id] = result.value.data;
-            }
-        }
-        else if (result.status === "rejected") {
-            const id = result.reason?.id;
-            if (!id) {
-                throw new Error(`missing route ID in error: ${result.reason}`);
-            }
-            if (!errors) {
-                errors = {};
-            }
-            errors[id] = result.reason;
-        }
-    }
-    return {
-        ...baseContext,
-        matches,
-        loaderData,
-        actionData: null,
-        errors,
-        statusCode: Object.keys(errors || {}).length > 0 ? 500 : 200,
-    };
-}

package/dist/loadRoute.js

@@ -1,14 +0,0 @@
-import { lazy } from "react";
-export const loadRoute = (importPromise) => {
-    const Component = lazy(async () => {
-        const module = await importPromise;
-        return { default: module.default };
-    });
-    const loader = async (args) => {
-        const module = await importPromise;
-        if (!module.loader)
-            return null;
-        return module.loader(args);
-    };
-    return { Component, loader: loader };
-};

package/dist/useApplyMeta.js

@@ -1,56 +0,0 @@
-import { useEffect } from "react";
-import { useLocation } from "react-router";
-export const useApplyMeta = () => {
-    const location = useLocation();
-    useEffect(() => {
-        const loadMeta = async () => {
-            let defaultTitle = "";
-            let defaultMeta = [];
-            let pagesMeta = {};
-            try {
-                const importPath = "@/static/meta";
-                const module = (await import(importPath));
-                defaultTitle = module.defaultTitle || defaultTitle;
-                defaultMeta = module.defaultMeta || defaultMeta;
-                pagesMeta = module.pagesMeta || pagesMeta;
-            }
-            catch (error) {
-                if (import.meta.env.MODE !== "production") {
-                    console.warn("Failed to load meta data from '@/static/meta'.", error);
-                }
-                return;
-            }
-            let pageMeta = pagesMeta[location.pathname];
-            if (!pageMeta) {
-                pageMeta = { title: defaultTitle, meta: defaultMeta };
-            }
-            document.title = pageMeta.title;
-            // Remove previous dynamically inserted tags
-            document.querySelectorAll("[data-react-meta]").forEach((tag) => tag.remove());
-            // Inject new tags
-            pageMeta.meta.forEach((meta) => {
-                const metaElement = document.createElement("meta");
-                metaElement.setAttribute("data-react-meta", "true");
-                // Set all attributes from the meta object
-                Object.entries(meta).forEach(([key, value]) => {
-                    if (value) {
-                        metaElement.setAttribute(key, value.toString());
-                    }
-                });
-                document.head.appendChild(metaElement);
-            });
-            // Update canonical link
-            const canonicalUrl = `${window.location.origin}${location.pathname}`;
-            const existingCanonical = document.querySelector("link[rel=\"canonical\"]");
-            if (existingCanonical) {
-                existingCanonical.remove();
-            }
-            const canonicalLink = document.createElement("link");
-            canonicalLink.setAttribute("rel", "canonical");
-            canonicalLink.setAttribute("href", canonicalUrl);
-            canonicalLink.setAttribute("data-react-meta", "true");
-            document.head.appendChild(canonicalLink);
-        };
-        loadMeta();
-    }, [location.pathname]);
-};