react-i18next 11.16.6 → 11.16.9

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 11.16.9
+
+- types: fix missing generic type for HTMLAttributes [1499](https://github.com/i18next/react-i18next/pull/1499)
+
+### 11.16.8
+
+- types: fix Trans component to support react 18 types, by introducing allowObjectInHTMLChildren TS option [1492](https://github.com/i18next/react-i18next/pull/1492)
+
+### 11.16.7
+
+- types: Added objects explicitly to Trans children [1486](https://github.com/i18next/react-i18next/pull/1486)
+
 ### 11.16.6
 
 - fix: warn just once 'i18n.languages were undefined or empty' and return true, like before

package/README.md

@@ -75,7 +75,7 @@ Head over to the **interactive playground** at [codesandbox](https://codesandbox
 ### Why i18next?
 
 - **Simplicity:** no need to change your webpack configuration or add additional babel transpilers, just use create-react-app and go.
-- **Production ready** we know there are more needs for production than just doing i18n on the clientside, so we offer wider support on [serverside](https://www.i18next.com/supported-frameworks.html) too (nodejs, php, ruby, .net, ...). **Learn once - translate everywhere**.
+- **Production ready** we know there are more needs for production than just doing i18n on the clientside, so we offer wider support on [serverside](https://www.i18next.com/overview/supported-frameworks) too (nodejs, php, ruby, .net, ...). **Learn once - translate everywhere**.
 - **Beyond i18n** comes with [locize](https://locize.com) bridging the gap between developement and translations - covering the whole translation process.
 
 ![ecosystem](https://raw.githubusercontent.com/i18next/i18next/master/assets/i18next-ecosystem.jpg)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-i18next",
-  "version": "11.16.6",
+  "version": "11.16.9",
   "description": "Internationalization for react done right. Using the i18next i18n ecosystem.",
   "main": "dist/commonjs/index.js",
   "types": "./index.d.ts",
@@ -85,7 +85,7 @@
     "rollup-plugin-replace": "^2.1.0",
     "rollup-plugin-terser": "^5.1.1",
     "sinon": "^7.2.3",
-    "tslint": "^5.20.1",
+    "tslint": "^6.1.3",
     "typescript": "4.6.2",
     "yargs": "^13.3.0"
   },

package/ts4.1/index.d.ts

@@ -40,6 +40,7 @@ export interface Resources {}
  *     nsSeparator: ':';
  *     keySeparator: '.';
  *     jsonFormat: 'v4';
+ *     allowObjectInHTMLChildren: false;
  *     resources: {
  *       custom: {
  *         foo: 'foo';
@@ -62,6 +63,7 @@ type TypeOptions = MergeBy<
     defaultNS: 'translation';
     jsonFormat: 'v4';
     resources: Resources;
+    allowObjectInHTMLChildren: false;
   },
   CustomTypeOptions
 >;
@@ -97,6 +99,15 @@ declare module 'i18next' {
   }
 }
 
+type ObjectOrNever = TypeOptions['allowObjectInHTMLChildren'] extends true
+  ? Record<string, unknown>
+  : never;
+declare module 'react' {
+  interface HTMLAttributes<T> {
+    children?: ReactNode | ObjectOrNever;
+  }
+}
+
 type PluralSuffix = 'zero' | 'one' | 'two' | 'few' | 'many' | 'other';
 
 type WithOrWithoutPlural<K> = TypeOptions['jsonFormat'] extends 'v4'
@@ -228,7 +239,6 @@ export type TFuncReturn<
 export interface TFunction<N extends Namespace = DefaultNamespace, TKPrefix = undefined> {
   <
     TKeys extends TFuncKey<N, TKPrefix> | TemplateStringsArray extends infer A ? A : never,
-    // tslint:disable-next-line:no-null-undefined-union
     TDefaultResult extends TFunctionResult | React.ReactNode = string,
     TInterpolationMap extends object = StringMap
   >(
@@ -237,7 +247,6 @@ export interface TFunction<N extends Namespace = DefaultNamespace, TKPrefix = un
   ): TFuncReturn<N, TKeys, TDefaultResult, TKPrefix>;
   <
     TKeys extends TFuncKey<N, TKPrefix> | TemplateStringsArray extends infer A ? A : never,
-    // tslint:disable-next-line:no-null-undefined-union
     TDefaultResult extends TFunctionResult | React.ReactNode = string,
     TInterpolationMap extends object = StringMap
   >(
@@ -247,13 +256,14 @@ export interface TFunction<N extends Namespace = DefaultNamespace, TKPrefix = un
   ): TFuncReturn<N, TKeys, TDefaultResult, TKPrefix>;
 }
 
+type TransChild = React.ReactNode | Record<string, unknown>;
 export type TransProps<
   K extends TFuncKey<N, TKPrefix> extends infer A ? A : never,
   N extends Namespace = DefaultNamespace,
   TKPrefix = undefined,
   E = React.HTMLProps<HTMLDivElement>
 > = E & {
-  children?: React.ReactNode;
+  children?: TransChild | TransChild[];
   components?: readonly React.ReactNode[] | { readonly [tagName: string]: React.ReactNode };
   count?: number;
   context?: string;

package/tslint.json

@@ -3,6 +3,7 @@
   "extends": "dtslint/dtslint.json",
   "rules": {
     "array-type": [true, "array"],
+    "no-null-undefined-union": false,
     "no-empty-interface": false,
     "no-redundant-jsdoc": false,
     "no-unnecessary-generics": false,