Update compile options

Author: ije

bundler/mod.ts

@@ -77,7 +77,7 @@ export class Bundler {
     })
 
     if (this.#app.config.buildTarget !== 'esnext') {
-      await this.bundlePolyfillChunck()
+      await this.bundlePolyfillsChunck()
     }
     await this.bundleChunk(
       'deps',
@@ -146,7 +146,6 @@ export class Bundler {
       {
         ...this.#app.sharedCompileOptions,
         swcOptions: {
-          target: 'es2020',
           sourceType: source.type,
         },
         bundleMode: true,
@@ -157,8 +156,8 @@ export class Bundler {
     if (starExports && starExports.length > 0) {
       for (let index = 0; index < starExports.length; index++) {
         const url = starExports[index]
-        const source = await this.#app.resolveModule(url)
-        const names = await parseExportNames(url, source.code, { sourceType: source.type })
+        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(',')}}`)
       }
     }
@@ -168,14 +167,7 @@ export class Bundler {
       if (!dep.url.startsWith('#') && !external.includes(dep.url)) {
         const depMod = this.#app.getModule(dep.url)
         if (depMod !== null) {
-          const s = `.bundling.js#${dep.url}@`
           await this.compile(depMod, external)
-          code = code.split(s).map((p, i) => {
-            if (i > 0 && p.charAt(6) === '"') {
-              return dep.hash.slice(0, 6) + p.slice(6)
-            }
-            return p
-          }).join(s)
         }
       }
     }
@@ -201,20 +193,20 @@ export class Bundler {
     log.info(`  {} main.js ${dim('• ' + util.formatBytes(mainJS.length))}`)
   }
 
-  /** create polyfill bundle. */
-  private async bundlePolyfillChunck() {
+  /** create polyfills bundle. */
+  private async bundlePolyfillsChunck() {
     const alephPkgUri = getAlephPkgUri()
     const { buildTarget } = this.#app.config
-    const polyfillTarget = 'es' + (parseInt(buildTarget.slice(2)) + 1)
+    const polyfillTarget = 'es' + (parseInt(buildTarget.slice(2)) + 1) // buildTarget + 1
     const hash = computeHash(polyfillTarget + '/[email protected]/' + VERSION)
-    const bundleFilename = `polyfill.bundle.${hash.slice(0, hashShort)}.js`
+    const bundleFilename = `polyfills.bundle.${hash.slice(0, hashShort)}.js`
     const bundleFilePath = join(this.#app.buildDir, bundleFilename)
     if (!existsFileSync(bundleFilePath)) {
-      const rawPolyfillFile = `${alephPkgUri}/bundler/polyfills/${polyfillTarget}/mod.ts`
-      await this.build(rawPolyfillFile, bundleFilePath)
+      const rawPolyfillsFile = `${alephPkgUri}/bundler/polyfills/${polyfillTarget}/mod.ts`
+      await this.build(rawPolyfillsFile, bundleFilePath)
     }
-    this.#bundledFiles.set('polyfill', bundleFilename)
-    log.info(`  {} polyfill.js (${buildTarget.toUpperCase()}) ${dim('• ' + util.formatBytes(Deno.statSync(bundleFilePath).size))}`)
+    this.#bundledFiles.set('polyfills', bundleFilename)
+    log.info(`  {} polyfills.js (${buildTarget.toUpperCase()}) ${dim('• ' + util.formatBytes(Deno.statSync(bundleFilePath).size))}`)
   }
 
   /** create bundle chunk. */

server/app.ts

@@ -1002,6 +1002,17 @@ export class Application implements ServerApplication {
     }
   }
 
+  async parseModuleExportNames(url: string): Promise<string[]> {
+    const source = await this.resolveModule(url)
+    const names = await parseExportNames(url, source.code, { sourceType: source.type })
+    return (await Promise.all(names.map(async name => {
+      if (name.startsWith('{') && name.startsWith('}')) {
+        return await this.parseModuleExportNames(name.slice(1, -1))
+      }
+      return name
+    }))).flat()
+  }
+
   /** compile a moudle by given url, then cache on the disk. */
   private async compile(
     url: string,
@@ -1115,7 +1126,6 @@ export class Application implements ServerApplication {
         ...this.sharedCompileOptions,
         sourceMap: this.isDev,
         swcOptions: {
-          target: 'es2020',
           sourceType: source.type
         },
       })
@@ -1125,13 +1135,12 @@ export class Application implements ServerApplication {
         jsSourceMap = map
       }
 
-      // in bundle mode we replace the star export with names
+      // in production/bundle mode we need to replace the star export with names
       if (starExports && starExports.length > 0) {
         for (let index = 0; index < starExports.length; index++) {
           const url = starExports[index]
-          const source = await this.resolveModule(url)
-          const names = await parseExportNames(url, source.code, { sourceType: source.type })
-          jsContent = jsContent.replace(`export * from "${url}:`, `export {${names.filter(name => name !== 'default').join(',')}} from "`)
+          const names = await this.parseModuleExportNames(url)
+          jsContent = jsContent.replace(`export * from "[${url}]:`, `export {${names.filter(name => name !== 'default').join(',')}} from "`)
         }
       }