Merge branch 'nuejs:master' into feat/link-components-attrs

packages/nuekit/src/builder.js

@@ -6,9 +6,12 @@ import { join } from 'node:path'
 import { resolve } from 'import-meta-resolve'
 import { Features, bundleAsync } from 'lightningcss'
 
+// don't reuse saved builder when in test mode
+const isTest = process.env.NODE_ENV == 'test'
+
 let jsBuilder
 export async function getBuilder(is_esbuild) {
-  if (jsBuilder) return jsBuilder
+  if (!isTest && jsBuilder) return jsBuilder
 
   try {
     return jsBuilder = is_esbuild ? await import(resolve('esbuild', `file://${process.cwd()}/`)) : Bun
@@ -21,7 +24,6 @@ export async function buildJS(args) {
   const { outdir, toname, minify, bundle } = args
   const is_esbuild = args.esbuild || !process.isBun
   const builder = await getBuilder(is_esbuild)
-  let ret
 
   const opts = {
     external: bundle ? ['../@nue/*', '/@nue/*'] : is_esbuild ? undefined : ['*'],
@@ -43,38 +45,19 @@ export async function buildJS(args) {
     }
   }
 
-  try {
-    ret = await builder.build(opts)
-
-  } catch (e) { ret = e }
-
-  // console.info(ret)
-  const error = parseError(ret)
-  if (error) throw error
-}
-
-export function parseError(buildResult) {
-  const { logs = [], errors = [] } = buildResult
-  let error
+  // make bun always throw on build error
+  if (!is_esbuild) opts.throw = true
 
-  // Bun
-  if (logs.length) {
-    const [err] = logs
-    error = { text: err.message, ...err.position }
-  }
+  try {
+    await builder.build(opts)
 
-  // esbuild
-  if (errors.length) {
+  } catch ({ errors }) {
     const [err] = errors
-    error = { text: err.text, ...err.location }
-  }
-
-  if (error) {
+    const error = { text: err.message || err.text, ...(err.location || err.position) }
     error.title = error.text.includes('resolve') ? 'Import error' : 'Syntax error'
     delete error.file
-    return error
+    throw error
   }
-
 }
 
 export async function lightningCSS(filename, minify, opts = {}) {