@zubyjs/preact 1.0.24 → 1.0.25

package/index.d.ts

@@ -0,0 +1,3 @@
+import { JsxProvider } from 'zuby/types.js';
+declare const _default: () => JsxProvider;
+export default _default;

package/index.js

@@ -0,0 +1,17 @@
+import render from './render.js';
+import { fileURLToPath } from 'url';
+import { dirname, resolve } from 'path';
+import { normalizePath } from 'zuby/utils/pathUtils.js';
+import { preact } from '@preact/preset-vite';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+export default () => ({
+    name: 'preact',
+    appTemplateFile: normalizePath(resolve(__dirname, 'templates', 'app.js')),
+    entryTemplateFile: normalizePath(resolve(__dirname, 'templates', 'entry.js')),
+    layoutTemplateFile: normalizePath(resolve(__dirname, 'templates', 'layout.js')),
+    innerLayoutTemplateFile: normalizePath(resolve(__dirname, 'templates', 'innerLayout.js')),
+    errorTemplateFile: normalizePath(resolve(__dirname, 'templates', 'error.js')),
+    render,
+    getPlugins: () => preact(),
+});

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "@zubyjs/preact",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "description": "Zuby.js JsxProvider for Preact",
   "type": "module",
   "main": "index.js",
   "scripts": {
-    "release": "npm publish --access public ./dist/",
+    "release": "cd ./dist && npm publish --access public && cd ..",
     "bump-version": "npm version patch",
     "build": "rm -rf dist/ stage/ && mkdir dist && tsc && cp -rf package.json README.md stage/preact/src/* dist/ && rm -rf stage/",
     "test": "exit 0"
   },
