feat: update esbuild to 0.19.11

terwer · Jan 17, 2024 · a6f3ea1 · a6f3ea1
1 parent a1afc43
commit a6f3ea1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/tools/esbuild-config-custom/CHANGELOG.md b/tools/esbuild-config-custom/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @terwer/esbuild-config-custom
 
+## 2.2.0
+
+### Minor Changes
+
+- fix config import error
+
 ## 2.1.4
 
 ### Patch Changes

diff --git a/tools/esbuild-config-custom/build.js b/tools/esbuild-config-custom/build.js
@@ -32,27 +32,24 @@ export class ZhiBuild {
     if (!existsSync(esbuildConfigFile)) {
       console.warn(`userEsbuildConfig not found, using default`)
     } else {
+      let customCfg
       try {
-        let customCfg
-        try {
-          console.log(`try import esbuildConfigFile => ${esbuildConfigFile}`)
-          // 兼容 mjs 和 cjs
-          const pkg = await import(esbuildConfigFile)
-          // console.log("pkg=>", pkg)
-          customCfg = pkg
-          if (pkg.default) {
-            customCfg = pkg.default
-          }
-        } catch (e) {
-          console.log(`import error, using require instead.esbuildConfigFile => ${esbuildConfigFile}`)
-          customCfg = require(esbuildConfigFile)
+        console.log(`try import esbuildConfigFile => ${esbuildConfigFile}`)
+        // 兼容 mjs 和 cjs
+        const pkg = await import(esbuildConfigFile)
+        // console.log("pkg=>", pkg)
+        customCfg = pkg
+        if (pkg.default) {
+          customCfg = pkg.default
         }
-        userEsbuildConfig = customCfg.esbuildConfig ?? {}
-        customConfig = customCfg.customConfig ?? {}
-      } catch (e2) {
-        console.error(`Failed to load esbuild config: ${e2}`)
+      } catch (e) {
+        console.error(`Failed to load esbuild config: `, e)
         process.exit(1)
+        console.log(`import error, using require instead.esbuildConfigFile => ${esbuildConfigFile}`)
+        customCfg = require(esbuildConfigFile)
       }
+      userEsbuildConfig = customCfg.esbuildConfig ?? {}
+      customConfig = customCfg.customConfig ?? {}
     }
     console.log("parsed user defined esbuild config", userEsbuildConfig)
 

diff --git a/tools/esbuild-config-custom/package.json b/tools/esbuild-config-custom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@terwer/esbuild-config-custom",
-  "version": "2.1.4",
+  "version": "2.2.0",
   "type": "module",
   "description": "universal esbuild tool for library",
   "bin": {