breaking: rewrite Config interface

Author: Je

hmr.ts

@@ -1,4 +1,4 @@
-import runtime from 'https://esm.sh/react-refresh/runtime?dev'
+import runtime from 'https://esm.sh/react-refresh@0.8.3/runtime'
 import events from './events.ts'
 import util, { hashShort } from './util.ts'
 

project.ts

@@ -43,7 +43,7 @@ interface RenderResult {
 export class Project {
     readonly mode: 'development' | 'production'
     readonly appRoot: string
-    readonly config: Readonly<Config>
+    readonly config: Readonly<Required<Config>>
     readonly importMap: Readonly<{ imports: Record<string, string> }>
     readonly ready: Promise<void>
 
@@ -68,7 +68,9 @@ export class Project {
             },
             buildTarget: mode === 'development' ? 'es2018' : 'es2015',
             sourceMap: false,
-            env: {}
+            env: {},
+            reactUrl: 'https://esm.sh/[email protected]',
+            reactDomUrl: 'https://esm.sh/[email protected]'
         }
         this.importMap = { imports: {} }
         this.ready = (async () => {
@@ -843,19 +845,16 @@ export class Project {
                     break
                 }
             }
-            if (dlUrl.startsWith('https://esm.sh/[')) {
-                dlUrl.replace(/\[([^\]]+)\]/, (_, s: string) => {
-                    const list = s.split(',').map(s => s.trim())
-                    if (list.length > 0) {
-                        const mod = util.trimPrefix(url, 'https://esm.sh/').replace(/\/+$/, '')
-                        if (!list.includes(mod)) {
-                            dlUrl = url
-                        }
-                    }
-                    return _
-                })
+            if (/^https?:\/\/[0-9a-z\.\-]+\/react(@[0-9a-z\.\-]+)?\/?$/i.test(url)) {
+                dlUrl = this.config.reactUrl
+            }
+            if (/^https?:\/\/[0-9a-z\.\-]+\/react\-dom(@[0-9a-z\.\-]+)?(\/server)?\/?$/i.test(url)) {
+                dlUrl = this.config.reactDomUrl
+                if (/\/server\/?$/i.test(url)) {
+                    dlUrl += '/server'
+                }
             }
-            if (url.startsWith('https://esm.sh/')) {
+            if (dlUrl.startsWith('https://esm.sh/')) {
                 const u = new URL(dlUrl)
                 u.searchParams.set('target', this.config.buildTarget)
                 if (this.isDev && !u.searchParams.has('dev')) {
@@ -972,21 +971,21 @@ export class Project {
                     this.isDev && `  _s();`,
                     `  const ref = useRef(null);`,
                     `  useEffect(() => {`,
-                    `    const appLinks = [];`,
+                    `    const anchors = [];`,
                     `    const onClick = e => {`,
                     `      e.preventDefault();`,
                     `      redirect(e.currentTarget.getAttribute("href"));`,
                     `    };`,
                     `    if (ref.current) {`,
                     `      ref.current.querySelectorAll("a").forEach(a => {`,
                     `        const href = a.getAttribute("href");`,
-                    `        if (href && !/^(https?|mailto|file):/i.test(href)) {`,
+                    `        if (href && !/^[a-z0-9]+:/i.test(href)) {`,
                     `          a.addEventListener("click", onClick, false);`,
-                    `          appLinks.push(a);`,
+                    `          anchors.push(a);`,
                     `        }`,
                     `      });`,
                     `    }`,
-                    `    return () => appLinks.forEach(a => a.removeEventListener("click", onClick));`,
+                    `    return () => anchors.forEach(a => a.removeEventListener("click", onClick));`,
                     `  }, []);`,
                     `  return React.createElement("div", {className: "markdown-page", ref, dangerouslySetInnerHTML: {__html: ${JSON.stringify(html)}}});`,
                     `}`,

types.ts

@@ -6,22 +6,36 @@ export interface AlephEnv {
 }
 
 export interface SSROptions {
-    readonly fallback?: string // default is '_fallback.html'
-    readonly include?: RegExp[]
-    readonly exclude?: RegExp[]
-    readonly staticPaths?: string[]
+    fallback?: string // default is '_fallback.html'
+    include?: RegExp[]
+    exclude?: RegExp[]
+    staticPaths?: string[]
 }
 
+/** Config for Aleph.js */
 export interface Config {
-    srcDir: string
-    outputDir: string
-    baseUrl: string
-    defaultLocale: string
-    locales: string[]
-    ssr: boolean | SSROptions
-    buildTarget: string
-    sourceMap: boolean
-    env: Record<string, string>
+    /** `srcDir` to put all your app `pages`, app.tsx, etc directories (default is '/') */
+    srcDir?: string
+    /** `outputDir` specifies the output directory for `build` command (default is 'dist') */
+    outputDir?: string
+    /** `baseUrl` specifies the path prefix for the application (default is '/') */
+    baseUrl?: string
+    /** `reactUrl` specifies the **react** url (default is 'https://esm.sh/[email protected]') */
+    reactUrl?: string
+    /** `reactDomUrl` specifies the **react-dom** url (default is 'https://esm.sh/[email protected]') */
+    reactDomUrl?: string
+    /** `defaultLocale` specifies the default locale of the application (default is 'en') */
+    defaultLocale?: string
+    /** A list of locales */
+    locales?: string[]
+    /** Option for **SSR** */
+    ssr?: boolean | SSROptions
+    /** `buildTarget` specifies the build taget for **tsc** (possible values: `ES2015-ES2020, ESNext`, default is ES2015 for production and ES2018 for development) */
+    buildTarget?: string
+    /** Enable sourceMap in **production** mode (default is false) */
+    sourceMap?: boolean
+    /** `env` defines the `Window.ALEPH.ENV` object in the application */
+    env?: Record<string, string>
 }
 
 export interface APIHandler {