fix(esbuild): include package.json in artifact if type is module (#12872)

eahefnawy · web-flow · commit a7d04bd28d56 · 2024-11-14T17:51:08.000+01:00
diff --git a/lib/plugins/esbuild/index.js b/lib/plugins/esbuild/index.js
@@ -314,6 +314,14 @@ class Esbuild {
 
   async _buildProperties() {
     const defaultConfig = { bundle: true, minify: false, sourcemap: true }
+
+    const packageJson = await this._readPackageJson()
+
+    // If the user explicitly set the type to "module" then we need to set the output format to ESM
+    if (packageJson.type === 'module') {
+      defaultConfig.format = `esm`
+    }
+
     if (
       this.serverless.service.build &&
       this.serverless.service.build !== 'esbuild' &&
@@ -356,12 +364,6 @@ class Esbuild {
         this.serverless.service.build.esbuild,
       )
 
-      const packageJson = await this._readPackageJson()
-
-      if (packageJson.type === 'module') {
-        mergedOptions.format = `esm`
-      }
-
       if (this.serverless.service.build.esbuild.sourcemap === true) {
         mergedOptions.sourcemap = true
       } else if (this.serverless.service.build.esbuild.sourcemap === false) {
@@ -711,6 +713,17 @@ class Esbuild {
                 '',
               )
 
+              const packageJsonPath = path.join(
+                this.serverless.config.serviceDir,
+                '.serverless',
+                'build',
+                'package.json',
+              )
+
+              if (existsSync(packageJsonPath)) {
+                zip.file(packageJsonPath, { name: `package.json` })
+              }
+
               const handlerZipPath = path.join(
                 this.serverless.config.serviceDir,
                 '.serverless',
@@ -719,6 +732,7 @@ class Esbuild {
               )
 
               zip.file(handlerZipPath, { name: `${handlerPath}.js` })
+
               if (existsSync(`${handlerZipPath}.map`)) {
                 zip.file(`${handlerZipPath}.map`, {
                   name: `${handlerPath}.js.map`,
@@ -803,6 +817,17 @@ class Esbuild {
             '',
           )
 
+          const packageJsonPath = path.join(
+            this.serverless.config.serviceDir,
+            '.serverless',
+            'build',
+            'package.json',
+          )
+
+          if (existsSync(packageJsonPath)) {
+            zip.file(packageJsonPath, { name: `package.json` })
+          }
+
           const handlerZipPath = path.join(
             this.serverless.config.serviceDir,
             '.serverless',
