next-translate-plugin 2.4.0-canary.5 → 2.4.1

package/lib/cjs/index.js

@@ -10,17 +10,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -34,7 +23,7 @@ function nextTranslate(nextConfig) {
     var basePath = pkgDir();
     basePath = path_1.default.resolve(path_1.default.relative(basePath, process.env.NEXT_TRANSLATE_PATH || '.'));
     var nextConfigI18n = nextConfig.i18n || {};
-    var _a = require(path_1.default.join(basePath, 'i18n')), _b = _a.locales, locales = _b === void 0 ? nextConfigI18n.locales || [] : _b, _c = _a.defaultLocale, defaultLocale = _c === void 0 ? nextConfigI18n.defaultLocale || 'en' : _c, _d = _a.domains, domains = _d === void 0 ? nextConfigI18n.domains : _d, _e = _a.localeDetection, localeDetection = _e === void 0 ? nextConfigI18n.localeDetection : _e, _f = _a.loader, loader = _f === void 0 ? true : _f, pagesInDir = _a.pagesInDir, restI18n = __rest(_a, ["locales", "defaultLocale", "domains", "localeDetection", "loader", "pagesInDir"]);
+    var _a = require(path_1.default.join(basePath, 'i18n')), _b = _a.locales, locales = _b === void 0 ? nextConfigI18n.locales || [] : _b, _c = _a.defaultLocale, defaultLocale = _c === void 0 ? nextConfigI18n.defaultLocale || 'en' : _c, _d = _a.domains, domains = _d === void 0 ? nextConfigI18n.domains : _d, _e = _a.localeDetection, localeDetection = _e === void 0 ? nextConfigI18n.localeDetection : _e, _f = _a.loader, loader = _f === void 0 ? true : _f, pagesInDir = _a.pagesInDir, _g = _a.extensionsRgx, extensionsRgx = _g === void 0 ? test : _g, _h = _a.revalidate, revalidate = _h === void 0 ? 0 : _h;
     var nextConfigWithI18n = __assign(__assign({}, nextConfig), { i18n: {
             locales: locales,
             defaultLocale: defaultLocale,
@@ -43,6 +32,7 @@ function nextTranslate(nextConfig) {
         } });
     var pagesFolder = (0, utils_1.calculatePageDir)('pages', pagesInDir, basePath);
     var appFolder = (0, utils_1.calculatePageDir)('app', pagesInDir, basePath);
+    var existLocalesFolder = (0, utils_1.existLocalesFolderWithNamespaces)(basePath);
     var existPagesFolder = (0, utils_1.existPages)(basePath, pagesFolder);
     var hasGetInitialPropsOnAppJs = false;
     var hasAppJs = false;
@@ -87,8 +77,9 @@ function nextTranslate(nextConfig) {
                         appFolder: path_1.default.join(appFolder, '/'),
                         hasAppJs: hasAppJs,
                         hasGetInitialPropsOnAppJs: hasGetInitialPropsOnAppJs,
-                        extensionsRgx: restI18n.extensionsRgx || test,
-                        revalidate: restI18n.revalidate || 0,
+                        extensionsRgx: extensionsRgx,
+                        revalidate: revalidate,
+                        existLocalesFolder: existLocalesFolder,
                     },
                 },
             });

package/lib/cjs/loader.js

@@ -9,7 +9,7 @@ var templateWithLoader_1 = __importDefault(require("./templateWithLoader"));
 var templateAppDir_1 = __importDefault(require("./templateAppDir"));
 var utils_1 = require("./utils");
 function loader(rawCode) {
-    var _a = this.getOptions(), basePath = _a.basePath, pagesFolder = _a.pagesFolder, appFolder = _a.appFolder, hasAppJs = _a.hasAppJs, hasGetInitialPropsOnAppJs = _a.hasGetInitialPropsOnAppJs, extensionsRgx = _a.extensionsRgx, revalidate = _a.revalidate;
+    var _a = this.getOptions(), basePath = _a.basePath, pagesFolder = _a.pagesFolder, appFolder = _a.appFolder, hasAppJs = _a.hasAppJs, hasGetInitialPropsOnAppJs = _a.hasGetInitialPropsOnAppJs, extensionsRgx = _a.extensionsRgx, revalidate = _a.revalidate, existLocalesFolder = _a.existLocalesFolder;
     try {
         var codeWithoutComments_1 = (0, utils_1.removeCommentsFromCode)(rawCode).trim();
         var normalizedResourcePath = path_1.default
@@ -22,8 +22,9 @@ function loader(rawCode) {
             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)();
+        if (normalizedResourcePath.includes('node_modules/next/dist/pages/_app') &&
+            !hasAppJs) {
+            return (0, utils_1.getDefaultAppJs)(existLocalesFolder);
         }
         if (normalizedResourcePath.includes('node_modules/'))
             return rawCode;
@@ -44,6 +45,7 @@ function loader(rawCode) {
                 appFolder: appFolder,
                 isClientComponent: isClientComponent,
                 code: rawCode,
+                existLocalesFolder: existLocalesFolder,
             });
         }
         var defaultExport = (0, utils_1.getDefaultExport)(pagePkg);
