Enhance compilation seepd

Author: ije

bundler/mod.ts

@@ -136,58 +136,61 @@ export class Bundler {
     }
 
     const bundlingFile = util.trimSuffix(mod.jsFile, '.js') + '.bundling.js'
-
+    this.#compiled.set(mod.url, bundlingFile)!
     if (existsFileSync(bundlingFile)) {
       return bundlingFile
     }
 
     const source = await this.#app.readModule(mod.url)
     if (source === null) {
+      this.#compiled.delete(mod.url)!
       throw new Error(`Unsupported module '${mod.url}'`)
     }
 
-    let { code, starExports } = await transform(
-      mod.url,
-      source.code,
-      {
-        ...this.#app.sharedCompileOptions,
-        swcOptions: {
-          sourceType: source.type,
-        },
-        bundleMode: true,
-        bundleExternal: external,
-      }
-    )
-
-    if (starExports && starExports.length > 0) {
-      for (let index = 0; index < starExports.length; index++) {
-        const url = starExports[index]
-        const names = await this.#app.parseModuleExportNames(url)
-        code = code.replace(`export * from "[${url}]:`, `export {${names.filter(name => name !== 'default').join(',')}} from "`)
-        code = code.replace(`export const $$star_${index}`, `export const {${names.filter(name => name !== 'default').join(',')}}`)
-      }
-    }
-
-    this.#compiled.set(mod.url, bundlingFile)!
+    try {
+      let { code, starExports } = await transform(
+        mod.url,
+        source.code,
+        {
+          ...this.#app.sharedCompileOptions,
+          swcOptions: {
+            sourceType: source.type,
+          },
+          bundleMode: true,
+          bundleExternal: external,
+        }
+      )
 
-    // compile deps
-    for (const dep of mod.deps) {
-      if (!dep.url.startsWith('#') && !external.includes(dep.url)) {
-        const depMod = this.#app.getModule(dep.url)
-        if (depMod !== null) {
-          await this.compile(depMod, external)
+      if (starExports && starExports.length > 0) {
+        for (let index = 0; index < starExports.length; index++) {
+          const url = starExports[index]
+          const names = await this.#app.parseModuleExportNames(url)
+          code = code.replace(`export * from "[${url}]:`, `export {${names.filter(name => name !== 'default').join(',')}} from "`)
+          code = code.replace(`export const $$star_${index}`, `export const {${names.filter(name => name !== 'default').join(',')}}`)
         }
       }
-    }
 
-    await ensureTextFile(bundlingFile, code)
+      // compile deps
+      await Promise.all(mod.deps.map(async dep => {
+        if (!dep.url.startsWith('#') && !external.includes(dep.url)) {
+          const depMod = this.#app.getModule(dep.url)
+          if (depMod !== null) {
+            await this.compile(depMod, external)
+          }
+        }
+      }))
 
-    return bundlingFile
+      await ensureTextFile(bundlingFile, code)
+      return bundlingFile
+    } catch (e) {
+      this.#compiled.delete(mod.url)!
+      throw new Error(`Can't compile module '${mod.url}': ${e.message}`)
+    }
   }
 
   private async createMainJS() {
     const bundled = Array.from(this.#bundled.entries())
-      .filter(([name]) => !['polyfill', 'deps', 'shared'].includes(name))
+      .filter(([name]) => !['polyfills', 'deps', 'shared'].includes(name))
       .reduce((r, [name, filename]) => {
         r[name] = filename
         return r

server/app.ts

@@ -731,7 +731,7 @@ export class Application implements ServerApplication {
 
     return [
       simpleJSMinify(bundlerRuntimeCode),
-      ...['polyfill', 'deps', 'shared', 'main', entryFile ? util.trimSuffix(entryFile, '.js') : '']
+      ...['polyfills', 'deps', 'shared', 'main', entryFile ? util.trimSuffix(entryFile, '.js') : '']
         .filter(name => name !== "" && this.#bundler.getBundledFile(name) !== null)
         .map(name => ({
           src: `${basePath}/_aleph/${this.#bundler.getBundledFile(name)}`
@@ -1176,7 +1176,7 @@ export class Application implements ServerApplication {
     }
 
     // compile deps
-    for (const dep of mod.deps) {
+    await Promise.all(mod.deps.map(async dep => {
       if (!dep.url.startsWith('#')) {
         const depMod = await this.compile(dep.url, { once })
         if (dep.hash === '' || dep.hash !== depMod.hash) {
@@ -1192,7 +1192,7 @@ export class Application implements ServerApplication {
           }
         }
       }
-    }
+    }))
 
     // update hash using deps status
     if (mod.deps.length > 0) {

server/config.ts

@@ -9,7 +9,7 @@ import type { Config, CSSOptions, PostCSSPlugin } from '../types.ts'
 import { VERSION } from '../version.ts'
 import { getAlephPkgUri, reLocaleID } from './helper.ts'
 
-export interface RequiredConfig extends Required<Config> {
+export type RequiredConfig = Required<Config> & {
   react: ReactResolve
 }
 
@@ -25,10 +25,7 @@ export const defaultConfig: Readonly<RequiredConfig> = {
   rewrites: {},
   ssr: {},
   plugins: [],
-  css: {
-    modules: false,
-    postcss: { plugins: ['autoprefixer'] },
-  },
+  css: {},
   headers: {},
   compress: true,
   env: {},