edge-functions 2.9.1 → 2.9.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+### [2.9.2](https://github.com/aziontech/vulcan/compare/v2.9.1...v2.9.2) (2024-06-24)
+
+
+### Bug Fixes
+
+* simplify rewrite rule ([#346](https://github.com/aziontech/vulcan/issues/346)) ([4e5756b](https://github.com/aziontech/vulcan/commit/4e5756bd633c9191363c561c5e47e6f2c346ba90))
+
+### [2.9.2-stage.1](https://github.com/aziontech/vulcan/compare/v2.9.1...v2.9.2-stage.1) (2024-06-24)
+
+
+### Bug Fixes
+
+* simplify rewrite rule ([#346](https://github.com/aziontech/vulcan/issues/346)) ([4e5756b](https://github.com/aziontech/vulcan/commit/4e5756bd633c9191363c561c5e47e6f2c346ba90))
+
 ### [2.9.1](https://github.com/aziontech/vulcan/compare/v2.9.0...v2.9.1) (2024-06-21)
 
 

package/README.md

@@ -19,10 +19,10 @@ Table:
 | Next 13 5 6 Middleware               | ✅      |
 | Next 12 3 4 Middleware               | ✅      |
 | Next Node Pages 12 3 1               | ✅      |
-| Next 13 5 6 Config                   | ⚠️     |
+| Next 13 5 6 Config                   | ✅      |
 | Next 12 3 4 Config                   | ✅      |
 | Next Static                          | ✅      |
-| Gatsby Static                        | ✅      |
+| Gatsby Static                        | ⚠️     |
 | Next Node Pages 12 3 1 Fs            | ✅      |
 | Vue Vite Static                      | ✅      |
 | Next 12 Static                       | ✅      |
@@ -41,7 +41,7 @@ Table:
 | Simple Js Esm                        | ✅      |
 | Simple Ts Esm                        | ✅      |
 
-Last test run date: 06/21/24 03:23:09 AM
+Last test run date: 06/24/24 03:23:39 AM
 ## Quick Installation
 
 For those who just want to use Vulcan in their project without contributing to the development, you can install it directly from npm.

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

@@ -35,9 +35,7 @@ const AzionConfig = {
         name: 'Redirect to index.html',
         match: '^\\/',
         behavior: {
-          rewrite: {
-            set: () => `/index.html`,
-          },
+          rewrite: `/index.html`,
         },
       },
     ],

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

@@ -33,18 +33,14 @@ const AzionConfig = {
         name: 'Redirect to index.html',
         match: '.*/$',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}index.html`,
-          },
+          rewrite: '${uri}index.html',
         },
       },
       {
         name: 'Redirect to index.html for Subpaths',
         match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}/index.html`,
-          },
+          rewrite: '${uri}/index.html',
         },
       },
     ],

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

@@ -33,18 +33,14 @@ const AzionConfig = {
         name: 'Redirect to index.html',
         match: '.*/$',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}index.html`,
-          },
+          rewrite: '${uri}index.html',
         },
       },
       {
         name: 'Redirect to index.html for Subpaths',
         match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}/index.html`,
-          },
+          rewrite: '${uri}/index.html',
         },
       },
     ],

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

@@ -33,18 +33,14 @@ const AzionConfig = {
         name: 'Redirect to index.html',
         match: '.*/$',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}index.html`,
-          },
+          rewrite: '${uri}index.html',
         },
       },
       {
         name: 'Redirect to index.html for Subpaths',
         match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}/index.html`,
-          },
+          rewrite: '${uri}/index.html',
         },
       },
     ],

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

@@ -33,18 +33,14 @@ const AzionConfig = {
         name: 'Redirect to index.html',
         match: '.*/$',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}index.html`,
-          },
+          rewrite: '${uri}index.html',
         },
       },
       {
         name: 'Redirect to index.html for Subpaths',
         match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}/index.html`,
-          },
+          rewrite: '${uri}/index.html',
         },
       },
     ],

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

