@wix/cli 1.1.57 → 1.1.59

package/build/{chunk-BHINMCY7.js → chunk-V4DAKO7L.js}

@@ -18,12 +18,12 @@ import {
 } from "./chunk-6F2RSXHN.js";
 import {
   getTestOverrides
-} from "./chunk-53UCEZFU.js";
+} from "./chunk-BNWDAMAL.js";
 import {
   CliError,
   CliErrorCode,
   require_lib
-} from "./chunk-XU2RG4HE.js";
+} from "./chunk-T4OH34QF.js";
 import {
   __commonJS,
   __require,
@@ -11471,20 +11471,18 @@ terminalLink.stderr = (text, url, options = {}) => terminalLink(text, url, { tar
 terminalLink.stderr.isSupported = import_supports_hyperlinks.default.stderr;
 
 // ../cli-ui-kit/src/components/Link.tsx
-var Link = ({
-  skin,
-  children,
-  url,
-  transform = (v) => v
-}) => {
+var Link = ({ skin, children, url }) => {
   if (children) {
-    return /* @__PURE__ */ import_react41.default.createElement(
-      Transform,
-      {
-        transform: (children2) => transform(terminalLink(children2, url, { fallback: true }))
-      },
-      /* @__PURE__ */ import_react41.default.createElement(Text2, { skin }, children)
-    );
+    if (terminalLink.isSupported) {
+      return /* @__PURE__ */ import_react41.default.createElement(
+        Transform,
+        {
+          transform: (childrenAsString) => terminalLink(childrenAsString, url, { fallback: false })
+        },
+        /* @__PURE__ */ import_react41.default.createElement(Text2, { skin }, children)
+      );
+    }
+    return /* @__PURE__ */ import_react41.default.createElement(Text2, null, /* @__PURE__ */ import_react41.default.createElement(Text2, { skin }, children), " (", url, ")");
   }
   return /* @__PURE__ */ import_react41.default.createElement(Text2, { skin: "info" }, url);
 };
@@ -11533,13 +11531,30 @@ var ErrorDetails = ({
   hint
 }) => /* @__PURE__ */ import_react44.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react44.default.createElement(Alert, { type: "error" }, message), explanation && /* @__PURE__ */ import_react44.default.createElement(Alert, { type: "warning" }, explanation), hint && /* @__PURE__ */ import_react44.default.createElement(Box_default, { paddingTop: 1 }, /* @__PURE__ */ import_react44.default.createElement(Alert, { type: "insight" }, hint)));
 
+// ../cli-ui-kit/src/components/Notification.tsx
+init_esm_shims();
+var import_react45 = __toESM(require_react(), 1);
+var Notification = ({ children }) => {
+  return /* @__PURE__ */ import_react45.default.createElement(Box_default, null, /* @__PURE__ */ import_react45.default.createElement(
+    Box_default,
+    {
+      padding: 1,
+      alignItems: "center",
+      flexDirection: "column",
+      borderColor: "yellowBright",
+      borderStyle: "round"
+    },
+    children
+  ));
+};
+
 // ../cli-ui-kit/src/hooks/use-async.ts
 init_esm_shims();
 var import_variant6 = __toESM(require_lib(), 1);
 
 // ../../node_modules/react-async-hook/dist/react-async-hook.esm.js
 init_esm_shims();
-var import_react45 = __toESM(require_react());
+var import_react46 = __toESM(require_react());
 function _extends() {
   _extends = Object.assign || function(target) {
     for (var i2 = 1; i2 < arguments.length; i2++) {
@@ -11556,13 +11571,13 @@ function _extends() {
 }
 var _iteratorSymbol = typeof Symbol !== "undefined" ? Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator")) : "@@iterator";
 var _asyncIteratorSymbol = typeof Symbol !== "undefined" ? Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator")) : "@@asyncIterator";
-var useIsomorphicLayoutEffect = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined" ? import_react45.useLayoutEffect : import_react45.useEffect;
+var useIsomorphicLayoutEffect = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined" ? import_react46.useLayoutEffect : import_react46.useEffect;
 var useGetter = function useGetter2(t3) {
-  var ref = (0, import_react45.useRef)(t3);
+  var ref = (0, import_react46.useRef)(t3);
   useIsomorphicLayoutEffect(function() {
     ref.current = t3;
   });
-  return (0, import_react45.useCallback)(function() {
+  return (0, import_react46.useCallback)(function() {
     return ref.current;
   }, [ref]);
 };
@@ -11615,22 +11630,22 @@ var normalizeOptions = function normalizeOptions2(options) {
   return _extends({}, DefaultOptions, {}, options);
 };
 var useAsyncState = function useAsyncState2(options) {
-  var _useState = (0, import_react45.useState)(function() {
+  var _useState = (0, import_react46.useState)(function() {
     return options.initialState(options);
   }), value2 = _useState[0], setValue = _useState[1];
-  var reset = (0, import_react45.useCallback)(function() {
+  var reset = (0, import_react46.useCallback)(function() {
     return setValue(options.initialState(options));
   }, [setValue, options]);
-  var setLoading = (0, import_react45.useCallback)(function() {
+  var setLoading = (0, import_react46.useCallback)(function() {
     return setValue(options.setLoading(value2));
   }, [value2, setValue]);
-  var setResult = (0, import_react45.useCallback)(function(result) {
+  var setResult = (0, import_react46.useCallback)(function(result) {
     return setValue(options.setResult(result, value2));
   }, [value2, setValue]);
-  var setError = (0, import_react45.useCallback)(function(error) {
+  var setError = (0, import_react46.useCallback)(function(error) {
     return setValue(options.setError(error, value2));
   }, [value2, setValue]);
-  var merge = (0, import_react45.useCallback)(function(state) {
+  var merge = (0, import_react46.useCallback)(function(state) {
     return setValue(_extends({}, value2, {}, state));
   }, [value2, setValue]);
   return {
@@ -11644,8 +11659,8 @@ var useAsyncState = function useAsyncState2(options) {
   };
 };
 var useIsMounted = function useIsMounted2() {
-  var ref = (0, import_react45.useRef)(false);
-  (0, import_react45.useEffect)(function() {
+  var ref = (0, import_react46.useRef)(false);
+  (0, import_react46.useEffect)(function() {
     ref.current = true;
     return function() {
       ref.current = false;
@@ -11656,7 +11671,7 @@ var useIsMounted = function useIsMounted2() {
   };
 };
 var useCurrentPromise = function useCurrentPromise2() {
-  var ref = (0, import_react45.useRef)(null);
+  var ref = (0, import_react46.useRef)(null);
   return {
     set: function set(promise) {
       return ref.current = promise;
@@ -11672,7 +11687,7 @@ var useCurrentPromise = function useCurrentPromise2() {
 var useAsyncInternal = function useAsyncInternal2(asyncFunction, params, options) {
   !params && (params = []);
   var normalizedOptions = normalizeOptions(options);
-  var _useState2 = (0, import_react45.useState)(null), currentParams = _useState2[0], setCurrentParams = _useState2[1];
+  var _useState2 = (0, import_react46.useState)(null), currentParams = _useState2[0], setCurrentParams = _useState2[1];
   var AsyncState = useAsyncState(normalizedOptions);
   var isMounted = useIsMounted();
   var CurrentPromise = useCurrentPromise();
@@ -11715,11 +11730,11 @@ var useAsyncInternal = function useAsyncInternal2(asyncFunction, params, options
     return promise;
   };
   var getLatestExecuteAsyncOperation = useGetter(executeAsyncOperation);
-  var executeAsyncOperationMemo = (0, import_react45.useCallback)(function() {
+  var executeAsyncOperationMemo = (0, import_react46.useCallback)(function() {
     return getLatestExecuteAsyncOperation().apply(void 0, arguments);
   }, [getLatestExecuteAsyncOperation]);
   var isMounting = !isMounted();
-  (0, import_react45.useEffect)(function() {
+  (0, import_react46.useEffect)(function() {
     var execute = function execute2() {
       return getLatestExecuteAsyncOperation().apply(void 0, params);
     };
@@ -11752,7 +11767,7 @@ var useAsyncCallback = function useAsyncCallback2(asyncFunction, options) {
 };
 
 // ../cli-ui-kit/src/hooks/use-async.ts
-var import_react46 = __toESM(require_react(), 1);
+var import_react47 = __toESM(require_react(), 1);
 var AsyncStatus = (0, import_variant6.variant)(
   (0, import_variant6.onTerms)(({ T: _T }) => ({
     Error: (error) => ({ error }),
@@ -11770,7 +11785,7 @@ var AsyncCallbackStatus = (0, import_variant6.variant)(
 );
 var useAsync2 = (fn, args, options) => {
   const exit = useExit();
-  const abortController = (0, import_react46.useMemo)(() => new AbortController(), []);
+  const abortController = (0, import_react47.useMemo)(() => new AbortController(), []);
   const { result, error, status, merge } = useAsync(
     fn.bind(null, { signal: abortController.signal }),
     args,
@@ -11779,7 +11794,7 @@ var useAsync2 = (fn, args, options) => {
       ...options ?? {}
     }
   );
-  (0, import_react46.useEffect)(() => {
+  (0, import_react47.useEffect)(() => {
     return () => {
       abortController.abort();
     };
@@ -11799,7 +11814,7 @@ var useAsync2 = (fn, args, options) => {
 };
 var useAsyncCallback3 = (fn, options) => {
   const exit = useExit();
-  const abortController = (0, import_react46.useMemo)(() => new AbortController(), []);
+  const abortController = (0, import_react47.useMemo)(() => new AbortController(), []);
   const { result, error, status, merge, execute } = useAsyncCallback(
     fn.bind(null, { signal: abortController.signal }),
     {
@@ -11807,7 +11822,7 @@ var useAsyncCallback3 = (fn, options) => {
       ...options ?? {}
     }
   );
-  (0, import_react46.useEffect)(() => {
+  (0, import_react47.useEffect)(() => {
     return () => {
       abortController.abort();
     };
@@ -11837,11 +11852,11 @@ var useAsyncCallback3 = (fn, options) => {
 
 // ../../node_modules/react-i18next/dist/es/Trans.js
 init_esm_shims();
-var import_react49 = __toESM(require_react(), 1);
+var import_react50 = __toESM(require_react(), 1);
 
 // ../../node_modules/react-i18next/dist/es/TransWithoutContext.js
 init_esm_shims();
-var import_react47 = __toESM(require_react(), 1);
+var import_react48 = __toESM(require_react(), 1);
 
 // ../../node_modules/html-parse-stringify/dist/html-parse-stringify.module.js
 init_esm_shims();
@@ -11908,24 +11923,27 @@ var html_parse_stringify_module_default = c;
 
 // ../../node_modules/react-i18next/dist/es/utils.js
 init_esm_shims();
-function warn() {
-  if (console && console.warn) {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    if (isString(args[0])) args[0] = `react-i18next:: ${args[0]}`;
+var warn = (i18n, code, msg, rest) => {
+  const args = [msg, {
+    code,
+    ...rest || {}
+  }];
+  if (i18n?.services?.logger?.forward) {
+    return i18n.services.logger.forward(args, "warn", "react-i18next::", true);
+  }
+  if (isString(args[0])) args[0] = `react-i18next:: ${args[0]}`;
+  if (i18n?.services?.logger?.warn) {
+    i18n.services.logger.warn(...args);
+  } else if (console?.warn) {
     console.warn(...args);
   }
-}
+};
 var alreadyWarned = {};
-function warnOnce() {
-  for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-    args[_key2] = arguments[_key2];
-  }
-  if (isString(args[0]) && alreadyWarned[args[0]]) return;
-  if (isString(args[0])) alreadyWarned[args[0]] = /* @__PURE__ */ new Date();
-  warn(...args);
-}
+var warnOnce = (i18n, code, msg, rest) => {
+  if (isString(msg) && alreadyWarned[msg]) return;
+  if (isString(msg)) alreadyWarned[msg] = /* @__PURE__ */ new Date();
+  warn(i18n, code, msg, rest);
+};
 var loadedClb = (i18n, cb) => () => {
   if (i18n.isInitialized) {
     cb();
@@ -11944,41 +11962,23 @@ var loadNamespaces = (i18n, ns, cb) => {
 };
 var loadLanguages = (i18n, lng, ns, cb) => {
   if (isString(ns)) ns = [ns];
+  if (i18n.options.preload && i18n.options.preload.indexOf(lng) > -1) return loadNamespaces(i18n, ns, cb);
   ns.forEach((n2) => {
     if (i18n.options.ns.indexOf(n2) < 0) i18n.options.ns.push(n2);
   });
   i18n.loadLanguages(lng, loadedClb(i18n, cb));
 };
-var oldI18nextHasLoadedNamespace = function(ns, i18n) {
-  let options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
-  const lng = i18n.languages[0];
-  const fallbackLng = i18n.options ? i18n.options.fallbackLng : false;
-  const lastLng = i18n.languages[i18n.languages.length - 1];
-  if (lng.toLowerCase() === "cimode") return true;
-  const loadNotPending = (l, n2) => {
-    const loadState = i18n.services.backendConnector.state[`${l}|${n2}`];
-    return loadState === -1 || loadState === 2;
-  };
-  if (options.bindI18n && options.bindI18n.indexOf("languageChanging") > -1 && i18n.services.backendConnector.backend && i18n.isLanguageChangingTo && !loadNotPending(i18n.isLanguageChangingTo, ns)) return false;
-  if (i18n.hasResourceBundle(lng, ns)) return true;
-  if (!i18n.services.backendConnector.backend || i18n.options.resources && !i18n.options.partialBundledLanguages) return true;
-  if (loadNotPending(lng, ns) && (!fallbackLng || loadNotPending(lastLng, ns))) return true;
-  return false;
-};
-var hasLoadedNamespace = function(ns, i18n) {
-  let options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
+var hasLoadedNamespace = (ns, i18n, options = {}) => {
   if (!i18n.languages || !i18n.languages.length) {
-    warnOnce("i18n.languages were undefined or empty", i18n.languages);
+    warnOnce(i18n, "NO_LANGUAGES", "i18n.languages were undefined or empty", {
+      languages: i18n.languages
+    });
     return true;
   }
-  const isNewerI18next = i18n.options.ignoreJSONStructure !== void 0;
-  if (!isNewerI18next) {
-    return oldI18nextHasLoadedNamespace(ns, i18n, options);
-  }
   return i18n.hasLoadedNamespace(ns, {
     lng: options.lng,
     precheck: (i18nInstance2, loadNotPending) => {
-      if (options.bindI18n && options.bindI18n.indexOf("languageChanging") > -1 && i18nInstance2.services.backendConnector.backend && i18nInstance2.isLanguageChangingTo && !loadNotPending(i18nInstance2.isLanguageChangingTo, ns)) return false;
+      if (options.bindI18n?.indexOf("languageChanging") > -1 && i18nInstance2.services.backendConnector.backend && i18nInstance2.isLanguageChangingTo && !loadNotPending(i18nInstance2.isLanguageChangingTo, ns)) return false;
     }
   });
 };
@@ -12027,8 +12027,7 @@ var defaultOptions = {
   useSuspense: true,
   unescape
 };
-var setDefaults = function() {
-  let options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+var setDefaults = (options = {}) => {
   defaultOptions = {
     ...defaultOptions,
     ...options
@@ -12047,16 +12046,16 @@ var getI18n = () => i18nInstance;
 // ../../node_modules/react-i18next/dist/es/TransWithoutContext.js
 var hasChildren = (node, checkLength) => {
   if (!node) return false;
-  const base = node.props ? node.props.children : node.children;
+  const base = node.props?.children ?? node.children;
   if (checkLength) return base.length > 0;
   return !!base;
 };
 var getChildren = (node) => {
   if (!node) return [];
-  const children = node.props ? node.props.children : node.children;
-  return node.props && node.props.i18nIsDynamicList ? getAsArray(children) : children;
+  const children = node.props?.children ?? node.children;
+  return node.props?.i18nIsDynamicList ? getAsArray(children) : children;
 };
-var hasValidReactChildren = (children) => Array.isArray(children) && children.every(import_react47.isValidElement);
+var hasValidReactChildren = (children) => Array.isArray(children) && children.every(import_react48.isValidElement);
 var getAsArray = (data) => Array.isArray(data) ? data : [data];
 var mergeProps = (source, target) => {
   const newTarget = {
@@ -12065,15 +12064,17 @@ var mergeProps = (source, target) => {
   newTarget.props = Object.assign(source.props, target.props);
   return newTarget;
 };
-var nodesToString = (children, i18nOptions) => {
+var nodesToString = (children, i18nOptions, i18n, i18nKey) => {
   if (!children) return "";
   let stringNode = "";
   const childrenArray = getAsArray(children);
-  const keepArray = i18nOptions.transSupportBasicHtmlNodes && i18nOptions.transKeepBasicHtmlNodesFor ? i18nOptions.transKeepBasicHtmlNodesFor : [];
+  const keepArray = i18nOptions?.transSupportBasicHtmlNodes ? i18nOptions.transKeepBasicHtmlNodesFor ?? [] : [];
   childrenArray.forEach((child, childIndex) => {
     if (isString(child)) {
       stringNode += `${child}`;
-    } else if ((0, import_react47.isValidElement)(child)) {
+      return;
+    }
+    if ((0, import_react48.isValidElement)(child)) {
       const {
         props,
         type
@@ -12083,17 +12084,27 @@ var nodesToString = (children, i18nOptions) => {
       const childChildren = props.children;
       if (!childChildren && shouldKeepChild && !childPropsCount) {
         stringNode += `<${type}/>`;
-      } else if (!childChildren && (!shouldKeepChild || childPropsCount) || props.i18nIsDynamicList) {
+        return;
+      }
+      if (!childChildren && (!shouldKeepChild || childPropsCount) || props.i18nIsDynamicList) {
         stringNode += `<${childIndex}></${childIndex}>`;
-      } else if (shouldKeepChild && childPropsCount === 1 && isString(childChildren)) {
+        return;
+      }
+      if (shouldKeepChild && childPropsCount === 1 && isString(childChildren)) {
         stringNode += `<${type}>${childChildren}</${type}>`;
-      } else {
-        const content = nodesToString(childChildren, i18nOptions);
-        stringNode += `<${childIndex}>${content}</${childIndex}>`;
+        return;
       }
-    } else if (child === null) {
-      warn(`Trans: the passed in value is invalid - seems you passed in a null child.`);
-    } else if (isObject(child)) {
+      const content = nodesToString(childChildren, i18nOptions, i18n, i18nKey);
+      stringNode += `<${childIndex}>${content}</${childIndex}>`;
+      return;
+    }
+    if (child === null) {
+      warn(i18n, "TRANS_NULL_VALUE", `Passed in a null value as child`, {
+        i18nKey
+      });
+      return;
+    }
+    if (isObject(child)) {
       const {
         format,
         ...clone
@@ -12102,12 +12113,18 @@ var nodesToString = (children, i18nOptions) => {
       if (keys.length === 1) {
         const value2 = format ? `${keys[0]}, ${format}` : keys[0];
         stringNode += `{{${value2}}}`;
-      } else {
-        warn(`react-i18next: the passed in object contained more than one variable - the object should look like {{ value, format }} where format is optional.`, child);
+        return;
       }
-    } else {
-      warn(`Trans: the passed in value is invalid - seems you passed in a variable like {number} - please pass in variables for interpolation as full objects like {{number}}.`, child);
+      warn(i18n, "TRANS_INVALID_OBJ", `Invalid child - Object should only have keys {{ value, format }} (format is optional).`, {
+        i18nKey,
+        child
+      });
+      return;
     }
+    warn(i18n, "TRANS_INVALID_VAR", `Passed in a variable like {number} - pass variables for interpolation as full objects like {{number}}.`, {
+      i18nKey,
+      child
+    });
   });
   return stringNode;
 };
@@ -12122,7 +12139,7 @@ var renderNodes = (children, targetString, i18n, i18nOptions, combinedTOpts, sho
     childrenArray.forEach((child) => {
       if (isString(child)) return;
       if (hasChildren(child)) getData(getChildren(child));
-      else if (isObject(child) && !(0, import_react47.isValidElement)(child)) Object.assign(data, child);
+      else if (isObject(child) && !(0, import_react48.isValidElement)(child)) Object.assign(data, child);
     });
   };
   getData(children);
@@ -12134,21 +12151,21 @@ var renderNodes = (children, targetString, i18n, i18nOptions, combinedTOpts, sho
   const renderInner = (child, node, rootReactNode) => {
     const childs = getChildren(child);
     const mappedChildren = mapAST(childs, node.children, rootReactNode);
-    return hasValidReactChildren(childs) && mappedChildren.length === 0 || child.props && child.props.i18nIsDynamicList ? childs : mappedChildren;
+    return hasValidReactChildren(childs) && mappedChildren.length === 0 || child.props?.i18nIsDynamicList ? childs : mappedChildren;
   };
   const pushTranslatedJSX = (child, inner, mem, i2, isVoid) => {
     if (child.dummy) {
       child.children = inner;
-      mem.push((0, import_react47.cloneElement)(child, {
+      mem.push((0, import_react48.cloneElement)(child, {
         key: i2
       }, isVoid ? void 0 : inner));
     } else {
-      mem.push(...import_react47.Children.map([child], (c2) => {
+      mem.push(...import_react48.Children.map([child], (c2) => {
         const props = {
           ...c2.props
         };
         delete props.i18nIsDynamicList;
-        return (0, import_react47.createElement)(c2.type, {
+        return (0, import_react48.createElement)(c2.type, {
           ...props,
           key: i2,
           ref: c2.ref
@@ -12160,7 +12177,7 @@ var renderNodes = (children, targetString, i18n, i18nOptions, combinedTOpts, sho
     const reactNodes = getAsArray(reactNode);
     const astNodes = getAsArray(astNode);
     return astNodes.reduce((mem, node, i2) => {
-      const translationContent = node.children && node.children[0] && node.children[0].content && i18n.services.interpolator.interpolate(node.children[0].content, opts, i18n.language);
+      const translationContent = node.children?.[0]?.content && i18n.services.interpolator.interpolate(node.children[0].content, opts, i18n.language);
       if (node.type === "tag") {
         let tmp = reactNodes[parseInt(node.name, 10)];
         if (rootReactNode.length === 1 && !tmp) tmp = rootReactNode[0][node.name];
@@ -12168,7 +12185,7 @@ var renderNodes = (children, targetString, i18n, i18nOptions, combinedTOpts, sho
         const child = Object.keys(node.attrs).length !== 0 ? mergeProps({
           props: node.attrs
         }, tmp) : tmp;
-        const isElement = (0, import_react47.isValidElement)(child);
+        const isElement = (0, import_react48.isValidElement)(child);
         const isValidTranslationWithChildren = isElement && hasChildren(node, true) && !node.voidElement;
         const isEmptyTransWithHTML = emptyChildrenButNeedsHandling && isObject(child) && child.dummy && !isElement;
         const isKnownComponent = isObject(children) && Object.hasOwnProperty.call(children, node.name);
@@ -12187,12 +12204,12 @@ var renderNodes = (children, targetString, i18n, i18nOptions, combinedTOpts, sho
             pushTranslatedJSX(child, inner, mem, i2, node.voidElement);
           } else if (i18nOptions.transSupportBasicHtmlNodes && keepArray.indexOf(node.name) > -1) {
             if (node.voidElement) {
-              mem.push((0, import_react47.createElement)(node.name, {
+              mem.push((0, import_react48.createElement)(node.name, {
                 key: `${node.name}-${i2}`
               }));
             } else {
               const inner = mapAST(reactNodes, node.children, rootReactNode);
-              mem.push((0, import_react47.createElement)(node.name, {
+              mem.push((0, import_react48.createElement)(node.name, {
                 key: `${node.name}-${i2}`
               }, inner));
             }
@@ -12212,7 +12229,7 @@ var renderNodes = (children, targetString, i18n, i18nOptions, combinedTOpts, sho
         const wrapTextNodes = i18nOptions.transWrapTextNodes;
         const content = shouldUnescape ? i18nOptions.unescape(i18n.services.interpolator.interpolate(node.content, opts, i18n.language)) : i18n.services.interpolator.interpolate(node.content, opts, i18n.language);
         if (wrapTextNodes) {
-          mem.push((0, import_react47.createElement)(wrapTextNodes, {
+          mem.push((0, import_react48.createElement)(wrapTextNodes, {
             key: `${node.name}-${i2}`
           }, content));
         } else {
@@ -12228,42 +12245,79 @@ var renderNodes = (children, targetString, i18n, i18nOptions, combinedTOpts, sho
   }], ast, getAsArray(children || []));
   return getChildren(result[0]);
 };
-function Trans(_ref) {
-  let {
-    children,
-    count,
-    parent,
-    i18nKey,
-    context,
-    tOptions = {},
-    values,
-    defaults: defaults2,
-    components,
-    ns,
-    i18n: i18nFromProps,
-    t: tFromProps,
-    shouldUnescape,
-    ...additionalProps
-  } = _ref;
+var fixComponentProps = (component, index, translation) => {
+  const componentKey = component.key || index;
+  const comp = (0, import_react48.cloneElement)(component, {
+    key: componentKey
+  });
+  if (!comp.props || !comp.props.children || translation.indexOf(`${index}/>`) < 0 && translation.indexOf(`${index} />`) < 0) {
+    return comp;
+  }
+  function Componentized() {
+    return (0, import_react48.createElement)(import_react48.Fragment, null, comp);
+  }
+  return (0, import_react48.createElement)(Componentized);
+};
+var generateArrayComponents = (components, translation) => components.map((c2, index) => fixComponentProps(c2, index, translation));
+var generateObjectComponents = (components, translation) => {
+  const componentMap = {};
+  Object.keys(components).forEach((c2) => {
+    Object.assign(componentMap, {
+      [c2]: fixComponentProps(components[c2], c2, translation)
+    });
+  });
+  return componentMap;
+};
+var generateComponents = (components, translation, i18n, i18nKey) => {
+  if (!components) return null;
+  if (Array.isArray(components)) {
+    return generateArrayComponents(components, translation);
+  }
+  if (isObject(components)) {
+    return generateObjectComponents(components, translation);
+  }
+  warnOnce(i18n, "TRANS_INVALID_COMPONENTS", `<Trans /> "components" prop expects an object or array`, {
+    i18nKey
+  });
+  return null;
+};
+function Trans({
+  children,
+  count,
+  parent,
+  i18nKey,
+  context,
+  tOptions = {},
+  values,
+  defaults: defaults2,
+  components,
+  ns,
+  i18n: i18nFromProps,
+  t: tFromProps,
+  shouldUnescape,
+  ...additionalProps
+}) {
   const i18n = i18nFromProps || getI18n();
   if (!i18n) {
-    warnOnce("You will need to pass in an i18next instance by using i18nextReactModule");
+    warnOnce(i18n, "NO_I18NEXT_INSTANCE", `Trans: You need to pass in an i18next instance using i18nextReactModule`, {
+      i18nKey
+    });
     return children;
   }
   const t3 = tFromProps || i18n.t.bind(i18n) || ((k) => k);
   const reactI18nextOptions = {
     ...getDefaults(),
-    ...i18n.options && i18n.options.react
+    ...i18n.options?.react
   };
-  let namespaces = ns || t3.ns || i18n.options && i18n.options.defaultNS;
+  let namespaces = ns || t3.ns || i18n.options?.defaultNS;
   namespaces = isString(namespaces) ? [namespaces] : namespaces || ["translation"];
-  const nodeAsString = nodesToString(children, reactI18nextOptions);
+  const nodeAsString = nodesToString(children, reactI18nextOptions, i18n, i18nKey);
   const defaultValue = defaults2 || nodeAsString || reactI18nextOptions.transEmptyNodeValue || i18nKey;
   const {
     hashTransKey
   } = reactI18nextOptions;
   const key = i18nKey || (hashTransKey ? hashTransKey(nodeAsString || defaultValue) : nodeAsString || defaultValue);
-  if (i18n.options && i18n.options.interpolation && i18n.options.interpolation.defaultVariables) {
+  if (i18n.options?.interpolation?.defaultVariables) {
     values = values && Object.keys(values).length > 0 ? {
       ...values,
       ...i18n.options.interpolation.defaultVariables
@@ -12271,7 +12325,7 @@ function Trans(_ref) {
       ...i18n.options.interpolation.defaultVariables
     };
   }
-  const interpolationOverride = values || count !== void 0 || !children ? tOptions.interpolation : {
+  const interpolationOverride = values || count !== void 0 && !i18n.options?.interpolation?.alwaysFormat || !children ? tOptions.interpolation : {
     interpolation: {
       ...tOptions.interpolation,
       prefix: "#$?",
@@ -12288,24 +12342,15 @@ function Trans(_ref) {
     ns: namespaces
   };
   const translation = key ? t3(key, combinedTOpts) : defaultValue;
-  if (components) {
-    Object.keys(components).forEach((c2) => {
-      const comp = components[c2];
-      if (typeof comp.type === "function" || !comp.props || !comp.props.children || translation.indexOf(`${c2}/>`) < 0 && translation.indexOf(`${c2} />`) < 0) return;
-      function Componentized() {
-        return (0, import_react47.createElement)(import_react47.Fragment, null, comp);
-      }
-      components[c2] = (0, import_react47.createElement)(Componentized);
-    });
-  }
-  const content = renderNodes(components || children, translation, i18n, reactI18nextOptions, combinedTOpts, shouldUnescape);
-  const useAsParent = parent !== void 0 ? parent : reactI18nextOptions.defaultTransParent;
-  return useAsParent ? (0, import_react47.createElement)(useAsParent, additionalProps, content) : content;
+  const generatedComponents = generateComponents(components, translation, i18n, i18nKey);
+  const content = renderNodes(generatedComponents || children, translation, i18n, reactI18nextOptions, combinedTOpts, shouldUnescape);
+  const useAsParent = parent ?? reactI18nextOptions.defaultTransParent;
+  return useAsParent ? (0, import_react48.createElement)(useAsParent, additionalProps, content) : content;
 }
 
 // ../../node_modules/react-i18next/dist/es/context.js
 init_esm_shims();
-var import_react48 = __toESM(require_react(), 1);
+var import_react49 = __toESM(require_react(), 1);
 
 // ../../node_modules/react-i18next/dist/es/initReactI18next.js
 init_esm_shims();
@@ -12318,7 +12363,7 @@ var initReactI18next = {
 };
 
 // ../../node_modules/react-i18next/dist/es/context.js
-var I18nContext = (0, import_react48.createContext)();
+var I18nContext = (0, import_react49.createContext)();
 var ReportNamespaces = class {
   constructor() {
     this.usedNamespaces = {};
@@ -12328,33 +12373,34 @@ var ReportNamespaces = class {
       if (!this.usedNamespaces[ns]) this.usedNamespaces[ns] = true;
     });
   }
-  getUsedNamespaces = () => Object.keys(this.usedNamespaces);
+  getUsedNamespaces() {
+    return Object.keys(this.usedNamespaces);
+  }
 };
 
 // ../../node_modules/react-i18next/dist/es/Trans.js
-function Trans2(_ref) {
-  let {
-    children,
-    count,
-    parent,
-    i18nKey,
-    context,
-    tOptions = {},
-    values,
-    defaults: defaults2,
-    components,
-    ns,
-    i18n: i18nFromProps,
-    t: tFromProps,
-    shouldUnescape,
-    ...additionalProps
-  } = _ref;
+function Trans2({
+  children,
+  count,
+  parent,
+  i18nKey,
+  context,
+  tOptions = {},
+  values,
+  defaults: defaults2,
+  components,
+  ns,
+  i18n: i18nFromProps,
+  t: tFromProps,
+  shouldUnescape,
+  ...additionalProps
+}) {
   const {
     i18n: i18nFromContext,
     defaultNS: defaultNSFromContext
-  } = (0, import_react49.useContext)(I18nContext) || {};
+  } = (0, import_react50.useContext)(I18nContext) || {};
   const i18n = i18nFromProps || i18nFromContext || getI18n();
-  const t3 = tFromProps || i18n && i18n.t.bind(i18n);
+  const t3 = tFromProps || i18n?.t.bind(i18n);
   return Trans({
     children,
     count,
@@ -12365,7 +12411,7 @@ function Trans2(_ref) {
     values,
     defaults: defaults2,
     components,
-    ns: ns || t3 && t3.ns || defaultNSFromContext || i18n && i18n.options && i18n.options.defaultNS,
+    ns: ns || t3?.ns || defaultNSFromContext || i18n?.options?.defaultNS,
     i18n,
     t: tFromProps,
     shouldUnescape,
@@ -12378,29 +12424,28 @@ init_esm_shims();
 
 // ../../node_modules/react-i18next/dist/es/useTranslation.js
 init_esm_shims();
-var import_react50 = __toESM(require_react(), 1);
+var import_react51 = __toESM(require_react(), 1);
 var usePrevious = (value2, ignore) => {
-  const ref = (0, import_react50.useRef)();
-  (0, import_react50.useEffect)(() => {
+  const ref = (0, import_react51.useRef)();
+  (0, import_react51.useEffect)(() => {
     ref.current = ignore ? ref.current : value2;
   }, [value2, ignore]);
   return ref.current;
 };
 var alwaysNewT = (i18n, language, namespace, keyPrefix) => i18n.getFixedT(language, namespace, keyPrefix);
-var useMemoizedT = (i18n, language, namespace, keyPrefix) => (0, import_react50.useCallback)(alwaysNewT(i18n, language, namespace, keyPrefix), [i18n, language, namespace, keyPrefix]);
-var useTranslation = function(ns) {
-  let props = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+var useMemoizedT = (i18n, language, namespace, keyPrefix) => (0, import_react51.useCallback)(alwaysNewT(i18n, language, namespace, keyPrefix), [i18n, language, namespace, keyPrefix]);
+var useTranslation = (ns, props = {}) => {
   const {
     i18n: i18nFromProps
   } = props;
   const {
     i18n: i18nFromContext,
     defaultNS: defaultNSFromContext
-  } = (0, import_react50.useContext)(I18nContext) || {};
+  } = (0, import_react51.useContext)(I18nContext) || {};
   const i18n = i18nFromProps || i18nFromContext || getI18n();
   if (i18n && !i18n.reportNamespaces) i18n.reportNamespaces = new ReportNamespaces();
   if (!i18n) {
-    warnOnce("You will need to pass in an i18next instance by using initReactI18next");
+    warnOnce(i18n, "NO_I18NEXT_INSTANCE", "useTranslation: You will need to pass in an i18next instance by using initReactI18next");
     const notReadyT = (k, optsOrDefaultValue) => {
       if (isString(optsOrDefaultValue)) return optsOrDefaultValue;
       if (isObject(optsOrDefaultValue) && isString(optsOrDefaultValue.defaultValue)) return optsOrDefaultValue.defaultValue;
@@ -12412,7 +12457,7 @@ var useTranslation = function(ns) {
     retNotReady.ready = false;
     return retNotReady;
   }
-  if (i18n.options.react && i18n.options.react.wait !== void 0) warnOnce("It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");
+  if (i18n.options.react?.wait) warnOnce(i18n, "DEPRECATED_OPTION", "useTranslation: It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.");
   const i18nOptions = {
     ...getDefaults(),
     ...i18n.options.react,
@@ -12422,19 +12467,19 @@ var useTranslation = function(ns) {
     useSuspense,
     keyPrefix
   } = i18nOptions;
-  let namespaces = ns || defaultNSFromContext || i18n.options && i18n.options.defaultNS;
+  let namespaces = ns || defaultNSFromContext || i18n.options?.defaultNS;
   namespaces = isString(namespaces) ? [namespaces] : namespaces || ["translation"];
-  if (i18n.reportNamespaces.addUsedNamespaces) i18n.reportNamespaces.addUsedNamespaces(namespaces);
+  i18n.reportNamespaces.addUsedNamespaces?.(namespaces);
   const ready = (i18n.isInitialized || i18n.initializedStoreOnce) && namespaces.every((n2) => hasLoadedNamespace(n2, i18n, i18nOptions));
   const memoGetT = useMemoizedT(i18n, props.lng || null, i18nOptions.nsMode === "fallback" ? namespaces : namespaces[0], keyPrefix);
   const getT = () => memoGetT;
   const getNewT = () => alwaysNewT(i18n, props.lng || null, i18nOptions.nsMode === "fallback" ? namespaces : namespaces[0], keyPrefix);
-  const [t3, setT] = (0, import_react50.useState)(getT);
+  const [t3, setT] = (0, import_react51.useState)(getT);
   let joinedNS = namespaces.join();
   if (props.lng) joinedNS = `${props.lng}${joinedNS}`;
   const previousJoinedNS = usePrevious(joinedNS);
-  const isMounted = (0, import_react50.useRef)(true);
-  (0, import_react50.useEffect)(() => {
+  const isMounted = (0, import_react51.useRef)(true);
+  (0, import_react51.useEffect)(() => {
     const {
       bindI18n,
       bindI18nStore
@@ -12457,15 +12502,15 @@ var useTranslation = function(ns) {
     const boundReset = () => {
       if (isMounted.current) setT(getNewT);
     };
-    if (bindI18n && i18n) i18n.on(bindI18n, boundReset);
-    if (bindI18nStore && i18n) i18n.store.on(bindI18nStore, boundReset);
+    if (bindI18n) i18n?.on(bindI18n, boundReset);
+    if (bindI18nStore) i18n?.store.on(bindI18nStore, boundReset);
     return () => {
       isMounted.current = false;
-      if (bindI18n && i18n) bindI18n.split(" ").forEach((e2) => i18n.off(e2, boundReset));
+      if (i18n) bindI18n?.split(" ").forEach((e2) => i18n.off(e2, boundReset));
       if (bindI18nStore && i18n) bindI18nStore.split(" ").forEach((e2) => i18n.store.off(e2, boundReset));
     };
   }, [i18n, joinedNS]);
-  (0, import_react50.useEffect)(() => {
+  (0, import_react51.useEffect)(() => {
     if (isMounted.current && ready) {
       setT(getT);
     }
@@ -12487,40 +12532,39 @@ var useTranslation = function(ns) {
 
 // ../../node_modules/react-i18next/dist/es/withTranslation.js
 init_esm_shims();
-var import_react51 = __toESM(require_react(), 1);
+var import_react52 = __toESM(require_react(), 1);
 
 // ../../node_modules/react-i18next/dist/es/Translation.js
 init_esm_shims();
 
 // ../../node_modules/react-i18next/dist/es/I18nextProvider.js
 init_esm_shims();
-var import_react52 = __toESM(require_react(), 1);
-function I18nextProvider(_ref) {
-  let {
-    i18n,
-    defaultNS,
-    children
-  } = _ref;
-  const value2 = (0, import_react52.useMemo)(() => ({
+var import_react53 = __toESM(require_react(), 1);
+function I18nextProvider({
+  i18n,
+  defaultNS,
+  children
+}) {
+  const value2 = (0, import_react53.useMemo)(() => ({
     i18n,
     defaultNS
   }), [i18n, defaultNS]);
-  return (0, import_react52.createElement)(I18nContext.Provider, {
+  return (0, import_react53.createElement)(I18nContext.Provider, {
     value: value2
   }, children);
 }
 
 // ../../node_modules/react-i18next/dist/es/withSSR.js
 init_esm_shims();
-var import_react54 = __toESM(require_react(), 1);
+var import_react55 = __toESM(require_react(), 1);
 
 // ../../node_modules/react-i18next/dist/es/useSSR.js
 init_esm_shims();
-var import_react53 = __toESM(require_react(), 1);
+var import_react54 = __toESM(require_react(), 1);
 
 // ../cli-i18n/src/I18nProvider.tsx
 init_esm_shims();
-var import_react55 = __toESM(require_react(), 1);
+var import_react56 = __toESM(require_react(), 1);
 
 // ../cli-i18n/src/create-i18n.ts
 init_esm_shims();
@@ -16107,7 +16151,7 @@ var setPath2 = (object, path, newValue) => {
     e2 = `${p[p.length - 1]}.${e2}`;
     p = p.slice(0, p.length - 1);
     last = getLastOfPath2(object, p, Object);
-    if (last && last.obj && typeof last.obj[`${last.k}.${e2}`] !== "undefined") {
+    if (last?.obj && typeof last.obj[`${last.k}.${e2}`] !== "undefined") {
       last.obj = void 0;
     }
   }
@@ -16127,6 +16171,7 @@ var getPath2 = (object, path) => {
     k
   } = getLastOfPath2(object, path);
   if (!obj) return void 0;
+  if (!Object.prototype.hasOwnProperty.call(obj, k)) return void 0;
   return obj[k];
 };
 var getPathWithDefaults = (data, defaultData, key) => {
@@ -16207,7 +16252,10 @@ var looksLikeObjectPath = (key, nsSeparator, keySeparator) => {
 var deepFind = function(obj, path) {
   let keySeparator = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : ".";
   if (!obj) return void 0;
-  if (obj[path]) return obj[path];
+  if (obj[path]) {
+    if (!Object.prototype.hasOwnProperty.call(obj, path)) return void 0;
+    return obj[path];
+  }
   const tokens = path.split(keySeparator);
   let current = obj;
   for (let i2 = 0; i2 < tokens.length; ) {
@@ -16234,7 +16282,7 @@ var deepFind = function(obj, path) {
   }
   return current;
 };
-var getCleanedCode = (code) => code && code.replace("_", "-");
+var getCleanedCode = (code) => code?.replace("_", "-");
 var consoleLogger = {
   type: "logger",
   log(args) {
@@ -16247,7 +16295,7 @@ var consoleLogger = {
     this.output("error", args);
   },
   output(type, args) {
-    if (console && console[type]) console[type].apply(console, args);
+    console?.[type]?.apply?.(console, args);
   }
 };
 var Logger = class _Logger {
@@ -16403,7 +16451,7 @@ var ResourceStore = class extends EventEmitter {
       key = path.slice(2).join(".");
     }
     if (result || !ignoreJSONStructure || !isString2(key)) return result;
-    return deepFind(this.data && this.data[lng] && this.data[lng][ns], key, keySeparator);
+    return deepFind(this.data?.[lng]?.[ns], key, keySeparator);
   }
   addResource(lng, ns, key, value2) {
     let options = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : {
@@ -16470,10 +16518,6 @@ var ResourceStore = class extends EventEmitter {
   }
   getResourceBundle(lng, ns) {
     if (!ns) ns = this.options.defaultNS;
-    if (this.options.compatibilityAPI === "v1") return {
-      ...{},
-      ...this.getResource(lng, ns)
-    };
     return this.getResource(lng, ns);
   }
   getDataByLanguage(lng) {
@@ -16495,7 +16539,7 @@ var postProcessor = {
   },
   handle(processors, value2, key, options, translator) {
     processors.forEach((processor) => {
-      if (this.processors[processor]) value2 = this.processors[processor].process(value2, key, options, translator);
+      value2 = this.processors[processor]?.process(value2, key, options, translator) ?? value2;
     });
     return value2;
   }
@@ -16519,11 +16563,11 @@ var Translator = class _Translator extends EventEmitter {
     let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {
       interpolation: {}
     };
-    if (key === void 0 || key === null) {
+    if (key == null) {
       return false;
     }
     const resolved = this.resolve(key, options);
-    return resolved && resolved.res !== void 0;
+    return resolved?.res !== void 0;
   }
   extractFromKey(key, options) {
     let nsSeparator = options.nsSeparator !== void 0 ? options.nsSeparator : this.options.nsSeparator;
@@ -16557,7 +16601,7 @@ var Translator = class _Translator extends EventEmitter {
       ...options
     };
     if (!options) options = {};
-    if (keys === void 0 || keys === null) return "";
+    if (keys == null) return "";
     if (!Array.isArray(keys)) keys = [String(keys)];
     const returnDetails = options.returnDetails !== void 0 ? options.returnDetails : this.options.returnDetails;
     const keySeparator = options.keySeparator !== void 0 ? options.keySeparator : this.options.keySeparator;
@@ -16568,7 +16612,7 @@ var Translator = class _Translator extends EventEmitter {
     const namespace = namespaces[namespaces.length - 1];
     const lng = options.lng || this.language;
     const appendNamespaceToCIMode = options.appendNamespaceToCIMode || this.options.appendNamespaceToCIMode;
-    if (lng && lng.toLowerCase() === "cimode") {
+    if (lng?.toLowerCase() === "cimode") {
       if (appendNamespaceToCIMode) {
         const nsSeparator = options.nsSeparator || this.options.nsSeparator;
         if (returnDetails) {
@@ -16596,9 +16640,9 @@ var Translator = class _Translator extends EventEmitter {
       return key;
     }
     const resolved = this.resolve(keys, options);
-    let res = resolved && resolved.res;
-    const resUsedKey = resolved && resolved.usedKey || key;
-    const resExactUsedKey = resolved && resolved.exactUsedKey || key;
+    let res = resolved?.res;
+    const resUsedKey = resolved?.usedKey || key;
+    const resExactUsedKey = resolved?.exactUsedKey || key;
     const resType = Object.prototype.toString.apply(res);
     const noObject = ["[object Number]", "[object Function]", "[object RegExp]"];
     const joinArrays = options.joinArrays !== void 0 ? options.joinArrays : this.options.joinArrays;
@@ -16651,7 +16695,7 @@ var Translator = class _Translator extends EventEmitter {
       const defaultValueSuffixOrdinalFallback = options.ordinal && needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count, {
         ordinal: false
       }) : "";
-      const needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0 && this.pluralResolver.shouldUseIntlApi();
+      const needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0;
       const defaultValue = needsZeroSuffixLookup && options[`defaultValue${this.options.pluralSeparator}zero`] || options[`defaultValue${defaultValueSuffix}`] || options[`defaultValue${defaultValueSuffixOrdinalFallback}`] || options.defaultValue;
       if (!this.isValidLookup(res) && hasDefaultValue) {
         usedDefault = true;
@@ -16688,7 +16732,7 @@ var Translator = class _Translator extends EventEmitter {
           const defaultForMissing = hasDefaultValue && specificDefaultValue !== res ? specificDefaultValue : resForMissing;
           if (this.options.missingKeyHandler) {
             this.options.missingKeyHandler(l, namespace, k, defaultForMissing, updateMissing, options);
-          } else if (this.backendConnector && this.backendConnector.saveMissing) {
+          } else if (this.backendConnector?.saveMissing) {
             this.backendConnector.saveMissing(l, namespace, k, defaultForMissing, updateMissing, options);
           }
           this.emit("missingKey", l, namespace, k, res);
@@ -16712,11 +16756,7 @@ var Translator = class _Translator extends EventEmitter {
       res = this.extendTranslation(res, keys, options, resolved, lastKey);
       if (usedKey && res === key && this.options.appendNamespaceToMissingKey) res = `${namespace}:${key}`;
       if ((usedKey || usedDefault) && this.options.parseMissingKeyHandler) {
-        if (this.options.compatibilityAPI !== "v1") {
-          res = this.options.parseMissingKeyHandler(this.options.appendNamespaceToMissingKey ? `${namespace}:${key}` : key, usedDefault ? res : void 0);
-        } else {
-          res = this.options.parseMissingKeyHandler(res);
-        }
+        res = this.options.parseMissingKeyHandler(this.options.appendNamespaceToMissingKey ? `${namespace}:${key}` : key, usedDefault ? res : void 0);
       }
     }
     if (returnDetails) {
@@ -16728,7 +16768,7 @@ var Translator = class _Translator extends EventEmitter {
   }
   extendTranslation(res, key, options, resolved, lastKey) {
     var _this = this;
-    if (this.i18nFormat && this.i18nFormat.parse) {
+    if (this.i18nFormat?.parse) {
       res = this.i18nFormat.parse(res, {
         ...this.options.interpolation.defaultVariables,
         ...options
@@ -16745,7 +16785,7 @@ var Translator = class _Translator extends EventEmitter {
           }
         }
       });
-      const skipOnVariables = isString2(res) && (options && options.interpolation && options.interpolation.skipOnVariables !== void 0 ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables);
+      const skipOnVariables = isString2(res) && (options?.interpolation?.skipOnVariables !== void 0 ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables);
       let nestBef;
       if (skipOnVariables) {
         const nb = res.match(this.interpolator.nestingRegexp);
@@ -16762,12 +16802,12 @@ var Translator = class _Translator extends EventEmitter {
         const nestAft = na && na.length;
         if (nestBef < nestAft) options.nest = false;
       }
-      if (!options.lng && this.options.compatibilityAPI !== "v1" && resolved && resolved.res) options.lng = this.language || resolved.usedLng;
+      if (!options.lng && resolved && resolved.res) options.lng = this.language || resolved.usedLng;
       if (options.nest !== false) res = this.interpolator.nest(res, function() {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        if (lastKey && lastKey[0] === args[0] && !options.context) {
+        if (lastKey?.[0] === args[0] && !options.context) {
           _this.logger.warn(`It seems you are nesting recursively key: ${args[0]} in key: ${key[0]}`);
           return null;
         }
@@ -16777,7 +16817,7 @@ var Translator = class _Translator extends EventEmitter {
     }
     const postProcess = options.postProcess || this.options.postProcess;
     const postProcessorNames = isString2(postProcess) ? [postProcess] : postProcess;
-    if (res !== void 0 && res !== null && postProcessorNames && postProcessorNames.length && options.applyPostProcessor !== false) {
+    if (res != null && postProcessorNames?.length && options.applyPostProcessor !== false) {
       res = postProcessor.handle(postProcessorNames, res, key, this.options && this.options.postProcessPassResolved ? {
         i18nResolved: {
           ...resolved,
@@ -16804,13 +16844,13 @@ var Translator = class _Translator extends EventEmitter {
       let namespaces = extracted.namespaces;
       if (this.options.fallbackNS) namespaces = namespaces.concat(this.options.fallbackNS);
       const needsPluralHandling = options.count !== void 0 && !isString2(options.count);
-      const needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0 && this.pluralResolver.shouldUseIntlApi();
+      const needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0;
       const needsContextHandling = options.context !== void 0 && (isString2(options.context) || typeof options.context === "number") && options.context !== "";
       const codes = options.lngs ? options.lngs : this.languageUtils.toResolveHierarchy(options.lng || this.language, options.fallbackLng);
       namespaces.forEach((ns) => {
         if (this.isValidLookup(found)) return;
         usedNS = ns;
-        if (!checkedLoadedFor[`${codes[0]}-${ns}`] && this.utils && this.utils.hasLoadedNamespace && !this.utils.hasLoadedNamespace(usedNS)) {
+        if (!checkedLoadedFor[`${codes[0]}-${ns}`] && this.utils?.hasLoadedNamespace && !this.utils?.hasLoadedNamespace(usedNS)) {
           checkedLoadedFor[`${codes[0]}-${ns}`] = true;
           this.logger.warn(`key "${usedKey}" for languages "${codes.join(", ")}" won't get resolved as namespace "${usedNS}" was not yet loaded`, "This means something IS WRONG in your setup. You access the t function before i18next.init / i18next.loadNamespace / i18next.changeLanguage was done. Wait for the callback or Promise to resolve before accessing it!!!");
         }
@@ -16818,7 +16858,7 @@ var Translator = class _Translator extends EventEmitter {
           if (this.isValidLookup(found)) return;
           usedLng = code;
           const finalKeys = [key];
-          if (this.i18nFormat && this.i18nFormat.addLookupKeys) {
+          if (this.i18nFormat?.addLookupKeys) {
             this.i18nFormat.addLookupKeys(finalKeys, key, code, ns, options);
           } else {
             let pluralSuffix;
@@ -16871,7 +16911,7 @@ var Translator = class _Translator extends EventEmitter {
   }
   getResource(code, ns, key) {
     let options = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {};
-    if (this.i18nFormat && this.i18nFormat.getResource) return this.i18nFormat.getResource(code, ns, key, options);
+    if (this.i18nFormat?.getResource) return this.i18nFormat.getResource(code, ns, key, options);
     return this.resourceStore.getResource(code, ns, key, options);
   }
   getUsedParamsDetails() {
@@ -16908,7 +16948,6 @@ var Translator = class _Translator extends EventEmitter {
     return false;
   }
 };
-var capitalize = (string) => string.charAt(0).toUpperCase() + string.slice(1);
 var LanguageUtil = class {
   constructor(options) {
     this.options = options;
@@ -16932,32 +16971,19 @@ var LanguageUtil = class {
   }
   formatLanguageCode(code) {
     if (isString2(code) && code.indexOf("-") > -1) {
-      if (typeof Intl !== "undefined" && typeof Intl.getCanonicalLocales !== "undefined") {
-        try {
-          let formattedCode = Intl.getCanonicalLocales(code)[0];
-          if (formattedCode && this.options.lowerCaseLng) {
-            formattedCode = formattedCode.toLowerCase();
-          }
-          if (formattedCode) return formattedCode;
-        } catch (e2) {
-        }
+      let formattedCode;
+      try {
+        formattedCode = Intl.getCanonicalLocales(code)[0];
+      } catch (e2) {
+      }
+      if (formattedCode && this.options.lowerCaseLng) {
+        formattedCode = formattedCode.toLowerCase();
       }
-      const specialCases = ["hans", "hant", "latn", "cyrl", "cans", "mong", "arab"];
-      let p = code.split("-");
+      if (formattedCode) return formattedCode;
       if (this.options.lowerCaseLng) {
-        p = p.map((part) => part.toLowerCase());
-      } else if (p.length === 2) {
-        p[0] = p[0].toLowerCase();
-        p[1] = p[1].toUpperCase();
-        if (specialCases.indexOf(p[1].toLowerCase()) > -1) p[1] = capitalize(p[1].toLowerCase());
-      } else if (p.length === 3) {
-        p[0] = p[0].toLowerCase();
-        if (p[1].length === 2) p[1] = p[1].toUpperCase();
-        if (p[0] !== "sgn" && p[2].length === 2) p[2] = p[2].toUpperCase();
-        if (specialCases.indexOf(p[1].toLowerCase()) > -1) p[1] = capitalize(p[1].toLowerCase());
-        if (specialCases.indexOf(p[2].toLowerCase()) > -1) p[2] = capitalize(p[2].toLowerCase());
-      }
-      return p.join("-");
+        return code.toLowerCase();
+      }
+      return code;
     }
     return this.options.cleanCode || this.options.lowerCaseLng ? code.toLowerCase() : code;
   }
@@ -17028,125 +17054,6 @@ var LanguageUtil = class {
     return codes;
   }
 };
-var sets = [{
-  lngs: ["ach", "ak", "am", "arn", "br", "fil", "gun", "ln", "mfe", "mg", "mi", "oc", "pt", "pt-BR", "tg", "tl", "ti", "tr", "uz", "wa"],
-  nr: [1, 2],
-  fc: 1
-}, {
-  lngs: ["af", "an", "ast", "az", "bg", "bn", "ca", "da", "de", "dev", "el", "en", "eo", "es", "et", "eu", "fi", "fo", "fur", "fy", "gl", "gu", "ha", "hi", "hu", "hy", "ia", "it", "kk", "kn", "ku", "lb", "mai", "ml", "mn", "mr", "nah", "nap", "nb", "ne", "nl", "nn", "no", "nso", "pa", "pap", "pms", "ps", "pt-PT", "rm", "sco", "se", "si", "so", "son", "sq", "sv", "sw", "ta", "te", "tk", "ur", "yo"],
-  nr: [1, 2],
-  fc: 2
-}, {
-  lngs: ["ay", "bo", "cgg", "fa", "ht", "id", "ja", "jbo", "ka", "km", "ko", "ky", "lo", "ms", "sah", "su", "th", "tt", "ug", "vi", "wo", "zh"],
-  nr: [1],
-  fc: 3
-}, {
-  lngs: ["be", "bs", "cnr", "dz", "hr", "ru", "sr", "uk"],
-  nr: [1, 2, 5],
-  fc: 4
-}, {
-  lngs: ["ar"],
-  nr: [0, 1, 2, 3, 11, 100],
-  fc: 5
-}, {
-  lngs: ["cs", "sk"],
-  nr: [1, 2, 5],
-  fc: 6
-}, {
-  lngs: ["csb", "pl"],
-  nr: [1, 2, 5],
-  fc: 7
-}, {
-  lngs: ["cy"],
-  nr: [1, 2, 3, 8],
-  fc: 8
-}, {
-  lngs: ["fr"],
-  nr: [1, 2],
-  fc: 9
-}, {
-  lngs: ["ga"],
-  nr: [1, 2, 3, 7, 11],
-  fc: 10
-}, {
-  lngs: ["gd"],
-  nr: [1, 2, 3, 20],
-  fc: 11
-}, {
-  lngs: ["is"],
-  nr: [1, 2],
-  fc: 12
-}, {
-  lngs: ["jv"],
-  nr: [0, 1],
-  fc: 13
-}, {
-  lngs: ["kw"],
-  nr: [1, 2, 3, 4],
-  fc: 14
-}, {
-  lngs: ["lt"],
-  nr: [1, 2, 10],
-  fc: 15
-}, {
-  lngs: ["lv"],
-  nr: [1, 2, 0],
-  fc: 16
-}, {
-  lngs: ["mk"],
-  nr: [1, 2],
-  fc: 17
-}, {
-  lngs: ["mnk"],
-  nr: [0, 1, 2],
-  fc: 18
-}, {
-  lngs: ["mt"],
-  nr: [1, 2, 11, 20],
-  fc: 19
-}, {
-  lngs: ["or"],
-  nr: [2, 1],
-  fc: 2
-}, {
-  lngs: ["ro"],
-  nr: [1, 2, 20],
-  fc: 20
-}, {
-  lngs: ["sl"],
-  nr: [5, 1, 2, 3],
-  fc: 21
-}, {
-  lngs: ["he", "iw"],
-  nr: [1, 2, 20, 21],
-  fc: 22
-}];
-var _rulesPluralsTypes = {
-  1: (n2) => Number(n2 > 1),
-  2: (n2) => Number(n2 != 1),
-  3: (n2) => 0,
-  4: (n2) => Number(n2 % 10 == 1 && n2 % 100 != 11 ? 0 : n2 % 10 >= 2 && n2 % 10 <= 4 && (n2 % 100 < 10 || n2 % 100 >= 20) ? 1 : 2),
-  5: (n2) => Number(n2 == 0 ? 0 : n2 == 1 ? 1 : n2 == 2 ? 2 : n2 % 100 >= 3 && n2 % 100 <= 10 ? 3 : n2 % 100 >= 11 ? 4 : 5),
-  6: (n2) => Number(n2 == 1 ? 0 : n2 >= 2 && n2 <= 4 ? 1 : 2),
-  7: (n2) => Number(n2 == 1 ? 0 : n2 % 10 >= 2 && n2 % 10 <= 4 && (n2 % 100 < 10 || n2 % 100 >= 20) ? 1 : 2),
-  8: (n2) => Number(n2 == 1 ? 0 : n2 == 2 ? 1 : n2 != 8 && n2 != 11 ? 2 : 3),
-  9: (n2) => Number(n2 >= 2),
-  10: (n2) => Number(n2 == 1 ? 0 : n2 == 2 ? 1 : n2 < 7 ? 2 : n2 < 11 ? 3 : 4),
-  11: (n2) => Number(n2 == 1 || n2 == 11 ? 0 : n2 == 2 || n2 == 12 ? 1 : n2 > 2 && n2 < 20 ? 2 : 3),
-  12: (n2) => Number(n2 % 10 != 1 || n2 % 100 == 11),
-  13: (n2) => Number(n2 !== 0),
-  14: (n2) => Number(n2 == 1 ? 0 : n2 == 2 ? 1 : n2 == 3 ? 2 : 3),
-  15: (n2) => Number(n2 % 10 == 1 && n2 % 100 != 11 ? 0 : n2 % 10 >= 2 && (n2 % 100 < 10 || n2 % 100 >= 20) ? 1 : 2),
-  16: (n2) => Number(n2 % 10 == 1 && n2 % 100 != 11 ? 0 : n2 !== 0 ? 1 : 2),
-  17: (n2) => Number(n2 == 1 || n2 % 10 == 1 && n2 % 100 != 11 ? 0 : 1),
-  18: (n2) => Number(n2 == 0 ? 0 : n2 == 1 ? 1 : 2),
-  19: (n2) => Number(n2 == 1 ? 0 : n2 == 0 || n2 % 100 > 1 && n2 % 100 < 11 ? 1 : n2 % 100 > 10 && n2 % 100 < 20 ? 2 : 3),
-  20: (n2) => Number(n2 == 1 ? 0 : n2 == 0 || n2 % 100 > 0 && n2 % 100 < 20 ? 1 : 2),
-  21: (n2) => Number(n2 % 100 == 1 ? 1 : n2 % 100 == 2 ? 2 : n2 % 100 == 3 || n2 % 100 == 4 ? 3 : 0),
-  22: (n2) => Number(n2 == 1 ? 0 : n2 == 2 ? 1 : (n2 < 0 || n2 > 10) && n2 % 10 == 0 ? 2 : 3)
-};
-var nonIntlVersions = ["v1", "v2", "v3"];
-var intlVersions = ["v4"];
 var suffixesOrder = {
   zero: 0,
   one: 1,
@@ -17155,17 +17062,11 @@ var suffixesOrder = {
   many: 4,
   other: 5
 };
-var createRules = () => {
-  const rules = {};
-  sets.forEach((set) => {
-    set.lngs.forEach((l) => {
-      rules[l] = {
-        numbers: set.nr,
-        plurals: _rulesPluralsTypes[set.fc]
-      };
-    });
-  });
-  return rules;
+var dummyRule = {
+  select: (count) => count === 1 ? "one" : "other",
+  resolvedOptions: () => ({
+    pluralCategories: ["one", "other"]
+  })
 };
 var PluralResolver = class {
   constructor(languageUtils) {
@@ -17173,11 +17074,6 @@ var PluralResolver = class {
     this.languageUtils = languageUtils;
     this.options = options;
     this.logger = baseLogger.create("pluralResolver");
-    if ((!this.options.compatibilityJSON || intlVersions.includes(this.options.compatibilityJSON)) && (typeof Intl === "undefined" || !Intl.PluralRules)) {
-      this.options.compatibilityJSON = "v3";
-      this.logger.error("Your environment seems not to be Intl API compatible, use an Intl.PluralRules polyfill. Will fallback to the compatibilityJSON v3 format handling.");
-    }
-    this.rules = createRules();
     this.pluralRulesCache = {};
   }
   addRule(lng, obj) {
@@ -17188,38 +17084,37 @@ var PluralResolver = class {
   }
   getRule(code) {
     let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    if (this.shouldUseIntlApi()) {
-      const cleanedCode = getCleanedCode(code === "dev" ? "en" : code);
-      const type = options.ordinal ? "ordinal" : "cardinal";
-      const cacheKey = JSON.stringify({
-        cleanedCode,
+    const cleanedCode = getCleanedCode(code === "dev" ? "en" : code);
+    const type = options.ordinal ? "ordinal" : "cardinal";
+    const cacheKey = JSON.stringify({
+      cleanedCode,
+      type
+    });
+    if (cacheKey in this.pluralRulesCache) {
+      return this.pluralRulesCache[cacheKey];
+    }
+    let rule;
+    try {
+      rule = new Intl.PluralRules(cleanedCode, {
         type
       });
-      if (cacheKey in this.pluralRulesCache) {
-        return this.pluralRulesCache[cacheKey];
-      }
-      let rule;
-      try {
-        rule = new Intl.PluralRules(cleanedCode, {
-          type
-        });
-      } catch (err) {
-        if (!code.match(/-|_/)) return;
-        const lngPart = this.languageUtils.getLanguagePartFromCode(code);
-        rule = this.getRule(lngPart, options);
+    } catch (err) {
+      if (!Intl) {
+        this.logger.error("No Intl support, please use an Intl polyfill!");
+        return dummyRule;
       }
-      this.pluralRulesCache[cacheKey] = rule;
-      return rule;
+      if (!code.match(/-|_/)) return dummyRule;
+      const lngPart = this.languageUtils.getLanguagePartFromCode(code);
+      rule = this.getRule(lngPart, options);
     }
-    return this.rules[code] || this.rules[this.languageUtils.getLanguagePartFromCode(code)];
+    this.pluralRulesCache[cacheKey] = rule;
+    return rule;
   }
   needsPlural(code) {
     let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    const rule = this.getRule(code, options);
-    if (this.shouldUseIntlApi()) {
-      return rule && rule.resolvedOptions().pluralCategories.length > 1;
-    }
-    return rule && rule.numbers.length > 1;
+    let rule = this.getRule(code, options);
+    if (!rule) rule = this.getRule("dev", options);
+    return rule?.resolvedOptions().pluralCategories.length > 1;
   }
   getPluralFormsOfKey(code, key) {
     let options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
@@ -17227,51 +17122,19 @@ var PluralResolver = class {
   }
   getSuffixes(code) {
     let options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    const rule = this.getRule(code, options);
-    if (!rule) {
-      return [];
-    }
-    if (this.shouldUseIntlApi()) {
-      return rule.resolvedOptions().pluralCategories.sort((pluralCategory1, pluralCategory2) => suffixesOrder[pluralCategory1] - suffixesOrder[pluralCategory2]).map((pluralCategory) => `${this.options.prepend}${options.ordinal ? `ordinal${this.options.prepend}` : ""}${pluralCategory}`);
-    }
-    return rule.numbers.map((number) => this.getSuffix(code, number, options));
+    let rule = this.getRule(code, options);
+    if (!rule) rule = this.getRule("dev", options);
+    if (!rule) return [];
+    return rule.resolvedOptions().pluralCategories.sort((pluralCategory1, pluralCategory2) => suffixesOrder[pluralCategory1] - suffixesOrder[pluralCategory2]).map((pluralCategory) => `${this.options.prepend}${options.ordinal ? `ordinal${this.options.prepend}` : ""}${pluralCategory}`);
   }
   getSuffix(code, count) {
     let options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
     const rule = this.getRule(code, options);
     if (rule) {
-      if (this.shouldUseIntlApi()) {
-        return `${this.options.prepend}${options.ordinal ? `ordinal${this.options.prepend}` : ""}${rule.select(count)}`;
-      }
-      return this.getSuffixRetroCompatible(rule, count);
+      return `${this.options.prepend}${options.ordinal ? `ordinal${this.options.prepend}` : ""}${rule.select(count)}`;
     }
     this.logger.warn(`no plural rule found for: ${code}`);
-    return "";
-  }
-  getSuffixRetroCompatible(rule, count) {
-    const idx = rule.noAbs ? rule.plurals(count) : rule.plurals(Math.abs(count));
-    let suffix = rule.numbers[idx];
-    if (this.options.simplifyPluralSuffix && rule.numbers.length === 2 && rule.numbers[0] === 1) {
-      if (suffix === 2) {
-        suffix = "plural";
-      } else if (suffix === 1) {
-        suffix = "";
-      }
-    }
-    const returnSuffix = () => this.options.prepend && suffix.toString() ? this.options.prepend + suffix.toString() : suffix.toString();
-    if (this.options.compatibilityJSON === "v1") {
-      if (suffix === 1) return "";
-      if (typeof suffix === "number") return `_plural_${suffix.toString()}`;
-      return returnSuffix();
-    } else if (this.options.compatibilityJSON === "v2") {
-      return returnSuffix();
-    } else if (this.options.simplifyPluralSuffix && rule.numbers.length === 2 && rule.numbers[0] === 1) {
-      return returnSuffix();
-    }
-    return this.options.prepend && idx.toString() ? this.options.prepend + idx.toString() : idx.toString();
-  }
-  shouldUseIntlApi() {
-    return !nonIntlVersions.includes(this.options.compatibilityJSON);
+    return this.getSuffix("dev", count, options);
   }
 };
 var deepFindWithDefaults = function(data, defaultData, key) {
@@ -17290,7 +17153,7 @@ var Interpolator = class {
     let options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     this.logger = baseLogger.create("interpolator");
     this.options = options;
-    this.format = options.interpolation && options.interpolation.format || ((value2) => value2);
+    this.format = options?.interpolation?.format || ((value2) => value2);
     this.init(options);
   }
   init() {
@@ -17337,7 +17200,7 @@ var Interpolator = class {
   }
   resetRegExp() {
     const getOrResetRegExp = (existingRegExp, pattern) => {
-      if (existingRegExp && existingRegExp.source === pattern) {
+      if (existingRegExp?.source === pattern) {
         existingRegExp.lastIndex = 0;
         return existingRegExp;
       }
@@ -17371,8 +17234,8 @@ var Interpolator = class {
       });
     };
     this.resetRegExp();
-    const missingInterpolationHandler = options && options.missingInterpolationHandler || this.options.missingInterpolationHandler;
-    const skipOnVariables = options && options.interpolation && options.interpolation.skipOnVariables !== void 0 ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables;
+    const missingInterpolationHandler = options?.missingInterpolationHandler || this.options.missingInterpolationHandler;
+    const skipOnVariables = options?.interpolation?.skipOnVariables !== void 0 ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables;
     const todos = [{
       regex: this.regexpUnescape,
       safeValue: (val) => regexSafe(val)
@@ -17431,7 +17294,7 @@ var Interpolator = class {
       optionsString = this.interpolate(optionsString, clonedOptions);
       const matchedSingleQuotes = optionsString.match(/'/g);
       const matchedDoubleQuotes = optionsString.match(/"/g);
-      if (matchedSingleQuotes && matchedSingleQuotes.length % 2 === 0 && !matchedDoubleQuotes || matchedDoubleQuotes.length % 2 !== 0) {
+      if ((matchedSingleQuotes?.length ?? 0) % 2 === 0 && !matchedDoubleQuotes || matchedDoubleQuotes.length % 2 !== 0) {
         optionsString = optionsString.replace(/'/g, '"');
       }
       try {
@@ -17598,7 +17461,7 @@ var Formatter = class {
       if (this.formats[formatName]) {
         let formatted = mem;
         try {
-          const valOptions = options && options.formatParams && options.formatParams[options.interpolationkey] || {};
+          const valOptions = options?.formatParams?.[options.interpolationkey] || {};
           const l = valOptions.locale || valOptions.lng || options.locale || options.lng || lng;
           formatted = this.formats[formatName](mem, l, {
             ...formatOptions,
@@ -17640,9 +17503,7 @@ var Connector = class extends EventEmitter {
     this.retryTimeout = options.retryTimeout >= 1 ? options.retryTimeout : 350;
     this.state = {};
     this.queue = [];
-    if (this.backend && this.backend.init) {
-      this.backend.init(services, options.backend, options);
-    }
+    this.backend?.init?.(services, options.backend, options);
   }
   queueLoad(languages, namespaces, options, callback) {
     const toLoad = {};
@@ -17810,12 +17671,12 @@ var Connector = class extends EventEmitter {
     let options = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : {};
     let clb = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : () => {
     };
-    if (this.services.utils && this.services.utils.hasLoadedNamespace && !this.services.utils.hasLoadedNamespace(namespace)) {
+    if (this.services?.utils?.hasLoadedNamespace && !this.services?.utils?.hasLoadedNamespace(namespace)) {
       this.logger.warn(`did not save key "${key}" as the namespace "${namespace}" was not yet loaded`, "This means something IS WRONG in your setup. You access the t function before i18next.init / i18next.loadNamespace / i18next.changeLanguage was done. Wait for the callback or Promise to resolve before accessing it!!!");
       return;
     }
     if (key === void 0 || key === null || key === "") return;
-    if (this.backend && this.backend.create) {
+    if (this.backend?.create) {
       const opts = {
         ...options,
         isUpdate
@@ -17847,7 +17708,7 @@ var Connector = class extends EventEmitter {
 };
 var get = () => ({
   debug: false,
-  initImmediate: true,
+  initAsync: true,
   ns: ["translation"],
   defaultNS: ["translation"],
   fallbackLng: ["dev"],
@@ -17909,9 +17770,10 @@ var transformOptions = (options) => {
   if (isString2(options.ns)) options.ns = [options.ns];
   if (isString2(options.fallbackLng)) options.fallbackLng = [options.fallbackLng];
   if (isString2(options.fallbackNS)) options.fallbackNS = [options.fallbackNS];
-  if (options.supportedLngs && options.supportedLngs.indexOf("cimode") < 0) {
+  if (options.supportedLngs?.indexOf?.("cimode") < 0) {
     options.supportedLngs = options.supportedLngs.concat(["cimode"]);
   }
+  if (typeof options.initImmediate === "boolean") options.initAsync = options.initImmediate;
   return options;
 };
 var noop4 = () => {
@@ -17937,7 +17799,7 @@ var I18n = class _I18n extends EventEmitter {
     };
     bindMemberFunctions(this);
     if (callback && !this.isInitialized && !options.isClone) {
-      if (!this.options.initImmediate) {
+      if (!this.options.initAsync) {
         this.init(options, callback);
         return this;
       }
@@ -17955,7 +17817,7 @@ var I18n = class _I18n extends EventEmitter {
       callback = options;
       options = {};
     }
-    if (!options.defaultNS && options.defaultNS !== false && options.ns) {
+    if (options.defaultNS == null && options.ns) {
       if (isString2(options.ns)) {
         options.defaultNS = options.ns;
       } else if (options.ns.indexOf("translation") < 0) {
@@ -17968,12 +17830,10 @@ var I18n = class _I18n extends EventEmitter {
       ...this.options,
       ...transformOptions(options)
     };
-    if (this.options.compatibilityAPI !== "v1") {
-      this.options.interpolation = {
-        ...defOpts.interpolation,
-        ...this.options.interpolation
-      };
-    }
+    this.options.interpolation = {
+      ...defOpts.interpolation,
+      ...this.options.interpolation
+    };
     if (options.keySeparator !== void 0) {
       this.options.userDefinedKeySeparator = options.keySeparator;
     }
@@ -17994,7 +17854,7 @@ var I18n = class _I18n extends EventEmitter {
       let formatter;
       if (this.modules.formatter) {
         formatter = this.modules.formatter;
-      } else if (typeof Intl !== "undefined") {
+      } else {
         formatter = Formatter;
       }
       const lu = new LanguageUtil(this.options);
@@ -18005,7 +17865,6 @@ var I18n = class _I18n extends EventEmitter {
       s2.languageUtils = lu;
       s2.pluralResolver = new PluralResolver(lu, {
         prepend: this.options.pluralSeparator,
-        compatibilityJSON: this.options.compatibilityJSON,
         simplifyPluralSuffix: this.options.simplifyPluralSuffix
       });
       if (formatter && (!this.options.interpolation.format || this.options.interpolation.format === defOpts.interpolation.format)) {
@@ -18076,10 +17935,10 @@ var I18n = class _I18n extends EventEmitter {
         deferred.resolve(t3);
         callback(err, t3);
       };
-      if (this.languages && this.options.compatibilityAPI !== "v1" && !this.isInitialized) return finish(null, this.t.bind(this));
+      if (this.languages && !this.isInitialized) return finish(null, this.t.bind(this));
       this.changeLanguage(this.options.lng, finish);
     };
-    if (this.options.resources || !this.options.initImmediate) {
+    if (this.options.resources || !this.options.initAsync) {
       load();
     } else {
       setTimeout(load, 0);
@@ -18092,7 +17951,7 @@ var I18n = class _I18n extends EventEmitter {
     const usedLng = isString2(language) ? language : this.language;
     if (typeof language === "function") usedCallback = language;
     if (!this.options.resources || this.options.partialBundledLanguages) {
-      if (usedLng && usedLng.toLowerCase() === "cimode" && (!this.options.preload || this.options.preload.length === 0)) return usedCallback();
+      if (usedLng?.toLowerCase() === "cimode" && (!this.options.preload || this.options.preload.length === 0)) return usedCallback();
       const toLoad = [];
       const append = (lng) => {
         if (!lng) return;
@@ -18109,9 +17968,7 @@ var I18n = class _I18n extends EventEmitter {
       } else {
         append(usedLng);
       }
-      if (this.options.preload) {
-        this.options.preload.forEach((l) => append(l));
-      }
+      this.options.preload?.forEach?.((l) => append(l));
       this.services.backendConnector.load(toLoad, this.options.ns, (e2) => {
         if (!e2 && !this.resolvedLanguage && this.language) this.setResolvedLanguage(this.language);
         usedCallback(e2);
@@ -18213,7 +18070,7 @@ var I18n = class _I18n extends EventEmitter {
           setLngProps(l);
         }
         if (!this.translator.language) this.translator.changeLanguage(l);
-        if (this.services.languageDetector && this.services.languageDetector.cacheUserLanguage) this.services.languageDetector.cacheUserLanguage(l);
+        this.services.languageDetector?.cacheUserLanguage?.(l);
       }
       this.loadResources(l, (err) => {
         done(err, l);
@@ -18269,10 +18126,16 @@ var I18n = class _I18n extends EventEmitter {
     return fixedT;
   }
   t() {
-    return this.translator && this.translator.translate(...arguments);
+    for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+      args[_key4] = arguments[_key4];
+    }
+    return this.translator?.translate(...args);
   }
   exists() {
-    return this.translator && this.translator.exists(...arguments);
+    for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+      args[_key5] = arguments[_key5];
+    }
+    return this.translator?.exists(...args);
   }
   setDefaultNamespace(ns) {
     this.options.defaultNS = ns;
@@ -18337,10 +18200,10 @@ var I18n = class _I18n extends EventEmitter {
     return deferred;
   }
   dir(lng) {
-    if (!lng) lng = this.resolvedLanguage || (this.languages && this.languages.length > 0 ? this.languages[0] : this.language);
+    if (!lng) lng = this.resolvedLanguage || (this.languages?.length > 0 ? this.languages[0] : this.language);
     if (!lng) return "rtl";
     const rtlLngs = ["ar", "shu", "sqr", "ssh", "xaa", "yhd", "yud", "aao", "abh", "abv", "acm", "acq", "acw", "acx", "acy", "adf", "ads", "aeb", "aec", "afb", "ajp", "apc", "apd", "arb", "arq", "ars", "ary", "arz", "auz", "avl", "ayh", "ayl", "ayn", "ayp", "bbz", "pga", "he", "iw", "ps", "pbt", "pbu", "pst", "prp", "prd", "ug", "ur", "ydd", "yds", "yih", "ji", "yi", "hbo", "men", "xmn", "fa", "jpr", "peo", "pes", "prs", "dv", "sam", "ckb"];
-    const languageUtils = this.services && this.services.languageUtils || new LanguageUtil(get());
+    const languageUtils = this.services?.languageUtils || new LanguageUtil(get());
     return rtlLngs.indexOf(languageUtils.getLanguagePartFromCode(lng)) > -1 || lng.toLowerCase().indexOf("-arab") > 1 ? "rtl" : "ltr";
   }
   static createInstance() {
@@ -18375,13 +18238,24 @@ var I18n = class _I18n extends EventEmitter {
       hasLoadedNamespace: clone.hasLoadedNamespace.bind(clone)
     };
     if (forkResourceStore) {
-      clone.store = new ResourceStore(this.store.data, mergedOptions);
+      const clonedData = Object.keys(this.store.data).reduce((prev, l) => {
+        prev[l] = {
+          ...this.store.data[l]
+        };
+        return Object.keys(prev[l]).reduce((acc, n2) => {
+          acc[n2] = {
+            ...prev[l][n2]
+          };
+          return acc;
+        }, {});
+      }, {});
+      clone.store = new ResourceStore(clonedData, mergedOptions);
       clone.services.resourceStore = clone.store;
     }
     clone.translator = new Translator(clone.services, mergedOptions);
     clone.translator.on("*", function(event) {
-      for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
-        args[_key4 - 1] = arguments[_key4];
+      for (var _len6 = arguments.length, args = new Array(_len6 > 1 ? _len6 - 1 : 0), _key6 = 1; _key6 < _len6; _key6++) {
+        args[_key6 - 1] = arguments[_key6];
       }
       clone.emit(event, ...args);
     });
@@ -18444,8 +18318,8 @@ var I18nProvider = ({
   messages,
   i18n: initialI18n
 }) => {
-  const [i18n] = (0, import_react55.useState)(() => initialI18n ?? createI18n(messages));
-  return /* @__PURE__ */ import_react55.default.createElement(I18nextProvider, { i18n }, children);
+  const [i18n] = (0, import_react56.useState)(() => initialI18n ?? createI18n(messages));
+  return /* @__PURE__ */ import_react56.default.createElement(I18nextProvider, { i18n }, children);
 };
 
 // ../cli-i18n/src/index.ts
@@ -18466,6 +18340,7 @@ export {
   Link,
   Spinner2 as Spinner,
   ErrorDetails,
+  Notification,
   useExit,
   useAsync2 as useAsync,
   useAsyncCallback3 as useAsyncCallback,
@@ -18523,4 +18398,4 @@ react-reconciler/cjs/react-reconciler-constants.production.min.js:
    * LICENSE file in the root directory of this source tree.
    *)
 */
-//# sourceMappingURL=chunk-BHINMCY7.js.map
+//# sourceMappingURL=chunk-V4DAKO7L.js.map