@akinon/next 1.47.0-rc.4 → 1.47.0-rc.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/next
 
+## 1.47.0-rc.6
+
+### Minor Changes
+
+- c670bd4: ZERO-2900: Add middleware rewrite functionality
+
+## 1.47.0-rc.5
+
+### Minor Changes
+
+- b9273fd: ZERO-2889: add host headers to requests
+
 ## 1.47.0-rc.4
 
 ### Minor Changes

package/api/client.ts

@@ -52,18 +52,24 @@ async function proxyRequest(...args) {
     extraHeaders[key.toLowerCase()] = value;
   }
 
-  [
+  const excludedHeaders = [
     'x-forwarded-host',
     'x-forwarded-proto',
     'x-forwarded-port',
     'x-requested-with',
     'origin',
-    'host',
     'referer',
     'accept',
     'content-length',
-    'content-type'
-  ].forEach((header) => delete extraHeaders[header]);
+    'content-type',
+    'host'
+  ];
+
+  excludedHeaders.forEach((header) => {
+    if (!settings.includedProxyHeaders?.includes(header)) {
+      delete extraHeaders[header];
+    }
+  });
 
   const fetchOptions = {
     method: req.method,
@@ -146,11 +152,8 @@ async function proxyRequest(...args) {
   try {
     const request = await fetch(url, fetchOptions);
 
-    // Using NextResponse.json with status 204 will cause an error
     if (request.status === 204) {
-      return new Response(null, {
-        status: 204
-      });
+      return new Response(null, { status: 204 });
     }
 
     let response = {} as any;

package/middlewares/default.ts

@@ -269,8 +269,26 @@ const withPzDefault =
                               if (
                                 middlewareResult.headers.get(
                                   'pz-override-response'
-                                ) !== 'true'
+                                ) === 'true'
                               ) {
+                                if (
+                                  middlewareResult.headers.get(
+                                    'x-middleware-rewrite'
+                                  )
+                                ) {
+                                  const rewriteUrl = new URL(
+                                    middlewareResult.headers.get(
+                                      'x-middleware-rewrite'
+                                    )
+                                  );
+
+                                  url.pathname = (
+                                    url.pathname + rewriteUrl.pathname
+                                  ).replace(/\/\//g, '/');
+
+                                  return NextResponse.rewrite(url);
+                                }
+                              } else {
                                 middlewareResult.headers.set(
                                   'x-middleware-rewrite',
                                   url.href

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.47.0-rc.4",
+  "version": "1.47.0-rc.6",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.47.0-rc.4",
+    "@akinon/eslint-plugin-projectzero": "1.47.0-rc.6",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/types/index.ts

@@ -192,6 +192,7 @@ export interface Settings {
   };
   customNotFoundEnabled: boolean;
   plugins?: Record<string, Record<string, any>>;
+  includedProxyHeaders?: string[];
 }
 
 export interface CacheOptions {

package/utils/app-fetch.ts

@@ -36,6 +36,7 @@ const appFetch = async <T>(
 
     init.headers = {
       ...(init.headers ?? {}),
+      ...(ServerVariables.globalHeaders ?? {}),
       'Accept-Language': currentLocale.apiValue,
       'x-currency': ServerVariables.currency,
       'x-forwarded-for': ip,

package/utils/server-variables.ts

@@ -5,5 +5,6 @@ const { locales, defaultLocaleValue, defaultCurrencyCode } =
 
 export const ServerVariables = {
   locale: locales.find((l) => l.value === defaultLocaleValue)?.value ?? '',
-  currency: defaultCurrencyCode
+  currency: defaultCurrencyCode,
+  globalHeaders: {}
 };