@enonic/nextjs-adapter 3.0.0-RC5 → 3.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enonic/nextjs-adapter",
-  "version": "3.0.0-RC5",
+  "version": "3.0.1",
   "license": "Apache-2.0",
   "main": "index.js",
   "author": "Pavel Milkevich <pmi@enonic.com>",
@@ -53,8 +53,8 @@
     "@formatjs/intl-localematcher": "^0.5.4",
     "html-react-parser": "^5.1.10",
     "negotiator": "^0.6.3",
-    "next": "^14.2.2",
-    "react": "18.2.0",
+    "next": "^14.2.3",
+    "react": "18.3.1",
     "react-dom": "18.2.0",
     "unescape": "^1.0.1"
   },
@@ -63,13 +63,13 @@
     "@enonic-types/core": "^7.14.1",
     "@enonic/eslint-config": "^1.2.1",
     "@testing-library/jest-dom": "^6.4.2",
-    "@testing-library/react": "^15.0.2",
+    "@testing-library/react": "^15.0.5",
     "@types/negotiator": "^0.6.3",
     "@types/node": "^20.12.7",
-    "@types/react": "^18.2.79",
+    "@types/react": "^18.3.1",
     "@types/react-dom": "^18.2.25",
-    "@typescript-eslint/eslint-plugin": "^7.7.0",
-    "@typescript-eslint/parser": "^7.7.0",
+    "@typescript-eslint/eslint-plugin": "^7.7.1",
+    "@typescript-eslint/parser": "^7.7.1",
     "concurrently": "^8.2.2",
     "cpy-cli": "^5.0.0",
     "del-cli": "^5.1.0",

package/src/utils/getRequestLocaleInfo.ts

@@ -1,8 +1,4 @@
 import type {Context} from '../types';
-
-
-import Negotiator from 'negotiator';
-import {match as localeMatcher} from '@formatjs/intl-localematcher';
 import {PROJECT_ID_HEADER} from '../common/constants';
 import {getLocaleMappings} from './getLocaleMappings';
 import {getLocaleMappingByProjectId} from './getLocaleMappingByProjectId';
@@ -19,10 +15,15 @@ export function getRequestLocaleInfo(context: Context) {
 
     } else {
         locale = context.locale;
+        /* Disabled to prevent situation when www.site.com redirects to www.site.com/no when accept-header is set to 'no'
+
         if (!locale) {
             const acceptLang = context.headers?.get('accept-language') || '';
             const langs = new Negotiator({headers: {'accept-language': acceptLang}}).languages();
             locale = localeMatcher(langs, locales, defaultLocale);
+        }*/
+        if (!locale) {
+            locale = defaultLocale;
         }
     }
     return {locale, locales, defaultLocale};

package/utils/getRequestLocaleInfo.js

@@ -1,10 +1,8 @@
-import Negotiator from 'negotiator';
-import { match as localeMatcher } from '@formatjs/intl-localematcher';
 import { PROJECT_ID_HEADER } from '../common/constants';
 import { getLocaleMappings } from './getLocaleMappings';
 import { getLocaleMappingByProjectId } from './getLocaleMappingByProjectId';
 export function getRequestLocaleInfo(context) {
-    var _a, _b, _c;
+    var _a, _b;
     let locale;
     const configs = getLocaleMappings();
     const locales = Object.keys(configs);
@@ -15,10 +13,15 @@ export function getRequestLocaleInfo(context) {
     }
     else {
         locale = context.locale;
+        /* Disabled to prevent situation when www.site.com redirects to www.site.com/no when accept-header is set to 'no'
+
         if (!locale) {
-            const acceptLang = ((_c = context.headers) === null || _c === void 0 ? void 0 : _c.get('accept-language')) || '';
-            const langs = new Negotiator({ headers: { 'accept-language': acceptLang } }).languages();
+            const acceptLang = context.headers?.get('accept-language') || '';
+            const langs = new Negotiator({headers: {'accept-language': acceptLang}}).languages();
             locale = localeMatcher(langs, locales, defaultLocale);
+        }*/
+        if (!locale) {
+            locale = defaultLocale;
         }
     }
     return { locale, locales, defaultLocale };

package/utils/getRequestLocaleInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"getRequestLocaleInfo.js","sourceRoot":"","sources":["../src/utils/getRequestLocaleInfo.ts"],"names":[],"mappings":"AAGA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,KAAK,IAAI,aAAa,EAAC,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,2BAA2B,EAAC,MAAM,+BAA+B,CAAC;AAG1E,MAAM,UAAU,oBAAoB,CAAC,OAAgB;;IACjD,IAAI,MAAc,CAAC;IACnB,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC1D,IAAI,SAAS,EAAE,CAAC;QACZ,MAAM,GAAG,MAAA,2BAA2B,CAAC,SAAS,EAAE,KAAK,CAAC,0CAAE,MAAM,CAAC;IAEnE,CAAC;SAAM,CAAC;QACJ,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QACxB,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,UAAU,GAAG,CAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC,iBAAiB,CAAC,KAAI,EAAE,CAAC;YACjE,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,EAAC,OAAO,EAAE,EAAC,iBAAiB,EAAE,UAAU,EAAC,EAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YACrF,MAAM,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QAC1D,CAAC;IACL,CAAC;IACD,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"getRequestLocaleInfo.js","sourceRoot":"","sources":["../src/utils/getRequestLocaleInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,2BAA2B,EAAC,MAAM,+BAA+B,CAAC;AAG1E,MAAM,UAAU,oBAAoB,CAAC,OAAgB;;IACjD,IAAI,MAAc,CAAC;IACnB,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC1D,IAAI,SAAS,EAAE,CAAC;QACZ,MAAM,GAAG,MAAA,2BAA2B,CAAC,SAAS,EAAE,KAAK,CAAC,0CAAE,MAAM,CAAC;IAEnE,CAAC;SAAM,CAAC;QACJ,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QACxB;;;;;;WAMG;QACH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,GAAG,aAAa,CAAC;QAC3B,CAAC;IACL,CAAC;IACD,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAC,CAAC;AAC5C,CAAC"}