@@ -51,12 +53,13 @@ function loader(rawCode) {
             return rawCode;
         if (hasGetInitialPropsOnAppJs) {
             return pageNoExt === '/_app'
-                ? (0, templateWithHoc_1.default)(pagePkg)
+                ? (0, templateWithHoc_1.default)(pagePkg, { existLocalesFolder: existLocalesFolder })
                 : rawCode;
         }
         if (pageNoExt === '/_app') {
             return (0, templateWithHoc_1.default)(pagePkg, {
                 skipInitialProps: true,
+                existLocalesFolder: existLocalesFolder,
             });
         }
         if ((0, utils_1.isPageToIgnore)(page))
@@ -69,7 +72,7 @@ function loader(rawCode) {
         var isGetInitialProps = (0, utils_1.hasStaticName)(pagePkg, defaultExport, 'getInitialProps');
         var hasLoader = isGetStaticProps || isGetServerSideProps || isGetInitialProps;
         if (isGetInitialProps || (!hasLoader && isWrapperWithExternalHOC)) {
-            return (0, templateWithHoc_1.default)(pagePkg);
+            return (0, templateWithHoc_1.default)(pagePkg, { existLocalesFolder: existLocalesFolder });
         }
         var loader_1 = isGetServerSideProps || (!hasLoader && isDynamicPage && !isGetStaticPaths)
             ? 'getServerSideProps'
@@ -78,6 +81,7 @@ function loader(rawCode) {
             page: pageNoExt,
             loader: loader_1,
             revalidate: revalidate,
+            existLocalesFolder: existLocalesFolder,
         });
     }
     catch (e) {

package/lib/cjs/templateAppDir.js

@@ -1,70 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("./utils");
-var validPages = ['/page', '/layout', '/error', '/loading', '/not-found', '/global-error'];
+var validPages = [
+    '/page',
+    '/layout',
+    '/error',
+    '/loading',
+    '/not-found',
+    '/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;
+    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,
         pathname: pathname,
         routeType: routeType,
+        existLocalesFolder: existLocalesFolder,
     });
 }
 exports.default = templateAppDir;
-function templateServerPage(_a) {
-    var pagePkg = _a.pagePkg, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, routeType = _a.routeType;
+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)(), "\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;
+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);
-    var exportDefault = pageVariableName
-        ? "export default " + wrapClientComponent({ name: "__Next_Translate_new__".concat(hash, "__"), pathname: pathname, isPage: isPage, pageVariableName: pageVariableName, routeType: routeType })
-        : '';
     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;
