@cloudtower/parrot 0.17.9 → 0.17.11

package/.turbo/turbo-build.log

@@ -1,3 +1,4 @@
 warning package.json: No license field
+warning package.json: "dependencies" has dependency "i18next" with range "21.10.0" that collides with a dependency in "devDependencies" of the same name with version "^21.10.0"
 $ rm -rf dist
 $ tsc

package/dist/parrotI18n.d.ts

@@ -1,4 +1,4 @@
 import { Callback, InitOptions } from "i18next";
 declare const parrotI18n: import("i18next").i18n;
 export default parrotI18n;
-export declare const initParrotI18n: (options: InitOptions, callback?: Callback | undefined) => void;
+export declare const initParrotI18n: (options?: InitOptions, callback?: Callback | undefined) => void;

package/dist/parrotI18n.js

@@ -10,8 +10,9 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import i18next from "i18next";
+import merge from "lodash.merge";
 import locales from "./locales";
-var parrotI18n = i18next.createInstance({
+var defaultOptions = {
     lng: "zh-CN",
     fallbackLng: "en-US",
     interpolation: {
@@ -26,8 +27,9 @@ var parrotI18n = i18next.createInstance({
             translation: __assign({}, locales["zh-CN"]),
         },
     },
-});
+};
+var parrotI18n = i18next.createInstance(defaultOptions);
 export default parrotI18n;
 export var initParrotI18n = function (options, callback) {
-    parrotI18n.init(options, callback);
+    parrotI18n.init(merge(defaultOptions, options), callback);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudtower/parrot",
-  "version": "0.17.9",
+  "version": "0.17.11",
   "description": "i18n modules for cloudtower sparrow and eagle",
   "keywords": [
     "i18n",
@@ -17,10 +17,16 @@
     "generate:reexport": "node --loader ts-node/esm tools/index.mts",
     "lint": "eslint src --ext .ts --quiet"
   },
+  "dependencies": {
+    "i18next": "21.10.0",
+    "lodash.merge": "^4.6.2"
+  },
   "devDependencies": {
+    "@rollup/plugin-json": "^6.0.0",
+    "@types/lodash.merge": "^4.6.7",
     "ejs": "^3.1.8",
     "i18next": "^21.10.0",
     "typescript": "^4.8.4"
   },
-  "gitHead": "1a215b9fe982fbf09abf3506572d245548e004e8"
+  "gitHead": "1a4f7f9d797b8598980a00e6f037d58b1d88cc48"
 }

package/src/parrotI18n.ts

@@ -1,8 +1,9 @@
 import i18next, { Callback, InitOptions } from "i18next";
+import merge from "lodash.merge";
 
 import locales from "./locales";
 
-const parrotI18n = i18next.createInstance({
+const defaultOptions = {
   lng: "zh-CN",
   fallbackLng: "en-US",
   interpolation: {
@@ -21,13 +22,15 @@ const parrotI18n = i18next.createInstance({
       },
     },
   },
-});
+};
+
+const parrotI18n = i18next.createInstance(defaultOptions);
 
 export default parrotI18n;
 
 export const initParrotI18n = (
-  options: InitOptions,
+  options?: InitOptions,
   callback?: Callback | undefined
 ) => {
-  parrotI18n.init(options, callback);
+  parrotI18n.init(merge(defaultOptions, options), callback);
 };