next-translate-plugin 2.4.0 → 2.4.2

package/lib/cjs/index.js

@@ -73,8 +73,8 @@ function nextTranslate(nextConfig) {
                     loader: 'next-translate-plugin/loader',
                     options: {
                         basePath: basePath,
-                        pagesFolder: path_1.default.join(pagesFolder, '/'),
-                        appFolder: path_1.default.join(appFolder, '/'),
+                        pagesFolder: path_1.default.join(pagesFolder, '/').replace(/\\/g, '/'),
+                        appFolder: path_1.default.join(appFolder, '/').replace(/\\/g, '/'),
                         hasAppJs: hasAppJs,
                         hasGetInitialPropsOnAppJs: hasGetInitialPropsOnAppJs,
                         extensionsRgx: extensionsRgx,

package/lib/cjs/loader.js

@@ -21,7 +21,6 @@ function loader(rawCode) {
         var shouldUseTemplateAppDir = isClientComponent ||
             normalizedResourcePath.includes(appFolder.replace(/\\/g, '/'));
         var pagesPath = (shouldUseTemplateAppDir ? appFolder : pagesFolder);
-        var normalizedPagesPath = pagesPath.replace(/\\/g, '/');
         if (normalizedResourcePath.includes('node_modules/next/dist/pages/_app') &&
             !hasAppJs) {
             return (0, utils_1.getDefaultAppJs)(existLocalesFolder);
@@ -29,9 +28,9 @@ function loader(rawCode) {
         if (normalizedResourcePath.includes('node_modules/'))
             return rawCode;
         if (!shouldUseTemplateAppDir &&
-            !normalizedResourcePath.includes(normalizedPagesPath))
+            !normalizedResourcePath.includes(pagesPath))
             return rawCode;
-        var page = normalizedResourcePath.replace(normalizedPagesPath, '/');
+        var page = normalizedResourcePath.replace(pagesPath, '/');
         var pageNoExt = page.replace(extensionsRgx, '');
         var pagePkg = (0, utils_1.parseFile)(basePath, normalizedResourcePath);
         if ((0, utils_1.hasExportName)(pagePkg, '__N_SSP') ||

package/lib/cjs/templateAppDir.js

@@ -10,35 +10,28 @@ var validPages = [
     '/global-error',
 ];
 var validPagesRegex = new RegExp("(".concat(validPages.join('|'), ")$"));
-var lastPathname = '';
 function templateAppDir(pagePkg, _a) {
     var _b = _a === void 0 ? {} : _a, _c = _b.code, code = _c === void 0 ? '' : _c, _d = _b.pageNoExt, pageNoExt = _d === void 0 ? '/' : _d, _e = _b.normalizedResourcePath, normalizedResourcePath = _e === void 0 ? '' : _e, _f = _b.appFolder, appFolder = _f === void 0 ? '' : _f, _g = _b.isClientComponent, isClientComponent = _g === void 0 ? false : _g, _h = _b.existLocalesFolder, existLocalesFolder = _h === void 0 ? true : _h;
     var routeType = validPages.find(function (pageName) { return pageNoExt.endsWith(pageName); }) || 'component';
     var isPage = routeType !== 'component' && normalizedResourcePath.includes(appFolder);
-    if (!isPage && !isClientComponent)
+    if (!isPage)
         return code;
     var hash = Date.now().toString(16);
-    var pathname = isPage
-        ? pageNoExt.replace(validPagesRegex, '/')
-        : lastPathname;
-    lastPathname = pathname;
+    var pathname = pageNoExt.replace(validPagesRegex, '/');
     var pageVariableName = (0, utils_1.interceptExport)(pagePkg, 'default', "__Next_Translate__Page__".concat(hash, "__"));
     if (isPage && !pageVariableName)
         return code;
-    if (isClientComponent && !code.includes('next-translate'))
-        return code;
     if (isClientComponent) {
-        return templateClientComponent({
+        return templateRCCPage({
             pagePkg: pagePkg,
             hash: hash,
             pageVariableName: pageVariableName,
             pathname: pathname,
-            isPage: isPage,
             routeType: routeType,
             existLocalesFolder: existLocalesFolder,
         });
     }
-    return templateServerPage({
+    return templateRSCPage({
         pagePkg: pagePkg,
         hash: hash,
         pageVariableName: pageVariableName,
@@ -48,49 +41,17 @@ function templateAppDir(pagePkg, _a) {
     });
 }
 exports.default = templateAppDir;
-function templateServerPage(_a) {
+function templateRSCPage(_a) {
     var pagePkg = _a.pagePkg, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, routeType = _a.routeType, existLocalesFolder = _a.existLocalesFolder;
     var code = pagePkg.getCode();
-    return "\n  import ".concat(utils_1.INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n  import __loadNamespaces from 'next-translate/loadNamespaces'\n  import __nt_store from 'next-translate/_store'\n\n  ").concat(code, "\n\n  export default async function __Next_Translate_new__").concat(hash, "__(props) {\n    const config = { \n      ...").concat(utils_1.INTERNAL_CONFIG_KEY, ",\n      locale: props.params?.lang ?? props.searchParams?.lang ?? ").concat(utils_1.INTERNAL_CONFIG_KEY, ".defaultLocale,\n      loaderName: 'server ").concat(routeType, "',\n      pathname: '").concat(pathname, "',\n      ").concat((0, utils_1.addLoadLocalesFrom)(existLocalesFolder), "\n    }\n    const { __lang, __namespaces } = await __loadNamespaces(config)\n\n    __nt_store.set({ lang: __lang, namespaces: __namespaces, config })\n\n    return <").concat(pageVariableName, " {...props} />\n  }\n");
+    return "\n  import ".concat(utils_1.INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n  import AppDirI18nProvider from 'next-translate/AppDirI18nProvider'\n  import __loadNamespaces from 'next-translate/loadNamespaces'\n\n  ").concat(code, "\n\n  export default async function __Next_Translate_new__").concat(hash, "__(props) {\n    const config = { \n      ...").concat(utils_1.INTERNAL_CONFIG_KEY, ",\n      locale: props.params?.lang ?? props.searchParams?.lang ?? ").concat(utils_1.INTERNAL_CONFIG_KEY, ".defaultLocale,\n      loaderName: 'server ").concat(routeType, "',\n      pathname: '").concat(pathname, "'\n    }\n\n    const { __lang, __namespaces } = await __loadNamespaces({ ...config, ").concat((0, utils_1.addLoadLocalesFrom)(existLocalesFolder), " });\n    globalThis.__NEXT_TRANSLATE__ = { lang: __lang, namespaces: __namespaces, config }\n\n    return <AppDirI18nProvider lang={__lang} namespaces={__namespaces} config={config}><").concat(pageVariableName, " {...props} /></AppDirI18nProvider>\n  }\n");
 }
-function templateClientComponent(_a) {
-    var pagePkg = _a.pagePkg, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, isPage = _a.isPage, routeType = _a.routeType, existLocalesFolder = _a.existLocalesFolder;
+function templateRCCPage(_a) {
+    var pagePkg = _a.pagePkg, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, routeType = _a.routeType, existLocalesFolder = _a.existLocalesFolder;
     var topLine = utils_1.clientLine[0];
-    var namedExportsModified = modifyNamedExportsComponents(pagePkg, { hash: hash, existLocalesFolder: existLocalesFolder });
-    var exportDefault = pageVariableName
-        ? 'export default ' +
-            wrapClientComponent({
-                name: "__Next_Translate_new__".concat(hash, "__"),
-                pathname: pathname,
-                isPage: isPage,
-                pageVariableName: pageVariableName,
-                routeType: routeType,
-                existLocalesFolder: existLocalesFolder,
-            })
-        : '';
     var clientCode = pagePkg.getCode();
     utils_1.clientLine.forEach(function (line) {
         clientCode = clientCode.replace(line, '');
     });
-    return "".concat(topLine, "\n  import ").concat(utils_1.INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n  import __loadNamespaces from 'next-translate/loadNamespaces'\n  import __nt_store from 'next-translate/_store'\n  import { useSearchParams as __useSearchParams, useParams as __useParams } from 'next/navigation'\n  import { use as __use } from 'react';\n\n  ").concat(clientCode, "\n\n  ").concat(exportDefault, "\n  ").concat(namedExportsModified, "\n");
-}
-function wrapClientComponent(_a) {
-    var _b = _a.name, name = _b === void 0 ? '' : _b, _c = _a.pathname, pathname = _c === void 0 ? '' : _c, _d = _a.isPage, isPage = _d === void 0 ? false : _d, _e = _a.pageVariableName, pageVariableName = _e === void 0 ? '' : _e, _f = _a.routeType, routeType = _f === void 0 ? 'component' : _f, _g = _a.existLocalesFolder, existLocalesFolder = _g === void 0 ? true : _g;
-    return "function ".concat(name, "(props) {\n    const searchParams = __useSearchParams()\n    const params = __useParams()\n    const lang = params.lang ?? searchParams.get('lang') ?? ").concat(utils_1.INTERNAL_CONFIG_KEY, ".defaultLocale\n    const config = {\n      ...").concat(utils_1.INTERNAL_CONFIG_KEY, ",\n      locale: lang,\n      loaderName: 'client ").concat(routeType, "',\n      pathname: '").concat(pathname, "',\n      logBuild: ").concat(isPage, ",\n      ").concat((0, utils_1.addLoadLocalesFrom)(existLocalesFolder), "\n    }\n    const { __lang, __namespaces } = __use(__loadNamespaces(config));\n\n    __nt_store.set({ lang, namespaces: __namespaces, config })\n\n    return <").concat(pageVariableName, " {...props} />\n  }");
-}
-function modifyNamedExportsComponents(pagePkg, _a) {
-    var hash = _a.hash, existLocalesFolder = _a.existLocalesFolder;
-    return (0, utils_1.interceptNamedExportsFromReactComponents)(pagePkg, hash)
-        .map(function (_a) {
-        var exportName = _a.exportName, defaultLocalName = _a.defaultLocalName;
-        return "\n    ".concat(wrapClientComponent({
-            name: defaultLocalName,
-            pathname: lastPathname,
-            isPage: false,
-            pageVariableName: exportName,
-            existLocalesFolder: existLocalesFolder
-        }), "\n    export { ").concat(defaultLocalName, " as ").concat(exportName, " }\n  ");
-    })
-        .join('')
-        .trim();
+    return "".concat(topLine, "\n  import ").concat(utils_1.INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n  import AppDirI18nProvider from 'next-translate/AppDirI18nProvider'\n  import { useSearchParams as __useSearchParams, useParams as __useParams } from 'next/navigation'\n  import { use as __use } from 'react'\n  import __loadNamespaces from 'next-translate/loadNamespaces'\n\n  ").concat(clientCode, "\n\n  export default function __Next_Translate_new__").concat(hash, "__(props) {\n    const searchParams = __useSearchParams()\n    const params = __useParams()\n    const lang = params.lang ?? searchParams.get('lang') ?? ").concat(utils_1.INTERNAL_CONFIG_KEY, ".defaultLocale\n    const config = {\n      ...").concat(utils_1.INTERNAL_CONFIG_KEY, ",\n      locale: lang,\n      loaderName: 'client ").concat(routeType, "',\n      pathname: '").concat(pathname, "',\n    }\n\n    const { __lang, __namespaces } = __use(__loadNamespaces({ ...config, ").concat((0, utils_1.addLoadLocalesFrom)(existLocalesFolder), " }));\n    globalThis.__NEXT_TRANSLATE__ = { lang: __lang, namespaces: __namespaces, config }\n\n    return <").concat(pageVariableName, " {...props} />\n  }\n");
 }

package/lib/cjs/utils.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.existLocalesFolderWithNamespaces = exports.existPages = exports.calculatePageDir = exports.removeCommentsFromCode = exports.interceptExport = exports.interceptNamedExportsFromReactComponents = exports.isNotExportModifier = exports.hasHOC = exports.isPageToIgnore = exports.hasStaticName = exports.getStaticName = exports.hasExportName = exports.getDefaultExport = exports.getNamedExport = exports.resolveIdentifier = exports.resolveParenthesis = exports.getImportedNames = exports.getSymbol = exports.parseCode = exports.parseFile = exports.getFilePkg = exports.getTsCompilerOptions = exports.addLoadLocalesFrom = exports.getDefaultAppJs = exports.defaultLoader = exports.clientLine = exports.INTERNAL_CONFIG_KEY = void 0;
+exports.existLocalesFolderWithNamespaces = exports.existPages = exports.calculatePageDir = exports.removeCommentsFromCode = exports.interceptExport = exports.isNotExportModifier = exports.hasHOC = exports.isPageToIgnore = exports.hasStaticName = exports.getStaticName = exports.hasExportName = exports.getDefaultExport = exports.getNamedExport = exports.resolveIdentifier = exports.resolveParenthesis = exports.getImportedNames = exports.getSymbol = exports.parseCode = exports.parseFile = exports.getFilePkg = exports.getTsCompilerOptions = exports.addLoadLocalesFrom = exports.getDefaultAppJs = exports.defaultLoader = exports.clientLine = exports.INTERNAL_CONFIG_KEY = void 0;
 var typescript_1 = __importDefault(require("typescript"));
 var path_1 = __importDefault(require("path"));
 var fs_1 = __importDefault(require("fs"));
@@ -36,7 +36,9 @@ function getDefaultAppJs(existLocalesFolder) {
 }
 exports.getDefaultAppJs = getDefaultAppJs;
 function addLoadLocalesFrom(existLocalesFolder) {
-    var defaultFn = existLocalesFolder ? exports.defaultLoader : "() => Promise.resolve({})";
+    var defaultFn = existLocalesFolder
+        ? exports.defaultLoader
+        : "() => Promise.resolve({})";
     return "loadLocaleFrom: ".concat(exports.INTERNAL_CONFIG_KEY, ".loadLocaleFrom || (").concat(defaultFn, "),");
 }
 exports.addLoadLocalesFrom = addLoadLocalesFrom;
@@ -291,40 +293,6 @@ function isNotExportModifier(modifier) {
     return !exportModifiers.includes(modifier.kind);
 }
 exports.isNotExportModifier = isNotExportModifier;
-function isPascalCase(str) {
-    return (str.length > 1 &&
-        str[0] === str[0].toUpperCase() &&
-        str[1] === str[1].toLowerCase());
-}
-function interceptNamedExportsFromReactComponents(filePkg, hash) {
-    var sourceFile = filePkg.sourceFile;
-    var interceptedExports = [];
-    sourceFile.statements
-        .filter(function (node) {
-        var _a;
-        return (_a = node.modifiers) === null || _a === void 0 ? void 0 : _a.some(function (modifier) { return (modifier === null || modifier === void 0 ? void 0 : modifier.kind) === typescript_1.default.SyntaxKind.ExportKeyword; });
-    })
-        .forEach(function (node) {
-        var _a, _b, _c;
-        var exportName = '';
-        if (typescript_1.default.isFunctionDeclaration(node) || typescript_1.default.isClassDeclaration(node)) {
-            exportName = (_b = (_a = node.name) === null || _a === void 0 ? void 0 : _a.getText()) !== null && _b !== void 0 ? _b : '';
-        }
-        else if (typescript_1.default.isVariableStatement(node)) {
-            var declaration = node.declarationList.declarations[0];
-            if (!typescript_1.default.isArrowFunction(declaration.initializer))
-                return;
-            exportName = (_c = declaration.name) === null || _c === void 0 ? void 0 : _c.getText();
-        }
-        if (isPascalCase(exportName)) {
-            var defaultLocalName = "__Next_Translate_Component_".concat(hash, "_").concat(interceptedExports.length);
-            interceptExport(filePkg, exportName, defaultLocalName);
-            interceptedExports.push({ exportName: exportName, defaultLocalName: defaultLocalName });
-        }
-    });
-    return interceptedExports;
-}
-exports.interceptNamedExportsFromReactComponents = interceptNamedExportsFromReactComponents;
 function interceptExport(filePkg, exportName, defaultLocalName) {
     var exportContent = getNamedExport(filePkg, exportName, false);
     var finalLocalName = '';

package/lib/esm/index.js

@@ -68,8 +68,8 @@ function nextTranslate(nextConfig) {
                     loader: 'next-translate-plugin/loader',
                     options: {
                         basePath: basePath,
-                        pagesFolder: path.join(pagesFolder, '/'),
-                        appFolder: path.join(appFolder, '/'),
+                        pagesFolder: path.join(pagesFolder, '/').replace(/\\/g, '/'),
+                        appFolder: path.join(appFolder, '/').replace(/\\/g, '/'),
                         hasAppJs: hasAppJs,
                         hasGetInitialPropsOnAppJs: hasGetInitialPropsOnAppJs,
                         extensionsRgx: extensionsRgx,

package/lib/esm/loader.js

@@ -16,7 +16,6 @@ export default function loader(rawCode) {
         var shouldUseTemplateAppDir = isClientComponent ||
             normalizedResourcePath.includes(appFolder.replace(/\\/g, '/'));
         var pagesPath = (shouldUseTemplateAppDir ? appFolder : pagesFolder);
-        var normalizedPagesPath = pagesPath.replace(/\\/g, '/');
         if (normalizedResourcePath.includes('node_modules/next/dist/pages/_app') &&
             !hasAppJs) {
             return getDefaultAppJs(existLocalesFolder);
@@ -24,9 +23,9 @@ export default function loader(rawCode) {
         if (normalizedResourcePath.includes('node_modules/'))
             return rawCode;
         if (!shouldUseTemplateAppDir &&
-            !normalizedResourcePath.includes(normalizedPagesPath))
+            !normalizedResourcePath.includes(pagesPath))
             return rawCode;
-        var page = normalizedResourcePath.replace(normalizedPagesPath, '/');
+        var page = normalizedResourcePath.replace(pagesPath, '/');
         var pageNoExt = page.replace(extensionsRgx, '');
         var pagePkg = parseFile(basePath, normalizedResourcePath);
         if (hasExportName(pagePkg, '__N_SSP') ||

package/lib/esm/templateAppDir.js

@@ -1,4 +1,4 @@
-import { interceptExport, addLoadLocalesFrom, clientLine, interceptNamedExportsFromReactComponents, INTERNAL_CONFIG_KEY, } from './utils';
+import { interceptExport, addLoadLocalesFrom, clientLine, INTERNAL_CONFIG_KEY, } from './utils';
 var validPages = [
     '/page',
     '/layout',
@@ -8,35 +8,28 @@ var validPages = [
     '/global-error',
 ];
 var validPagesRegex = new RegExp("(".concat(validPages.join('|'), ")$"));
-var lastPathname = '';
 export default function templateAppDir(pagePkg, _a) {
     var _b = _a === void 0 ? {} : _a, _c = _b.code, code = _c === void 0 ? '' : _c, _d = _b.pageNoExt, pageNoExt = _d === void 0 ? '/' : _d, _e = _b.normalizedResourcePath, normalizedResourcePath = _e === void 0 ? '' : _e, _f = _b.appFolder, appFolder = _f === void 0 ? '' : _f, _g = _b.isClientComponent, isClientComponent = _g === void 0 ? false : _g, _h = _b.existLocalesFolder, existLocalesFolder = _h === void 0 ? true : _h;
     var routeType = validPages.find(function (pageName) { return pageNoExt.endsWith(pageName); }) || 'component';
     var isPage = routeType !== 'component' && normalizedResourcePath.includes(appFolder);
-    if (!isPage && !isClientComponent)
+    if (!isPage)
         return code;
     var hash = Date.now().toString(16);
-    var pathname = isPage
-        ? pageNoExt.replace(validPagesRegex, '/')
-        : lastPathname;
-    lastPathname = pathname;
+    var pathname = pageNoExt.replace(validPagesRegex, '/');
     var pageVariableName = interceptExport(pagePkg, 'default', "__Next_Translate__Page__".concat(hash, "__"));
     if (isPage && !pageVariableName)
         return code;
-    if (isClientComponent && !code.includes('next-translate'))
-        return code;
     if (isClientComponent) {
-        return templateClientComponent({
+        return templateRCCPage({
             pagePkg: pagePkg,
             hash: hash,
             pageVariableName: pageVariableName,
             pathname: pathname,
-            isPage: isPage,
             routeType: routeType,
             existLocalesFolder: existLocalesFolder,
         });
     }
-    return templateServerPage({
+    return templateRSCPage({
         pagePkg: pagePkg,
         hash: hash,
         pageVariableName: pageVariableName,
@@ -45,49 +38,17 @@ export default function templateAppDir(pagePkg, _a) {
         existLocalesFolder: existLocalesFolder,
     });
 }
-function templateServerPage(_a) {
+function templateRSCPage(_a) {
     var pagePkg = _a.pagePkg, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, routeType = _a.routeType, existLocalesFolder = _a.existLocalesFolder;
     var code = pagePkg.getCode();
-    return "\n  import ".concat(INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n  import __loadNamespaces from 'next-translate/loadNamespaces'\n  import __nt_store from 'next-translate/_store'\n\n  ").concat(code, "\n\n  export default async function __Next_Translate_new__").concat(hash, "__(props) {\n    const config = { \n      ...").concat(INTERNAL_CONFIG_KEY, ",\n      locale: props.params?.lang ?? props.searchParams?.lang ?? ").concat(INTERNAL_CONFIG_KEY, ".defaultLocale,\n      loaderName: 'server ").concat(routeType, "',\n      pathname: '").concat(pathname, "',\n      ").concat(addLoadLocalesFrom(existLocalesFolder), "\n    }\n    const { __lang, __namespaces } = await __loadNamespaces(config)\n\n    __nt_store.set({ lang: __lang, namespaces: __namespaces, config })\n\n    return <").concat(pageVariableName, " {...props} />\n  }\n");
+    return "\n  import ".concat(INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n  import AppDirI18nProvider from 'next-translate/AppDirI18nProvider'\n  import __loadNamespaces from 'next-translate/loadNamespaces'\n\n  ").concat(code, "\n\n  export default async function __Next_Translate_new__").concat(hash, "__(props) {\n    const config = { \n      ...").concat(INTERNAL_CONFIG_KEY, ",\n      locale: props.params?.lang ?? props.searchParams?.lang ?? ").concat(INTERNAL_CONFIG_KEY, ".defaultLocale,\n      loaderName: 'server ").concat(routeType, "',\n      pathname: '").concat(pathname, "'\n    }\n\n    const { __lang, __namespaces } = await __loadNamespaces({ ...config, ").concat(addLoadLocalesFrom(existLocalesFolder), " });\n    globalThis.__NEXT_TRANSLATE__ = { lang: __lang, namespaces: __namespaces, config }\n\n    return <AppDirI18nProvider lang={__lang} namespaces={__namespaces} config={config}><").concat(pageVariableName, " {...props} /></AppDirI18nProvider>\n  }\n");
 }
-function templateClientComponent(_a) {
-    var pagePkg = _a.pagePkg, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, isPage = _a.isPage, routeType = _a.routeType, existLocalesFolder = _a.existLocalesFolder;
+function templateRCCPage(_a) {
+    var pagePkg = _a.pagePkg, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, routeType = _a.routeType, existLocalesFolder = _a.existLocalesFolder;
     var topLine = clientLine[0];
-    var namedExportsModified = modifyNamedExportsComponents(pagePkg, { hash: hash, existLocalesFolder: existLocalesFolder });
-    var exportDefault = pageVariableName
-        ? 'export default ' +
-            wrapClientComponent({
-                name: "__Next_Translate_new__".concat(hash, "__"),
-                pathname: pathname,
-                isPage: isPage,
-                pageVariableName: pageVariableName,
-                routeType: routeType,
-                existLocalesFolder: existLocalesFolder,
-            })
-        : '';
     var clientCode = pagePkg.getCode();
     clientLine.forEach(function (line) {
         clientCode = clientCode.replace(line, '');
     });
-    return "".concat(topLine, "\n  import ").concat(INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n  import __loadNamespaces from 'next-translate/loadNamespaces'\n  import __nt_store from 'next-translate/_store'\n  import { useSearchParams as __useSearchParams, useParams as __useParams } from 'next/navigation'\n  import { use as __use } from 'react';\n\n  ").concat(clientCode, "\n\n  ").concat(exportDefault, "\n  ").concat(namedExportsModified, "\n");
-}
-function wrapClientComponent(_a) {
-    var _b = _a.name, name = _b === void 0 ? '' : _b, _c = _a.pathname, pathname = _c === void 0 ? '' : _c, _d = _a.isPage, isPage = _d === void 0 ? false : _d, _e = _a.pageVariableName, pageVariableName = _e === void 0 ? '' : _e, _f = _a.routeType, routeType = _f === void 0 ? 'component' : _f, _g = _a.existLocalesFolder, existLocalesFolder = _g === void 0 ? true : _g;
-    return "function ".concat(name, "(props) {\n    const searchParams = __useSearchParams()\n    const params = __useParams()\n    const lang = params.lang ?? searchParams.get('lang') ?? ").concat(INTERNAL_CONFIG_KEY, ".defaultLocale\n    const config = {\n      ...").concat(INTERNAL_CONFIG_KEY, ",\n      locale: lang,\n      loaderName: 'client ").concat(routeType, "',\n      pathname: '").concat(pathname, "',\n      logBuild: ").concat(isPage, ",\n      ").concat(addLoadLocalesFrom(existLocalesFolder), "\n    }\n    const { __lang, __namespaces } = __use(__loadNamespaces(config));\n\n    __nt_store.set({ lang, namespaces: __namespaces, config })\n\n    return <").concat(pageVariableName, " {...props} />\n  }");
-}
-function modifyNamedExportsComponents(pagePkg, _a) {
-    var hash = _a.hash, existLocalesFolder = _a.existLocalesFolder;
-    return interceptNamedExportsFromReactComponents(pagePkg, hash)
-        .map(function (_a) {
-        var exportName = _a.exportName, defaultLocalName = _a.defaultLocalName;
-        return "\n    ".concat(wrapClientComponent({
-            name: defaultLocalName,
-            pathname: lastPathname,
-            isPage: false,
-            pageVariableName: exportName,
-            existLocalesFolder: existLocalesFolder
-        }), "\n    export { ").concat(defaultLocalName, " as ").concat(exportName, " }\n  ");
-    })
-        .join('')
-        .trim();
+    return "".concat(topLine, "\n  import ").concat(INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n  import AppDirI18nProvider from 'next-translate/AppDirI18nProvider'\n  import { useSearchParams as __useSearchParams, useParams as __useParams } from 'next/navigation'\n  import { use as __use } from 'react'\n  import __loadNamespaces from 'next-translate/loadNamespaces'\n\n  ").concat(clientCode, "\n\n  export default function __Next_Translate_new__").concat(hash, "__(props) {\n    const searchParams = __useSearchParams()\n    const params = __useParams()\n    const lang = params.lang ?? searchParams.get('lang') ?? ").concat(INTERNAL_CONFIG_KEY, ".defaultLocale\n    const config = {\n      ...").concat(INTERNAL_CONFIG_KEY, ",\n      locale: lang,\n      loaderName: 'client ").concat(routeType, "',\n      pathname: '").concat(pathname, "',\n    }\n\n    const { __lang, __namespaces } = __use(__loadNamespaces({ ...config, ").concat(addLoadLocalesFrom(existLocalesFolder), " }));\n    globalThis.__NEXT_TRANSLATE__ = { lang: __lang, namespaces: __namespaces, config }\n\n    return <").concat(pageVariableName, " {...props} />\n  }\n");
 }

package/lib/esm/utils.js

@@ -29,7 +29,9 @@ export function getDefaultAppJs(existLocalesFolder) {
     return "\n    import ".concat(INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n    import appWithI18n from 'next-translate/appWithI18n'\n  \n    function MyApp({ Component, pageProps }) {\n      return <Component {...pageProps} />\n    }\n  \n    export default appWithI18n(MyApp, {\n      ...").concat(INTERNAL_CONFIG_KEY, ",\n      skipInitialProps: true,\n      isLoader: true,\n      ").concat(addLoadLocalesFrom(existLocalesFolder), "\n    })\n  ");
 }
 export function addLoadLocalesFrom(existLocalesFolder) {
-    var defaultFn = existLocalesFolder ? defaultLoader : "() => Promise.resolve({})";
+    var defaultFn = existLocalesFolder
+        ? defaultLoader
+        : "() => Promise.resolve({})";
     return "loadLocaleFrom: ".concat(INTERNAL_CONFIG_KEY, ".loadLocaleFrom || (").concat(defaultFn, "),");
 }
 export function getTsCompilerOptions(basePath, cutDependencies) {
@@ -267,39 +269,6 @@ export function isNotExportModifier(modifier) {
     ];
     return !exportModifiers.includes(modifier.kind);
 }
-function isPascalCase(str) {
-    return (str.length > 1 &&
-        str[0] === str[0].toUpperCase() &&
-        str[1] === str[1].toLowerCase());
-}
-export function interceptNamedExportsFromReactComponents(filePkg, hash) {
-    var sourceFile = filePkg.sourceFile;
-    var interceptedExports = [];
-    sourceFile.statements
-        .filter(function (node) {
-        var _a;
-        return (_a = node.modifiers) === null || _a === void 0 ? void 0 : _a.some(function (modifier) { return (modifier === null || modifier === void 0 ? void 0 : modifier.kind) === ts.SyntaxKind.ExportKeyword; });
-    })
-        .forEach(function (node) {
-        var _a, _b, _c;
-        var exportName = '';
-        if (ts.isFunctionDeclaration(node) || ts.isClassDeclaration(node)) {
-            exportName = (_b = (_a = node.name) === null || _a === void 0 ? void 0 : _a.getText()) !== null && _b !== void 0 ? _b : '';
-        }
-        else if (ts.isVariableStatement(node)) {
-            var declaration = node.declarationList.declarations[0];
-            if (!ts.isArrowFunction(declaration.initializer))
-                return;
-            exportName = (_c = declaration.name) === null || _c === void 0 ? void 0 : _c.getText();
-        }
-        if (isPascalCase(exportName)) {
-            var defaultLocalName = "__Next_Translate_Component_".concat(hash, "_").concat(interceptedExports.length);
-            interceptExport(filePkg, exportName, defaultLocalName);
-            interceptedExports.push({ exportName: exportName, defaultLocalName: defaultLocalName });
-        }
-    });
-    return interceptedExports;
-}
 export function interceptExport(filePkg, exportName, defaultLocalName) {
     var exportContent = getNamedExport(filePkg, exportName, false);
     var finalLocalName = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-translate-plugin",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "Tiny and powerful i18n plugin to translate your Next.js pages.",
   "license": "MIT",
   "keywords": [
@@ -72,7 +72,7 @@
     "husky": "7.0.4",
     "jest": "27.3.1",
     "next": "13.1.2",
-    "next-translate": "2.0.0-canary.1",
+    "next-translate": "2.4.0",
     "prettier": "2.8.3",
     "pretty-quick": "3.1.3",
     "react": "18.2.0",
@@ -80,7 +80,7 @@
     "supertest": "6.3.3"
   },
   "peerDependencies": {
-    "next-translate": ">= 2.4.0"
+    "next-translate": ">= 2.4.1"
   },
   "prettier": {
     "trailingComma": "es5",
@@ -104,4 +104,4 @@
       "^.+\\.(j|t)sx?$": "babel-jest"
     }
   }
-}
+}

package/utils.d.ts

@@ -21,14 +21,8 @@ export declare function hasStaticName(filePkg: ParsedFilePkg, target: ts.Declara
 export declare function isPageToIgnore(pageFilePath: string): boolean;
 export declare function hasHOC(filePkg: ParsedFilePkg): boolean;
 export declare function isNotExportModifier(modifier: ts.Modifier): boolean;
-declare type InterceptedExport = {
-    exportName: string;
-    defaultLocalName: string;
-};
-export declare function interceptNamedExportsFromReactComponents(filePkg: ParsedFilePkg, hash: string): InterceptedExport[];
 export declare function interceptExport(filePkg: ParsedFilePkg, exportName: string, defaultLocalName: string): string;
 export declare function removeCommentsFromCode(code: string): string;
 export declare function calculatePageDir(name: 'pages' | 'app', pagesInDir: string | undefined, dir: string): string;
 export declare function existPages(dir: string, pages: string | undefined): boolean | "" | undefined;
 export declare function existLocalesFolderWithNamespaces(dir: string): boolean;
-export {};