next-translate-plugin 2.4.1 → 2.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/index.js +2 -2
- package/lib/cjs/loader.js +2 -3
- package/lib/cjs/templateAppDir.js +2 -2
- package/lib/esm/index.js +2 -2
- package/lib/esm/loader.js +2 -3
- package/lib/esm/templateAppDir.js +2 -2
- package/package.json +1 -1
package/lib/cjs/index.js
CHANGED
|
@@ -73,8 +73,8 @@ function nextTranslate(nextConfig) {
|
|
|
73
73
|
loader: 'next-translate-plugin/loader',
|
|
74
74
|
options: {
|
|
75
75
|
basePath: basePath,
|
|
76
|
-
pagesFolder: path_1.default.join(pagesFolder, '/'),
|
|
77
|
-
appFolder: path_1.default.join(appFolder, '/'),
|
|
76
|
+
pagesFolder: path_1.default.join(pagesFolder, '/').replace(/\\/g, '/'),
|
|
77
|
+
appFolder: path_1.default.join(appFolder, '/').replace(/\\/g, '/'),
|
|
78
78
|
hasAppJs: hasAppJs,
|
|
79
79
|
hasGetInitialPropsOnAppJs: hasGetInitialPropsOnAppJs,
|
|
80
80
|
extensionsRgx: extensionsRgx,
|
package/lib/cjs/loader.js
CHANGED
|
@@ -21,7 +21,6 @@ function loader(rawCode) {
|
|
|
21
21
|
var shouldUseTemplateAppDir = isClientComponent ||
|
|
22
22
|
normalizedResourcePath.includes(appFolder.replace(/\\/g, '/'));
|
|
23
23
|
var pagesPath = (shouldUseTemplateAppDir ? appFolder : pagesFolder);
|
|
24
|
-
var normalizedPagesPath = pagesPath.replace(/\\/g, '/');
|
|
25
24
|
if (normalizedResourcePath.includes('node_modules/next/dist/pages/_app') &&
|
|
26
25
|
!hasAppJs) {
|
|
27
26
|
return (0, utils_1.getDefaultAppJs)(existLocalesFolder);
|
|
@@ -29,9 +28,9 @@ function loader(rawCode) {
|
|
|
29
28
|
if (normalizedResourcePath.includes('node_modules/'))
|
|
30
29
|
return rawCode;
|
|
31
30
|
if (!shouldUseTemplateAppDir &&
|
|
32
|
-
!normalizedResourcePath.includes(
|
|
31
|
+
!normalizedResourcePath.includes(pagesPath))
|
|
33
32
|
return rawCode;
|
|
34
|
-
var page = normalizedResourcePath.replace(
|
|
33
|
+
var page = normalizedResourcePath.replace(pagesPath, '/');
|
|
35
34
|
var pageNoExt = page.replace(extensionsRgx, '');
|
|
36
35
|
var pagePkg = (0, utils_1.parseFile)(basePath, normalizedResourcePath);
|
|
37
36
|
if ((0, utils_1.hasExportName)(pagePkg, '__N_SSP') ||
|
|
@@ -44,7 +44,7 @@ exports.default = templateAppDir;
|
|
|
44
44
|
function templateRSCPage(_a) {
|
|
45
45
|
var pagePkg = _a.pagePkg, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, routeType = _a.routeType, existLocalesFolder = _a.existLocalesFolder;
|
|
46
46
|
var code = pagePkg.getCode();
|
|
47
|
-
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");
|
|
47
|
+
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 ...JSON.parse(JSON.stringify(").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");
|
|
48
48
|
}
|
|
49
49
|
function templateRCCPage(_a) {
|
|
50
50
|
var pagePkg = _a.pagePkg, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, routeType = _a.routeType, existLocalesFolder = _a.existLocalesFolder;
|
|
@@ -53,5 +53,5 @@ function templateRCCPage(_a) {
|
|
|
53
53
|
utils_1.clientLine.forEach(function (line) {
|
|
54
54
|
clientCode = clientCode.replace(line, '');
|
|
55
55
|
});
|
|
56
|
-
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");
|
|
56
|
+
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 ...JSON.parse(JSON.stringify(").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");
|
|
57
57
|
}
|
package/lib/esm/index.js
CHANGED
|
@@ -68,8 +68,8 @@ function nextTranslate(nextConfig) {
|
|
|
68
68
|
loader: 'next-translate-plugin/loader',
|
|
69
69
|
options: {
|
|
70
70
|
basePath: basePath,
|
|
71
|
-
pagesFolder: path.join(pagesFolder, '/'),
|
|
72
|
-
appFolder: path.join(appFolder, '/'),
|
|
71
|
+
pagesFolder: path.join(pagesFolder, '/').replace(/\\/g, '/'),
|
|
72
|
+
appFolder: path.join(appFolder, '/').replace(/\\/g, '/'),
|
|
73
73
|
hasAppJs: hasAppJs,
|
|
74
74
|
hasGetInitialPropsOnAppJs: hasGetInitialPropsOnAppJs,
|
|
75
75
|
extensionsRgx: extensionsRgx,
|
package/lib/esm/loader.js
CHANGED
|
@@ -16,7 +16,6 @@ export default function loader(rawCode) {
|
|
|
16
16
|
var shouldUseTemplateAppDir = isClientComponent ||
|
|
17
17
|
normalizedResourcePath.includes(appFolder.replace(/\\/g, '/'));
|
|
18
18
|
var pagesPath = (shouldUseTemplateAppDir ? appFolder : pagesFolder);
|
|
19
|
-
var normalizedPagesPath = pagesPath.replace(/\\/g, '/');
|
|
20
19
|
if (normalizedResourcePath.includes('node_modules/next/dist/pages/_app') &&
|
|
21
20
|
!hasAppJs) {
|
|
22
21
|
return getDefaultAppJs(existLocalesFolder);
|
|
@@ -24,9 +23,9 @@ export default function loader(rawCode) {
|
|
|
24
23
|
if (normalizedResourcePath.includes('node_modules/'))
|
|
25
24
|
return rawCode;
|
|
26
25
|
if (!shouldUseTemplateAppDir &&
|
|
27
|
-
!normalizedResourcePath.includes(
|
|
26
|
+
!normalizedResourcePath.includes(pagesPath))
|
|
28
27
|
return rawCode;
|
|
29
|
-
var page = normalizedResourcePath.replace(
|
|
28
|
+
var page = normalizedResourcePath.replace(pagesPath, '/');
|
|
30
29
|
var pageNoExt = page.replace(extensionsRgx, '');
|
|
31
30
|
var pagePkg = parseFile(basePath, normalizedResourcePath);
|
|
32
31
|
if (hasExportName(pagePkg, '__N_SSP') ||
|
|
@@ -41,7 +41,7 @@ export default function templateAppDir(pagePkg, _a) {
|
|
|
41
41
|
function templateRSCPage(_a) {
|
|
42
42
|
var pagePkg = _a.pagePkg, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, routeType = _a.routeType, existLocalesFolder = _a.existLocalesFolder;
|
|
43
43
|
var code = pagePkg.getCode();
|
|
44
|
-
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");
|
|
44
|
+
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 ...JSON.parse(JSON.stringify(").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");
|
|
45
45
|
}
|
|
46
46
|
function templateRCCPage(_a) {
|
|
47
47
|
var pagePkg = _a.pagePkg, hash = _a.hash, pageVariableName = _a.pageVariableName, pathname = _a.pathname, routeType = _a.routeType, existLocalesFolder = _a.existLocalesFolder;
|
|
@@ -50,5 +50,5 @@ function templateRCCPage(_a) {
|
|
|
50
50
|
clientLine.forEach(function (line) {
|
|
51
51
|
clientCode = clientCode.replace(line, '');
|
|
52
52
|
});
|
|
53
|
-
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");
|
|
53
|
+
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 ...JSON.parse(JSON.stringify(").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");
|
|
54
54
|
}
|