edge-functions 4.0.0 → 4.0.1-stage.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+### [4.0.1-stage.1](https://github.com/aziontech/bundler/compare/v4.0.0...v4.0.1-stage.1) (2024-09-26)
+
+
+### Bug Fixes
+
+* merge azion.config user with preset azion.config ([#386](https://github.com/aziontech/bundler/issues/386)) ([8b1054b](https://github.com/aziontech/bundler/commit/8b1054b4610c1e9a72fdb165ed7c785c8b15bddf))
+
 ## [4.0.0](https://github.com/aziontech/bundler/compare/v3.3.0...v4.0.0) (2024-09-25)
 
 

package/lib/build/dispatcher/dispatcher.js

@@ -1,4 +1,5 @@
 import { join } from 'path';
+import lodash from 'lodash';
 import { readFileSync, existsSync, writeFileSync, rmSync } from 'fs';
 import { Esbuild, Webpack } from '#bundlers';
 import {
@@ -526,25 +527,47 @@ class Dispatcher {
         }
       }
       // manifest
+      // azion.config.js preset
+      const presetAzionConfigPath = join(
+        this.vulcanLibPath,
+        'presets',
+        this.preset.name,
+        'azion.config.js',
+      );
+      const presetConfigModule = await vulcan.loadAzionConfig(
+        presetAzionConfigPath,
+      );
+      // azion.config.js project user
       const azionConfigPath = await vulcan.getAzionConfigPath();
-      let configModule = await vulcan.loadAzionConfig(azionConfigPath);
+      const azionConfigModule = await vulcan.loadAzionConfig(azionConfigPath);
 
-      if (!configModule) {
-        const presetAzionConfigPath = join(
-          this.vulcanLibPath,
-          'presets',
-          this.preset.name,
-          'azion.config.js',
-        );
-        configModule = await vulcan.loadAzionConfig(presetAzionConfigPath);
+      if (!presetConfigModule) {
+        throw new Error(Messages.errors.azion_config_not_found);
+      }
 
-        if (configModule) {
-          await vulcan.createAzionConfigFile(isCommonJS(), configModule);
+      // merge azion.config.js user with preset azion.config.js
+      const customizer = (objValue, srcValue) => {
+        if (Array.isArray(objValue)) {
+          const map = new Map();
+          objValue.concat(srcValue).forEach((item) => {
+            if (item && item.name) {
+              map.set(item.name, item);
+            }
+          });
+          return Array.from(map.values());
         }
-      }
+        return undefined;
+      };
+      // priority to user config
+      const configModule = lodash.mergeWith(
+        {},
+        presetConfigModule,
+        azionConfigModule,
+        customizer,
+      );
 
       if (!configModule) {
-        throw new Error(Messages.errors.azion_config_not_found);
+        await vulcan.createAzionConfigFile(isCommonJS(), configModule);
       }
 
       const outputPath = join(process.cwd(), '.edge');

package/lib/constants/messages/build.messages.js

@@ -6,7 +6,7 @@ Build messages object.
  */
 const build = {
   success: {
-    prebuild_succeeded: 'Preb-uild succeeded!',
+    prebuild_succeeded: 'Pre-build succeeded!',
     vulcan_build_succeeded: 'Build completed!',
     manifest_succeeded: 'Azion Manifest generated successfully!',
   },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "edge-functions",
   "type": "module",
-  "version": "4.0.0",
+  "version": "4.0.1-stage.1",
   "description": "Tool to launch and build JavaScript/Frameworks. This tool automates polyfills for Edge Computing and assists in creating Workers, notably for the Azion platform.",
   "main": "lib/main.js",
   "bin": {