next-translate-plugin 2.0.0-canary.6 → 2.0.1

package/lib/cjs/index.js

@@ -21,6 +21,15 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -28,19 +37,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("./utils");
+var test = /\.(tsx|ts|js|mjs|jsx)$/;
+var appDirNext13 = ['app', 'src/app'];
+var possiblePageDirs = __spreadArray([
+    'pages',
+    'src/pages',
+    'app/pages',
+    'integrations/pages'
+], appDirNext13, true);
 function nextTranslate(nextConfig) {
     if (nextConfig === void 0) { nextConfig = {}; }
-    var test = /\.(tsx|ts|js|mjs|jsx)$/;
     var basePath = pkgDir();
-    var possiblePageDirs = [
-        'pages',
-        'src/pages',
-        'app/pages',
-        'integrations/pages',
-    ];
-    var translationDir = path_1.default.resolve(path_1.default.relative(basePath, process.env.NEXT_TRANSLATE_PATH || '.'));
+    var dir = 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(translationDir, '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(dir, '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 nextConfigWithI18n = __assign(__assign({}, nextConfig), { i18n: {
             locales: locales,
             defaultLocale: defaultLocale,
@@ -48,22 +58,24 @@ function nextTranslate(nextConfig) {
             localeDetection: localeDetection,
         } });
     var hasGetInitialPropsOnAppJs = false;
+    var isAppDirNext13 = false;
     if (!pagesInDir) {
         for (var _i = 0, possiblePageDirs_1 = possiblePageDirs; _i < possiblePageDirs_1.length; _i++) {
             var possiblePageDir = possiblePageDirs_1[_i];
-            if (fs_1.default.existsSync(path_1.default.join(basePath, possiblePageDir))) {
+            if (fs_1.default.existsSync(path_1.default.join(dir, possiblePageDir))) {
                 pagesInDir = possiblePageDir;
+                isAppDirNext13 = appDirNext13.includes(possiblePageDir);
                 break;
             }
         }
     }
-    if (!pagesInDir || !fs_1.default.existsSync(path_1.default.join(basePath, pagesInDir))) {
+    if (!pagesInDir || !fs_1.default.existsSync(path_1.default.join(dir, pagesInDir))) {
         return nextConfigWithI18n;
     }
-    var pagesPath = path_1.default.join(basePath, pagesInDir);
+    var pagesPath = path_1.default.join(dir, pagesInDir);
     var app = fs_1.default.readdirSync(pagesPath).find(function (page) { return page.startsWith('_app.'); });
     if (app) {
-        var appPkg = (0, utils_1.parseFile)(basePath, path_1.default.join(pagesPath, app));
+        var appPkg = (0, utils_1.parseFile)(dir, path_1.default.join(pagesPath, app));
         var defaultExport = (0, utils_1.getDefaultExport)(appPkg);
         if (defaultExport) {
             var isGetInitialProps = (0, utils_1.hasStaticName)(appPkg, defaultExport, 'getInitialProps');
@@ -80,7 +92,7 @@ function nextTranslate(nextConfig) {
                 config.module = {};
             if (!config.module.rules)
                 config.module.rules = [];
-            config.resolve.alias = __assign(__assign({}, (config.resolve.alias || {})), { '@next-translate-root': path_1.default.resolve(translationDir) });
+            config.resolve.alias = __assign(__assign({}, (config.resolve.alias || {})), { '@next-translate-root': path_1.default.resolve(dir) });
             if (!loader)
                 return config;
             config.module.rules.push({
@@ -95,6 +107,7 @@ function nextTranslate(nextConfig) {
                         hasLoadLocaleFrom: typeof restI18n.loadLocaleFrom === 'function',
                         extensionsRgx: restI18n.extensionsRgx || test,
                         revalidate: restI18n.revalidate || 0,
+                        isAppDirNext13: isAppDirNext13,
                     },
                 },
             });

package/lib/cjs/loader.js

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var templateWithHoc_1 = __importDefault(require("./templateWithHoc"));
 var templateWithLoader_1 = __importDefault(require("./templateWithLoader"));
 var utils_1 = require("./utils");
+var templateAppDir_1 = __importDefault(require("./templateAppDir"));
 function loader(rawCode) {
-    var _a = this.getOptions(), basePath = _a.basePath, pagesPath = _a.pagesPath, hasAppJs = _a.hasAppJs, hasGetInitialPropsOnAppJs = _a.hasGetInitialPropsOnAppJs, hasLoadLocaleFrom = _a.hasLoadLocaleFrom, extensionsRgx = _a.extensionsRgx, revalidate = _a.revalidate;
+    var _a = this.getOptions(), basePath = _a.basePath, pagesPath = _a.pagesPath, hasAppJs = _a.hasAppJs, hasGetInitialPropsOnAppJs = _a.hasGetInitialPropsOnAppJs, hasLoadLocaleFrom = _a.hasLoadLocaleFrom, extensionsRgx = _a.extensionsRgx, revalidate = _a.revalidate, isAppDirNext13 = _a.isAppDirNext13;
     var normalizedPagesPath = pagesPath.replace(/\\/g, '/');
     var normalizedResourcePath = this.resourcePath.replace(/\\/g, '/');
     if (normalizedResourcePath.includes('node_modules/next/dist/pages/_app')) {
@@ -15,7 +16,7 @@ function loader(rawCode) {
             return rawCode;
         return (0, utils_1.getDefaultAppJs)(hasLoadLocaleFrom);
     }
-    if (!normalizedResourcePath.startsWith(normalizedPagesPath))
+    if (!isAppDirNext13 && !normalizedResourcePath.startsWith(normalizedPagesPath))
         return rawCode;
     var page = normalizedResourcePath.replace(normalizedPagesPath, '/');
     var pageNoExt = page.replace(extensionsRgx, '');
@@ -23,6 +24,9 @@ function loader(rawCode) {
     var defaultExport = (0, utils_1.getDefaultExport)(pagePkg);
     if (!defaultExport)
         return rawCode;
+    if (isAppDirNext13) {
+        return (0, templateAppDir_1.default)(pagePkg, { hasLoadLocaleFrom: hasLoadLocaleFrom, pageNoExt: pageNoExt, normalizedResourcePath: normalizedResourcePath, normalizedPagesPath: normalizedPagesPath });
+    }
     if ((0, utils_1.hasExportName)(pagePkg, '__N_SSP') || (0, utils_1.hasExportName)(pagePkg, '__N_SSG')) {
         return rawCode;
     }

package/lib/cjs/templateAppDir.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var utils_1 = require("./utils");
+var clientLine = ['"use client"', "'use client'"];
+var defaultDynamicExport = "export const dynamic = 'force-dynamic';";
+function templateAppDir(pagePkg, _a) {
+    var _b = _a === void 0 ? {} : _a, _c = _b.hasLoadLocaleFrom, hasLoadLocaleFrom = _c === void 0 ? false : _c, _d = _b.pageNoExt, pageNoExt = _d === void 0 ? '/' : _d, _e = _b.normalizedResourcePath, normalizedResourcePath = _e === void 0 ? '' : _e, _f = _b.normalizedPagesPath, normalizedPagesPath = _f === void 0 ? '' : _f;
+    var code = pagePkg.getCode();
+    var codeWithoutComments = (0, utils_1.removeCommentsFromCode)(code).trim();
+    var isClientCode = clientLine.some(function (line) { return codeWithoutComments.startsWith(line); });
+    var isPage = pageNoExt.endsWith('/page') && normalizedResourcePath.startsWith(normalizedPagesPath);
+    if (!isPage && !isClientCode)
+        return code;
+    var hash = Date.now().toString(16);
+    var pathname = pageNoExt.replace('/page', '/');
+    var pageVariableName = (0, utils_1.interceptExport)(pagePkg, 'default', "__Next_Translate__Page__".concat(hash, "__"));
+    var dynamicVariable = (0, utils_1.getNamedExport)(pagePkg, 'dynamic', false);
+    var dynamicExport = dynamicVariable ? '' : defaultDynamicExport;
+    if (!pageVariableName)
+        return code;
+    code = pagePkg.getCode();
+    if (isClientCode && !isPage)
+        return templateAppDirClientComponent({ code: code, hash: hash, pageVariableName: pageVariableName });
+    if (isClientCode && isPage)
+        return templateAppDirClientPage({ code: code, hash: hash, pageVariableName: pageVariableName, pathname: pathname, hasLoadLocaleFrom: hasLoadLocaleFrom });
+    return "\n    import __i18nConfig from '@next-translate-root/i18n'\n    import __loadNamespaces from 'next-translate/loadNamespaces'\n    ".concat(code, "\n\n    globalThis.i18nConfig = __i18nConfig\n\n    ").concat(dynamicExport, "\n\n    export default async function __Next_Translate_new__").concat(hash, "__(props) {\n      let config = { \n        ...__i18nConfig,\n        locale: props.searchParams?.lang,\n        loaderName: `${dynamic} (server page)`,\n        pathname: '").concat(pathname, "',\n        ").concat((0, utils_1.overwriteLoadLocales)(hasLoadLocaleFrom), "\n      }\n  \n      if (!globalThis.__NEXT_TRANSLATE__) {\n        globalThis.__NEXT_TRANSLATE__ = {}\n      }\n  \n      const { __lang, __namespaces } = await __loadNamespaces(config)\n      globalThis.__NEXT_TRANSLATE__ = { lang: __lang, namespaces: __namespaces, pathname: '").concat(pathname, "' }\n\n      return (\n        <>\n          <div \n            id=\"__NEXT_TRANSLATE_DATA__\" \n            data-lang={__lang} \n            data-ns={JSON.stringify(__namespaces)}\n            data-pathname=\"").concat(pathname, "\"\n          />\n          <").concat(pageVariableName, " {...props} />\n        </>\n      )\n    }\n");
+}
+exports.default = templateAppDir;
+function templateAppDirClientComponent(_a) {
+    var code = _a.code, hash = _a.hash, pageVariableName = _a.pageVariableName;
+    var clientCode = code;
+    var topLine = clientLine[0];
+    clientLine.forEach(function (line) { clientCode = clientCode.replace(line, ''); });
+    return "".concat(topLine, "\n    import __i18nConfig from '@next-translate-root/i18n'\n    import * as __react from 'react'\n\n    ").concat(clientCode, "\n\n    export default function __Next_Translate_new__").concat(hash, "__(props) {\n      const forceUpdate = __react.useReducer(() => [])[1]\n      const isClient = typeof window !== 'undefined'\n\n      if (isClient && !window.__NEXT_TRANSLATE__) {\n        window.__NEXT_TRANSLATE__ = { lang: __i18nConfig.defaultLocale, namespaces: {} }\n        update(false)\n      }\n\n      if (isClient && !window.i18nConfig) {\n        window.i18nConfig = __i18nConfig\n      }\n\n      __react.useEffect(update)\n\n      function update(rerender = true) {\n        const el = document.getElementById('__NEXT_TRANSLATE_DATA__')\n\n        if (!el) return\n\n        const { lang, ns, pathname } = el.dataset\n        const shouldRerender = lang !== window.__NEXT_TRANSLATE__.lang || pathname !== window.__NEXT_TRANSLATE__.pathname\n        window.__NEXT_TRANSLATE__ = { lang, namespaces: JSON.parse(ns), pathname }\n        if (shouldRerender && rerender) forceUpdate()\n      }\n\n      return <").concat(pageVariableName, " {...props} />\n    }\n  ");
+}
+function templateAppDirClientPage(_a) {
+    var code = _a.code, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, hasLoadLocaleFrom = _a.hasLoadLocaleFrom;
+    var clientCode = code;
+    var topLine = clientLine[0];
+    clientLine.forEach(function (line) { clientCode = clientCode.replace(line, ''); });
+    return "".concat(topLine, "\n    import __i18nConfig from '@next-translate-root/i18n'\n    import __loadNamespaces, { log as __log } from 'next-translate/loadNamespaces'\n    import { useSearchParams as __useSearchParams } from 'next/navigation'\n    import * as __react from 'react'\n\n    ").concat(clientCode, "\n\n    export default function __Next_Translate_new__").concat(hash, "__(props) {\n      const forceUpdate = __react.useReducer(() => [])[1]\n      const lang = __useSearchParams().get('lang')\n      const pathname = '").concat(pathname, "'\n      const isServer = typeof window === 'undefined'\n      const config = { \n        ...__i18nConfig,\n        locale: lang,\n        loaderName: 'useEffect (client page)',\n        pathname,\n        ").concat((0, utils_1.overwriteLoadLocales)(hasLoadLocaleFrom), "\n      }\n\n      __react.useEffect(() => {\n        const shouldLoad = lang !== window.__NEXT_TRANSLATE__?.lang || pathname !== window.__NEXT_TRANSLATE__?.pathname\n\n        if (!shouldLoad) return\n\n        __loadNamespaces(config).then(({ __lang, __namespaces }) => {\n          window.__NEXT_TRANSLATE__ = { lang: __lang, namespaces: __namespaces, pathname: '").concat(pathname, "' }\n          window.i18nConfig = __i18nConfig\n          forceUpdate()\n        })\n      }, [lang])\n\n      if (isServer) __log(config, { page: pathname, lang, namespaces: ['calculated in client-side'] })\n      if (isServer || !window.__NEXT_TRANSLATE__) return null\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.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.overwriteLoadLocales = exports.getDefaultAppJs = exports.defaultLoader = void 0;
+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.overwriteLoadLocales = exports.getDefaultAppJs = exports.defaultLoader = void 0;
 var typescript_1 = __importDefault(require("typescript"));
 var specFileOrFolderRgx = /(__mocks__|__tests__)|(\.(spec|test)\.(tsx|ts|js|jsx)$)/;
 exports.defaultLoader = '(l, n) => import(`@next-translate-root/locales/${l}/${n}`).then(m => m.default)';
@@ -350,3 +350,7 @@ function interceptExport(filePkg, exportName, defaultLocalName) {
     return finalLocalName;
 }
 exports.interceptExport = interceptExport;
+function removeCommentsFromCode(code) {
+    return code.replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, '');
+}
+exports.removeCommentsFromCode = removeCommentsFromCode;

package/lib/esm/index.js

@@ -20,22 +20,32 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import fs from 'fs';
 import path from 'path';
 import { parseFile, getDefaultExport, hasStaticName, hasHOC } from './utils';
+var test = /\.(tsx|ts|js|mjs|jsx)$/;
+var appDirNext13 = ['app', 'src/app'];
+var possiblePageDirs = __spreadArray([
+    'pages',
+    'src/pages',
+    'app/pages',
+    'integrations/pages'
+], appDirNext13, true);
 function nextTranslate(nextConfig) {
     if (nextConfig === void 0) { nextConfig = {}; }
-    var test = /\.(tsx|ts|js|mjs|jsx)$/;
     var basePath = pkgDir();
-    var possiblePageDirs = [
-        'pages',
-        'src/pages',
-        'app/pages',
-        'integrations/pages',
-    ];
-    var translationDir = path.resolve(path.relative(basePath, process.env.NEXT_TRANSLATE_PATH || '.'));
+    var dir = path.resolve(path.relative(basePath, process.env.NEXT_TRANSLATE_PATH || '.'));
     var nextConfigI18n = nextConfig.i18n || {};
-    var _a = require(path.join(translationDir, '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(dir, '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 nextConfigWithI18n = __assign(__assign({}, nextConfig), { i18n: {
             locales: locales,
             defaultLocale: defaultLocale,
@@ -43,22 +53,24 @@ function nextTranslate(nextConfig) {
             localeDetection: localeDetection,
         } });
     var hasGetInitialPropsOnAppJs = false;
+    var isAppDirNext13 = false;
     if (!pagesInDir) {
         for (var _i = 0, possiblePageDirs_1 = possiblePageDirs; _i < possiblePageDirs_1.length; _i++) {
             var possiblePageDir = possiblePageDirs_1[_i];
-            if (fs.existsSync(path.join(basePath, possiblePageDir))) {
+            if (fs.existsSync(path.join(dir, possiblePageDir))) {
                 pagesInDir = possiblePageDir;
+                isAppDirNext13 = appDirNext13.includes(possiblePageDir);
                 break;
             }
         }
     }
-    if (!pagesInDir || !fs.existsSync(path.join(basePath, pagesInDir))) {
+    if (!pagesInDir || !fs.existsSync(path.join(dir, pagesInDir))) {
         return nextConfigWithI18n;
     }
-    var pagesPath = path.join(basePath, pagesInDir);
+    var pagesPath = path.join(dir, pagesInDir);
     var app = fs.readdirSync(pagesPath).find(function (page) { return page.startsWith('_app.'); });
     if (app) {
-        var appPkg = parseFile(basePath, path.join(pagesPath, app));
+        var appPkg = parseFile(dir, path.join(pagesPath, app));
         var defaultExport = getDefaultExport(appPkg);
         if (defaultExport) {
             var isGetInitialProps = hasStaticName(appPkg, defaultExport, 'getInitialProps');
@@ -75,7 +87,7 @@ function nextTranslate(nextConfig) {
                 config.module = {};
             if (!config.module.rules)
                 config.module.rules = [];
-            config.resolve.alias = __assign(__assign({}, (config.resolve.alias || {})), { '@next-translate-root': path.resolve(translationDir) });
+            config.resolve.alias = __assign(__assign({}, (config.resolve.alias || {})), { '@next-translate-root': path.resolve(dir) });
             if (!loader)
                 return config;
             config.module.rules.push({
@@ -90,6 +102,7 @@ function nextTranslate(nextConfig) {
                         hasLoadLocaleFrom: typeof restI18n.loadLocaleFrom === 'function',
                         extensionsRgx: restI18n.extensionsRgx || test,
                         revalidate: restI18n.revalidate || 0,
+                        isAppDirNext13: isAppDirNext13,
                     },
                 },
             });

package/lib/esm/loader.js

@@ -1,8 +1,9 @@
 import templateWithHoc from './templateWithHoc';
 import templateWithLoader from './templateWithLoader';
 import { parseFile, getDefaultAppJs, getDefaultExport, hasExportName, hasStaticName, isPageToIgnore, hasHOC, } from './utils';
+import templateAppDir from './templateAppDir';
 export default function loader(rawCode) {
-    var _a = this.getOptions(), basePath = _a.basePath, pagesPath = _a.pagesPath, hasAppJs = _a.hasAppJs, hasGetInitialPropsOnAppJs = _a.hasGetInitialPropsOnAppJs, hasLoadLocaleFrom = _a.hasLoadLocaleFrom, extensionsRgx = _a.extensionsRgx, revalidate = _a.revalidate;
+    var _a = this.getOptions(), basePath = _a.basePath, pagesPath = _a.pagesPath, hasAppJs = _a.hasAppJs, hasGetInitialPropsOnAppJs = _a.hasGetInitialPropsOnAppJs, hasLoadLocaleFrom = _a.hasLoadLocaleFrom, extensionsRgx = _a.extensionsRgx, revalidate = _a.revalidate, isAppDirNext13 = _a.isAppDirNext13;
     var normalizedPagesPath = pagesPath.replace(/\\/g, '/');
     var normalizedResourcePath = this.resourcePath.replace(/\\/g, '/');
     if (normalizedResourcePath.includes('node_modules/next/dist/pages/_app')) {
@@ -10,7 +11,7 @@ export default function loader(rawCode) {
             return rawCode;
         return getDefaultAppJs(hasLoadLocaleFrom);
     }
-    if (!normalizedResourcePath.startsWith(normalizedPagesPath))
+    if (!isAppDirNext13 && !normalizedResourcePath.startsWith(normalizedPagesPath))
         return rawCode;
     var page = normalizedResourcePath.replace(normalizedPagesPath, '/');
     var pageNoExt = page.replace(extensionsRgx, '');
@@ -18,6 +19,9 @@ export default function loader(rawCode) {
     var defaultExport = getDefaultExport(pagePkg);
     if (!defaultExport)
         return rawCode;
+    if (isAppDirNext13) {
+        return templateAppDir(pagePkg, { hasLoadLocaleFrom: hasLoadLocaleFrom, pageNoExt: pageNoExt, normalizedResourcePath: normalizedResourcePath, normalizedPagesPath: normalizedPagesPath });
+    }
     if (hasExportName(pagePkg, '__N_SSP') || hasExportName(pagePkg, '__N_SSG')) {
         return rawCode;
     }

package/lib/esm/templateAppDir.js

@@ -0,0 +1,39 @@
+import { interceptExport, overwriteLoadLocales, getNamedExport, removeCommentsFromCode } from "./utils";
+var clientLine = ['"use client"', "'use client'"];
+var defaultDynamicExport = "export const dynamic = 'force-dynamic';";
+export default function templateAppDir(pagePkg, _a) {
+    var _b = _a === void 0 ? {} : _a, _c = _b.hasLoadLocaleFrom, hasLoadLocaleFrom = _c === void 0 ? false : _c, _d = _b.pageNoExt, pageNoExt = _d === void 0 ? '/' : _d, _e = _b.normalizedResourcePath, normalizedResourcePath = _e === void 0 ? '' : _e, _f = _b.normalizedPagesPath, normalizedPagesPath = _f === void 0 ? '' : _f;
+    var code = pagePkg.getCode();
+    var codeWithoutComments = removeCommentsFromCode(code).trim();
+    var isClientCode = clientLine.some(function (line) { return codeWithoutComments.startsWith(line); });
+    var isPage = pageNoExt.endsWith('/page') && normalizedResourcePath.startsWith(normalizedPagesPath);
+    if (!isPage && !isClientCode)
+        return code;
+    var hash = Date.now().toString(16);
+    var pathname = pageNoExt.replace('/page', '/');
+    var pageVariableName = interceptExport(pagePkg, 'default', "__Next_Translate__Page__".concat(hash, "__"));
+    var dynamicVariable = getNamedExport(pagePkg, 'dynamic', false);
+    var dynamicExport = dynamicVariable ? '' : defaultDynamicExport;
+    if (!pageVariableName)
+        return code;
+    code = pagePkg.getCode();
+    if (isClientCode && !isPage)
+        return templateAppDirClientComponent({ code: code, hash: hash, pageVariableName: pageVariableName });
+    if (isClientCode && isPage)
+        return templateAppDirClientPage({ code: code, hash: hash, pageVariableName: pageVariableName, pathname: pathname, hasLoadLocaleFrom: hasLoadLocaleFrom });
+    return "\n    import __i18nConfig from '@next-translate-root/i18n'\n    import __loadNamespaces from 'next-translate/loadNamespaces'\n    ".concat(code, "\n\n    globalThis.i18nConfig = __i18nConfig\n\n    ").concat(dynamicExport, "\n\n    export default async function __Next_Translate_new__").concat(hash, "__(props) {\n      let config = { \n        ...__i18nConfig,\n        locale: props.searchParams?.lang,\n        loaderName: `${dynamic} (server page)`,\n        pathname: '").concat(pathname, "',\n        ").concat(overwriteLoadLocales(hasLoadLocaleFrom), "\n      }\n  \n      if (!globalThis.__NEXT_TRANSLATE__) {\n        globalThis.__NEXT_TRANSLATE__ = {}\n      }\n  \n      const { __lang, __namespaces } = await __loadNamespaces(config)\n      globalThis.__NEXT_TRANSLATE__ = { lang: __lang, namespaces: __namespaces, pathname: '").concat(pathname, "' }\n\n      return (\n        <>\n          <div \n            id=\"__NEXT_TRANSLATE_DATA__\" \n            data-lang={__lang} \n            data-ns={JSON.stringify(__namespaces)}\n            data-pathname=\"").concat(pathname, "\"\n          />\n          <").concat(pageVariableName, " {...props} />\n        </>\n      )\n    }\n");
+}
+function templateAppDirClientComponent(_a) {
+    var code = _a.code, hash = _a.hash, pageVariableName = _a.pageVariableName;
+    var clientCode = code;
+    var topLine = clientLine[0];
+    clientLine.forEach(function (line) { clientCode = clientCode.replace(line, ''); });
+    return "".concat(topLine, "\n    import __i18nConfig from '@next-translate-root/i18n'\n    import * as __react from 'react'\n\n    ").concat(clientCode, "\n\n    export default function __Next_Translate_new__").concat(hash, "__(props) {\n      const forceUpdate = __react.useReducer(() => [])[1]\n      const isClient = typeof window !== 'undefined'\n\n      if (isClient && !window.__NEXT_TRANSLATE__) {\n        window.__NEXT_TRANSLATE__ = { lang: __i18nConfig.defaultLocale, namespaces: {} }\n        update(false)\n      }\n\n      if (isClient && !window.i18nConfig) {\n        window.i18nConfig = __i18nConfig\n      }\n\n      __react.useEffect(update)\n\n      function update(rerender = true) {\n        const el = document.getElementById('__NEXT_TRANSLATE_DATA__')\n\n        if (!el) return\n\n        const { lang, ns, pathname } = el.dataset\n        const shouldRerender = lang !== window.__NEXT_TRANSLATE__.lang || pathname !== window.__NEXT_TRANSLATE__.pathname\n        window.__NEXT_TRANSLATE__ = { lang, namespaces: JSON.parse(ns), pathname }\n        if (shouldRerender && rerender) forceUpdate()\n      }\n\n      return <").concat(pageVariableName, " {...props} />\n    }\n  ");
+}
+function templateAppDirClientPage(_a) {
+    var code = _a.code, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, hasLoadLocaleFrom = _a.hasLoadLocaleFrom;
+    var clientCode = code;
+    var topLine = clientLine[0];
+    clientLine.forEach(function (line) { clientCode = clientCode.replace(line, ''); });
+    return "".concat(topLine, "\n    import __i18nConfig from '@next-translate-root/i18n'\n    import __loadNamespaces, { log as __log } from 'next-translate/loadNamespaces'\n    import { useSearchParams as __useSearchParams } from 'next/navigation'\n    import * as __react from 'react'\n\n    ").concat(clientCode, "\n\n    export default function __Next_Translate_new__").concat(hash, "__(props) {\n      const forceUpdate = __react.useReducer(() => [])[1]\n      const lang = __useSearchParams().get('lang')\n      const pathname = '").concat(pathname, "'\n      const isServer = typeof window === 'undefined'\n      const config = { \n        ...__i18nConfig,\n        locale: lang,\n        loaderName: 'useEffect (client page)',\n        pathname,\n        ").concat(overwriteLoadLocales(hasLoadLocaleFrom), "\n      }\n\n      __react.useEffect(() => {\n        const shouldLoad = lang !== window.__NEXT_TRANSLATE__?.lang || pathname !== window.__NEXT_TRANSLATE__?.pathname\n\n        if (!shouldLoad) return\n\n        __loadNamespaces(config).then(({ __lang, __namespaces }) => {\n          window.__NEXT_TRANSLATE__ = { lang: __lang, namespaces: __namespaces, pathname: '").concat(pathname, "' }\n          window.i18nConfig = __i18nConfig\n          forceUpdate()\n        })\n      }, [lang])\n\n      if (isServer) __log(config, { page: pathname, lang, namespaces: ['calculated in client-side'] })\n      if (isServer || !window.__NEXT_TRANSLATE__) return null\n\n      return <").concat(pageVariableName, " {...props} />\n    }\n  ");
+}

package/lib/esm/utils.js

@@ -325,3 +325,6 @@ export function interceptExport(filePkg, exportName, defaultLocalName) {
     }
     return finalLocalName;
 }
+export function removeCommentsFromCode(code) {
+    return code.replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, '');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-translate-plugin",
-  "version": "2.0.0-canary.6",
+  "version": "2.0.1",
   "description": "Tiny and powerful i18n plugin to translate your Next.js pages.",
   "license": "MIT",
   "keywords": [
@@ -48,7 +48,8 @@
     "test": "cross-env NODE_ENV=test jest --env=jsdom",
     "test:coverage": "cross-env NODE_ENV=test jest --env=jsdom --coverage",
     "test:watch": "cross-env NODE_ENV=test jest --env=jsdom --watch",
-    "tsc": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node build-packages.js"
+    "tsc": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && node build-packages.js",
+    "postinstall": "node postinstall-message.js"
   },
   "dependencies": {
     "typescript": "4.5.2"

package/templateAppDir/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "templateappdir",
+  "private": true,
+  "main": "../lib/cjs/templateAppDir.js",
+  "module": "../lib/esm/templateAppDir.js",
+  "types": "../templateAppDir.d.ts"
+}

package/templateAppDir.d.ts

@@ -0,0 +1,7 @@
+import { ParsedFilePkg } from "./types";
+export default function templateAppDir(pagePkg: ParsedFilePkg, { hasLoadLocaleFrom, pageNoExt, normalizedResourcePath, normalizedPagesPath }?: {
+    hasLoadLocaleFrom?: boolean | undefined;
+    pageNoExt?: string | undefined;
+    normalizedResourcePath?: string | undefined;
+    normalizedPagesPath?: string | undefined;
+}): string;

package/types.d.ts

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

package/utils.d.ts

@@ -20,3 +20,4 @@ export declare function isPageToIgnore(pageFilePath: string): boolean;
 export declare function hasHOC(filePkg: ParsedFilePkg): boolean;
 export declare function isNotExportModifier(modifier: ts.Modifier): boolean;
 export declare function interceptExport(filePkg: ParsedFilePkg, exportName: string, defaultLocalName: string): string;
+export declare function removeCommentsFromCode(code: string): string;