next-translate 2.3.1 → 2.4.0-canary.2

package/_store/package.json

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

package/_store.d.ts

@@ -0,0 +1,6 @@
+import { DataForStoreType } from '.';
+declare const _default: {
+    set(storeData: DataForStoreType): void;
+    get(): DataForStoreType;
+};
+export default _default;

package/index.d.ts

@@ -3,6 +3,11 @@ import type { NextConfig } from 'next';
 export interface TranslationQuery {
     [name: string]: any;
 }
+export type DataForStoreType = {
+    lang: string;
+    namespaces: Record<string, I18nDictionary>;
+    config: LoaderConfig;
+};
 export type Translate = <T extends unknown = string>(i18nKey: string | TemplateStringsArray, query?: TranslationQuery | null, options?: {
     returnObjects?: boolean;
     fallback?: string | string[];

package/lib/cjs/_store.js

@@ -0,0 +1,22 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var data;
+exports.default = {
+    set: function (storeData) {
+        data = __assign(__assign({}, storeData), { namespaces: __assign(__assign({}, ((data === null || data === void 0 ? void 0 : data.namespaces) || {})), (storeData.namespaces || {})) });
+    },
+    get: function () {
+        return data;
+    },
+};

package/lib/cjs/useTranslation.js

@@ -15,6 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
+var _store_1 = __importDefault(require("./_store"));
 var wrapTWithDefaultNs_1 = __importDefault(require("./wrapTWithDefaultNs"));
 var context_1 = __importDefault(require("./context"));
 var transCore_1 = __importDefault(require("./transCore"));
@@ -23,11 +24,11 @@ function useTranslationInPages(defaultNS) {
     return (0, react_1.useMemo)(function () { return (__assign(__assign({}, ctx), { t: (0, wrapTWithDefaultNs_1.default)(ctx.t, defaultNS) })); }, [ctx, defaultNS]);
 }
 function useTranslationAppDir(defaultNS) {
-    var _a = globalThis.__NEXT_TRANSLATE__ || {}, lang = _a.lang, namespaces = _a.namespaces;
-    var localesToIgnore = globalThis.i18nConfig.localesToIgnore || ['default'];
+    var _a = _store_1.default.get(), lang = _a.lang, namespaces = _a.namespaces, config = _a.config;
+    var localesToIgnore = config.localesToIgnore || ['default'];
     var ignoreLang = localesToIgnore.includes(lang);
     var t = (0, transCore_1.default)({
-        config: globalThis.i18nConfig,
+        config: config,
         allNamespaces: namespaces,
         pluralRules: new Intl.PluralRules(ignoreLang ? undefined : lang),
         lang: lang,
@@ -35,8 +36,8 @@ function useTranslationAppDir(defaultNS) {
     return { t: (0, wrapTWithDefaultNs_1.default)(t, defaultNS), lang: lang };
 }
 function useTranslation(defaultNS) {
-    var isAppDir = !!globalThis.__NEXT_TRANSLATE__;
-    var useT = isAppDir ? useTranslationAppDir : useTranslationInPages;
+    var appDir = _store_1.default.get();
+    var useT = (appDir === null || appDir === void 0 ? void 0 : appDir.config) ? useTranslationAppDir : useTranslationInPages;
     return useT(defaultNS);
 }
 exports.default = useTranslation;

package/lib/esm/_store.js

@@ -0,0 +1,20 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var data;
+export default {
+    set: function (storeData) {
+        data = __assign(__assign({}, storeData), { namespaces: __assign(__assign({}, ((data === null || data === void 0 ? void 0 : data.namespaces) || {})), (storeData.namespaces || {})) });
+    },
+    get: function () {
+        return data;
+    },
+};

package/lib/esm/useTranslation.js

@@ -10,6 +10,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { useContext, useMemo } from 'react';
+import store from './_store';
 import wrapTWithDefaultNs from './wrapTWithDefaultNs';
 import I18nContext from './context';
 import transCore from './transCore';
@@ -18,11 +19,11 @@ function useTranslationInPages(defaultNS) {
     return useMemo(function () { return (__assign(__assign({}, ctx), { t: wrapTWithDefaultNs(ctx.t, defaultNS) })); }, [ctx, defaultNS]);
 }
 function useTranslationAppDir(defaultNS) {
-    var _a = globalThis.__NEXT_TRANSLATE__ || {}, lang = _a.lang, namespaces = _a.namespaces;
-    var localesToIgnore = globalThis.i18nConfig.localesToIgnore || ['default'];
+    var _a = store.get(), lang = _a.lang, namespaces = _a.namespaces, config = _a.config;
+    var localesToIgnore = config.localesToIgnore || ['default'];
     var ignoreLang = localesToIgnore.includes(lang);
     var t = transCore({
-        config: globalThis.i18nConfig,
+        config: config,
         allNamespaces: namespaces,
         pluralRules: new Intl.PluralRules(ignoreLang ? undefined : lang),
         lang: lang,
@@ -30,7 +31,7 @@ function useTranslationAppDir(defaultNS) {
     return { t: wrapTWithDefaultNs(t, defaultNS), lang: lang };
 }
 export default function useTranslation(defaultNS) {
-    var isAppDir = !!globalThis.__NEXT_TRANSLATE__;
-    var useT = isAppDir ? useTranslationAppDir : useTranslationInPages;
+    var appDir = store.get();
+    var useT = (appDir === null || appDir === void 0 ? void 0 : appDir.config) ? useTranslationAppDir : useTranslationInPages;
     return useT(defaultNS);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-translate",
-  "version": "2.3.1",
+  "version": "2.4.0-canary.2",
   "description": "Tiny and powerful i18n tools (Next plugin + API) to translate your Next.js pages.",
   "license": "MIT",
   "keywords": [
@@ -42,12 +42,12 @@
     "useTranslation*",
     "setLanguage*",
     "index*",
-    "app-dir*"
+    "_store*"
   ],
   "scripts": {
     "build": "yarn clean && cross-env NODE_ENV=production && yarn tsc",
     "clean": "yarn clean:build && yarn clean:examples",
-    "clean:build": "rm -rf lib appWith* Dynamic* I18n* index context loadNa* setLang* Trans* useT* withT* getP* getC* *.d.ts getT transC* wrapT* types formatElements app-dir*",
+    "clean:build": "rm -rf lib appWith* Dynamic* I18n* index context loadNa* setLang* Trans* useT* withT* getP* getC* *.d.ts getT transC* wrapT* types formatElements _store*",
     "clean:examples": "rm -rf examples/**/.next && rm -rf examples/**/node_modules && rm -rf examples/**/yarn.lock",
     "example": "yarn example:complex",
     "example:basic": "yarn build && yarn --cwd examples/basic && yarn --cwd examples/basic dev",

package/lib/cjs/withTranslationClientComponent.js

@@ -1,71 +0,0 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = __importStar(require("react"));
-function withTranslationClientComponent(Component, i18nConfig) {
-    function WithTranslation(props) {
-        var forceUpdate = (0, react_1.useReducer)(function () { return []; })[1];
-        var isClient = typeof window !== 'undefined';
-        if (isClient && !window.__NEXT_TRANSLATE__) {
-            window.__NEXT_TRANSLATE__ = {
-                lang: i18nConfig.defaultLocale,
-                namespaces: {},
-            };
-            update(false);
-        }
-        if (isClient && !window.i18nConfig) {
-            window.i18nConfig = i18nConfig;
-        }
-        (0, react_1.useEffect)(update);
-        function update(rerender) {
-            if (rerender === void 0) { rerender = true; }
-            var el = document.getElementById('__NEXT_TRANSLATE_DATA__');
-            if (!el)
-                return;
-            var _a = el.dataset, lang = _a.lang, ns = _a.ns, pathname = _a.pathname;
-            var shouldRerender = lang !== window.__NEXT_TRANSLATE__.lang ||
-                pathname !== window.__NEXT_TRANSLATE__.pathname;
-            window.__NEXT_TRANSLATE__ = { lang: lang, namespaces: JSON.parse(ns), pathname: pathname };
-            if (shouldRerender && rerender)
-                forceUpdate();
-        }
-        return react_1.default.createElement(Component, __assign({}, props));
-    }
-    var displayName = Component.displayName || Component.name || 'Component';
-    WithTranslation.displayName = "withTranslationClientComponent(".concat(displayName, ")");
-    return WithTranslation;
-}
-exports.default = withTranslationClientComponent;

package/lib/esm/withTranslationClientComponent.js

@@ -1,45 +0,0 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-import React, { useEffect, useReducer } from 'react';
-export default function withTranslationClientComponent(Component, i18nConfig) {
-    function WithTranslation(props) {
-        var forceUpdate = useReducer(function () { return []; })[1];
-        var isClient = typeof window !== 'undefined';
-        if (isClient && !window.__NEXT_TRANSLATE__) {
-            window.__NEXT_TRANSLATE__ = {
-                lang: i18nConfig.defaultLocale,
-                namespaces: {},
-            };
-            update(false);
-        }
-        if (isClient && !window.i18nConfig) {
-            window.i18nConfig = i18nConfig;
-        }
-        useEffect(update);
-        function update(rerender) {
-            if (rerender === void 0) { rerender = true; }
-            var el = document.getElementById('__NEXT_TRANSLATE_DATA__');
-            if (!el)
-                return;
-            var _a = el.dataset, lang = _a.lang, ns = _a.ns, pathname = _a.pathname;
-            var shouldRerender = lang !== window.__NEXT_TRANSLATE__.lang ||
-                pathname !== window.__NEXT_TRANSLATE__.pathname;
-            window.__NEXT_TRANSLATE__ = { lang: lang, namespaces: JSON.parse(ns), pathname: pathname };
-            if (shouldRerender && rerender)
-                forceUpdate();
-        }
-        return React.createElement(Component, __assign({}, props));
-    }
-    var displayName = Component.displayName || Component.name || 'Component';
-    WithTranslation.displayName = "withTranslationClientComponent(".concat(displayName, ")");
-    return WithTranslation;
-}

package/withTranslationClientComponent/package.json

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

package/withTranslationClientComponent.d.ts

@@ -1,3 +0,0 @@
-import React from 'react';
-import type { LoaderConfig } from '.';
-export default function withTranslationClientComponent<P extends JSX.IntrinsicAttributes>(Component: React.ComponentType<P>, i18nConfig: LoaderConfig): React.ComponentType<P>;