@@ -33,18 +33,14 @@ const AzionConfig = {
         name: 'Redirect to index.html',
         match: '.*/$',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}index.html`,
-          },
+          rewrite: '${uri}index.html',
         },
       },
       {
         name: 'Redirect to index.html for Subpaths',
         match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}/index.html`,
-          },
+          rewrite: '${uri}/index.html',
         },
       },
     ],

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

@@ -33,18 +33,14 @@ const AzionConfig = {
         name: 'Redirect to index.html',
         match: '.*/$',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}index.html`,
-          },
+          rewrite: '${uri}index.html',
         },
       },
       {
         name: 'Redirect to index.html for Subpaths',
         match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}/index.html`,
-          },
+          rewrite: '${uri}/index.html',
         },
       },
     ],

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

@@ -33,18 +33,14 @@ const AzionConfig = {
         name: 'Redirect to index.html',
         match: '.*/$',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}index.html`,
-          },
+          rewrite: '${uri}index.html',
         },
       },
       {
         name: 'Redirect to index.html for Subpaths',
         match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}/index.html`,
-          },
+          rewrite: '${uri}/index.html',
         },
       },
     ],

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

@@ -35,9 +35,7 @@ const AzionConfig = {
         name: 'Redirect to index.html',
         match: '^\\/',
         behavior: {
-          rewrite: {
-            set: () => `/index.html`,
-          },
+          rewrite: `/index.html`,
         },
       },
     ],

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

