Clean up

Author: ije

deno.json

@@ -10,7 +10,7 @@
       "./types.d.ts"
     ],
     "jsx": "react-jsx",
-    "jsxImportSource": "https://esm.sh/v110/react@18.2.0"
+    "jsxImportSource": "https://esm.sh/react@18.2.0"
   },
   "importMap": "./import_map.json",
   "fmt": {

examples/monaco-editor/editor.ts

@@ -1,18 +1,18 @@
-import { editor, Uri } from "https://esm.sh/v110/monaco-editor@0.36.1";
-import "https://esm.sh/v110/monaco-editor@0.36.1?css";
+import { editor, Uri } from "https://esm.sh/monaco-editor@0.36.1";
+import "https://esm.sh/monaco-editor@0.36.1?css";
 
 // deno-lint-ignore ban-ts-comment
 // @ts-ignore
 self.MonacoEnvironment = {
   async getWorker(_: unknown, label: string) {
     if (label === "typescript" || label === "javascript") {
       const { default: tsWorker } = await import(
-        "https://esm.sh/v110/monaco-editor@0.36.1/esm/vs/language/typescript/ts.worker?worker"
+        "https://esm.sh/monaco-editor@0.36.1/esm/vs/language/typescript/ts.worker?worker"
       );
       return tsWorker();
     }
     const { default: editorWorker } = await import(
-      "https://esm.sh/v110/monaco-editor@0.36.1/esm/vs/editor/editor.worker?worker"
+      "https://esm.sh/monaco-editor@0.36.1/esm/vs/editor/editor.worker?worker"
     );
     return editorWorker();
   },

examples/react-mdx-app/routes/_export.ts

@@ -3,12 +3,12 @@
 // deno-fmt-ignore-file
 // deno-lint-ignore-file
 // @ts-nocheck
-var u=Object.defineProperty;var c=(s,e)=>{for(var o in e)u(s,o,{get:e[o],enumerable:!0})};import*as y from"./_404.tsx";import*as k from"./_app.tsx";import*as v from"./index.tsx";import*as A from"./docs.tsx";var t={};c(t,{default:()=>b});import{Fragment as g,jsx as r,jsxs as i}from"https://esm.sh/v110/react@18.2.0/jsx-runtime";import{useMDXComponents as h}from"https://esm.sh/v110/@mdx-js/react@2.3.0";import{Head as j}from"aleph/react";function d(s){let e=Object.assign({h1:"h1",p:"p",code:"code",pre:"pre"},h(),s.components);return i(g,{children:[r(j,{children:r("title",{children:"Get Started - Docs"})}),`
+var u=Object.defineProperty;var c=(s,e)=>{for(var o in e)u(s,o,{get:e[o],enumerable:!0})};import*as y from"./_404.tsx";import*as k from"./_app.tsx";import*as v from"./index.tsx";import*as A from"./docs.tsx";var t={};c(t,{default:()=>b});import{Fragment as g,jsx as r,jsxs as i}from"https://esm.sh/react@18.2.0/jsx-runtime";import{useMDXComponents as h}from"https://esm.sh/v112/@mdx-js/react@2.3.0";import{Head as j}from"aleph/react";function d(s){let e=Object.assign({h1:"h1",p:"p",code:"code",pre:"pre"},h(),s.components);return i(g,{children:[r(j,{children:r("title",{children:"Get Started - Docs"})}),`
 `,r(e.h1,{id:"get-started",children:"Get Started"}),`
 `,i(e.p,{children:["Initialize a new project, you can pick a start template with ",r(e.code,{children:"--template"}),` flag, available templates:
 `,r(e.code,{children:"[react, vue, api, yew]"})]}),`
 `,r(e.pre,{children:r(e.code,{className:"hljs language-bash",children:`deno run -A https://deno.land/x/aleph@1.0.0-beta.18/init.ts
-`})})]})}function f(s={}){let{wrapper:e}=Object.assign({},h(),s.components);return e?r(e,Object.assign({},s,{children:r(d,s)})):d(s)}var b=f;var l={};c(l,{default:()=>x});import{Fragment as N,jsx as n,jsxs as a}from"https://esm.sh/v110/react@18.2.0/jsx-runtime";import{useMDXComponents as p}from"https://esm.sh/v110/@mdx-js/react@2.3.0";import{Head as w}from"aleph/react";function m(s){let e=Object.assign({h1:"h1",p:"p",strong:"strong",a:"a",blockquote:"blockquote",em:"em",code:"code",pre:"pre",span:"span"},p(),s.components);return a(N,{children:[n(w,{children:n("title",{children:"About - Docs"})}),`
+`})})]})}function f(s={}){let{wrapper:e}=Object.assign({},h(),s.components);return e?r(e,Object.assign({},s,{children:r(d,s)})):d(s)}var b=f;var l={};c(l,{default:()=>x});import{Fragment as N,jsx as n,jsxs as a}from"https://esm.sh/react@18.2.0/jsx-runtime";import{useMDXComponents as p}from"https://esm.sh/v112/@mdx-js/react@2.3.0";import{Head as w}from"aleph/react";function m(s){let e=Object.assign({h1:"h1",p:"p",strong:"strong",a:"a",blockquote:"blockquote",em:"em",code:"code",pre:"pre",span:"span"},p(),s.components);return a(N,{children:[n(w,{children:n("title",{children:"About - Docs"})}),`
 `,n(e.h1,{id:"about",children:"About"}),`
 `,a(e.p,{children:[n(e.strong,{children:"Aleph.js"})," (or ",n(e.strong,{children:"Aleph"})," or ",n(e.strong,{children:"\u05D0"})," or ",n(e.strong,{children:"\u963F\u83B1\u592B"}),", ",n("samp",{children:"\u02C8\u0251\u02D0l\u025Bf"}),`) is a
 fullstack framework in `,n(e.a,{href:"https://deno.land",children:"Deno"}),". Inspired by ",n(e.a,{href:"https://nextjs.org",children:"Next.js"}),", ",n(e.a,{href:"https://remix.run",children:"Remix"})," and ",n(e.a,{href:"https://vitejs.dev",children:"Vite"}),"."]}),`

examples/react-mdx-app/server.ts

@@ -5,10 +5,10 @@ import mdx from "aleph/plugins/mdx";
 import modules from "./routes/_export.ts";
 
 // check https://mdxjs.com/docs/extending-mdx
-import remarkFrontmatter from "https://esm.sh/v110/remark-frontmatter@4.0.1";
-import remarkGFM from "https://esm.sh/v110/remark-gfm@3.0.1";
-import rehypeHighlight from "https://esm.sh/v110/rehype-highlight@5.0.2";
-import rehypeSlug from "https://esm.sh/v110/rehype-slug@5.0.1";
+import remarkFrontmatter from "https://esm.sh/v112/remark-frontmatter@4.0.1";
+import remarkGFM from "https://esm.sh/v112/remark-gfm@3.0.1";
+import rehypeHighlight from "https://esm.sh/v112/rehype-highlight@5.0.2";
+import rehypeSlug from "https://esm.sh/v112/rehype-slug@5.0.1";
 
 serve({
   plugins: [

examples/react-mdx-app/style/hljs.css

@@ -1,4 +1,4 @@
-/* copied from https://esm.sh/v110/highlightjs@9.16.2/styles/github.css */
+/* copied from https://esm.sh/highlightjs@9.16.2/styles/github.css */
 
 .hljs {
   display: block;

examples/solid-app/routes/_export.ts

@@ -1,4 +1,4 @@
-import mitt from "https://esm.sh/v110/mitt@3.0.0";
+import mitt from "https://esm.sh/v112/mitt@3.0.0";
 
 // shared event emitter for client(browser)
 export default mitt<Record<string, Record<string, unknown>>>();

examples/vue-app/routes/_export.ts

@@ -4,6 +4,14 @@ import { createStaticURLPatternResult, URLPatternCompat } from "./url_pattern.ts
 import { FetchError } from "./error.ts";
 import events from "./events.ts";
 
+export type Router = {
+  prefix: string;
+  routes: RoutePattern[];
+  appDir?: string; // for ssr
+  _404?: RoutePattern;
+  _app?: RoutePattern;
+};
+
 export type RouteModule = {
   url: URL;
   params: Record<string, string>;
@@ -14,44 +22,33 @@ export type RouteModule = {
   dataCacheTtl?: number;
 };
 
-export type RouteMeta = {
-  filename: string;
-  pattern: URLPatternInput;
-  nesting?: boolean;
-};
-
 export type RouteData = {
   data?: unknown;
   dataCacheTtl?: number;
   dataExpires?: number;
 };
 
-export type Route = readonly [
+export type RouteMeta = {
+  filename: string;
+  pattern: URLPatternInput;
+  nesting?: boolean;
+};
+
+export type RoutePattern = readonly [
   pattern: URLPatternCompat,
   meta: RouteMeta,
 ];
 
-export type Router = {
-  appDir?: string;
-  prefix: string;
-  routes: Route[];
-  _404?: Route;
-  _app?: Route;
-};
+export type RouteMatch = readonly [
+  ret: URLPatternResult,
+  route: RouteMeta,
+];
 
 export type CSRContext = {
   readonly router: Router;
   readonly modules: RouteModule[];
 };
 
-export type RouteRegExp = {
-  prefix: string;
-  test(filename: string): boolean;
-  exec(filename: string): URLPatternInput | null;
-};
-
-export type RouteMatch = [ret: URLPatternResult, route: RouteMeta];
-
 /** match routes against the given url */
 // todo: support basePath
 export function matchRoutes(url: URL, router: Router): RouteMatch[] {
@@ -132,11 +129,11 @@ export function loadRouterFromTag(): Router {
     try {
       const manifest = JSON.parse(el.innerText);
       if (Array.isArray(manifest.routes)) {
-        let _app: Route | undefined = undefined;
-        let _404: Route | undefined = undefined;
+        let _app: RoutePattern | undefined = undefined;
+        let _404: RoutePattern | undefined = undefined;
         const routes = manifest.routes.map((meta: RouteMeta) => {
           const { pattern } = meta;
-          const route: Route = [new URLPatternCompat(pattern), meta];
+          const route: RoutePattern = [new URLPatternCompat(pattern), meta];
           if (pattern.pathname === "/_app") {
             _app = route;
           } else if (pattern.pathname === "/_404") {
@@ -283,7 +280,7 @@ export function listenRouter(
   const onhmrcreate = (e: Record<string, unknown>) => {
     const pattern = e.routePattern as URLPatternInput | undefined;
     if (pattern) {
-      const route: Route = [
+      const route: RoutePattern = [
         new URLPatternCompat(pattern),
         {
           filename: e.specifier as string,

framework/core/events.ts

@@ -1,15 +1,10 @@
 import type { FC, PropsWithChildren } from "react";
 import { createElement, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { FetchError } from "../core/error.ts";
+import type { RouteData } from "../core/router.ts";
 import type { DataContextProps, HttpMethod, UpdateStrategy } from "./context.ts";
 import { DataContext } from "./context.ts";
 
-export type RouteData = {
-  data?: unknown;
-  dataCacheTtl?: number;
-  dataExpires?: number;
-};
-
 export type DataProviderProps = PropsWithChildren<{
   dataUrl: string;
   dataCache: Map<string, RouteData>;