Improve imort map loading

Author: ije

server/app.ts

@@ -36,7 +36,6 @@ import type {
 import { VERSION } from '../version.ts'
 import {
   defaultConfig,
-  defaultImportMap,
   loadConfig,
   loadAndUpgradeImportMap,
   RequiredConfig
@@ -118,13 +117,7 @@ export class Application implements ServerApplication {
     ])
 
     Object.assign(this.config, config)
-    Object.assign(this.importMap, {
-      ...importMap,
-      imports: Object.assign(
-        defaultImportMap(this.config.react.version).imports,
-        importMap.imports
-      )
-    })
+    Object.assign(this.importMap, importMap)
     this.#pageRouting.config(this.config)
     this.#cssProcesser.config(!this.isDev, this.config.css)
 

server/config.ts

@@ -174,24 +174,28 @@ export async function loadAndUpgradeImportMap(workingDir: string): Promise<Impor
     await Deno.writeTextFile(importMapFile, JSON.stringify(importMap, undefined, 2))
   }
 
-  return importMap
-}
-
-export function defaultImportMap(reactVersion: string): ImportMap {
+  const v = Deno.env.get('ALEPH_DEV')
   const alephPkgUri = getAlephPkgUri()
-  return {
-    imports: {
-      'aleph/': `${alephPkgUri}/`,
-      'framework': `${alephPkgUri}/framework/core/mod.ts`,
-      'framework/react': `${alephPkgUri}/framework/react/mod.ts`,
-      'react': `https://esm.sh/react@${reactVersion}`,
-      'react-dom': `https://esm.sh/react-dom@${reactVersion}`,
-      'react-dom/server': `https://esm.sh/react-dom@${reactVersion}/server`,
-    },
-    scopes: {}
+  const defaultImports: Record<string, string> = {
+    'aleph/': `${alephPkgUri}/`,
+    'framework': `${alephPkgUri}/framework/core/mod.ts`,
+    'framework/react': `${alephPkgUri}/framework/react/mod.ts`,
+    'react': `https://esm.sh/react@${defaultReactVersion}`,
+    'react-dom': `https://esm.sh/react-dom@${defaultReactVersion}`,
+    'react-dom/server': `https://esm.sh/react-dom@${defaultReactVersion}/server`,
+  }
+  // in aleph dev mode, use default imports instead of app settings
+  if (v !== undefined) {
+    Object.assign(importMap.imports, defaultImports)
+  } else {
+    importMap.imports = Object.assign(defaultImports, importMap.imports,)
   }
+
+  return importMap
 }
 
+
+
 function isFramework(v: any): v is 'react' {
   switch (v) {
     case 'react':