@@ -33,18 +33,16 @@ const AzionConfig = {
         name: 'Redirect to index.html',
         match: '.*/$',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}index.html`,
-          },
+          // eslint-disable-next-line no-template-curly-in-string
+          rewrite: '${uri}index.html',
         },
       },
       {
         name: 'Redirect to index.html for Subpaths',
         match: '^(?!.*\\/$)(?![\\s\\S]*\\.[a-zA-Z0-9]+$).*',
         behavior: {
-          rewrite: {
-            set: (uri) => `${uri}/index.html`,
-          },
+          // eslint-disable-next-line no-template-curly-in-string
+          rewrite: '${uri}/index.html',
         },
       },
     ],

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

@@ -34,9 +34,7 @@ const AzionConfig = {
         name: 'Redirect to index.html',
         match: '^\\/',
         behavior: {
-          rewrite: {
-            set: () => `/index.html`,
-          },
+          rewrite: `/index.html`,
         },
       },
     ],

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

@@ -86,17 +86,18 @@ function jsToJson(inputConfig) {
   // Convert cache settings
   if (config && config.cache && config.cache.length > 0) {
     config.cache.forEach((cache) => {
-      const maxAgeSecondsBrowser = evaluateMathExpression(
-        cache?.browser?.maxAgeSeconds,
-      );
-      const maxAgeSecondsEdge = evaluateMathExpression(
-        cache?.edge?.maxAgeSeconds,
-      );
+      const maxAgeSecondsBrowser = cache?.browser
+        ? evaluateMathExpression(cache.browser.maxAgeSeconds)
+        : 0;
+      const maxAgeSecondsEdge = cache?.edge
+        ? evaluateMathExpression(cache.edge.maxAgeSeconds)
+        : 60;
 
       const cacheSetting = {
         name: cache.name,
-        browser_cache_settings: 'override',
+        browser_cache_settings: cache?.browser ? 'override' : 'honor',
         browser_cache_settings_maximum_ttl: maxAgeSecondsBrowser,
+        cdn_cache_settings: cache?.edge ? 'override' : 'honor',
         cdn_cache_settings_maximum_ttl: maxAgeSecondsEdge,
         enable_caching_for_post: cache?.methods?.post || false,
         enable_caching_for_options: cache?.methods?.options || false,

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

@@ -50,50 +50,6 @@ describe('Utils - generateManifest', () => {
       );
     });
 
-    it('should handle rewrites with dynamic parameter names correctly', () => {
-      const azionConfig = {
-        rules: {
-          request: [
-            {
-              name: 'rewriteRule',
-              match: '/path',
-              behavior: {
-                capture: {
-                  match: '^(./)([^/])$',
-                  captured: 'other',
-                  subject: 'uri',
-                },
-                rewrite: {
-                  match: '^(./)([^/])$',
-                  set: (other) => `/${other[0]}/${other[1]}`,
-                },
-              },
-            },
-          ],
-        },
-      };
-
-      const result = jsToJson(azionConfig);
-      expect(result.rules[0].behaviors).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            name: 'capture_match_groups',
-            target: expect.objectContaining({
-              regex: '^(./)([^/])$',
-              captured_array: 'other',
-              // eslint-disable-next-line no-template-curly-in-string
-              subject: '${uri}',
-            }),
-          }),
-          expect.objectContaining({
-            name: 'rewrite_request',
-            // eslint-disable-next-line no-template-curly-in-string
-            target: '/${other[0]}/${other[1]}',
-          }),
-        ]),
-      );
-    });
-
     it('should handle rewrites directly as a string', () => {
       const azionConfig = {
         rules: {

package/lib/utils/generateManifest/helpers/azion.config.example.js

@@ -34,11 +34,7 @@ export default {
         match: '^/rewrite$',
         behavior: {
           setCache: 'mycache1',
-          rewrite: {
-            match: '^(./)([^/])$',
-            subject: 'uri',
-            set: (captured) => `/new/${captured[1]}`, // Rewrites /original/image.jpg to /new/image.jpg
-          },
+          rewrite: `/new/%{captured[1]}`, // Rewrites /original/image.jpg to /new/image.jpg
           setCookie: 'user=12345; Path=/; Secure',
           setHeaders: 'Cache-Control: no-cache',
           forwardCookies: true,

package/lib/utils/generateManifest/helpers/behaviors.js

@@ -24,42 +24,10 @@ export const requestBehaviors = {
   rewrite: {
     transform: (value) => {
       const behaviors = [];
-
-      if (typeof value === 'string') {
-        behaviors.push({
-          name: 'rewrite_request',
-          target: value,
-        });
-        return behaviors;
-      }
-
-      const functionString = value.set.toString();
-      const paramNameMatch = functionString.match(/\(([^)]+)\)/);
-      let paramName = paramNameMatch ? paramNameMatch[1] : null;
-      if (paramName) {
-        [paramName] = paramName.trim().split(/\s*,\s*/);
-      }
-
-      if (value.match) {
-        behaviors.push({
-          name: 'capture_match_groups',
-          target: {
-            captured_array: paramName || 'captured',
-            subject: `\${${value.subject ?? 'uri'}}`,
-            regex: value.match,
-          },
-        });
-      }
-
-      const pathTransformation = functionString
-        .replace(/.*=>\s*`/, '')
-        .replace(/`\s*;?\s*}?\s*$/, '');
-
       behaviors.push({
         name: 'rewrite_request',
-        target: pathTransformation,
+        target: value,
       });
-
       return behaviors;
     },
   },

package/lib/utils/generateManifest/helpers/schema.js

@@ -205,40 +205,8 @@ const azionConfigSchema = {
                     },
                   },
                   rewrite: {
-                    oneOf: [
-                      {
-                        type: 'object',
-                        properties: {
-                          match: {
-                            type: ['string', 'null'],
-                            errorMessage:
-                              "The 'match' field must be a string or null.",
-                          },
-                          subject: {
-                            type: ['string', 'null'],
-                            errorMessage:
-                              "The 'subject' field must be a string or null.",
-                          },
-                          set: {
-                            instanceof: 'Function',
-                            errorMessage: "The 'set' field must be a function.",
-                          },
-                        },
-                        required: ['set'],
-                        additionalProperties: false,
-                        errorMessage: {
-                          additionalProperties:
-                            "No additional properties are allowed in the 'rewrite' object.",
-                          required:
-                            "The 'set' field is required in the 'rewrite' object.",
-                        },
-                      },
-                      {
-                        type: 'string',
-                        errorMessage:
-                          "The 'rewrite' field can be a direct string.",
-                      },
-                    ],
+                    type: 'string',
+                    errorMessage: "The 'rewrite' field must be a string.",
                   },
                   setHeaders: {
                     type: 'array',

package/package.json

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