+  "publishConfig": {
+    "directory": "dist",
+    "linkDirectory": true
+  },
   "dependencies": {
     "@preact/preset-vite": "^2.6.0",
     "wouter-preact": "^2.12.0",

package/render.d.ts

@@ -0,0 +1,13 @@
+import { h } from 'preact';
+interface PrerenderOptions {
+    maxDepth?: number;
+    props?: object;
+}
+/**
+ * @param {ReturnType<h>} vnode The root JSX element to render (eg: `<App />`)
+ * @param {PrerenderOptions} [options]
+ * @param {number} [options.maxDepth = 10] The maximum number of nested asynchronous operations to wait for before flushing
+ * @param {object} [options.props] Additional props to merge into the root JSX element
+ */
+export default function render(vnode: ReturnType<typeof h>, options?: PrerenderOptions): Promise<string>;
+export {};

package/render.js

@@ -0,0 +1,47 @@
+import { h, options, cloneElement } from 'preact';
+import { render as renderToString } from 'preact-render-to-string';
+let vnodeHook;
+const old = options.vnode;
+options.vnode = (vnode) => {
+    if (old)
+        old(vnode);
+    if (vnodeHook)
+        vnodeHook(vnode);
+};
+/**
+ * @param {ReturnType<h>} vnode The root JSX element to render (eg: `<App />`)
+ * @param {PrerenderOptions} [options]
+ * @param {number} [options.maxDepth = 10] The maximum number of nested asynchronous operations to wait for before flushing
+ * @param {object} [options.props] Additional props to merge into the root JSX element
+ */
+export default async function render(vnode, options) {
+    options = options || {};
+    const maxDepth = options.maxDepth || 10;
+    const props = options.props;
+    let tries = 0;
+    if (typeof vnode === 'function') {
+        vnode = h(vnode, props);
+    }
+    else if (props) {
+        vnode = cloneElement(vnode, props);
+    }
+    const renderNode = async () => {
+        if (++tries > maxDepth) {
+            console.warn(`WARNING: Maximum depth of ${maxDepth} of lazy components exceeded while prerendering page.`);
+            console.warn(`This may indicate a circular dependency in your code.`);
+            return '';
+        }
+        try {
+            // @ts-ignore
+            return renderToString(vnode);
+        }
+        catch (e) {
+            if (e instanceof Promise) {
+                await e;
+                return renderNode();
+            }
+            throw e;
+        }
+    };
+    return await renderNode();
+}

package/router.d.ts

@@ -0,0 +1,5 @@
+import { createElement } from 'preact';
+/**
+ * Zuby's Router component provides support for file-system based routing.
+ */
+export default function Router(): createElement.JSX.Element;

package/router.js

@@ -0,0 +1,37 @@
+import { jsx as _jsx } from "preact/jsx-runtime";
+import { Router as WouterRouter, Route as WouterRoute, Switch as WouterSwitch, } from 'wouter-preact';
+import { Suspense, lazy } from 'preact/compat';
+import { getContext } from 'zuby/context/index.js';
+import { createElement } from 'preact';
+let pages;
+let apps;
+let errors;
+/**
+ * Zuby's Router component provides support for file-system based routing.
+ */
+export default function Router() {
+    const zubyContext = getContext();
+    const loadTemplates = (templates) => templates?.map((pageTemplate) => ({
+        ...pageTemplate,
+        component: lazy(pageTemplate.component),
+    })) || [];
+    if (!pages) {
+        pages = loadTemplates(zubyContext.templates?.pages);
+    }
+    if (!apps) {
+        apps = loadTemplates(zubyContext.templates?.apps);
+    }
+    if (!errors) {
+        errors = loadTemplates(zubyContext.templates?.errors);
+    }
+    const app = apps.find(({ pathRegex }) => {
+        return pathRegex.test(zubyContext.currentPath ?? '');
+    });
+    const error = errors.find(({ pathRegex }) => {
+        return pathRegex.test(zubyContext.currentPath ?? '');
+    });
+    const page = (_jsx(WouterSwitch, { children: pages.map((page) => (_jsx(WouterRoute, { path: page.path, component: page.component }))) }));
+    return (_jsx(WouterRouter, { ssrPath: zubyContext.currentPath, children: _jsx(Suspense, { fallback: _jsx("div", { children: "Loading..." }), children: createElement(app?.component, {
+                children: page,
+            }) }) }));
+}

package/templates/app.d.ts

@@ -0,0 +1,4 @@
+import { ComponentChildren } from 'preact';
+export default function App({ children }: {
+    children: ComponentChildren;
+}): import("preact").JSX.Element;

package/templates/app.js

@@ -0,0 +1,4 @@
+import { Fragment as _Fragment, jsx as _jsx } from "preact/jsx-runtime";
+export default function App({ children }) {
+    return _jsx(_Fragment, { children: children });
+}

package/templates/entry.d.ts

@@ -0,0 +1,2 @@
+import Router from '@zubyjs/preact/router.js';
+export default Router;

package/{src/templates/entry.tsx → templates/entry.js}

@@ -1,13 +1,11 @@
+import { jsx as _jsx } from "preact/jsx-runtime";
 // This file serves as a template for the entry file of the Preact JSX provider.
 // @ts-nocheck
 import { render, hydrate } from 'preact';
 import Router from '@zubyjs/preact/router.js';
-
 if (typeof window !== 'undefined') {
-  const appElement = document.getElementById('app')!;
-  const renderMethod = appElement.hasChildNodes() ? hydrate : render;
-
-  renderMethod(<Router />, appElement);
+    const appElement = document.getElementById('app');
+    const renderMethod = appElement.hasChildNodes() ? hydrate : render;
+    renderMethod(_jsx(Router, {}), appElement);
 }
-
 export default Router;

package/templates/error.d.ts

@@ -0,0 +1,4 @@
+import { ComponentChildren } from 'preact';
+export default function App({ children }: {
+    children: ComponentChildren;
+}): import("preact").JSX.Element;

package/templates/error.js

@@ -0,0 +1,4 @@
+import { Fragment as _Fragment, jsx as _jsx } from "preact/jsx-runtime";
+export default function App({ children }) {
+    return _jsx(_Fragment, { children: children });
+}

package/templates/innerLayout.d.ts

@@ -0,0 +1,4 @@
+import { ComponentChildren } from 'preact';
+export default function InnerLayout({ children }: {
+    children: ComponentChildren;
+}): import("preact").JSX.Element;

package/templates/innerLayout.js

@@ -0,0 +1,4 @@
+import { jsx as _jsx } from "preact/jsx-runtime";
+export default function InnerLayout({ children }) {
+    return _jsx("div", { id: "app", children: children });
+}

package/templates/layout.d.ts

@@ -0,0 +1,4 @@
+import { ComponentChildren } from 'preact';
+export default function Layout({ children }: {
+    children: ComponentChildren;
+}): import("preact").JSX.Element;

package/templates/layout.js

@@ -0,0 +1,4 @@
+import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
+export default function Layout({ children }) {
+    return (_jsxs("html", { children: [_jsxs("head", { children: [_jsx("meta", { charset: "UTF-8" }), _jsx("title", { children: "Something" })] }), _jsx("body", { children: children })] }));
+}

package/src/index.ts

@@ -1,20 +0,0 @@
-import render from './render.js';
-import { JsxProvider } from 'zuby/types.js';
-import { fileURLToPath } from 'url';
-import { dirname, resolve } from 'path';
-import { normalizePath } from 'zuby/utils/pathUtils.js';
-import { preact } from '@preact/preset-vite';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-export default (): JsxProvider => ({
-  name: 'preact',
-  appTemplateFile: normalizePath(resolve(__dirname, 'templates', 'app.js')),
-  entryTemplateFile: normalizePath(resolve(__dirname, 'templates', 'entry.js')),
-  layoutTemplateFile: normalizePath(resolve(__dirname, 'templates', 'layout.js')),
-  innerLayoutTemplateFile: normalizePath(resolve(__dirname, 'templates', 'innerLayout.js')),
-  errorTemplateFile: normalizePath(resolve(__dirname, 'templates', 'error.js')),
-  render,
-  getPlugins: () => preact(),
-});

package/src/render.ts

@@ -1,58 +0,0 @@
-import { h, options, cloneElement, VNode } from 'preact';
-import { render as renderToString } from 'preact-render-to-string';
-
-type VNodeHook = (vnode: VNode) => void;
-let vnodeHook: VNodeHook | undefined;
-
-const old = options.vnode;
-options.vnode = (vnode: VNode) => {
-  if (old) old(vnode);
-  if (vnodeHook) vnodeHook(vnode);
-};
-
-interface PrerenderOptions {
-  maxDepth?: number;
-  props?: object;
-}
-
-/**
- * @param {ReturnType<h>} vnode The root JSX element to render (eg: `<App />`)
- * @param {PrerenderOptions} [options]
- * @param {number} [options.maxDepth = 10] The maximum number of nested asynchronous operations to wait for before flushing
- * @param {object} [options.props] Additional props to merge into the root JSX element
- */
-export default async function render(vnode: ReturnType<typeof h>, options?: PrerenderOptions) {
-  options = options || {};
-
-  const maxDepth = options.maxDepth || 10;
-  const props = options.props;
-  let tries = 0;
-
-  if (typeof vnode === 'function') {
-    vnode = h(vnode, props as Object | null);
-  } else if (props) {
-    vnode = cloneElement(vnode, props);
-  }
-
-  const renderNode = async (): Promise<string> => {
-    if (++tries > maxDepth) {
-      console.warn(
-        `WARNING: Maximum depth of ${maxDepth} of lazy components exceeded while prerendering page.`
-      );
-      console.warn(`This may indicate a circular dependency in your code.`);
-      return '';
-    }
-    try {
-      // @ts-ignore
-      return renderToString(vnode);
-    } catch (e) {
-      if (e instanceof Promise) {
-        await e;
-        return renderNode();
-      }
-      throw e;
-    }
-  };
-
-  return await renderNode();
-}

package/src/router.tsx

@@ -1,62 +0,0 @@
-import { Component } from 'preact';
-import {
-  Router as WouterRouter,
-  Route as WouterRoute,
-  Switch as WouterSwitch,
-} from 'wouter-preact';
-import { Suspense, lazy } from 'preact/compat';
-import { getContext } from 'zuby/context/index.js';
-import { LazyTemplate } from 'zuby/templates/types.js';
-import { createElement } from 'preact';
-
-let pages: LazyTemplate[] | undefined;
-let apps: LazyTemplate[] | undefined;
-let errors: LazyTemplate[] | undefined;
-
-/**
- * Zuby's Router component provides support for file-system based routing.
- */
-export default function Router() {
-  const zubyContext = getContext();
-
-  const loadTemplates = (templates?: LazyTemplate[]) =>
-    templates?.map((pageTemplate: any) => ({
-      ...pageTemplate,
-      component: lazy(pageTemplate.component as () => Promise<Component>),
-    })) || [];
-
-  if (!pages) {
-    pages = loadTemplates(zubyContext.templates?.pages);
-  }
-  if (!apps) {
-    apps = loadTemplates(zubyContext.templates?.apps);
-  }
-  if (!errors) {
-    errors = loadTemplates(zubyContext.templates?.errors);
-  }
-
-  const app = apps.find(({ pathRegex }) => {
-    return pathRegex.test(zubyContext.currentPath ?? '');
-  });
-  const error = errors.find(({ pathRegex }) => {
-    return pathRegex.test(zubyContext.currentPath ?? '');
-  });
-
-  const page = (
-    <WouterSwitch>
-      {pages.map((page: LazyTemplate) => (
-        <WouterRoute path={page.path} component={page.component} />
-      ))}
-    </WouterSwitch>
-  );
-
-  return (
-    <WouterRouter ssrPath={zubyContext.currentPath}>
-      <Suspense fallback={<div>Loading...</div>}>
-        {createElement(app?.component, {
-          children: page,
-        })}
-      </Suspense>
-    </WouterRouter>
-  );
-}

package/src/templates/app.tsx

@@ -1,5 +0,0 @@
-import { ComponentChildren } from 'preact';
-
-export default function App({ children }: { children: ComponentChildren }) {
-  return <>{children}</>;
-}

package/src/templates/error.tsx

@@ -1,5 +0,0 @@
-import { ComponentChildren } from 'preact';
-
-export default function App({ children }: { children: ComponentChildren }) {
-  return <>{children}</>;
-}

package/src/templates/innerLayout.tsx

@@ -1,5 +0,0 @@
-import { ComponentChildren } from 'preact';
-
-export default function InnerLayout({ children }: { children: ComponentChildren }) {
-  return <div id="app">{children}</div>;
-}

package/src/templates/layout.tsx

@@ -1,13 +0,0 @@
-import { ComponentChildren } from 'preact';
-
-export default function Layout({ children }: { children: ComponentChildren }) {
-  return (
-    <html>
-      <head>
-        <meta charset="UTF-8" />
-        <title>Something</title>
-      </head>
-      <body>{children}</body>
-    </html>
-  );
-}

package/tsconfig.json

@@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "nodenext",
-    "moduleResolution": "nodenext",
-    "declaration": true,
-    "outDir": "./stage",
-    "strict": true,
-    "esModuleInterop": true,
-    "downlevelIteration": true,
-    "lib": ["es2020", "dom"],
-    "skipLibCheck": true,
-    "baseUrl": "..",
-    "paths": {
-      "zuby": ["zuby/src"],
-      "zuby/*": ["zuby/src/*"]
-    },
-    "jsx": "react-jsx",
-    "jsxImportSource": "preact",
-    "types": ["vite/client"]
-  },
-  "include": ["src"],
-  "exclude": ["node_modules"]
-}