-    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)(), "\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, hash) {
-    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 }), "\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/templateWithHoc.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("./utils");
 function templateWithHoc(pagePkg, _a) {
-    var _b = _a === void 0 ? {} : _a, _c = _b.skipInitialProps, skipInitialProps = _c === void 0 ? false : _c;
+    var _b = _a === void 0 ? {} : _a, _c = _b.skipInitialProps, skipInitialProps = _c === void 0 ? false : _c, _d = _b.existLocalesFolder, existLocalesFolder = _d === void 0 ? true : _d;
     var hash = Date.now().toString(16);
     var pageVariableName = (0, utils_1.interceptExport)(pagePkg, 'default', "__Next_Translate__Page__".concat(hash, "__"));
     var hasDefaultExport = Boolean(pageVariableName);
     if (!hasDefaultExport)
         return pagePkg.getCode();
-    return "\n    import ".concat(utils_1.INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n    import __appWithI18n from 'next-translate/appWithI18n'\n    ").concat(pagePkg.getCode(), "\n    export default __appWithI18n(").concat(pageVariableName, ", {\n      ...").concat(utils_1.INTERNAL_CONFIG_KEY, ",\n      isLoader: true,\n      skipInitialProps: ").concat(skipInitialProps, ",\n      ").concat((0, utils_1.addLoadLocalesFrom)(), "\n    });\n  ");
+    return "\n    import ".concat(utils_1.INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n    import __appWithI18n from 'next-translate/appWithI18n'\n    ").concat(pagePkg.getCode(), "\n    export default __appWithI18n(").concat(pageVariableName, ", {\n      ...").concat(utils_1.INTERNAL_CONFIG_KEY, ",\n      isLoader: true,\n      skipInitialProps: ").concat(skipInitialProps, ",\n      ").concat((0, utils_1.addLoadLocalesFrom)(existLocalesFolder), "\n    });\n  ");
 }
 exports.default = templateWithHoc;

package/lib/cjs/templateWithLoader.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("./utils");
 function templateWithLoader(pagePkg, _a) {
-    var _b = _a === void 0 ? {} : _a, _c = _b.page, page = _c === void 0 ? '' : _c, _d = _b.loader, loader = _d === void 0 ? 'getStaticProps' : _d, _e = _b.revalidate, revalidate = _e === void 0 ? 0 : _e;
+    var _b = _a === void 0 ? {} : _a, _c = _b.page, page = _c === void 0 ? '' : _c, _d = _b.loader, loader = _d === void 0 ? 'getStaticProps' : _d, _e = _b.revalidate, revalidate = _e === void 0 ? 0 : _e, _f = _b.existLocalesFolder, existLocalesFolder = _f === void 0 ? true : _f;
     var hash = Date.now().toString(16);
     var oldLoaderName = (0, utils_1.interceptExport)(pagePkg, loader, "__Next_Translate_old_".concat(loader, "__").concat(hash, "__"));
     var newLoaderName = "__Next_Translate__".concat(loader, "__").concat(hash, "__");
     var hasLoader = Boolean(oldLoaderName);
-    return "\n    import ".concat(utils_1.INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n    import __loadNamespaces from 'next-translate/loadNamespaces'\n    ").concat(pagePkg.getCode(), "\n    async function ").concat(newLoaderName, "(ctx) {\n      ").concat(hasLoader ? "const res = await ".concat(oldLoaderName, "(ctx)") : '', "\n      return {\n        ").concat(hasLoader && revalidate > 0 ? "revalidate: ".concat(revalidate, ",") : '', "\n        ").concat(hasLoader ? '...res,' : '', "\n        props: {\n          ").concat(hasLoader ? '...(res.props || {}),' : '', "\n          ...(await __loadNamespaces({\n            ...ctx,\n            ...").concat(utils_1.INTERNAL_CONFIG_KEY, ",\n            pathname: '").concat(page, "',\n            loaderName: '").concat(loader, "',\n            ").concat((0, utils_1.addLoadLocalesFrom)(), "\n          }))\n        }\n      }\n    }\n    export { ").concat(newLoaderName, " as ").concat(loader, " }\n  ");
+    return "\n    import ".concat(utils_1.INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n    import __loadNamespaces from 'next-translate/loadNamespaces'\n    ").concat(pagePkg.getCode(), "\n    async function ").concat(newLoaderName, "(ctx) {\n      ").concat(hasLoader ? "const res = await ".concat(oldLoaderName, "(ctx)") : '', "\n      return {\n        ").concat(hasLoader && revalidate > 0 ? "revalidate: ".concat(revalidate, ",") : '', "\n        ").concat(hasLoader ? '...res,' : '', "\n        props: {\n          ").concat(hasLoader ? '...(res.props || {}),' : '', "\n          ...(await __loadNamespaces({\n            ...ctx,\n            ...").concat(utils_1.INTERNAL_CONFIG_KEY, ",\n            pathname: '").concat(page, "',\n            loaderName: '").concat(loader, "',\n            ").concat((0, utils_1.addLoadLocalesFrom)(existLocalesFolder), "\n          }))\n        }\n      }\n    }\n    export { ").concat(newLoaderName, " as ").concat(loader, " }\n  ");
 }
 exports.default = templateWithLoader;

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.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"));
@@ -31,12 +31,15 @@ var specFileOrFolderRgx = /(__mocks__|__tests__)|(\.(spec|test)\.(tsx|ts|js|jsx)
 exports.INTERNAL_CONFIG_KEY = '__i18nConfig';
 exports.clientLine = ['"use client"', "'use client'"];
 exports.defaultLoader = '(l, n) => import(`@next-translate-root/locales/${l}/${n}`).then(m => m.default)';
-function getDefaultAppJs() {
-    return "\n    import ".concat(exports.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(exports.INTERNAL_CONFIG_KEY, ",\n      skipInitialProps: true,\n      isLoader: true,\n      ").concat(addLoadLocalesFrom(), "\n    })\n  ");
+function getDefaultAppJs(existLocalesFolder) {
+    return "\n    import ".concat(exports.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(exports.INTERNAL_CONFIG_KEY, ",\n      skipInitialProps: true,\n      isLoader: true,\n      ").concat(addLoadLocalesFrom(existLocalesFolder), "\n    })\n  ");
 }
 exports.getDefaultAppJs = getDefaultAppJs;
-function addLoadLocalesFrom() {
-    return "loadLocaleFrom: typeof ".concat(exports.INTERNAL_CONFIG_KEY, ".loadLocaleFrom === 'function' ? ").concat(exports.INTERNAL_CONFIG_KEY, ".loadLocaleFrom : ").concat(exports.defaultLoader, ",");
+function addLoadLocalesFrom(existLocalesFolder) {
+    var defaultFn = existLocalesFolder
+        ? exports.defaultLoader
+        : "() => Promise.resolve({})";
+    return "loadLocaleFrom: ".concat(exports.INTERNAL_CONFIG_KEY, ".loadLocaleFrom || (").concat(defaultFn, "),");
 }
 exports.addLoadLocalesFrom = addLoadLocalesFrom;
 function getTsCompilerOptions(basePath, cutDependencies) {
@@ -290,35 +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 = '';
@@ -407,3 +381,24 @@ function existPages(dir, pages) {
     return pages && fs_1.default.existsSync(path_1.default.join(dir, pages));
 }
 exports.existPages = existPages;
+function existLocalesFolderWithNamespaces(dir) {
+    var existLocalesFolder = fs_1.default.existsSync(path_1.default.join(dir, 'locales'));
+    if (!existLocalesFolder)
+        return false;
+    var langFolder = fs_1.default.readdirSync(path_1.default.join(dir, 'locales')).find(function (file) {
+        var currentLangFolder = path_1.default.join(dir, 'locales', file);
+        return (fs_1.default.existsSync(currentLangFolder) &&
+            fs_1.default.lstatSync(currentLangFolder).isDirectory());
+    });
+    if (!langFolder)
+        return false;
+    var existNamespaceFile = fs_1.default
+        .readdirSync(path_1.default.join(dir, 'locales', langFolder))
+        .some(function (file) {
+        var namespaceFile = path_1.default.join(dir, 'locales', langFolder, file);
+        return (fs_1.default.existsSync(namespaceFile) &&
+            !fs_1.default.lstatSync(namespaceFile).isDirectory());
+    });
+    return existNamespaceFile;
+}
+exports.existLocalesFolderWithNamespaces = existLocalesFolderWithNamespaces;

package/lib/esm/index.js

@@ -9,27 +9,16 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import fs from 'fs';
 import path from 'path';
-import { getDefaultExport, hasHOC, hasStaticName, parseFile, calculatePageDir, existPages, } from './utils';
+import { getDefaultExport, hasHOC, hasStaticName, parseFile, calculatePageDir, existPages, existLocalesFolderWithNamespaces, } from './utils';
 var test = /\.(tsx|ts|js|mjs|jsx)$/;
 function nextTranslate(nextConfig) {
     if (nextConfig === void 0) { nextConfig = {}; }
     var basePath = pkgDir();
     basePath = path.resolve(path.relative(basePath, process.env.NEXT_TRANSLATE_PATH || '.'));
     var nextConfigI18n = nextConfig.i18n || {};
-    var _a = require(path.join(basePath, 'i18n')), _b = _a.locales, locales = _b === void 0 ? nextConfigI18n.locales || [] : _b, _c = _a.defaultLocale, defaultLocale = _c === void 0 ? nextConfigI18n.defaultLocale || 'en' : _c, _d = _a.domains, domains = _d === void 0 ? nextConfigI18n.domains : _d, _e = _a.localeDetection, localeDetection = _e === void 0 ? nextConfigI18n.localeDetection : _e, _f = _a.loader, loader = _f === void 0 ? true : _f, pagesInDir = _a.pagesInDir, restI18n = __rest(_a, ["locales", "defaultLocale", "domains", "localeDetection", "loader", "pagesInDir"]);
+    var _a = require(path.join(basePath, 'i18n')), _b = _a.locales, locales = _b === void 0 ? nextConfigI18n.locales || [] : _b, _c = _a.defaultLocale, defaultLocale = _c === void 0 ? nextConfigI18n.defaultLocale || 'en' : _c, _d = _a.domains, domains = _d === void 0 ? nextConfigI18n.domains : _d, _e = _a.localeDetection, localeDetection = _e === void 0 ? nextConfigI18n.localeDetection : _e, _f = _a.loader, loader = _f === void 0 ? true : _f, pagesInDir = _a.pagesInDir, _g = _a.extensionsRgx, extensionsRgx = _g === void 0 ? test : _g, _h = _a.revalidate, revalidate = _h === void 0 ? 0 : _h;
     var nextConfigWithI18n = __assign(__assign({}, nextConfig), { i18n: {
             locales: locales,
             defaultLocale: defaultLocale,
@@ -38,6 +27,7 @@ function nextTranslate(nextConfig) {
         } });
     var pagesFolder = calculatePageDir('pages', pagesInDir, basePath);
     var appFolder = calculatePageDir('app', pagesInDir, basePath);
+    var existLocalesFolder = existLocalesFolderWithNamespaces(basePath);
     var existPagesFolder = existPages(basePath, pagesFolder);
     var hasGetInitialPropsOnAppJs = false;
     var hasAppJs = false;
@@ -82,8 +72,9 @@ function nextTranslate(nextConfig) {
                         appFolder: path.join(appFolder, '/'),
                         hasAppJs: hasAppJs,
                         hasGetInitialPropsOnAppJs: hasGetInitialPropsOnAppJs,
-                        extensionsRgx: restI18n.extensionsRgx || test,
-                        revalidate: restI18n.revalidate || 0,
+                        extensionsRgx: extensionsRgx,
+                        revalidate: revalidate,
+                        existLocalesFolder: existLocalesFolder,
                     },
                 },
             });

package/lib/esm/loader.js

@@ -4,7 +4,7 @@ import templateWithLoader from './templateWithLoader';
 import templateAppDir from './templateAppDir';
 import { parseFile, getDefaultAppJs, getDefaultExport, hasExportName, hasStaticName, isPageToIgnore, hasHOC, removeCommentsFromCode, clientLine, } from './utils';
 export default function loader(rawCode) {
-    var _a = this.getOptions(), basePath = _a.basePath, pagesFolder = _a.pagesFolder, appFolder = _a.appFolder, hasAppJs = _a.hasAppJs, hasGetInitialPropsOnAppJs = _a.hasGetInitialPropsOnAppJs, extensionsRgx = _a.extensionsRgx, revalidate = _a.revalidate;
+    var _a = this.getOptions(), basePath = _a.basePath, pagesFolder = _a.pagesFolder, appFolder = _a.appFolder, hasAppJs = _a.hasAppJs, hasGetInitialPropsOnAppJs = _a.hasGetInitialPropsOnAppJs, extensionsRgx = _a.extensionsRgx, revalidate = _a.revalidate, existLocalesFolder = _a.existLocalesFolder;
     try {
         var codeWithoutComments_1 = removeCommentsFromCode(rawCode).trim();
         var normalizedResourcePath = path
@@ -17,8 +17,9 @@ export default function loader(rawCode) {
             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();
+        if (normalizedResourcePath.includes('node_modules/next/dist/pages/_app') &&
+            !hasAppJs) {
+            return getDefaultAppJs(existLocalesFolder);
         }
         if (normalizedResourcePath.includes('node_modules/'))
             return rawCode;
@@ -39,6 +40,7 @@ export default function loader(rawCode) {
                 appFolder: appFolder,
                 isClientComponent: isClientComponent,
                 code: rawCode,
+                existLocalesFolder: existLocalesFolder,
             });
         }
         var defaultExport = getDefaultExport(pagePkg);
@@ -46,12 +48,13 @@ export default function loader(rawCode) {
             return rawCode;
         if (hasGetInitialPropsOnAppJs) {
             return pageNoExt === '/_app'
-                ? templateWithHoc(pagePkg)
+                ? templateWithHoc(pagePkg, { existLocalesFolder: existLocalesFolder })
                 : rawCode;
         }
         if (pageNoExt === '/_app') {
             return templateWithHoc(pagePkg, {
                 skipInitialProps: true,
+                existLocalesFolder: existLocalesFolder,
             });
         }
         if (isPageToIgnore(page))
@@ -64,7 +67,7 @@ export default function loader(rawCode) {
         var isGetInitialProps = hasStaticName(pagePkg, defaultExport, 'getInitialProps');
         var hasLoader = isGetStaticProps || isGetServerSideProps || isGetInitialProps;
         if (isGetInitialProps || (!hasLoader && isWrapperWithExternalHOC)) {
-            return templateWithHoc(pagePkg);
+            return templateWithHoc(pagePkg, { existLocalesFolder: existLocalesFolder });
         }
         var loader_1 = isGetServerSideProps || (!hasLoader && isDynamicPage && !isGetStaticPaths)
             ? 'getServerSideProps'
@@ -73,6 +76,7 @@ export default function loader(rawCode) {
             page: pageNoExt,
             loader: loader_1,
             revalidate: revalidate,
+            existLocalesFolder: existLocalesFolder,
         });
     }
     catch (e) {

package/lib/esm/templateAppDir.js

@@ -1,67 +1,54 @@
-import { interceptExport, addLoadLocalesFrom, clientLine, interceptNamedExportsFromReactComponents, INTERNAL_CONFIG_KEY, } from './utils';
-var validPages = ['/page', '/layout', '/error', '/loading', '/not-found', '/global-error'];
+import { interceptExport, addLoadLocalesFrom, clientLine, INTERNAL_CONFIG_KEY, } from './utils';
+var validPages = [
+    '/page',
+    '/layout',
+    '/error',
+    '/loading',
+    '/not-found',
+    '/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;
+    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,
         pathname: pathname,
         routeType: routeType,
+        existLocalesFolder: existLocalesFolder,
     });
 }
-function templateServerPage(_a) {
-    var pagePkg = _a.pagePkg, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, routeType = _a.routeType;
+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(), "\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;
+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);
-    var exportDefault = pageVariableName
-        ? "export default " + wrapClientComponent({ name: "__Next_Translate_new__".concat(hash, "__"), pathname: pathname, isPage: isPage, pageVariableName: pageVariableName, routeType: routeType })
-        : '';
     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;
-    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(), "\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, hash) {
-    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 }), "\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/templateWithHoc.js

@@ -1,10 +1,10 @@
-import { INTERNAL_CONFIG_KEY, interceptExport, addLoadLocalesFrom } from './utils';
+import { INTERNAL_CONFIG_KEY, interceptExport, addLoadLocalesFrom, } from './utils';
 export default function templateWithHoc(pagePkg, _a) {
-    var _b = _a === void 0 ? {} : _a, _c = _b.skipInitialProps, skipInitialProps = _c === void 0 ? false : _c;
+    var _b = _a === void 0 ? {} : _a, _c = _b.skipInitialProps, skipInitialProps = _c === void 0 ? false : _c, _d = _b.existLocalesFolder, existLocalesFolder = _d === void 0 ? true : _d;
     var hash = Date.now().toString(16);
     var pageVariableName = interceptExport(pagePkg, 'default', "__Next_Translate__Page__".concat(hash, "__"));
     var hasDefaultExport = Boolean(pageVariableName);
     if (!hasDefaultExport)
         return pagePkg.getCode();
-    return "\n    import ".concat(INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n    import __appWithI18n from 'next-translate/appWithI18n'\n    ").concat(pagePkg.getCode(), "\n    export default __appWithI18n(").concat(pageVariableName, ", {\n      ...").concat(INTERNAL_CONFIG_KEY, ",\n      isLoader: true,\n      skipInitialProps: ").concat(skipInitialProps, ",\n      ").concat(addLoadLocalesFrom(), "\n    });\n  ");
+    return "\n    import ".concat(INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n    import __appWithI18n from 'next-translate/appWithI18n'\n    ").concat(pagePkg.getCode(), "\n    export default __appWithI18n(").concat(pageVariableName, ", {\n      ...").concat(INTERNAL_CONFIG_KEY, ",\n      isLoader: true,\n      skipInitialProps: ").concat(skipInitialProps, ",\n      ").concat(addLoadLocalesFrom(existLocalesFolder), "\n    });\n  ");
 }

package/lib/esm/templateWithLoader.js

@@ -1,9 +1,9 @@
-import { interceptExport, addLoadLocalesFrom, INTERNAL_CONFIG_KEY } from './utils';
+import { interceptExport, addLoadLocalesFrom, INTERNAL_CONFIG_KEY, } from './utils';
 export default function templateWithLoader(pagePkg, _a) {
-    var _b = _a === void 0 ? {} : _a, _c = _b.page, page = _c === void 0 ? '' : _c, _d = _b.loader, loader = _d === void 0 ? 'getStaticProps' : _d, _e = _b.revalidate, revalidate = _e === void 0 ? 0 : _e;
+    var _b = _a === void 0 ? {} : _a, _c = _b.page, page = _c === void 0 ? '' : _c, _d = _b.loader, loader = _d === void 0 ? 'getStaticProps' : _d, _e = _b.revalidate, revalidate = _e === void 0 ? 0 : _e, _f = _b.existLocalesFolder, existLocalesFolder = _f === void 0 ? true : _f;
     var hash = Date.now().toString(16);
     var oldLoaderName = interceptExport(pagePkg, loader, "__Next_Translate_old_".concat(loader, "__").concat(hash, "__"));
     var newLoaderName = "__Next_Translate__".concat(loader, "__").concat(hash, "__");
     var hasLoader = Boolean(oldLoaderName);
-    return "\n    import ".concat(INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n    import __loadNamespaces from 'next-translate/loadNamespaces'\n    ").concat(pagePkg.getCode(), "\n    async function ").concat(newLoaderName, "(ctx) {\n      ").concat(hasLoader ? "const res = await ".concat(oldLoaderName, "(ctx)") : '', "\n      return {\n        ").concat(hasLoader && revalidate > 0 ? "revalidate: ".concat(revalidate, ",") : '', "\n        ").concat(hasLoader ? '...res,' : '', "\n        props: {\n          ").concat(hasLoader ? '...(res.props || {}),' : '', "\n          ...(await __loadNamespaces({\n            ...ctx,\n            ...").concat(INTERNAL_CONFIG_KEY, ",\n            pathname: '").concat(page, "',\n            loaderName: '").concat(loader, "',\n            ").concat(addLoadLocalesFrom(), "\n          }))\n        }\n      }\n    }\n    export { ").concat(newLoaderName, " as ").concat(loader, " }\n  ");
+    return "\n    import ".concat(INTERNAL_CONFIG_KEY, " from '@next-translate-root/i18n'\n    import __loadNamespaces from 'next-translate/loadNamespaces'\n    ").concat(pagePkg.getCode(), "\n    async function ").concat(newLoaderName, "(ctx) {\n      ").concat(hasLoader ? "const res = await ".concat(oldLoaderName, "(ctx)") : '', "\n      return {\n        ").concat(hasLoader && revalidate > 0 ? "revalidate: ".concat(revalidate, ",") : '', "\n        ").concat(hasLoader ? '...res,' : '', "\n        props: {\n          ").concat(hasLoader ? '...(res.props || {}),' : '', "\n          ...(await __loadNamespaces({\n            ...ctx,\n            ...").concat(INTERNAL_CONFIG_KEY, ",\n            pathname: '").concat(page, "',\n            loaderName: '").concat(loader, "',\n            ").concat(addLoadLocalesFrom(existLocalesFolder), "\n          }))\n        }\n      }\n    }\n    export { ").concat(newLoaderName, " as ").concat(loader, " }\n  ");
 }

package/lib/esm/utils.js

@@ -25,11 +25,14 @@ var specFileOrFolderRgx = /(__mocks__|__tests__)|(\.(spec|test)\.(tsx|ts|js|jsx)
 export var INTERNAL_CONFIG_KEY = '__i18nConfig';
 export var clientLine = ['"use client"', "'use client'"];
 export var defaultLoader = '(l, n) => import(`@next-translate-root/locales/${l}/${n}`).then(m => m.default)';
-export function getDefaultAppJs() {
-    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(), "\n    })\n  ");
+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() {
-    return "loadLocaleFrom: typeof ".concat(INTERNAL_CONFIG_KEY, ".loadLocaleFrom === 'function' ? ").concat(INTERNAL_CONFIG_KEY, ".loadLocaleFrom : ").concat(defaultLoader, ",");
+export function addLoadLocalesFrom(existLocalesFolder) {
+    var defaultFn = existLocalesFolder
+        ? defaultLoader
+        : "() => Promise.resolve({})";
+    return "loadLocaleFrom: ".concat(INTERNAL_CONFIG_KEY, ".loadLocaleFrom || (").concat(defaultFn, "),");
 }
 export function getTsCompilerOptions(basePath, cutDependencies) {
     if (cutDependencies === void 0) { cutDependencies = false; }
@@ -266,34 +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 = '';
@@ -378,3 +353,23 @@ export function calculatePageDir(name, pagesInDir, dir) {
 export function existPages(dir, pages) {
     return pages && fs.existsSync(path.join(dir, pages));
 }
+export function existLocalesFolderWithNamespaces(dir) {
+    var existLocalesFolder = fs.existsSync(path.join(dir, 'locales'));
+    if (!existLocalesFolder)
+        return false;
+    var langFolder = fs.readdirSync(path.join(dir, 'locales')).find(function (file) {
+        var currentLangFolder = path.join(dir, 'locales', file);
+        return (fs.existsSync(currentLangFolder) &&
+            fs.lstatSync(currentLangFolder).isDirectory());
+    });
+    if (!langFolder)
+        return false;
+    var existNamespaceFile = fs
+        .readdirSync(path.join(dir, 'locales', langFolder))
+        .some(function (file) {
+        var namespaceFile = path.join(dir, 'locales', langFolder, file);
+        return (fs.existsSync(namespaceFile) &&
+            !fs.lstatSync(namespaceFile).isDirectory());
+    });
+    return existNamespaceFile;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-translate-plugin",
-  "version": "2.4.0-canary.5",
+  "version": "2.4.1",
   "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.3.0"
+    "next-translate": ">= 2.4.1"
   },
   "prettier": {
     "trailingComma": "es5",
@@ -104,4 +104,4 @@
       "^.+\\.(j|t)sx?$": "babel-jest"
     }
   }
-}
+}

package/templateAppDir.d.ts

@@ -1,8 +1,9 @@
 import { ParsedFilePkg } from './types';
-export default function templateAppDir(pagePkg: ParsedFilePkg, { code, pageNoExt, normalizedResourcePath, appFolder, isClientComponent, }?: {
+export default function templateAppDir(pagePkg: ParsedFilePkg, { code, pageNoExt, normalizedResourcePath, appFolder, isClientComponent, existLocalesFolder, }?: {
     code?: string | undefined;
     pageNoExt?: string | undefined;
     normalizedResourcePath?: string | undefined;
     appFolder?: string | undefined;
     isClientComponent?: boolean | undefined;
+    existLocalesFolder?: boolean | undefined;
 }): string;

package/templateWithHoc.d.ts

@@ -1,4 +1,5 @@
 import { ParsedFilePkg } from './types';
-export default function templateWithHoc(pagePkg: ParsedFilePkg, { skipInitialProps }?: {
+export default function templateWithHoc(pagePkg: ParsedFilePkg, { skipInitialProps, existLocalesFolder }?: {
     skipInitialProps?: boolean | undefined;
+    existLocalesFolder?: boolean | undefined;
 }): string;

package/templateWithLoader.d.ts

@@ -1,6 +1,7 @@
 import { ParsedFilePkg } from './types';
-export default function templateWithLoader(pagePkg: ParsedFilePkg, { page, loader, revalidate, }?: {
+export default function templateWithLoader(pagePkg: ParsedFilePkg, { page, loader, revalidate, existLocalesFolder, }?: {
     page?: string | undefined;
     loader?: string | undefined;
     revalidate?: number | undefined;
+    existLocalesFolder?: boolean | undefined;
 }): string;

package/types.d.ts

@@ -7,6 +7,7 @@ export interface LoaderOptions {
     hasGetInitialPropsOnAppJs: boolean;
     extensionsRgx: RegExp;
     revalidate: number;
+    existLocalesFolder: boolean;
 }
 export declare type Transformer = (rootNode: ts.SourceFile, context: ts.TransformationContext) => ts.SourceFile;
 export interface ParsedFilePkg {

package/utils.d.ts

@@ -3,8 +3,8 @@ import { ParsedFilePkg } from './types';
 export declare const INTERNAL_CONFIG_KEY = "__i18nConfig";
 export declare const clientLine: string[];
 export declare const defaultLoader = "(l, n) => import(`@next-translate-root/locales/${l}/${n}`).then(m => m.default)";
-export declare function getDefaultAppJs(): string;
-export declare function addLoadLocalesFrom(): string;
+export declare function getDefaultAppJs(existLocalesFolder: boolean): string;
+export declare function addLoadLocalesFrom(existLocalesFolder: boolean): string;
 export declare function getTsCompilerOptions(basePath: string, cutDependencies?: boolean): ts.CompilerOptions;
 export declare function getFilePkg(program: ts.Program, filename: string): ParsedFilePkg;
 export declare function parseFile(basePath: string, filename: string): ParsedFilePkg;
@@ -21,13 +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 {};
+export declare function existLocalesFolderWithNamespaces(dir: string): boolean;