edge-functions 2.7.2 → 2.7.3

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+### [2.7.3](https://github.com/aziontech/vulcan/compare/v2.7.2...v2.7.3) (2024-05-10)
+
+
+### Bug Fixes
+
+* restore overwritten features ([#328](https://github.com/aziontech/vulcan/issues/328)) ([99142dd](https://github.com/aziontech/vulcan/commit/99142dd711a7375bf877a5e79d6c8ab3960fa3a3))
+
+### [2.7.3-stage.1](https://github.com/aziontech/vulcan/compare/v2.7.2...v2.7.3-stage.1) (2024-05-10)
+
+
+### Bug Fixes
+
+* react with vite ([d1eb167](https://github.com/aziontech/vulcan/commit/d1eb1676df781eca28271da29a0fbdfe1e4676a3))
+* react/vue with vite (preset) ([#325](https://github.com/aziontech/vulcan/issues/325)) ([976bb2e](https://github.com/aziontech/vulcan/commit/976bb2e23a8ccd5ffce5ffb85fb7ea812f4be5d6))
+* recover overwritten commits ([#327](https://github.com/aziontech/vulcan/issues/327)) ([47350a4](https://github.com/aziontech/vulcan/commit/47350a4689ee06b891c9d4bf05a28735bae0053d))
+* vite/vue with ts ([5446750](https://github.com/aziontech/vulcan/commit/54467505644c34f60330e14074786ddda6169fea))
+
 ### [2.7.2](https://github.com/aziontech/vulcan/compare/v2.7.1...v2.7.2) (2024-05-10)
 
 

package/lib/build/dispatcher/dispatcher.js

@@ -123,7 +123,7 @@ class Dispatcher {
    * @returns {object} - Preset files
    */
   async loadPreset() {
-    feedback.build.info('Loading build context ...');
+    feedback.build.info('Loading build context...');
 
     const VALID_BUILD_PRESETS = presets.getKeys();
     const vulcanRootPath = resolve(this.vulcanLibPath, '..');
@@ -347,11 +347,8 @@ class Dispatcher {
       'Checking Azion Edge Application configuration file...',
     );
     const buildConfigPath = join(process.cwd(), 'azion.config.js');
-    let vulcanCustomConfigModule = {};
-    if (existsSync(buildConfigPath)) {
-      vulcanCustomConfigModule = (await import(buildConfigPath)).default;
-    }
-    await generateManifest(vulcanCustomConfigModule, true);
+    const vulcanCustomConfigModule = (await import(buildConfigPath)).default;
+    await generateManifest(vulcanCustomConfigModule);
     feedback.build.success('Manifest generated successfully.');
   }
 

package/lib/notations/namespaces.js

@@ -5,12 +5,6 @@
  */
 const Utils = {};
 
-/**
- * @namespace Platform
- * @description Contains functions and actions to interact with the edge platform (Azion).
- */
-const Platform = {};
-
 /**
  * @namespace Build
  * @description Represents the structure responsible for pre-build and build processes for the edge.
@@ -48,20 +42,4 @@ const Commands = {};
  */
 const Polyfills = {};
 
-/**
- * @namespace Services
- * @description Azion Platform Services.
- */
-const Services = {};
-
-export {
-  Utils,
-  Platform,
-  Build,
-  Env,
-  Presets,
-  Edge,
-  Polyfills,
-  Commands,
-  Services,
-};
+export { Utils, Build, Env, Presets, Edge, Polyfills, Commands };

package/lib/utils/feedback/feedback.utils.js

@@ -40,9 +40,9 @@ const methods = {
     logLevel: 'info',
   },
   option: {
-    badge: '🟣',
-    color: 'magenta',
-    label: 'option',
+    badge: '🌋',
+    color: 'green',
+    label: '',
     logLevel: 'info',
   },
 };
@@ -106,33 +106,6 @@ const scopes = {
       types: methods,
     }),
   },
-  platform: {
-    ...global.scope('Vulcan', 'Platform'),
-    interactive: getLogger({
-      interactive: true,
-      scope: ['Vulcan', 'Platform'],
-      types: methods,
-    }),
-  },
-  statics: {
-    ...global.scope('Vulcan', 'Storage'),
-    interactive: getLogger({
-      interactive: true,
-      scope: ['Vulcan', 'storage'],
-      types: methods,
-    }),
-  },
-  logs: (scope1, scope2, scope3) => ({
-    ...global.scope('Azion', `${scope1}`, scope2, scope3),
-  }),
-  propagation: {
-    ...global.scope('Azion', 'Edge Network'),
-    interactive: getLogger({
-      interactive: true,
-      scope: ['Vulcan', 'Azion Network'],
-      types: methods,
-    }),
-  },
 };
 
 /**

package/lib/utils/generateManifest/generateManifest.utils.js

@@ -1,14 +1,10 @@
-import { existsSync, writeFileSync, readFileSync, mkdirSync, rm } from 'fs';
+import { writeFileSync, existsSync, mkdirSync, readFileSync } from 'fs';
 import { join } from 'path';
 import Ajv from 'ajv';
 import ajvErrors from 'ajv-errors';
 import addKeywords from 'ajv-keywords';
-import os from 'node:os';
-import lodash from 'lodash';
 
 import azionConfigSchema from './fixtures/schema.js';
-import debug from '../debug/debug.utils.js';
-
 /**
  * Validates the provided configuration against a JSON Schema.
  * This function uses AJV (Another JSON Schema Validator) to validate the configuration.
@@ -253,34 +249,44 @@ function processManifestConfig(config) {
 }
 
 /**
- * Removes the temporary folder used to store the manifest file.
- * This function is typically called after the manifest is generated and copied to the edge directory.
+ * Loads the Azion deploy configuration from a local file or a provided module.
+ * If a custom configuration file 'azion.config.js' exists in the root directory, it takes precedence and is loaded.
+ * If the file does not exist, the function will attempt to use the provided configuration module.
+ * If no module is provided, a minimal default configuration is returned.
+ * @param {string} configPath - The path to the custom configuration file.
+ * @param {object} configModule - An alternative configuration module provided as a fallback.
+ * @returns {Promise<object>} A promise that resolves to the loaded configuration object.
  */
-function removeTmpFolder() {
-  const manifestPath = globalThis.vulcan.tmpManifestFile;
-  if (manifestPath) {
-    const dirName = manifestPath.substring(0, manifestPath.lastIndexOf('/'));
-    rm(dirName, { recursive: true }, (err) => {
-      if (err) {
-        debug.error(err);
-      }
-    });
+async function loadAzionConfig(configPath, configModule) {
+  const existCustomAzionConfig = existsSync(configPath); // user created azion.config.js in root directory
+
+  // the file created has priorty over preset
+  if (existCustomAzionConfig) {
+    return (await import(configPath)).default;
+  }
+  if (!existCustomAzionConfig && configModule) {
+    return configModule;
   }
-  globalThis.vulcan.tmpManifestFile = null;
+  return {
+    rules: {
+      request: [{}], // minimal configuration
+    },
+  };
 }
 
 /**
- * Create the final manifest file to the edge directory.
+ * Determines if the project uses the CommonJS module system by default.
+ * It checks the 'type' key in the 'package.json' file at the project root.
+ * If 'type' is 'commonjs' or absent, returns true. Otherwise, returns false.
+ * @returns {boolean} True if the project uses CommonJS, false if it uses ES Modules.
  */
-async function generateFinalManifest() {
-  const manifestPath = globalThis.vulcan.tmpManifestFile;
-  const finalManifestPath = join(process.cwd(), '.edge', 'manifest.json');
-  if (existsSync(manifestPath)) {
-    writeFileSync(finalManifestPath, readFileSync(manifestPath));
-    removeTmpFolder();
-  } else {
-    throw new Error('Manifest file not found');
+function useCommonJS() {
+  const packageJsonPath = join(process.cwd(), 'package.json');
+  if (existsSync(packageJsonPath)) {
+    const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
+    return packageJson.type !== 'module'; // Returns true for 'commonjs' or no 'type' specified
   }
+  return true; // Default to CommonJS if 'package.json' does not exist or 'type' key is absent
 }
 
 /**
@@ -288,64 +294,50 @@ async function generateFinalManifest() {
  * If an existing manifest is found, it merges the configurations, prioritizing the custom module.
  * This function is typically called during the prebuild stage to prepare the CDN configuration.
  * @param {object} configModule - The custom configuration module provided by the user.
- * @param {boolean} shouldGenerateFinalManifest - A flag indicating whether the final manifest should be generated after the temporary manifest is created.
  * @async
  */
-async function generateManifest(
-  configModule,
-  shouldGenerateFinalManifest = false,
-) {
-  const edgeDirPath = join(process.cwd(), '.edge');
-  const tmpDirPath = join(os.tmpdir(), 'vulcan');
-
-  if (!existsSync(tmpDirPath)) {
-    mkdirSync(tmpDirPath);
-  }
+async function generateManifest(configModule) {
+  const configPath = join(process.cwd(), 'azion.config.js');
+  const dotEdgeDir = join(process.cwd(), '.edge');
+  const finalManifestPath = join(dotEdgeDir, 'manifest.json');
 
-  let manifestPath = globalThis.vulcan.tmpManifestFile;
-  if (!manifestPath) {
-    manifestPath = join(tmpDirPath, `manifest-${new Date().getTime()}.json`);
-    globalThis.vulcan.tmpManifestFile = manifestPath;
+  if (!existsSync(dotEdgeDir)) {
+    mkdirSync(dotEdgeDir);
   }
 
-  //  preset configuration (existingManifest) have priority over user azion.config.js
-  let existingManifest = {};
+  const AzionConfig = await loadAzionConfig(configPath, configModule);
+  const manifest = processManifestConfig(AzionConfig);
 
-  if (!existsSync(edgeDirPath)) {
-    mkdirSync(edgeDirPath);
-  }
+  if (!existsSync(configPath)) {
+    const moduleExportStyle = useCommonJS()
+      ? 'module.exports ='
+      : 'export default';
 
-  if (existsSync(manifestPath)) {
-    const existingManifestRaw = readFileSync(manifestPath, 'utf8');
-    existingManifest = JSON.parse(existingManifestRaw);
-  }
-
-  const newManifestConfig = processManifestConfig(configModule);
-
-  // eslint-disable-next-line
-  function customizer(objValue, srcValue) {
-    if (Array.isArray(objValue)) {
-      return objValue.concat(
-        srcValue.filter(
-          (srcItem) =>
-            !objValue.some((objItem) => objItem?.name === srcItem?.name),
-        ),
-      );
-    }
-  }
+    // Function to convert functions to strings in a customized way
+    const replacer = (key, value) => {
+      if (typeof value === 'function') {
+        // Convert the function to a string, adding a unique marker
+        return `__FUNCTION_START__${value.toString()}__FUNCTION_END__`;
+      }
+      return value;
+    };
 
-  // Merge the new configuration with the existing manifest with priority to the existing manifest
-  const mergeManifest = lodash.mergeWith(
-    existingManifest,
-    newManifestConfig,
-    customizer,
-  );
+    // Serialize the object with the replacer function
+    let jsonString = JSON.stringify(AzionConfig, replacer, 2);
 
-  writeFileSync(manifestPath, JSON.stringify(mergeManifest, null, 2));
+    // Replace the markers with a clean representation of the function
+    jsonString = jsonString.replace(
+      /"__FUNCTION_START__(.*?)__FUNCTION_END__"/g,
+      (match, p1) => {
+        return p1.replace(/\\n/g, ' ').replace(/\\'/g, "'");
+      },
+    );
 
-  if (shouldGenerateFinalManifest) {
-    await generateFinalManifest();
+    // Write the configuration file with the correct module export style
+    writeFileSync(configPath, `${moduleExportStyle} ${jsonString};`);
   }
+
+  writeFileSync(finalManifestPath, JSON.stringify(manifest, null, 2));
 }
 
 export { processManifestConfig, generateManifest };

package/lib/utils/generateManifest/generateManifest.utils.test.js

@@ -1,113 +1,7 @@
 import { describe, expect } from '@jest/globals';
-import { readFileSync } from 'node:fs';
-import mockFs from 'mock-fs';
-import {
-  generateManifest,
-  processManifestConfig,
-} from './generateManifest.utils.js';
+import { processManifestConfig } from './generateManifest.utils.js';
 
 describe('Utils - generateManifest', () => {
-  it('should correctly merge config when generateManifest is called multiple times', async () => {
-    globalThis.vulcan = {};
-    const presetConfig = {
-      rules: {
-        request: [
-          {
-            name: 'Main_Rule',
-            match: '^\\/',
-            runFunction: {
-              path: '.edge/worker.js',
-            },
-          },
-        ],
-      },
-    };
-    const azionConfig = {
-      origin: [
-        {
-          name: 'my origin storage',
-          type: 'object_storage',
-          bucket: 'mybucket',
-          prefix: 'myfolder',
-        },
-      ],
-      rules: {
-        request: [
-          {
-            name: 'my-rule-origin',
-            match: '/^/_statics/;',
-            setOrigin: {
-              name: 'my origin storage',
-              type: 'object_storage',
-            },
-          },
-        ],
-      },
-    };
-    mockFs({
-      '.edge/manifest.json': '{}',
-    });
-    await generateManifest(presetConfig);
-    await generateManifest(azionConfig, true);
-    const manifest = readFileSync('.edge/manifest.json', 'utf8');
-    mockFs.restore();
-    expect(JSON.parse(manifest)).toEqual(
-      expect.objectContaining({
-        origin: expect.arrayContaining([
-          {
-            name: 'my origin storage',
-            origin_type: 'object_storage',
-            bucket: 'mybucket',
-            prefix: 'myfolder',
-          },
-        ]),
-        rules: expect.arrayContaining([
-          {
-            name: 'my-rule-origin',
-            criteria: [
-              [
-                {
-                  // eslint-disable-next-line no-template-curly-in-string
-                  variable: '${uri}',
-                  operator: 'matches',
-                  conditional: 'if',
-                  input_value: '/^/_statics/;',
-                },
-              ],
-            ],
-            behaviors: [
-              {
-                name: 'set_origin',
-                target: 'my origin storage',
-              },
-            ],
-          },
-          {
-            name: 'Main_Rule',
-            criteria: [
-              [
-                {
-                  // eslint-disable-next-line no-template-curly-in-string
-                  variable: '${uri}',
-                  operator: 'matches',
-                  conditional: 'if',
-                  input_value: '^\\/',
-                },
-              ],
-            ],
-            behaviors: [
-              {
-                name: 'run_function',
-                target: '.edge/worker.js',
-              },
-            ],
-          },
-        ]),
-        cache: [],
-      }),
-    );
-  });
-
   describe('processManifestConfig', () => {
     it('should throw an error for invalid mathematical expressions', () => {
       const azionConfig = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "edge-functions",
   "type": "module",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "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": {