edge-functions 2.8.1 → 2.9.0-stage.2

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## [2.9.0-stage.2](https://github.com/aziontech/vulcan/compare/v2.9.0-stage.1...v2.9.0-stage.2) (2024-06-19)
+
+
+### Features
+
+* behavior order, description prop and active prop (azion.config.js) ([#341](https://github.com/aziontech/vulcan/issues/341)) ([9ace596](https://github.com/aziontech/vulcan/commit/9ace5961f7bbfe66419ab0754c5975aaf63ace76))
+
+## [2.9.0-stage.1](https://github.com/aziontech/vulcan/compare/v2.8.1...v2.9.0-stage.1) (2024-06-13)
+
+
+### Features
+
+* add capture_match_groups rule ([e5a9238](https://github.com/aziontech/vulcan/commit/e5a9238215759c536a43da519542f9bf5184694c))
+* add optional 'variable' field (azion.config) ([71e7184](https://github.com/aziontech/vulcan/commit/71e7184e052c239cb3d6116dc76216d56a3d64d2))
+* expand azion.config.js field support ([#340](https://github.com/aziontech/vulcan/issues/340)) ([266f257](https://github.com/aziontech/vulcan/commit/266f25743417ca57fdfbfd1667cceb0906d1cb95))
+* flag to build manifest only and skip other steps ([08201ce](https://github.com/aziontech/vulcan/commit/08201ceb81420a75f4d26f57b5d0555f886bc963))
+* request phase gzip field ([ac84e82](https://github.com/aziontech/vulcan/commit/ac84e82e93b33963c17d7f64e75ed49eed285eb2))
+* request phase redirects + bypass cache ([f49d8f5](https://github.com/aziontech/vulcan/commit/f49d8f59168c829990de4f08573bd154ecde2079))
+* support response phase in manifest ([5ee8717](https://github.com/aziontech/vulcan/commit/5ee8717804ac0004ea3c87c324956e589d5bbc92))
+
+
+### Bug Fixes
+
+* request or response are required ([8c8ca7e](https://github.com/aziontech/vulcan/commit/8c8ca7e06ef391a2cfee2998ce54a38ea245d906))
+* response phase criteria ([c85ef9f](https://github.com/aziontech/vulcan/commit/c85ef9f4ed9968e03a8668dcb11af2b34578b805))
+
 ### [2.8.1](https://github.com/aziontech/vulcan/compare/v2.8.0...v2.8.1) (2024-06-07)
 
 

package/lib/build/dispatcher/dispatcher.js

@@ -1,4 +1,4 @@
-import { join, resolve, dirname } from 'path';
+import { join, resolve, dirname, extname } from 'path';
 import { readFileSync, existsSync, writeFileSync, rmSync } from 'fs';
 import { Esbuild, Webpack } from '#bundlers';
 import {
@@ -127,18 +127,29 @@ class Dispatcher {
    * @returns {object} - Preset files
    */
   async loadPreset() {
-    feedback.build.info('Loading build context...');
-
     const VALID_BUILD_PRESETS = presets.getKeys();
     const vulcanRootPath = resolve(this.vulcanLibPath, '..');
 
     const validPreset = VALID_BUILD_PRESETS.includes(this.preset.name);
+    const validMode = ['deliver', 'compute'].includes(this.preset.mode);
 
     if (!validPreset) {
       feedback.build.error(Messages.build.error.invalid_preset);
       process.exit(1);
     }
 
+    if (!validMode) {
+      feedback.build.error(
+        Messages.build.error.invalid_preset_mode(
+          this.preset.mode,
+          this.preset.name,
+        ),
+      );
+      process.exit(1);
+    }
+
+    feedback.build.info('Loading build context...');
+
     let configFilePath;
     let prebuildFilePath;
     let postbuildFilePath;
@@ -469,86 +480,88 @@ class Dispatcher {
 
   /**
    * Run the build process.
+   * @param {boolean} processOnlyManifst - Boolean for Skip build and process just the manifest
    */
-  async run() {
+  async run(processOnlyManifst) {
     let buildEntryTemp;
     try {
-      await Dispatcher.checkNodeModules();
-
-      // Load files from preset
-      const { handler, prebuild, config, postbuild } = await this.loadPreset();
-      const buildConfig = Dispatcher.configureBuild(
-        {
-          localCustom: this.custom,
-          preset: this.preset,
-          useNodePolyfills: this.useNodePolyfills,
-          useOwnWorker: this.useOwnWorker,
-          memoryFS: this.memoryFS,
-        },
-        config,
-      );
-      buildEntryTemp = buildConfig.entry;
-      // temp entry
-      writeFileSync(buildConfig?.entry, handler);
+      if (!processOnlyManifst) {
+        await Dispatcher.checkNodeModules();
+
+        // Load files from preset
+        const { handler, prebuild, config, postbuild } =
+          await this.loadPreset();
+        const buildConfig = Dispatcher.configureBuild(
+          {
+            localCustom: this.custom,
+            preset: this.preset,
+            useNodePolyfills: this.useNodePolyfills,
+            useOwnWorker: this.useOwnWorker,
+            memoryFS: this.memoryFS,
+          },
+          config,
+        );
+        buildEntryTemp = buildConfig.entry;
+        // temp entry
+        writeFileSync(buildConfig?.entry, handler);
 
-      const prebuildContext = await Dispatcher.runPrebuild(
-        { handler, prebuild },
-        buildConfig,
-      );
-      const { codeToInjectInHandler, builderPlugins, defineVars } =
-        prebuildContext;
-
-      // inject code in handler (build is necessary to pull the modules,
-      // this is not a simples code append)
-      if (codeToInjectInHandler && codeToInjectInHandler.onEntry !== '') {
-        let entryContent = readFileSync(buildConfig?.entry, 'utf-8');
-        entryContent = `${codeToInjectInHandler.onEntry} ${entryContent}`;
-        entryContent = relocateImportsAndRequires(entryContent);
-        writeFileSync(buildConfig?.entry, entryContent);
-      }
+        const prebuildContext = await Dispatcher.runPrebuild(
+          { handler, prebuild },
+          buildConfig,
+        );
+        const { codeToInjectInHandler, builderPlugins, defineVars } =
+          prebuildContext;
+
+        // inject code in handler (build is necessary to pull the modules,
+        // this is not a simples code append)
+        if (codeToInjectInHandler && codeToInjectInHandler.onEntry !== '') {
+          let entryContent = readFileSync(buildConfig?.entry, 'utf-8');
+          entryContent = `${codeToInjectInHandler.onEntry} ${entryContent}`;
+          entryContent = relocateImportsAndRequires(entryContent);
+          writeFileSync(buildConfig?.entry, entryContent);
+        }
 
-      // inject code banner
-      if (codeToInjectInHandler && codeToInjectInHandler.onBanner !== '') {
-        buildConfig.contentToInject = codeToInjectInHandler.onBanner;
-      }
+        // inject code banner
+        if (codeToInjectInHandler && codeToInjectInHandler.onBanner !== '') {
+          buildConfig.contentToInject = codeToInjectInHandler.onBanner;
+        }
 
-      if (builderPlugins) {
-        buildConfig.custom.plugins = buildConfig.custom.plugins
-          ? [...buildConfig.custom.plugins, ...builderPlugins]
-          : builderPlugins;
-      }
+        if (builderPlugins) {
+          buildConfig.custom.plugins = buildConfig.custom.plugins
+            ? [...buildConfig.custom.plugins, ...builderPlugins]
+            : builderPlugins;
+        }
 
-      Dispatcher.setVulcanLibAbsolutePath(buildConfig.entry);
+        Dispatcher.setVulcanLibAbsolutePath(buildConfig.entry);
 
-      // prebuildContext.defineVars
-      if (defineVars) {
-        buildConfig.defineVars = defineVars;
-      }
+        // prebuildContext.defineVars
+        if (defineVars) {
+          buildConfig.defineVars = defineVars;
+        }
 
-      await Dispatcher.executeBuild(this.entry, this.builder, buildConfig);
+        await Dispatcher.executeBuild(this.entry, this.builder, buildConfig);
 
-      if (postbuild) {
-        feedback.postbuild.info('Running postbuild actions...');
-        await postbuild(buildConfig);
+        if (postbuild) {
+          feedback.postbuild.info('Running postbuild actions...');
+          await postbuild(buildConfig);
+        }
       }
-
       // manifest
       const azionConfigPath = await getAzionConfigPath();
       const azionConfigAlreadyExists = !!azionConfigPath;
 
       let configModule = null;
-
       if (azionConfigAlreadyExists) {
         const configModulePath = dirname(azionConfigPath);
+        const extension = extname(azionConfigPath);
         configModule = await loadModule(
           configModulePath,
           'azion.config',
-          isCommonJS(),
+          extension,
         );
       }
 
       if (!azionConfigAlreadyExists) {
-        const useCommonJS = isCommonJS();
         const presetAzionConfigPath = join(
           this.vulcanLibPath,
           'presets',
@@ -559,13 +572,14 @@ class Dispatcher {
         configModule = await loadModule(
           presetAzionConfigPath,
           'azion.config',
-          false,
+          '.js',
         );
-        await createAzionConfigFile(useCommonJS, configModule);
+        await createAzionConfigFile(isCommonJS(), configModule);
       }
 
       const outputPath = join(process.cwd(), '.edge');
       await generateManifest(configModule, outputPath);
+      feedback.build.success(Messages.build.success.manifest_succeeded);
       feedback.build.success(Messages.build.success.vulcan_build_succeeded);
     } catch (error) {
       if (existsSync(buildEntryTemp)) {

package/lib/build/dispatcher/dispatcher.test.js

@@ -3,6 +3,10 @@ import { expect } from '@jest/globals';
 import Dispatcher from './dispatcher.js';
 import { folderExistsInProject, getAliasPath } from './helpers/helpers.js';
 
+jest.mock('prettier', () => ({
+  format: jest.fn((content) => content),
+}));
+
 describe('dispatcher', () => {
   const { env } = process;
   beforeEach(() => {

package/lib/build/dispatcher/helpers/helpers.js

@@ -7,6 +7,7 @@ import {
 } from 'fs';
 import { join } from 'path';
 import { fileURLToPath } from 'url';
+import prettier from 'prettier';
 
 /**
  * Get the path corresponding to a specific alias defined in the package.json.
@@ -78,20 +79,16 @@ function isCommonJS() {
 }
 
 /**
- * Dynamically loads a module based on the path, filename, and whether to use CommonJS.
- * @param {string} inputpath - The path where the module is located.
- * @param {string} filename - The filename of the module without the extension.
- * @param {boolean} useCommonJS - If true, uses CommonJS extensions (.cjs, .js); otherwise, uses ES Modules (.js, .mjs).
- * @returns {Promise<*>} The imported module or null if no valid module is found.
+ * Carrega dinamicamente um módulo com base no caminho, nome do arquivo e formato do arquivo.
+ * @param {string} inputpath - O caminho onde o módulo está localizado.
+ * @param {string} filename - O nome do arquivo do módulo sem a extensão.
+ * @param {string} format - O formato do arquivo (por exemplo, '.js', '.cjs', '.mjs').
+ * @returns {Promise<*>} O módulo importado ou null se nenhum módulo válido for encontrado.
  */
-async function loadModule(inputpath, filename, useCommonJS) {
-  const extensions = useCommonJS ? ['.cjs', '.js'] : ['.js', '.mjs'];
+async function loadModule(inputpath, filename, format) {
+  const modulePath = join(inputpath, `${filename}${format}`);
 
-  const modulePath = extensions
-    .map((ext) => join(inputpath, `${filename}${ext}`))
-    .find((path) => existsSync(path));
-
-  if (modulePath) {
+  if (existsSync(modulePath)) {
     const module = await import(modulePath);
     return module.default || module;
   }
@@ -142,9 +139,19 @@ async function createAzionConfigFile(useCommonJS, module) {
       return p1.replace(/\\n/g, ' ').replace(/\\'/g, "'");
     },
   );
+  // Formatação da string JSON usando prettier
+  const formattedContent = await prettier.format(
+    `${moduleExportStyle} ${jsonString};`,
+    {
+      parser: 'babel',
+      semi: false,
+      singleQuote: true,
+      trailingComma: 'none',
+    },
+  );
 
   if (!existsSync(configPath)) {
-    writeFileSync(configPath, `${moduleExportStyle} ${jsonString};`);
+    writeFileSync(configPath, formattedContent);
   }
 }
 

package/lib/commands/build.commands.js

@@ -65,6 +65,7 @@ function getPresetValue(
  * @param {string} [options.mode] - Mode in which to run the build (e.g., 'deliver', 'compute').
  * @param {boolean} [options.useNodePolyfills] - Whether to use Node.js polyfills.
  * @param {boolean} [options.useOwnWorker] - This flag indicates that the constructed code inserts its own worker expression, such as addEventListener("fetch") or similar, without the need to inject a provider.
+ * @param {boolean} [options.onlyManifest] - Skip build and process. just the manifest.
  * @param {boolean} [isFirewall] - (Experimental) Enable isFirewall for local environment.
  * @returns {Promise<void>} - A promise that resolves when the build is complete.
  * @example
@@ -77,7 +78,15 @@ function getPresetValue(
  * });
  */
 async function buildCommand(
-  { entry, builder, preset, mode, useNodePolyfills, useOwnWorker },
+  {
+    entry,
+    builder,
+    preset,
+    mode,
+    useNodePolyfills,
+    useOwnWorker,
+    onlyManifest,
+  },
   isFirewall,
 ) {
   const customConfigurationModule = await vulcan.loadVulcanConfigFile();
@@ -142,7 +151,7 @@ async function buildCommand(
   const BuildDispatcher = (await import('#build')).default;
   const buildDispatcher = new BuildDispatcher(config, undefined, isFirewall);
 
-  await buildDispatcher.run();
+  await buildDispatcher.run(onlyManifest);
 }
 
 export default buildCommand;

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

@@ -7,7 +7,8 @@ Build messages object.
 const build = {
   success: {
     prebuild_succeeded: 'Prebuild succeeded!',
-    vulcan_build_succeeded: 'Vulcan Build succeeded!',
+    vulcan_build_succeeded: 'Build completed!',
+    manifest_succeeded: 'Manifest generated successfully!',
   },
   info: {
     rebuilding: 'We are rebuilding with the new changes...',

package/lib/main.js

@@ -135,6 +135,7 @@ function startVulcanProgram() {
     )
     .option('--mode <type>', 'Mode of build target (e.g., deliver, compute)')
     .option('--useNodePolyfills <boolean>', 'Use node polyfills in build.')
+    .option('--onlyManifest', 'Process just the azion.config.js')
     .option(
       '--useOwnWorker <boolean>',
       'This flag indicates that the constructed code inserts its own worker expression, such as addEventListener("fetch") or similar, without the need to inject a provider.',

package/lib/presets/angular/deliver/azion.config.js

@@ -10,9 +10,11 @@ const AzionConfig = {
       {
         name: 'Set Storage Origin for All Requests',
         match: '^\\/',
-        setOrigin: {
-          name: 'origin-storage-default',
-          type: 'object_storage',
+        behavior: {
+          setOrigin: {
+            name: 'origin-storage-default',
+            type: 'object_storage',
+          },
         },
       },
 
@@ -20,19 +22,22 @@ const AzionConfig = {
         name: 'Deliver Static Assets',
         match:
           '.(css|js|ttf|woff|woff2|pdf|svg|jpg|jpeg|gif|bmp|png|ico|mp4|json|xml|html)$',
-        setOrigin: {
-          name: 'origin-storage-default',
-          type: 'object_storage',
+        behavior: {
+          setOrigin: {
+            name: 'origin-storage-default',
+            type: 'object_storage',
+          },
+          deliver: true,
         },
-        deliver: true,
       },
 
       {
         name: 'Redirect to index.html',
         match: '^\\/',
-        // eslint-disable-next-line no-template-curly-in-string
-        rewrite: {
-          set: () => `/index.html`,
+        behavior: {
+          rewrite: {
+            set: () => `/index.html`,
+          },
         },
       },
     ],

package/lib/presets/astro/deliver/azion.config.js

@@ -10,33 +10,41 @@ const AzionConfig = {
       {
         name: 'Set Storage Origin for All Requests',
         match: '^\\/',
-        setOrigin: {
-          name: 'origin-storage-default',
-          type: 'object_storage',
+        behavior: {
+          setOrigin: {
+            name: 'origin-storage-default',
+            type: 'object_storage',
+          },
         },
       },
       {
         name: 'Deliver Static Assets',
         match:
           '.(css|js|ttf|woff|woff2|pdf|svg|jpg|jpeg|gif|bmp|png|ico|mp4|json|xml|html)$',
-        setOrigin: {
-          name: 'origin-storage-default',
-          type: 'object_storage',
+        behavior: {
+          setOrigin: {
+            name: 'origin-storage-default',
+            type: 'object_storage',
+          },
+          deliver: true,
         },
-        deliver: true,
       },
       {
         name: 'Redirect to index.html',
         match: '.*/$',
-        rewrite: {
-          set: (uri) => `${uri}index.html`,
+        behavior: {
+          rewrite: {
+            set: (uri) => `${uri}index.html`,
+          },
         },
       },
       {
         name: 'Redirect to index.html for Subpaths',
         match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
-        rewrite: {
-          set: (uri) => `${uri}/index.html`,
+        behavior: {
+          rewrite: {
+            set: (uri) => `${uri}/index.html`,
+          },
         },
       },
     ],

package/lib/presets/eleventy/deliver/azion.config.js

@@ -10,33 +10,41 @@ const AzionConfig = {
       {
         name: 'Set Storage Origin for All Requests',
         match: '^\\/',
-        setOrigin: {
-          name: 'origin-storage-default',
-          type: 'object_storage',
+        behavior: {
+          setOrigin: {
+            name: 'origin-storage-default',
+            type: 'object_storage',
+          },
         },
       },
       {
         name: 'Deliver Static Assets',
         match:
           '.(css|js|ttf|woff|woff2|pdf|svg|jpg|jpeg|gif|bmp|png|ico|mp4|json|xml|html)$',
-        setOrigin: {
-          name: 'origin-storage-default',
-          type: 'object_storage',
+        behavior: {
+          setOrigin: {
+            name: 'origin-storage-default',
+            type: 'object_storage',
+          },
+          deliver: true,
         },
-        deliver: true,
       },
       {
         name: 'Redirect to index.html',
         match: '.*/$',
-        rewrite: {
-          set: (uri) => `${uri}index.html`,
+        behavior: {
+          rewrite: {
+            set: (uri) => `${uri}index.html`,
+          },
         },
       },
       {
         name: 'Redirect to index.html for Subpaths',
         match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
-        rewrite: {
-          set: (uri) => `${uri}/index.html`,
+        behavior: {
+          rewrite: {
+            set: (uri) => `${uri}/index.html`,
+          },
         },
       },
     ],

package/lib/presets/emscripten/compute/azion.config.js

@@ -4,8 +4,10 @@ const AzionConfig = {
       {
         name: 'Execute Edge Function',
         match: '^\\/',
-        runFunction: {
-          path: '.edge/worker.js',
+        behavior: {
+          runFunction: {
+            path: '.edge/worker.js',
+          },
         },
       },
     ],

package/lib/presets/gatsby/deliver/azion.config.js

@@ -10,33 +10,41 @@ const AzionConfig = {
       {
         name: 'Set Storage Origin for All Requests',
         match: '^\\/',
-        setOrigin: {
-          name: 'origin-storage-default',
-          type: 'object_storage',
+        behavior: {
+          setOrigin: {
+            name: 'origin-storage-default',
+            type: 'object_storage',
+          },
         },
       },
       {
         name: 'Deliver Static Assets',
         match:
           '.(css|js|ttf|woff|woff2|pdf|svg|jpg|jpeg|gif|bmp|png|ico|mp4|json|xml|html)$',
-        setOrigin: {
-          name: 'origin-storage-default',
-          type: 'object_storage',
+        behavior: {
+          setOrigin: {
+            name: 'origin-storage-default',
+            type: 'object_storage',
+          },
+          deliver: true,
         },
-        deliver: true,
       },
       {
         name: 'Redirect to index.html',
         match: '.*/$',
-        rewrite: {
-          set: (uri) => `${uri}index.html`,
+        behavior: {
+          rewrite: {
+            set: (uri) => `${uri}index.html`,
+          },
         },
       },
       {
         name: 'Redirect to index.html for Subpaths',
         match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
-        rewrite: {
-          set: (uri) => `${uri}/index.html`,
+        behavior: {
+          rewrite: {
+            set: (uri) => `${uri}/index.html`,
+          },
         },
       },
     ],

package/lib/presets/hexo/deliver/azion.config.js

@@ -10,33 +10,41 @@ const AzionConfig = {
       {
         name: 'Set Storage Origin for All Requests',
         match: '^\\/',
-        setOrigin: {
-          name: 'origin-storage-default',
-          type: 'object_storage',
+        behavior: {
+          setOrigin: {
+            name: 'origin-storage-default',
+            type: 'object_storage',
+          },
         },
       },
       {
         name: 'Deliver Static Assets',
         match:
           '.(css|js|ttf|woff|woff2|pdf|svg|jpg|jpeg|gif|bmp|png|ico|mp4|json|xml|html)$',
-        setOrigin: {
-          name: 'origin-storage-default',
-          type: 'object_storage',
+        behavior: {
+          setOrigin: {
+            name: 'origin-storage-default',
+            type: 'object_storage',
+          },
+          deliver: true,
         },
-        deliver: true,
       },
       {
         name: 'Redirect to index.html',
         match: '.*/$',
-        rewrite: {
-          set: (uri) => `${uri}index.html`,
+        behavior: {
+          rewrite: {
+            set: (uri) => `${uri}index.html`,
+          },
         },
       },
       {
         name: 'Redirect to index.html for Subpaths',
         match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
-        rewrite: {
-          set: (uri) => `${uri}/index.html`,
+        behavior: {
+          rewrite: {
+            set: (uri) => `${uri}/index.html`,
+          },
         },
       },
     ],

package/lib/presets/html/deliver/azion.config.js

@@ -10,9 +10,11 @@ const AzionConfig = {
       {
         name: 'Set Storage Origin for All Requests',
         match: '^\\/',
-        setOrigin: {
-          name: 'origin-storage-default',
-          type: 'object_storage',
+        behavior: {
+          setOrigin: {
+            name: 'origin-storage-default',
+            type: 'object_storage',
+          },
         },
       },
     ],