Update types

Author: ije

compiler/dist/compiler.js

@@ -206,7 +206,7 @@ async function load(module, imports) {
       try {
         return await WebAssembly.instantiateStreaming(module, imports);
       } catch (e) {
-        if (module.headers.get("Content-Type") != "application/wasm") {
+        if (module.headers.get("Content-Type") !== "application/wasm") {
           console.warn(
             "`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n",
             e,

framework/react/init.ts

@@ -5,10 +5,23 @@ export async function init(aleph: Aleph) {
   if (aleph.mode === 'development') {
     const alephPkgUri = getAlephPkgUri()
     const alephPkgPath = alephPkgUri.replace('https://', '').replace('http://localhost:', 'http_localhost_')
-    await aleph.addModule(`${alephPkgUri}/framework/react/refresh.ts`)
+    const refreshModule = await aleph.addModule(`${alephPkgUri}/framework/react/refresh.ts`, `
+      import runtime from 'https://esm.sh/[email protected]/runtime'
+      import util from '../../shared/util.ts'
+
+      // react-refresh
+      // @link https://github.com/facebook/react/issues/16604#issuecomment-528663101
+      runtime.injectIntoGlobalHook(window)
+      Object.assign(window, {
+        $RefreshReg$: () => { },
+        $RefreshSig$: () => (type: any) => type,
+        __REACT_REFRESH_RUNTIME__: runtime,
+        __REACT_REFRESH__: util.debounce(runtime.performReactRefresh, 30)
+      })
+    `)
     aleph.onTransform('mainscript', ({ code }) => ({
       code: [
-        `import "./-/${alephPkgPath}/framework/react/refresh.js";`,
+        `import ".${refreshModule.jsFile}";`,
         code
       ].join('\n')
     }))

framework/react/refresh.ts

@@ -501,26 +501,23 @@ export class Aleph implements IAleph {
   }
 
   /** add a module by given path and optional source code. */
-  async addModule(specifier: string, sourceCode?: string): Promise<void> {
-    const source = sourceCode ? {
-      code: sourceCode,
-      type: SourceType.TSX,
-      external: false,
-      isStyle: false,
-    } : undefined
-    if (source !== undefined) {
-      const type = getSourceType(specifier)
-      if (type !== SourceType.Unknown) {
-        source.type = type
+  async addModule(specifier: string, sourceCode: string): Promise<Module> {
+    const module = await this.compile(specifier, {
+      source: {
+        code: sourceCode,
+        type: getSourceType(specifier),
+        isStyle: false,
       }
+    })
+    if (specifier.startsWith('pages/') || specifier.startsWith('api/')) {
+      specifier = '/' + specifier
     }
-    await this.compile(specifier, { source })
     if (specifier.startsWith('/pages/')) {
       this.#pageRouting.update(...this.createRouteUpdate(specifier))
     } else if (specifier.startsWith('/api/') && !specifier.startsWith('/api/_middlewares.')) {
       this.#apiRouting.update(...this.createRouteUpdate(specifier))
     }
-    return
+    return module
   }
 
   /** add a dist. */

server/aleph.ts

@@ -100,7 +100,7 @@ export default {
   debounce<T extends Function>(callback: T, delay: number): T {
     let timer: number | null = null
     return ((...args: any[]) => {
-      if (timer != null) {
+      if (timer !== null) {
         clearTimeout(timer)
       }
       timer = setTimeout(() => {

shared/util.ts

@@ -6,7 +6,7 @@ export interface Aleph {
   readonly workingDir: string
   readonly config: RequiredConfig
   addDist(path: string, content: Uint8Array): Promise<void>
-  addModule(specifier: string, sourceCode?: string): Promise<void>
+  addModule(specifier: string, sourceCode: string): Promise<{ specifier: string, jsFile: string }>
   fetchModule(specifier: string): Promise<{ content: Uint8Array, contentType: string | null }>
   onResolve(test: RegExp, resolve: (specifier: string) => ResolveResult): void
   onLoad(test: RegExp, load: (input: LoadInput) => LoadOutput | Promise<LoadOutput>): void