Merge branch 'develop'

Author: aws-sam-cli-bot

aws_lambda_builders/__init__.py

@@ -4,5 +4,5 @@
 
 # Changing version will trigger a new release!
 # Please make the version change as the last step of your development.
-__version__ = "1.32.0"
+__version__ = "1.33.0"
 RPC_PROTOCOL_VERSION = "0.3"

aws_lambda_builders/workflows/nodejs_npm_esbuild/esbuild.py

@@ -101,6 +101,10 @@ def run(self, args, cwd=None):
 
 NON_CONFIGURABLE_VALUES = {"bundle", "platform", "outdir"}
 
+# Ignore the values below. These are options that Lambda Builders accepts for
+# Node.js related workflows, but are not relevant to esbuild itself.
+ESBUILD_IGNORE_VALUES = {"use_npm_ci", "entry_points"}
+
 
 class EsbuildCommandBuilder:
     ENTRY_POINTS = "entry_points"
@@ -142,8 +146,7 @@ def build_esbuild_args_from_config(self) -> "EsbuildCommandBuilder":
                     config_value,
                 )
                 continue
-            if config_key == "entry_points":
-                # Entry points are a required parameter and are handled by the build_entry_points() method
+            if config_key in ESBUILD_IGNORE_VALUES:
                 continue
             configuration_type_callback = self._get_config_type_callback(config_value)
             LOG.debug("Configuring the parameter '%s=%s'", config_key, config_value)

requirements/dev.txt

@@ -1,7 +1,7 @@
-coverage==7.2.5
+coverage==7.2.6
 flake8==3.3.0; python_version < '3.8'
 flake8==3.8.4; python_version >= '3.8'
-pytest-cov==4.0.0
+pytest-cov==4.1.0
 
 isort>=4.2.5,<5; python_version < '3.8'
 
@@ -12,4 +12,4 @@ pyelftools~=0.29 # Used to verify the generated Go binary architecture in integr
 
 # formatter
 black==23.3.0
-ruff==0.0.269
+ruff==0.0.270

tests/integration/workflows/nodejs_npm_esbuild/test_nodejs_npm_with_esbuild.py

@@ -491,3 +491,24 @@ def test_esbuild_can_build_in_source_with_local_dependency(self, runtime):
         expected_files = {"included.js"}
         output_files = set(os.listdir(self.artifacts_dir))
         self.assertEqual(expected_files, output_files)
+
+    @parameterized.expand([("nodejs12.x",), ("nodejs14.x",), ("nodejs16.x",), ("nodejs18.x",)])
+    def test_builds_javascript_project_ignoring_relevant_flags(self, runtime):
+        source_dir = os.path.join(self.TEST_DATA_FOLDER, "with-deps-esbuild")
+
+        options = {"entry_points": ["included.js"], "use_npm_ci": True}
+
+        self.builder.build(
+            source_dir,
+            self.artifacts_dir,
+            self.scratch_dir,
+            os.path.join(source_dir, "package.json"),
+            runtime=runtime,
+            options=options,
+            experimental_flags=[],
+            executable_search_paths=[self.binpath],
+        )
+
+        expected_files = {"included.js"}
+        output_files = set(os.listdir(self.artifacts_dir))
+        self.assertEqual(expected_files, output_files)

tests/unit/workflows/nodejs_npm_esbuild/test_actions.py

@@ -329,6 +329,30 @@ def test_building_with_skip_deps_fails_if_esbuild_version_less_than_minimum(
         with self.assertRaises(ActionFailedError):
             action.execute()
 
+    def test_packages_javascript_ignoring_non_relevant_flags(self):
+        action = EsbuildBundleAction(
+            "source",
+            "artifacts",
+            {"entry_points": ["x.js"], "use_npm_ci": True},
+            self.osutils,
+            self.subprocess_esbuild,
+            "package.json",
+        )
+        action.execute()
+
+        self.subprocess_esbuild.run.assert_called_with(
+            [
+                "x.js",
+                "--bundle",
+                "--platform=node",
+                "--outdir=artifacts",
+                "--target=es2020",
+                "--format=cjs",
+                "--minify",
+            ],
+            cwd="source",
+        )
+
 
 class TestEsbuildVersionChecker(TestCase):
     @parameterized.expand(["0.14.0", "0.0.0", "0.14.12"])