@websolutespa/bom-mixer-models 2.0.1 → 2.0.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-mixer-models
 
+## 2.0.3
+
+### Patch Changes
+
+- Modified: routeInterceptor routeAutoDetection added search
+
+## 2.0.2
+
+### Patch Changes
+
+- Fixing: routeInterceptor routeAutoDetection
+
 ## 2.0.1
 
 ### Patch Changes

package/dist/index.js

@@ -903,7 +903,7 @@ async function routeAutoDetection(request, next) {
     const detectedRoute = detectedLocaleRoutes.length > 0 ? detectedLocaleRoutes[0] : detectedMarketRoutes.find((x) => {
       const market2 = markets.find((m) => m.id === x.market);
       const marketLocale = market2.defaultLanguage ? (0, import_bom_core5.asEquatable)(market2.defaultLanguage) : defaultMarketLocale;
-      x.locale === marketLocale;
+      return x.locale === marketLocale;
     });
     if (detectedRoute && detectedRoute.id !== url.pathname) {
       console.log("routeInterceptor.routeAutoDetection", detectedLocale, detectedCountry, detectedRoute.id);
@@ -919,7 +919,10 @@ async function routeInterceptor(request, next) {
   try {
     const redirectUrl = await routeAutoDetection(request, next);
     if (redirectUrl) {
-      const response2 = import_server.NextResponse.redirect(resolveHref(redirectUrl), import_bom_core5.isDevelopment ? 307 : 301);
+      const resolvedUrl = resolveHref(redirectUrl);
+      const search = request.nextUrl.search;
+      const isTemporaryRedirect = import_bom_core5.isDevelopment || search;
+      const response2 = import_server.NextResponse.redirect(resolvedUrl + search, { status: isTemporaryRedirect ? 303 : 301 });
       response2.cookies.set({
         expires: new Date(Date.now() + 1 * 24 * 60 * 60 * 1e3),
         httpOnly: true,

package/dist/index.mjs

@@ -803,7 +803,7 @@ async function routeAutoDetection(request, next) {
     const detectedRoute = detectedLocaleRoutes.length > 0 ? detectedLocaleRoutes[0] : detectedMarketRoutes.find((x) => {
       const market2 = markets.find((m) => m.id === x.market);
       const marketLocale = market2.defaultLanguage ? asEquatable(market2.defaultLanguage) : defaultMarketLocale;
-      x.locale === marketLocale;
+      return x.locale === marketLocale;
     });
     if (detectedRoute && detectedRoute.id !== url.pathname) {
       console.log("routeInterceptor.routeAutoDetection", detectedLocale, detectedCountry, detectedRoute.id);
@@ -819,7 +819,10 @@ async function routeInterceptor(request, next) {
   try {
     const redirectUrl = await routeAutoDetection(request, next);
     if (redirectUrl) {
-      const response2 = NextResponse.redirect(resolveHref(redirectUrl), isDevelopment ? 307 : 301);
+      const resolvedUrl = resolveHref(redirectUrl);
+      const search = request.nextUrl.search;
+      const isTemporaryRedirect = isDevelopment || search;
+      const response2 = NextResponse.redirect(resolvedUrl + search, { status: isTemporaryRedirect ? 303 : 301 });
       response2.cookies.set({
         expires: new Date(Date.now() + 1 * 24 * 60 * 60 * 1e3),
         httpOnly: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-models",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Mixer Models module of the BOM Repository",
   "keywords": [
     "bom",
@@ -16,7 +16,8 @@
     "lint": "eslint *.ts*",
     "compile": "tsup ./src/index.ts --format esm,cjs --dts",
     "prepack": "bom prepack",
-    "postpack": "bom postpack"
+    "postpack": "bom postpack",
+    "release": "npm publish --access public --tag bom2"
   },
   "dependencies": {},
   "peerDependencies": {

package/src/route/route.interceptor.ts

@@ -96,7 +96,7 @@ export async function routeAutoDetection(request: NextRequest, next: NextFetchEv
         detectedMarketRoutes.find(x => {
           const market = markets.find(m => m.id === x.market)!;
           const marketLocale = (market.defaultLanguage ? asEquatable(market.defaultLanguage as string) : defaultMarketLocale);
-          x.locale === marketLocale;
+          return x.locale === marketLocale;
         })!;
     if (detectedRoute && detectedRoute.id !== url.pathname) {
       console.log('routeInterceptor.routeAutoDetection', detectedLocale, detectedCountry, detectedRoute.id);
@@ -114,7 +114,12 @@ export async function routeInterceptor(request: NextRequest, next: NextFetchEven
   try {
     const redirectUrl = await routeAutoDetection(request, next);
     if (redirectUrl) {
-      const response = NextResponse.redirect(resolveHref(redirectUrl), isDevelopment ? 307 : 301);
+      // console.log('routeInterceptor', 'redirectUrl', redirectUrl);
+      const resolvedUrl = resolveHref(redirectUrl);
+      // console.log('routeInterceptor', 'resolvedUrl', resolvedUrl);
+      const search = request.nextUrl.search;
+      const isTemporaryRedirect = isDevelopment || search;
+      const response = NextResponse.redirect(resolvedUrl + search, { status: isTemporaryRedirect ? 303 : 301 });
       response.cookies.set({
         expires: new Date(Date.now() + 1 * 24 * 60 * 60 * 1000),
         httpOnly: true,