diff --git a/crates/swc/tests/tsc-references/callbackTagVariadicType.2.minified.js b/crates/swc/tests/tsc-references/callbackTagVariadicType.2.minified.js index 5b7c15214b46..1502d61b43e5 100644 --- a/crates/swc/tests/tsc-references/callbackTagVariadicType.2.minified.js +++ b/crates/swc/tests/tsc-references/callbackTagVariadicType.2.minified.js @@ -2,4 +2,4 @@ export var x = function() { return 1; }; -x('a', 'b'); +x(); diff --git a/crates/swc/tests/tsc-references/taggedTemplateStringsWithOverloadResolution3.2.minified.js b/crates/swc/tests/tsc-references/taggedTemplateStringsWithOverloadResolution3.2.minified.js index 96260feeb957..e6230a53d535 100644 --- a/crates/swc/tests/tsc-references/taggedTemplateStringsWithOverloadResolution3.2.minified.js +++ b/crates/swc/tests/tsc-references/taggedTemplateStringsWithOverloadResolution3.2.minified.js @@ -218,5 +218,5 @@ function _templateObject21() { } function fn2() {} _templateObject(), _templateObject1(); -var d1 = fn2(_templateObject2(), 0, void 0), d2 = fn2(_templateObject3(), 0, void 0); +var d1 = fn2(_templateObject2()), d2 = fn2(_templateObject3()); d1.foo(), d2(), _templateObject4(), _templateObject5(), _templateObject6(), _templateObject7(), _templateObject8(), _templateObject9(), _templateObject10(), _templateObject11(), _templateObject12(), _templateObject13(), _templateObject14(), _templateObject15(), _templateObject16(), _templateObject17(), _templateObject18(), _templateObject19(), _templateObject20(), _templateObject21(); diff --git a/crates/swc_ecma_minifier/src/compress/optimize/call_args.rs b/crates/swc_ecma_minifier/src/compress/optimize/call_args.rs new file mode 100644 index 000000000000..a1a46844ba7c --- /dev/null +++ b/crates/swc_ecma_minifier/src/compress/optimize/call_args.rs @@ -0,0 +1,67 @@ +use swc_ecma_ast::*; + +use super::Optimizer; +use crate::program_data::VarUsageInfoFlags; + +impl Optimizer<'_> { + /// Drop trailing call arguments that are guaranteed to be unused by a + /// known function binding. + pub(super) fn drop_unused_args_of_known_fn_call(&mut self, e: &mut CallExpr) { + if !self.options.unused && !self.options.reduce_vars { + return; + } + + let callee = match &e.callee { + Callee::Super(_) | Callee::Import(_) => return, + Callee::Expr(callee) => match &**callee { + Expr::Ident(callee) => callee, + _ => return, + }, + #[cfg(swc_ast_unknown)] + _ => panic!("unable to access unknown nodes"), + }; + + let Some(usage) = self.data.vars.get(&callee.to_id()) else { + return; + }; + if usage.flags.contains(VarUsageInfoFlags::REASSIGNED) { + return; + } + + let Some(metadata) = self.functions.get(&callee.to_id()) else { + return; + }; + + if metadata.has_rest || metadata.uses_arguments { + return; + } + + if e.args.len() <= metadata.param_count { + return; + } + + if e.args.iter().any(|arg| arg.spread.is_some()) { + return; + } + + let mut removed = false; + + for idx in (metadata.param_count..e.args.len()).rev() { + if let Some(arg) = e.args.get_mut(idx) { + let new = self.ignore_return_value(&mut arg.expr); + + if let Some(new) = new { + arg.expr = Box::new(new); + } else { + e.args.remove(idx); + removed = true; + } + } + } + + if removed { + self.changed = true; + report_change!("unused: Dropped trailing unused call arguments"); + } + } +} diff --git a/crates/swc_ecma_minifier/src/compress/optimize/mod.rs b/crates/swc_ecma_minifier/src/compress/optimize/mod.rs index 5c97b857d017..53771e7c36cb 100644 --- a/crates/swc_ecma_minifier/src/compress/optimize/mod.rs +++ b/crates/swc_ecma_minifier/src/compress/optimize/mod.rs @@ -38,6 +38,7 @@ use crate::{ mod arguments; mod bools; +mod call_args; mod conditionals; mod dead_code; mod drop_console; @@ -336,21 +337,40 @@ impl Repeated for Optimizer<'_> { #[derive(Debug, Clone, Copy)] struct FnMetadata { len: usize, + param_count: usize, + has_rest: bool, + uses_arguments: bool, } -impl From<&Function> for FnMetadata { - fn from(f: &Function) -> Self { +fn function_length_from_params<'a>(params: impl IntoIterator) -> usize { + params + .into_iter() + .filter(|p| matches!(p, Pat::Ident(..) | Pat::Array(..) | Pat::Object(..))) + .count() +} + +impl Optimizer<'_> { + fn fn_metadata_of_function(&self, f: &Function) -> FnMetadata { FnMetadata { - len: f - .params - .iter() - .filter(|p| matches!(&p.pat, Pat::Ident(..) | Pat::Array(..) | Pat::Object(..))) - .count(), + len: function_length_from_params(f.params.iter().map(|p| &p.pat)), + param_count: f.params.len(), + has_rest: f.params.iter().any(|p| p.pat.is_rest()), + uses_arguments: self + .data + .get_scope(f.ctxt) + .is_some_and(|scope| scope.contains(ScopeData::USED_ARGUMENTS)), + } + } + + fn fn_metadata_of_arrow(&self, a: &ArrowExpr) -> FnMetadata { + FnMetadata { + len: function_length_from_params(a.params.iter()), + param_count: a.params.len(), + has_rest: a.params.iter().any(Pat::is_rest), + uses_arguments: false, } } -} -impl Optimizer<'_> { fn may_remove_ident(&self, id: &Ident) -> bool { if self .data @@ -1711,6 +1731,7 @@ impl VisitMut for Optimizer<'_> { self.ignore_unused_args_of_iife(e); self.inline_args_of_iife(e); self.drop_arguments_of_symbol_call(e); + self.drop_unused_args_of_known_fn_call(e); // Try to replace static method call with alias (after other transformations) if let Callee::Expr(callee) = &mut e.callee { @@ -2135,9 +2156,8 @@ impl VisitMut for Optimizer<'_> { ) .entered(); - self.functions - .entry(f.ident.to_id()) - .or_insert_with(|| FnMetadata::from(&*f.function)); + let metadata = self.fn_metadata_of_function(&f.function); + self.functions.entry(f.ident.to_id()).or_insert(metadata); self.drop_unused_params(&mut f.function.params); @@ -2154,9 +2174,8 @@ impl VisitMut for Optimizer<'_> { #[cfg_attr(feature = "debug", tracing::instrument(level = "debug", skip_all))] fn visit_mut_fn_expr(&mut self, e: &mut FnExpr) { if let Some(ident) = &e.ident { - self.functions - .entry(ident.to_id()) - .or_insert_with(|| FnMetadata::from(&*e.function)); + let metadata = self.fn_metadata_of_function(&e.function); + self.functions.entry(ident.to_id()).or_insert(metadata); } if !self.options.keep_fnames { @@ -3016,6 +3035,23 @@ impl VisitMut for Optimizer<'_> { debug_assert_valid(&var.init); + if let VarDeclarator { + name: Pat::Ident(id), + init: Some(init), + .. + } = var + { + let metadata = match &**init { + Expr::Fn(FnExpr { function, .. }) => Some(self.fn_metadata_of_function(function)), + Expr::Arrow(arrow) => Some(self.fn_metadata_of_arrow(arrow)), + _ => None, + }; + + if let Some(metadata) = metadata { + self.functions.entry(id.id.to_id()).or_insert(metadata); + } + } + if let VarDeclarator { name: Pat::Ident(id), init: Some(init), diff --git a/crates/swc_ecma_minifier/tests/benches-full/victory.js b/crates/swc_ecma_minifier/tests/benches-full/victory.js index d9e3efdff457..357d85a23bae 100644 --- a/crates/swc_ecma_minifier/tests/benches-full/victory.js +++ b/crates/swc_ecma_minifier/tests/benches-full/victory.js @@ -30598,7 +30598,7 @@ scale: scale, axisType: axisType, text: text - }).tickStyle, axisAngle = "radial" === axisType ? getAxisAngle(props, scale) : void 0, tickPadding = tickStyle.padding || tickStyle.size || 0, padAngle = victory_core__WEBPACK_IMPORTED_MODULE_3__.Helpers.degreesToRadians(90 - axisAngle), tickAngle = "angular" === axisType ? scale(tickValue) : victory_core__WEBPACK_IMPORTED_MODULE_3__.Helpers.degreesToRadians(-1 * axisAngle), tickRadius = "angular" === axisType ? radius : scale(tickValue); + }).tickStyle, axisAngle = "radial" === axisType ? getAxisAngle(props) : void 0, tickPadding = tickStyle.padding || tickStyle.size || 0, padAngle = victory_core__WEBPACK_IMPORTED_MODULE_3__.Helpers.degreesToRadians(90 - axisAngle), tickAngle = "angular" === axisType ? scale(tickValue) : victory_core__WEBPACK_IMPORTED_MODULE_3__.Helpers.degreesToRadians(-1 * axisAngle), tickRadius = "angular" === axisType ? radius : scale(tickValue); return "angular" === axisType ? { index: index, datum: tick, @@ -30627,7 +30627,7 @@ radius: radius, scale: scale, axisType: axisType - }).labelStyle, tickLabelComponent = props.tickLabelComponent, labelPlacement = tickLabelComponent.props && tickLabelComponent.props.labelPlacement ? tickLabelComponent.props.labelPlacement : props.labelPlacement, tickPadding = labelStyle.padding || 0, axisAngle = "radial" === axisType ? getAxisAngle(props, scale) : void 0, labelAngle = "angular" === axisType ? victory_core__WEBPACK_IMPORTED_MODULE_3__.Helpers.radiansToDegrees(scale(tickValue)) : axisAngle + 0, textAngle = void 0 === labelStyle.angle ? victory_core__WEBPACK_IMPORTED_MODULE_3__.LabelHelpers.getPolarAngle(lodash_assign__WEBPACK_IMPORTED_MODULE_2___default()({}, props, { + }).labelStyle, tickLabelComponent = props.tickLabelComponent, labelPlacement = tickLabelComponent.props && tickLabelComponent.props.labelPlacement ? tickLabelComponent.props.labelPlacement : props.labelPlacement, tickPadding = labelStyle.padding || 0, axisAngle = "radial" === axisType ? getAxisAngle(props) : void 0, labelAngle = "angular" === axisType ? victory_core__WEBPACK_IMPORTED_MODULE_3__.Helpers.radiansToDegrees(scale(tickValue)) : axisAngle + 0, textAngle = void 0 === labelStyle.angle ? victory_core__WEBPACK_IMPORTED_MODULE_3__.LabelHelpers.getPolarAngle(lodash_assign__WEBPACK_IMPORTED_MODULE_2___default()({}, props, { labelPlacement: labelPlacement }), labelAngle) : labelStyle.angle, labelRadius = "angular" === axisType ? radius + tickPadding : scale(tickValue), textAnchor = labelStyle.textAnchor || victory_core__WEBPACK_IMPORTED_MODULE_3__.LabelHelpers.getPolarTextAnchor(lodash_assign__WEBPACK_IMPORTED_MODULE_2___default()({}, props, { labelPlacement: labelPlacement @@ -30673,9 +30673,9 @@ endAngle: endAngle }; }, getAxisLabelProps = function(props, calculatedValues) { - var axisType = calculatedValues.axisType, radius = calculatedValues.radius, style = calculatedValues.style, scale = calculatedValues.scale, origin = calculatedValues.origin, axisLabelComponent = props.axisLabelComponent; + var axisType = calculatedValues.axisType, radius = calculatedValues.radius, style = calculatedValues.style, origin = (calculatedValues.scale, calculatedValues.origin), axisLabelComponent = props.axisLabelComponent; if ("radial" !== axisType) return {}; - var labelPlacement = axisLabelComponent.props && axisLabelComponent.props.labelPlacement ? axisLabelComponent.props.labelPlacement : props.labelPlacement, labelStyle = style && style.axisLabel || {}, axisAngle = "radial" === axisType ? getAxisAngle(props, scale) : void 0, textAngle = void 0 === labelStyle.angle ? victory_core__WEBPACK_IMPORTED_MODULE_3__.LabelHelpers.getPolarAngle(lodash_assign__WEBPACK_IMPORTED_MODULE_2___default()({}, props, { + var labelPlacement = axisLabelComponent.props && axisLabelComponent.props.labelPlacement ? axisLabelComponent.props.labelPlacement : props.labelPlacement, labelStyle = style && style.axisLabel || {}, axisAngle = "radial" === axisType ? getAxisAngle(props) : void 0, textAngle = void 0 === labelStyle.angle ? victory_core__WEBPACK_IMPORTED_MODULE_3__.LabelHelpers.getPolarAngle(lodash_assign__WEBPACK_IMPORTED_MODULE_2___default()({}, props, { labelPlacement: labelPlacement }), axisAngle) : labelStyle.angle, labelRadius = radius + (labelStyle.padding || 0), textAnchor = labelStyle.textAnchor || victory_core__WEBPACK_IMPORTED_MODULE_3__.LabelHelpers.getTextPolarAnchor(lodash_assign__WEBPACK_IMPORTED_MODULE_2___default()({}, props, { labelPlacement: labelPlacement @@ -30692,7 +30692,7 @@ y: getPosition(labelRadius, victory_core__WEBPACK_IMPORTED_MODULE_3__.Helpers.degreesToRadians(axisAngle), "y") + origin.y }; }, getAxisProps = function(modifiedProps, calculatedValues) { - var style = calculatedValues.style, axisType = calculatedValues.axisType, radius = calculatedValues.radius, scale = calculatedValues.scale, origin = calculatedValues.origin, startAngle = modifiedProps.startAngle, endAngle = modifiedProps.endAngle, _modifiedProps$innerR = modifiedProps.innerRadius, innerRadius = void 0 === _modifiedProps$innerR ? 0 : _modifiedProps$innerR, axisAngle = "radial" === axisType ? victory_core__WEBPACK_IMPORTED_MODULE_3__.Helpers.degreesToRadians(getAxisAngle(modifiedProps, scale)) : void 0; + var style = calculatedValues.style, axisType = calculatedValues.axisType, radius = calculatedValues.radius, origin = (calculatedValues.scale, calculatedValues.origin), startAngle = modifiedProps.startAngle, endAngle = modifiedProps.endAngle, _modifiedProps$innerR = modifiedProps.innerRadius, innerRadius = void 0 === _modifiedProps$innerR ? 0 : _modifiedProps$innerR, axisAngle = "radial" === axisType ? victory_core__WEBPACK_IMPORTED_MODULE_3__.Helpers.degreesToRadians(getAxisAngle(modifiedProps)) : void 0; return "radial" === axisType ? { style: style.axis, x1: getPosition(innerRadius, axisAngle, "x") + origin.x, diff --git a/crates/swc_ecma_minifier/tests/fixture/issues/2257/full/output.js b/crates/swc_ecma_minifier/tests/fixture/issues/2257/full/output.js index e6f6f89aa4df..a9918dc28167 100644 --- a/crates/swc_ecma_minifier/tests/fixture/issues/2257/full/output.js +++ b/crates/swc_ecma_minifier/tests/fixture/issues/2257/full/output.js @@ -1704,7 +1704,7 @@ }; } // CONCATENATED MODULE: ./node_modules/_@swc_helpers@0.2.13@@swc/helpers/src/_sliced_to_array.js function _slicedToArray(arr, i) { - return _arrayWithHoles(arr) || _iterableToArray(arr, i) || _nonIterableRest(); + return _arrayWithHoles(arr) || _iterableToArray(arr) || _nonIterableRest(); } // CONCATENATED MODULE: ./node_modules/_@swc_helpers@0.2.13@@swc/helpers/src/_sliced_to_array_loose.js function _slicedToArrayLoose(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimitLoose(arr, i) || _nonIterableRest(); diff --git a/crates/swc_ecma_minifier/tests/fixture/issues/7784/3/output.js b/crates/swc_ecma_minifier/tests/fixture/issues/7784/3/output.js index a3f1a473bbcf..75a96d83c874 100644 --- a/crates/swc_ecma_minifier/tests/fixture/issues/7784/3/output.js +++ b/crates/swc_ecma_minifier/tests/fixture/issues/7784/3/output.js @@ -2,5 +2,5 @@ export function f(i, e, cmp) { function g() { return i++, e || 0; } - return e = g(e), cmp(i, e) && console.log(e), g; + return e = g(), cmp(i, e) && console.log(e), g; } diff --git a/crates/swc_ecma_minifier/tests/fixture/next/33265/static/chunks/d6e1aeb5-38a8d7ae57119c23/output.js b/crates/swc_ecma_minifier/tests/fixture/next/33265/static/chunks/d6e1aeb5-38a8d7ae57119c23/output.js index 355ec5fbe77a..bdef99ae321e 100644 --- a/crates/swc_ecma_minifier/tests/fixture/next/33265/static/chunks/d6e1aeb5-38a8d7ae57119c23/output.js +++ b/crates/swc_ecma_minifier/tests/fixture/next/33265/static/chunks/d6e1aeb5-38a8d7ae57119c23/output.js @@ -11097,7 +11097,7 @@ try { var muted = Html5.TEST_VID.muted; // in some versions of iOS muted property doesn't always return(// work, so we want to set both property and attribute - Html5.TEST_VID.muted = !muted, Html5.TEST_VID.muted ? setAttribute(Html5.TEST_VID, "muted", "muted") : removeAttribute(Html5.TEST_VID, "muted", "muted"), muted !== Html5.TEST_VID.muted); + Html5.TEST_VID.muted = !muted, Html5.TEST_VID.muted ? setAttribute(Html5.TEST_VID, "muted", "muted") : removeAttribute(Html5.TEST_VID, "muted"), muted !== Html5.TEST_VID.muted); } catch (e) { return !1; } diff --git a/crates/swc_ecma_minifier/tests/fixture/next/47005/output.js b/crates/swc_ecma_minifier/tests/fixture/next/47005/output.js index 7f30eacbd890..43d2042e6305 100644 --- a/crates/swc_ecma_minifier/tests/fixture/next/47005/output.js +++ b/crates/swc_ecma_minifier/tests/fixture/next/47005/output.js @@ -121,17 +121,12 @@ ...k.platform, _c: E }; - return V(m, S, { - ...k, - platform: R - }); + return V(); }; var er = async ({ elementReference: m = null, tooltipReference: S = null, tooltipArrowReference: h = null, place: E = "top", offset: k = 10, strategy: R = "absolute", middlewares: A = [ X(Number(k)), W(), - Y({ - padding: 5 - }) + Y() ] })=>{ if (!m) return { tooltipStyles: {}, @@ -213,7 +208,7 @@ }; eo(S), V.current = S; }, ei = (m)=>{ - ee(m), y; + ee(), y; }, ea = (S)=>{ var h; [ @@ -222,7 +217,7 @@ ].some((m)=>null == m ? void 0 : m.contains(S.target)) || null != (h = m.current) && h.contains(S.target) || Z(!1); }, eu = (m)=>{ "Escape" === m.key && Z(!1); - }, es = I(ee, 50), ec = I(et, 50); + }, es = I(), ec = I(); (0, A.useEffect)(()=>{ var S, h; let E = new Set(W); diff --git a/crates/swc_ecma_minifier/tests/fixture/next/react-pdf-renderer/output.js b/crates/swc_ecma_minifier/tests/fixture/next/react-pdf-renderer/output.js index a4de4d54c6b7..bc0ba25f7beb 100644 --- a/crates/swc_ecma_minifier/tests/fixture/next/react-pdf-renderer/output.js +++ b/crates/swc_ecma_minifier/tests/fixture/next/react-pdf-renderer/output.js @@ -16527,8 +16527,7 @@ } return r < n ? -1 : +(n < r); } - var I = void 0; - function j(t, e, r, n) { + function I(t, e, r, n) { if (t === e) return 0 !== t || !r || l(t, e); if (r) { if ("object" !== i(t)) return "number" == typeof t && c(t) && c(e); @@ -16541,8 +16540,8 @@ if (a !== h(e)) return !1; if (Array.isArray(t)) { if (t.length !== e.length) return !1; - var u = F(t, I), s = F(e, I); - return u.length === s.length && M(t, e, r, n, 1, u); + var u = F(t), s = F(e); + return u.length === s.length && B(t, e, r, n, 1, u); } if ("[object Object]" === a && (!m(t) && m(e) || !w(t) && w(e))) return !1; if (b(t)) { @@ -16559,21 +16558,21 @@ return !0; }(t, e)) return !1; } else if (t.byteLength !== e.byteLength || 0 !== R(new Uint8Array(t.buffer, t.byteOffset, t.byteLength), new Uint8Array(e.buffer, e.byteOffset, e.byteLength))) return !1; - var f = F(t, I), p = F(e, I); - return f.length === p.length && M(t, e, r, n, 0, f); - } else if (w(t)) return !!w(e) && t.size === e.size && M(t, e, r, n, 2); - else if (m(t)) return !!m(e) && t.size === e.size && M(t, e, r, n, 3); + var f = F(t), p = F(e); + return f.length === p.length && B(t, e, r, n, 0, f); + } else if (w(t)) return !!w(e) && t.size === e.size && B(t, e, r, n, 2); + else if (m(t)) return !!m(e) && t.size === e.size && B(t, e, r, n, 3); else if (g(t)) { if (t.byteLength !== e.byteLength || 0 !== R(new Uint8Array(t), new Uint8Array(e))) return !1; } else if (_(t) && (x(t) ? !(x(e) && l(Number.prototype.valueOf.call(t), Number.prototype.valueOf.call(e))) : S(t) ? !S(e) || String.prototype.valueOf.call(t) !== String.prototype.valueOf.call(e) : A(t) ? !A(e) || Boolean.prototype.valueOf.call(t) !== Boolean.prototype.valueOf.call(e) : k(t) ? !k(e) || BigInt.prototype.valueOf.call(t) !== BigInt.prototype.valueOf.call(e) : !T(e) || Symbol.prototype.valueOf.call(t) !== Symbol.prototype.valueOf.call(e))) return !1; - return M(t, e, r, n, 0); + return B(t, e, r, n, 0); } - function B(t, e) { + function j(t, e) { return e.filter(function(e) { return d(t, e); }); } - function M(t, e, r, o, l, c) { + function B(t, e, r, o, l, c) { if (5 == arguments.length) { c = Object.keys(t); var f = Object.keys(e); @@ -16592,10 +16591,10 @@ } else if (d(e, v)) return !1; } var b = s(e); - if (y.length !== b.length && B(e, b).length !== g) return !1; + if (y.length !== b.length && j(e, b).length !== g) return !1; } else { var m = s(e); - if (0 !== m.length && 0 !== B(e, m).length) return !1; + if (0 !== m.length && 0 !== j(e, m).length) return !1; } } if (0 === c.length && (0 === l || 1 === l && 0 === t.length || 0 === t.size)) return !0; @@ -16622,7 +16621,7 @@ if ("object" === i(s) && null !== s) null === o && (o = new Set()), o.add(s); else if (!e.has(s)) { if (r || !function(t, e, r) { - var n = L(r); + var n = N(r); return null != n ? n : e.has(n) && !t.has(n); }(t, e, s)) return !1; null === o && (o = new Set()), o.add(s); @@ -16632,8 +16631,8 @@ for(var c = a(e), f = 0; f < c.length; f++){ var p = c[f]; if ("object" === i(p) && null !== p) { - if (!N(o, p, r, n)) return !1; - } else if (!r && !t.has(p) && !N(o, p, r, n)) return !1; + if (!M(o, p, r, n)) return !1; + } else if (!r && !t.has(p) && !M(o, p, r, n)) return !1; } return 0 === o.size; } @@ -16646,12 +16645,12 @@ if ("object" === i(f) && null !== f) null === a && (a = new Set()), a.add(f); else { var d = e.get(f); - if (void 0 === d && !e.has(f) || !j(p, d, r, o)) { + if (void 0 === d && !e.has(f) || !I(p, d, r, o)) { if (r || !function(t, e, r, n, i) { - var o = L(r); + var o = N(r); if (null != o) return o; var a = e.get(o); - return (void 0 !== a || !!e.has(o)) && !!j(n, a, !1, i) && !t.has(o) && j(n, a, !1, i); + return (void 0 !== a || !!e.has(o)) && !!I(n, a, !1, i) && !t.has(o) && I(n, a, !1, i); }(t, e, f, p, o)) return !1; null === a && (a = new Set()), a.add(f); } @@ -16661,40 +16660,40 @@ for(var h = u(e), y = 0; y < h.length; y++){ var g = n(h[y], 2), f = g[0], v = g[1]; if ("object" === i(f) && null !== f) { - if (!U(a, t, f, v, r, o)) return !1; - } else if (!r && (!t.has(f) || !j(t.get(f), v, !1, o)) && !U(a, t, f, v, !1, o)) return !1; + if (!L(a, t, f, v, r, o)) return !1; + } else if (!r && (!t.has(f) || !I(t.get(f), v, !1, o)) && !L(a, t, f, v, !1, o)) return !1; } return 0 === a.size; } return !0; }(t, e, r, l)) return !1; } else if (1 === s) for(; c < t.length; c++)if (p(t, c)) { - if (!p(e, c) || !j(t[c], e[c], r, l)) return !1; + if (!p(e, c) || !I(t[c], e[c], r, l)) return !1; } else { if (p(e, c)) return !1; for(var f = Object.keys(t); c < f.length; c++){ var d = f[c]; - if (!p(e, d) || !j(t[d], e[d], r, l)) return !1; + if (!p(e, d) || !I(t[d], e[d], r, l)) return !1; } if (f.length !== Object.keys(e).length) return !1; return !0; } for(c = 0; c < o.length; c++){ var h = o[c]; - if (!j(t[h], e[h], r, l)) return !1; + if (!I(t[h], e[h], r, l)) return !1; } return !0; }(t, e, r, c, o, l); return o.val1.delete(t), o.val2.delete(e), E; } - function N(t, e, r, n) { + function M(t, e, r, n) { for(var i = a(t), o = 0; o < i.length; o++){ var u = i[o]; - if (j(e, u, r, n)) return t.delete(u), !0; + if (I(e, u, r, n)) return t.delete(u), !0; } return !1; } - function L(t) { + function N(t) { switch(i(t)){ case "undefined": return null; @@ -16709,19 +16708,19 @@ } return !0; } - function U(t, e, r, n, i, o) { + function L(t, e, r, n, i, o) { for(var u = a(t), l = 0; l < u.length; l++){ var s = u[l]; - if (j(r, s, i, o) && j(n, e.get(s), i, o)) return t.delete(s), !0; + if (I(r, s, i, o) && I(n, e.get(s), i, o)) return t.delete(s), !0; } return !1; } t.exports = { isDeepEqual: function(t, e) { - return j(t, e, !1); + return I(t, e, !1); }, isDeepStrictEqual: function(t, e) { - return j(t, e, !0); + return I(t, e, !0); } }; }, @@ -24947,14 +24946,14 @@ return null != (t = t.childContextTypes); } function tq(t) { - tB(tU, t), tB(tL, t); + tB(tU), tB(tL); } function tV(t) { - tB(tU, t), tB(tL, t); + tB(tU), tB(tL); } function tH(t, e, r) { if (tL.current !== tN) throw Error(p(168)); - tM(tL, e, t), tM(tU, r, t); + tM(tL, e), tM(tU, r); } function tZ(t, e, r) { var n = t.stateNode; @@ -24964,12 +24963,12 @@ } function tX(t) { var e = t.stateNode; - return e = e && e.__reactInternalMemoizedMergedChildContext || tN, tz = tL.current, tM(tL, e, t), tM(tU, tU.current, t), !0; + return e = e && e.__reactInternalMemoizedMergedChildContext || tN, tz = tL.current, tM(tL, e), tM(tU, tU.current), !0; } function tJ(t, e, r) { var n = t.stateNode; if (!n) throw Error(p(169)); - r ? (n.__reactInternalMemoizedMergedChildContext = e = tZ(t, e, tz), tB(tU, t), tB(tL, t), tM(tL, e, t)) : tB(tU, t), tM(tU, r, t); + r ? (n.__reactInternalMemoizedMergedChildContext = e = tZ(t, e, tz), tB(tU), tB(tL), tM(tL, e)) : tB(tU), tM(tU, r); } var tY = f.unstable_runWithPriority, tK = f.unstable_scheduleCallback, tQ = f.unstable_cancelCallback, t$ = f.unstable_shouldYield, t0 = f.unstable_requestPaint, t1 = f.unstable_now, t2 = f.unstable_getCurrentPriorityLevel, t3 = f.unstable_ImmediatePriority, t4 = f.unstable_UserBlockingPriority, t5 = f.unstable_NormalPriority, t8 = f.unstable_LowPriority, t6 = f.unstable_IdlePriority, t7 = {}, t9 = void 0 !== t0 ? t0 : function() {}, et = null, ee = null, er = !1, en = t1(), ei = 1e4 > en ? t1 : function() { return t1() - en; @@ -25068,11 +25067,11 @@ } function eE(t, e) { var r = t.type._context; - Y ? (tM(ev, r._currentValue, t), r._currentValue = e) : (tM(ev, r._currentValue2, t), r._currentValue2 = e); + Y ? (tM(ev, r._currentValue), r._currentValue = e) : (tM(ev, r._currentValue2), r._currentValue2 = e); } function e_(t) { var e = ev.current; - tB(ev, t), t = t.type._context, Y ? t._currentValue = e : t._currentValue2 = e; + tB(ev), t = t.type._context, Y ? t._currentValue = e : t._currentValue2 = e; } function ex(t, e) { for(; null !== t;){ @@ -25084,7 +25083,7 @@ } } function eS(t, e) { - eb = t, eD = em = null, null !== (t = t.dependencies) && null !== t.firstContext && (t.expirationTime >= e && (rJ = !0), t.firstContext = null); + eb = t, eD = em = null, null !== (t = t.dependencies) && null !== t.firstContext && (t.expirationTime >= e && (rX = !0), t.firstContext = null); } function eA(t, e) { if (eD !== t && !1 !== e && 0 !== e) if (("number" != typeof e || 1073741823 === e) && (eD = t, e = 1073741823), e = { @@ -25176,13 +25175,13 @@ ek = !1, e = eI(t, e); for(var o = e.baseState, a = null, u = 0, l = e.firstUpdate, s = o; null !== l;){ var c = l.expirationTime; - c < i ? (null === a && (a = l, o = s), u < c && (u = c)) : (n4(c, l.suspenseConfig), s = ej(t, e, l, s, r, n), null !== l.callback && (t.effectTag |= 32, l.nextEffect = null, null === e.lastEffect ? e.firstEffect = e.lastEffect = l : (e.lastEffect.nextEffect = l, e.lastEffect = l))), l = l.next; + c < i ? (null === a && (a = l, o = s), u < c && (u = c)) : (n3(c, l.suspenseConfig), s = ej(t, e, l, s, r, n), null !== l.callback && (t.effectTag |= 32, l.nextEffect = null, null === e.lastEffect ? e.firstEffect = e.lastEffect = l : (e.lastEffect.nextEffect = l, e.lastEffect = l))), l = l.next; } for(c = null, l = e.firstCapturedUpdate; null !== l;){ var f = l.expirationTime; f < i ? (null === c && (c = l, null === a && (o = s)), u < f && (u = f)) : (s = ej(t, e, l, s, r, n), null !== l.callback && (t.effectTag |= 32, l.nextEffect = null, null === e.lastCapturedEffect ? e.firstCapturedEffect = e.lastCapturedEffect = l : (e.lastCapturedEffect.nextEffect = l, e.lastCapturedEffect = l))), l = l.next; } - null === a && (e.lastUpdate = null), null === c ? e.lastCapturedUpdate = null : t.effectTag |= 32, null === a && null === c && (o = s), e.baseState = o, e.firstUpdate = a, e.firstCapturedUpdate = c, n5(u), t.expirationTime = u, t.memoizedState = s; + null === a && (e.lastUpdate = null), null === c ? e.lastCapturedUpdate = null : t.effectTag |= 32, null === a && null === c && (o = s), e.baseState = o, e.firstUpdate = a, e.firstCapturedUpdate = c, n4(u), t.expirationTime = u, t.memoizedState = s; } function eM(t, e, r) { null !== e.firstCapturedUpdate && (null !== e.lastUpdate && (e.lastUpdate.next = e.firstCapturedUpdate, e.lastUpdate = e.lastCapturedUpdate), e.firstCapturedUpdate = e.lastCapturedUpdate = null), eN(e.firstEffect, r), e.firstEffect = e.lastEffect = null, eN(e.firstCapturedEffect, r), e.firstCapturedEffect = e.lastCapturedEffect = null; @@ -25207,18 +25206,18 @@ }, enqueueSetState: function(t, e, r) { t = t._reactInternalFiber; - var n = nH(), i = eL.suspense; - (i = eC(n = nZ(n, t, i), i)).payload = e, null != r && (i.callback = r), eF(t, i), nX(t, n); + var n = nV(), i = eL.suspense; + (i = eC(n = nH(n, t, i), i)).payload = e, null != r && (i.callback = r), eF(t, i), nZ(t, n); }, enqueueReplaceState: function(t, e, r) { t = t._reactInternalFiber; - var n = nH(), i = eL.suspense; - (i = eC(n = nZ(n, t, i), i)).tag = 1, i.payload = e, null != r && (i.callback = r), eF(t, i), nX(t, n); + var n = nV(), i = eL.suspense; + (i = eC(n = nH(n, t, i), i)).tag = 1, i.payload = e, null != r && (i.callback = r), eF(t, i), nZ(t, n); }, enqueueForceUpdate: function(t, e) { t = t._reactInternalFiber; - var r = nH(), n = eL.suspense; - (n = eC(r = nZ(r, t, n), n)).tag = 2, null != e && (n.callback = e), eF(t, n), nX(t, r); + var r = nV(), n = eL.suspense; + (n = eC(r = nH(r, t, n), n)).tag = 2, null != e && (n.callback = e), eF(t, n), nZ(t, r); } }; function eG(t, e, r, n, i, o, a) { @@ -25277,7 +25276,7 @@ return t; } function i(t, e, r) { - return (t = ih(t, e, r)).index = 0, t.sibling = null, t; + return (t = id(t, e, r)).index = 0, t.sibling = null, t; } function o(e, r, n) { return (e.index = n, t) ? null !== (n = e.alternate) ? (n = n.index) < r ? (e.effectTag = 2, r) : n : (e.effectTag = 2, r) : r; @@ -25286,27 +25285,27 @@ return t && null === e.alternate && (e.effectTag = 2), e; } function u(t, e, r, n) { - return null === e || 6 !== e.tag ? (e = iv(r, t.mode, n)).return = t : (e = i(e, r, n)).return = t, e; + return null === e || 6 !== e.tag ? (e = ig(r, t.mode, n)).return = t : (e = i(e, r, n)).return = t, e; } function l(t, e, r, n) { - return null !== e && e.elementType === r.type ? (n = i(e, r.props, n)).ref = eX(t, e, r) : (n = iy(r.type, r.key, r.props, null, t.mode, n)).ref = eX(t, e, r), n.return = t, n; + return null !== e && e.elementType === r.type ? (n = i(e, r.props, n)).ref = eX(t, e, r) : (n = ih(r.type, r.key, r.props, null, t.mode, n)).ref = eX(t, e, r), n.return = t, n; } function s(t, e, r, n) { - return null === e || 4 !== e.tag || e.stateNode.containerInfo !== r.containerInfo || e.stateNode.implementation !== r.implementation ? (e = ib(r, t.mode, n)).return = t : (e = i(e, r.children || [], n)).return = t, e; + return null === e || 4 !== e.tag || e.stateNode.containerInfo !== r.containerInfo || e.stateNode.implementation !== r.implementation ? (e = iv(r, t.mode, n)).return = t : (e = i(e, r.children || [], n)).return = t, e; } function c(t, e, r, n, o) { - return null === e || 7 !== e.tag ? (e = ig(r, t.mode, n, o)).return = t : (e = i(e, r, n)).return = t, e; + return null === e || 7 !== e.tag ? (e = iy(r, t.mode, n, o)).return = t : (e = i(e, r, n)).return = t, e; } function f(t, e, r) { - if ("string" == typeof e || "number" == typeof e) return (e = iv("" + e, t.mode, r)).return = t, e; + if ("string" == typeof e || "number" == typeof e) return (e = ig("" + e, t.mode, r)).return = t, e; if ("object" == typeof e && null !== e) { switch(e.$$typeof){ case y: - return (r = iy(e.type, e.key, e.props, null, t.mode, r)).ref = eX(t, null, e), r.return = t, r; + return (r = ih(e.type, e.key, e.props, null, t.mode, r)).ref = eX(t, null, e), r.return = t, r; case g: - return (e = ib(e, t.mode, r)).return = t, e; + return (e = iv(e, t.mode, r)).return = t, e; } - if (eZ(e) || O(e)) return (e = ig(e, t.mode, r, null)).return = t, e; + if (eZ(e) || O(e)) return (e = iy(e, t.mode, r, null)).return = t, e; eJ(t, e); } return null; @@ -25357,7 +25356,7 @@ } e(u, b), b = b.sibling; } - s.type === v ? ((l = ig(s.props.children, u.mode, c, s.key)).return = u, u = l) : ((c = iy(s.type, s.key, s.props, null, u.mode, c)).ref = eX(u, l, s), c.return = u, u = c); + s.type === v ? ((l = iy(s.props.children, u.mode, c, s.key)).return = u, u = l) : ((c = ih(s.type, s.key, s.props, null, u.mode, c)).ref = eX(u, l, s), c.return = u, u = c); } return a(u); case g: @@ -25372,11 +25371,11 @@ } e(u, l), l = l.sibling; } - (l = ib(s, u.mode, c)).return = u, u = l; + (l = iv(s, u.mode, c)).return = u, u = l; } return a(u); } - if ("string" == typeof s || "number" == typeof s) return s = "" + s, null !== l && 6 === l.tag ? (r(u, l.sibling), (l = i(l, s, c)).return = u) : (r(u, l), (l = iv(s, u.mode, c)).return = u), a(u = l); + if ("string" == typeof s || "number" == typeof s) return s = "" + s, null !== l && 6 === l.tag ? (r(u, l.sibling), (l = i(l, s, c)).return = u) : (r(u, l), (l = ig(s, u.mode, c)).return = u), a(u = l); if (eZ(s)) return function(i, a, u, l) { for(var s = null, c = null, p = a, y = a = 0, g = null; null !== p && y < u.length; y++){ p.index > y ? (g = p, p = null) : g = p.sibling; @@ -25440,17 +25439,17 @@ return t; } function e4(t, e) { - tM(e2, e, t), tM(e1, t, t), tM(e0, e$, t), e = B(e), tB(e0, t), tM(e0, e, t); + tM(e2, e), tM(e1, t), tM(e0, e$), e = B(e), tB(e0), tM(e0, e); } function e5(t) { - tB(e0, t), tB(e1, t), tB(e2, t); + tB(e0), tB(e1), tB(e2); } function e8(t) { var e = e3(e2.current), r = e3(e0.current); - e = M(r, t.type, e), r !== e && (tM(e1, t, t), tM(e0, e, t)); + e = M(r, t.type, e), r !== e && (tM(e1, t), tM(e0, e)); } function e6(t) { - e1.current === t && (tB(e0, t), tB(e1, t)); + e1.current === t && (tB(e0), tB(e1)); } var e7 = { current: 0 @@ -25491,16 +25490,16 @@ return !0; } function rb(t, e, r, n, i, o) { - if (rn = o, ri = e, re.current = null === (ra = null !== t ? t.memoizedState : null) ? rM : rN, e = r(n, i), rd) { - do rd = !1, ry += 1, ra = null !== t ? t.memoizedState : null, rs = ru, rf = rl = ro = null, re.current = rN, e = r(n, i); + if (rn = o, ri = e, re.current = null === (ra = null !== t ? t.memoizedState : null) ? rB : rM, e = r(n, i), rd) { + do rd = !1, ry += 1, ra = null !== t ? t.memoizedState : null, rs = ru, rf = rl = ro = null, re.current = rM, e = r(n, i); while (rd) rh = null, ry = 0; } - if (re.current = rB, (t = ri).memoizedState = ru, t.expirationTime = rc, t.updateQueue = rf, t.effectTag |= rp, t = null !== ro && null !== ro.next, rn = 0, rs = rl = ru = ra = ro = ri = null, rc = 0, rf = null, rp = 0, t) throw Error(p(300)); + if (re.current = rj, (t = ri).memoizedState = ru, t.expirationTime = rc, t.updateQueue = rf, t.effectTag |= rp, t = null !== ro && null !== ro.next, rn = 0, rs = rl = ru = ra = ro = ri = null, rc = 0, rf = null, rp = 0, t) throw Error(p(300)); return e; } function rm() { - re.current = rB, rn = 0, rs = rl = ru = ra = ro = ri = null, rc = 0, rf = null, rp = 0, rd = !1, rh = null, ry = 0; + re.current = rj, rn = 0, rs = rl = ru = ra = ro = ri = null, rc = 0, rf = null, rp = 0, rd = !1, rh = null, ry = 0; } function rD() { var t = { @@ -25542,7 +25541,7 @@ var o = e.memoizedState; do o = t(o, i.action), i = i.next; while (null !== i) - return ed(o, e.memoizedState) || (rJ = !0), e.memoizedState = o, e.baseUpdate === r.last && (e.baseState = o), r.lastRenderedState = o, [ + return ed(o, e.memoizedState) || (rX = !0), e.memoizedState = o, e.baseUpdate === r.last && (e.baseState = o), r.lastRenderedState = o, [ o, n ]; @@ -25559,9 +25558,9 @@ var u = i = null, l = n, s = !1; do { var c = l.expirationTime; - c < rn ? (s || (s = !0, u = a, i = o), c > rc && n5(rc = c)) : (n4(c, l.suspenseConfig), o = l.eagerReducer === t ? l.eagerState : t(o, l.action)), a = l, l = l.next; + c < rn ? (s || (s = !0, u = a, i = o), c > rc && n4(rc = c)) : (n3(c, l.suspenseConfig), o = l.eagerReducer === t ? l.eagerState : t(o, l.action)), a = l, l = l.next; }while (null !== l && l !== n) - s || (u = a, i = o), ed(o, e.memoizedState) || (rJ = !0), e.memoizedState = o, e.baseUpdate = u, e.baseState = i, r.lastRenderedState = o; + s || (u = a, i = o), ed(o, e.memoizedState) || (rX = !0), e.memoizedState = o, e.baseUpdate = u, e.baseState = i, r.lastRenderedState = o; } return [ e.memoizedState, @@ -25575,15 +25574,12 @@ dispatch: null, lastRenderedReducer: rE, lastRenderedState: t - }).dispatch = rj.bind(null, ri, t), [ + }).dispatch = rI.bind(null, ri, t), [ e.memoizedState, t ]; } - function rS(t) { - return r_(rE, t); - } - function rA(t, e, r, n) { + function rS(t, e, r, n) { return t = { tag: t, create: e, @@ -25594,41 +25590,41 @@ lastEffect: null }).lastEffect = t.next = t : null === (e = rf.lastEffect) ? rf.lastEffect = t.next = t : (r = e.next, e.next = t, t.next = r, rf.lastEffect = t), t; } - function rk(t, e, r, n) { + function rA(t, e, r, n) { var i = rD(); - rp |= t, i.memoizedState = rA(e, r, void 0, void 0 === n ? null : n); + rp |= t, i.memoizedState = rS(e, r, void 0, void 0 === n ? null : n); } - function rT(t, e, r, n) { + function rk(t, e, r, n) { var i = rw(); n = void 0 === n ? null : n; var o = void 0; if (null !== ro) { var a = ro.memoizedState; - if (o = a.destroy, null !== n && rv(n, a.deps)) return void rA(0, r, o, n); + if (o = a.destroy, null !== n && rv(n, a.deps)) return void rS(0, r, o, n); } - rp |= t, i.memoizedState = rA(e, r, o, n); + rp |= t, i.memoizedState = rS(e, r, o, n); + } + function rT(t, e) { + return rA(516, 192, t, e); } function rO(t, e) { return rk(516, 192, t, e); } function rC(t, e) { - return rT(516, 192, t, e); - } - function rP(t, e) { return "function" == typeof e ? (e(t = t()), function() { e(null); }) : null != e ? (e.current = t = t(), function() { e.current = null; }) : void 0; } - function rF() {} - function rR(t, e) { + function rP() {} + function rF(t, e) { return rD().memoizedState = [ t, void 0 === e ? null : e ], t; } - function rI(t, e) { + function rR(t, e) { var r = rw(); e = void 0 === e ? null : e; var n = r.memoizedState; @@ -25637,7 +25633,7 @@ e ], t); } - function rj(t, e, r) { + function rI(t, e, r) { if (!(25 > ry)) throw Error(p(301)); var n = t.alternate; if (t === ri || null !== n && n === ri) if (rd = !0, t = { @@ -25653,9 +25649,9 @@ e.next = t; } else { - var i = nH(), o = eL.suspense; + var i = nV(), o = eL.suspense; o = { - expirationTime: i = nZ(i, t, o), + expirationTime: i = nH(i, t, o), suspenseConfig: o, action: r, eagerReducer: null, @@ -25672,10 +25668,10 @@ var l = e.lastRenderedState, s = n(l, r); if (o.eagerReducer = n, o.eagerState = s, ed(s, l)) return; } catch (t) {} finally{} - nX(t, i); + nZ(t, i); } } - var rB = { + var rj = { readContext: eA, useCallback: rg, useContext: rg, @@ -25690,18 +25686,18 @@ useResponder: rg, useDeferredValue: rg, useTransition: rg - }, rM = { + }, rB = { readContext: eA, - useCallback: rR, + useCallback: rF, useContext: eA, - useEffect: rO, + useEffect: rT, useImperativeHandle: function(t, e, r) { return r = null != r ? r.concat([ t - ]) : null, rk(4, 36, rP.bind(null, e, t), r); + ]) : null, rA(4, 36, rC.bind(null, e, t), r); }, useLayoutEffect: function(t, e) { - return rk(4, 36, t, e); + return rA(4, 36, t, e); }, useMemo: function(t, e) { return e = void 0 === e ? null : e, rD().memoizedState = [ @@ -25716,7 +25712,7 @@ dispatch: null, lastRenderedReducer: t, lastRenderedState: e - }).dispatch = rj.bind(null, ri, t), [ + }).dispatch = rI.bind(null, ri, t), [ n.memoizedState, t ]; @@ -25727,11 +25723,11 @@ }; }, useState: rx, - useDebugValue: rF, + useDebugValue: rP, useResponder: rt, useDeferredValue: function(t, e) { var r = rx(t), n = r[0], i = r[1]; - return rO(function() { + return rT(function() { f.unstable_next(function() { var r = rr.suspense; rr.suspense = void 0 === e ? null : e; @@ -25749,7 +25745,7 @@ useTransition: function(t) { var e = rx(!1), r = e[0], n = e[1]; return [ - rR(function(e) { + rF(function(e) { n(!0), f.unstable_next(function() { var r = rr.suspense; rr.suspense = void 0 === t ? null : t; @@ -25766,18 +25762,18 @@ r ]; } - }, rN = { + }, rM = { readContext: eA, - useCallback: rI, + useCallback: rR, useContext: eA, - useEffect: rC, + useEffect: rO, useImperativeHandle: function(t, e, r) { return r = null != r ? r.concat([ t - ]) : null, rT(4, 36, rP.bind(null, e, t), r); + ]) : null, rk(4, 36, rC.bind(null, e, t), r); }, useLayoutEffect: function(t, e) { - return rT(4, 36, t, e); + return rk(4, 36, t, e); }, useMemo: function(t, e) { var r = rw(); @@ -25792,12 +25788,14 @@ useRef: function() { return rw().memoizedState; }, - useState: rS, - useDebugValue: rF, + useState: function(t) { + return r_(rE); + }, + useDebugValue: rP, useResponder: rt, useDeferredValue: function(t, e) { - var r = rS(t), n = r[0], i = r[1]; - return rC(function() { + var r = r_(rE), n = r[0], i = r[1]; + return rO(function() { f.unstable_next(function() { var r = rr.suspense; rr.suspense = void 0 === e ? null : e; @@ -25813,9 +25811,9 @@ ]), n; }, useTransition: function(t) { - var e = rS(!1), r = e[0], n = e[1]; + var e = r_(rE), r = e[0], n = e[1]; return [ - rI(function(e) { + rR(function(e) { n(!0), f.unstable_next(function() { var r = rr.suspense; rr.suspense = void 0 === t ? null : t; @@ -25832,12 +25830,12 @@ r ]; } - }, rL = null, rU = null, rz = !1; - function rW(t, e) { - var r = ip(5, null, null, 0); + }, rN = null, rL = null, rU = !1; + function rz(t, e) { + var r = ic(5, null, null, 0); r.elementType = "DELETED", r.type = "DELETED", r.stateNode = e, r.return = t, r.effectTag = 8, null !== t.lastEffect ? (t.lastEffect.nextEffect = r, t.lastEffect = r) : t.firstEffect = t.lastEffect = r; } - function rG(t, e) { + function rW(t, e) { switch(t.tag){ case 5: return null !== (e = tw(e, t.type, t.pendingProps)) && (t.stateNode = e, !0); @@ -25847,74 +25845,74 @@ return !1; } } - function rq(t) { - if (rz) { - var e = rU; + function rG(t) { + if (rU) { + var e = rL; if (e) { var r = e; - if (!rG(t, e)) { - if (!(e = tS(r)) || !rG(t, e)) { - t.effectTag = -1025 & t.effectTag | 2, rz = !1, rL = t; + if (!rW(t, e)) { + if (!(e = tS(r)) || !rW(t, e)) { + t.effectTag = -1025 & t.effectTag | 2, rU = !1, rN = t; return; } - rW(rL, r); + rz(rN, r); } - rL = t, rU = tA(e); - } else t.effectTag = -1025 & t.effectTag | 2, rz = !1, rL = t; + rN = t, rL = tA(e); + } else t.effectTag = -1025 & t.effectTag | 2, rU = !1, rN = t; } } - function rV(t) { + function rq(t) { for(t = t.return; null !== t && 5 !== t.tag && 3 !== t.tag && 13 !== t.tag;)t = t.return; - rL = t; + rN = t; } - function rH(t) { - if (!$ || t !== rL) return !1; - if (!rz) return rV(t), rz = !0, !1; + function rV(t) { + if (!$ || t !== rN) return !1; + if (!rU) return rq(t), rU = !0, !1; var e = t.type; - if (5 !== t.tag || "head" !== e && "body" !== e && !q(e, t.memoizedProps)) for(e = rU; e;)rW(t, e), e = tS(e); - if (rV(t), 13 === t.tag) { + if (5 !== t.tag || "head" !== e && "body" !== e && !q(e, t.memoizedProps)) for(e = rL; e;)rz(t, e), e = tS(e); + if (rq(t), 13 === t.tag) { if (!$) throw Error(p(316)); if (!(t = null !== (t = t.memoizedState) ? t.dehydrated : null)) throw Error(p(317)); - rU = tO(t); - } else rU = rL ? tS(t.stateNode) : null; + rL = tO(t); + } else rL = rN ? tS(t.stateNode) : null; return !0; } - function rZ() { - $ && (rU = rL = null, rz = !1); + function rH() { + $ && (rL = rN = null, rU = !1); } - var rX = d.ReactCurrentOwner, rJ = !1; - function rY(t, e, r, n) { + var rZ = d.ReactCurrentOwner, rX = !1; + function rJ(t, e, r, n) { e.child = null === t ? eQ(e, null, r, n) : eK(e, t.child, r, n); } - function rK(t, e, r, n, i) { + function rY(t, e, r, n, i) { r = r.render; var o = e.ref; - return (eS(e, i), n = rb(t, e, r, n, o, i), null === t || rJ) ? (e.effectTag |= 1, rY(t, e, n, i), e.child) : (e.updateQueue = t.updateQueue, e.effectTag &= -517, t.expirationTime <= i && (t.expirationTime = 0), nt(t, e, i)); + return (eS(e, i), n = rb(t, e, r, n, o, i), null === t || rX) ? (e.effectTag |= 1, rJ(t, e, n, i), e.child) : (e.updateQueue = t.updateQueue, e.effectTag &= -517, t.expirationTime <= i && (t.expirationTime = 0), r9(t, e, i)); } - function rQ(t, e, r, n, i, o) { + function rK(t, e, r, n, i, o) { if (null === t) { var a = r.type; - return "function" != typeof a || id(a) || void 0 !== a.defaultProps || null !== r.compare || void 0 !== r.defaultProps ? ((t = iy(r.type, null, n, null, e.mode, o)).ref = e.ref, t.return = e, e.child = t) : (e.tag = 15, e.type = a, r$(t, e, a, n, i, o)); + return "function" != typeof a || ip(a) || void 0 !== a.defaultProps || null !== r.compare || void 0 !== r.defaultProps ? ((t = ih(r.type, null, n, null, e.mode, o)).ref = e.ref, t.return = e, e.child = t) : (e.tag = 15, e.type = a, rQ(t, e, a, n, i, o)); } - return (a = t.child, i < o && (i = a.memoizedProps, (r = null !== (r = r.compare) ? r : ey)(i, n) && t.ref === e.ref)) ? nt(t, e, o) : (e.effectTag |= 1, (t = ih(a, n, o)).ref = e.ref, t.return = e, e.child = t); + return (a = t.child, i < o && (i = a.memoizedProps, (r = null !== (r = r.compare) ? r : ey)(i, n) && t.ref === e.ref)) ? r9(t, e, o) : (e.effectTag |= 1, (t = id(a, n, o)).ref = e.ref, t.return = e, e.child = t); } - function r$(t, e, r, n, i, o) { - return null !== t && ey(t.memoizedProps, n) && t.ref === e.ref && (rJ = !1, i < o) ? nt(t, e, o) : r1(t, e, r, n, o); + function rQ(t, e, r, n, i, o) { + return null !== t && ey(t.memoizedProps, n) && t.ref === e.ref && (rX = !1, i < o) ? r9(t, e, o) : r0(t, e, r, n, o); } - function r0(t, e) { + function r$(t, e) { var r = e.ref; (null === t && null !== r || null !== t && t.ref !== r) && (e.effectTag |= 128); } - function r1(t, e, r, n, i) { + function r0(t, e, r, n, i) { var o = tG(r) ? tz : tL.current; - return (o = tW(e, o), eS(e, i), r = rb(t, e, r, n, o, i), null === t || rJ) ? (e.effectTag |= 1, rY(t, e, r, i), e.child) : (e.updateQueue = t.updateQueue, e.effectTag &= -517, t.expirationTime <= i && (t.expirationTime = 0), nt(t, e, i)); + return (o = tW(e, o), eS(e, i), r = rb(t, e, r, n, o, i), null === t || rX) ? (e.effectTag |= 1, rJ(t, e, r, i), e.child) : (e.updateQueue = t.updateQueue, e.effectTag &= -517, t.expirationTime <= i && (t.expirationTime = 0), r9(t, e, i)); } - function r2(t, e, r, n, i) { + function r1(t, e, r, n, i) { if (tG(r)) { var o = !0; tX(e); } else o = !1; - if (eS(e, i), null === e.stateNode) null !== t && (t.alternate = null, e.alternate = null, e.effectTag |= 2), eq(e, r, n, i), eH(e, r, n, i), n = !0; + if (eS(e, i), null === e.stateNode) null !== t && (t.alternate = null, e.alternate = null, e.effectTag |= 2), eq(e, r, n), eH(e, r, n, i), n = !0; else if (null === t) { var a = e.stateNode, u = e.memoizedProps; a.props = u; @@ -25927,52 +25925,52 @@ var d = e.updateQueue; null !== d && (eB(e, d, n, a, i), l = e.memoizedState), u !== n || p !== l || tU.current || ek ? ("function" == typeof c && (ez(e, r, c, n), l = e.memoizedState), (u = ek || eG(e, r, u, n, p, l, s)) ? (f || "function" != typeof a.UNSAFE_componentWillMount && "function" != typeof a.componentWillMount || ("function" == typeof a.componentWillMount && a.componentWillMount(), "function" == typeof a.UNSAFE_componentWillMount && a.UNSAFE_componentWillMount()), "function" == typeof a.componentDidMount && (e.effectTag |= 4)) : ("function" == typeof a.componentDidMount && (e.effectTag |= 4), e.memoizedProps = n, e.memoizedState = l), a.props = n, a.state = l, a.context = s, n = u) : ("function" == typeof a.componentDidMount && (e.effectTag |= 4), n = !1); } else a = e.stateNode, u = e.memoizedProps, a.props = e.type === e.elementType ? u : eg(e.type, u), l = a.context, s = "object" == typeof (s = r.contextType) && null !== s ? eA(s) : tW(e, s = tG(r) ? tz : tL.current), (f = "function" == typeof (c = r.getDerivedStateFromProps) || "function" == typeof a.getSnapshotBeforeUpdate) || "function" != typeof a.UNSAFE_componentWillReceiveProps && "function" != typeof a.componentWillReceiveProps || (u !== n || l !== s) && eV(e, a, n, s), ek = !1, l = e.memoizedState, p = a.state = l, null !== (d = e.updateQueue) && (eB(e, d, n, a, i), p = e.memoizedState), u !== n || l !== p || tU.current || ek ? ("function" == typeof c && (ez(e, r, c, n), p = e.memoizedState), (c = ek || eG(e, r, u, n, l, p, s)) ? (f || "function" != typeof a.UNSAFE_componentWillUpdate && "function" != typeof a.componentWillUpdate || ("function" == typeof a.componentWillUpdate && a.componentWillUpdate(n, p, s), "function" == typeof a.UNSAFE_componentWillUpdate && a.UNSAFE_componentWillUpdate(n, p, s)), "function" == typeof a.componentDidUpdate && (e.effectTag |= 4), "function" == typeof a.getSnapshotBeforeUpdate && (e.effectTag |= 256)) : ("function" != typeof a.componentDidUpdate || u === t.memoizedProps && l === t.memoizedState || (e.effectTag |= 4), "function" != typeof a.getSnapshotBeforeUpdate || u === t.memoizedProps && l === t.memoizedState || (e.effectTag |= 256), e.memoizedProps = n, e.memoizedState = p), a.props = n, a.state = p, a.context = s, n = c) : ("function" != typeof a.componentDidUpdate || u === t.memoizedProps && l === t.memoizedState || (e.effectTag |= 4), "function" != typeof a.getSnapshotBeforeUpdate || u === t.memoizedProps && l === t.memoizedState || (e.effectTag |= 256), n = !1); - return r3(t, e, r, n, o, i); + return r2(t, e, r, n, o, i); } - function r3(t, e, r, n, i, o) { - r0(t, e); + function r2(t, e, r, n, i, o) { + r$(t, e); var a = 0 != (64 & e.effectTag); - if (!n && !a) return i && tJ(e, r, !1), nt(t, e, o); - n = e.stateNode, rX.current = e; + if (!n && !a) return i && tJ(e, r, !1), r9(t, e, o); + n = e.stateNode, rZ.current = e; var u = a && "function" != typeof r.getDerivedStateFromError ? null : n.render(); - return e.effectTag |= 1, null !== t && a ? (e.child = eK(e, t.child, null, o), e.child = eK(e, null, u, o)) : rY(t, e, u, o), e.memoizedState = n.state, i && tJ(e, r, !0), e.child; + return e.effectTag |= 1, null !== t && a ? (e.child = eK(e, t.child, null, o), e.child = eK(e, null, u, o)) : rJ(t, e, u, o), e.memoizedState = n.state, i && tJ(e, r, !0), e.child; } - function r4(t) { + function r3(t) { var e = t.stateNode; e.pendingContext ? tH(t, e.pendingContext, e.pendingContext !== e.context) : e.context && tH(t, e.context, !1), e4(t, e.containerInfo); } - var r5 = { + var r4 = { dehydrated: null, retryTime: 0 }; - function r8(t, e, r) { + function r5(t, e, r) { var n, i = e.mode, o = e.pendingProps, a = e7.current, u = !1; - if ((n = 0 != (64 & e.effectTag)) || (n = 0 != (2 & a) && (null === t || null !== t.memoizedState)), n ? (u = !0, e.effectTag &= -65) : null !== t && null === t.memoizedState || void 0 === o.fallback || !0 === o.unstable_avoidThisFallback || (a |= 1), tM(e7, 1 & a, e), null === t) { - if (void 0 !== o.fallback && rq(e), u) { - if (u = o.fallback, (o = ig(null, i, 0, null)).return = e, 0 == (2 & e.mode)) for(t = null !== e.memoizedState ? e.child.child : e.child, o.child = t; null !== t;)t.return = o, t = t.sibling; - return (r = ig(u, i, r, null)).return = e, o.sibling = r, e.memoizedState = r5, e.child = o, r; + if ((n = 0 != (64 & e.effectTag)) || (n = 0 != (2 & a) && (null === t || null !== t.memoizedState)), n ? (u = !0, e.effectTag &= -65) : null !== t && null === t.memoizedState || void 0 === o.fallback || !0 === o.unstable_avoidThisFallback || (a |= 1), tM(e7, 1 & a), null === t) { + if (void 0 !== o.fallback && rG(e), u) { + if (u = o.fallback, (o = iy(null, i, 0, null)).return = e, 0 == (2 & e.mode)) for(t = null !== e.memoizedState ? e.child.child : e.child, o.child = t; null !== t;)t.return = o, t = t.sibling; + return (r = iy(u, i, r, null)).return = e, o.sibling = r, e.memoizedState = r4, e.child = o, r; } return i = o.children, e.memoizedState = null, e.child = eQ(e, null, i, r); } if (null !== t.memoizedState) { if (i = (t = t.child).sibling, u) { - if (o = o.fallback, (r = ih(t, t.pendingProps, 0)).return = e, 0 == (2 & e.mode) && (u = null !== e.memoizedState ? e.child.child : e.child) !== t.child) for(r.child = u; null !== u;)u.return = r, u = u.sibling; - return (i = ih(i, o, i.expirationTime)).return = e, r.sibling = i, r.childExpirationTime = 0, e.memoizedState = r5, e.child = r, i; + if (o = o.fallback, (r = id(t, t.pendingProps, 0)).return = e, 0 == (2 & e.mode) && (u = null !== e.memoizedState ? e.child.child : e.child) !== t.child) for(r.child = u; null !== u;)u.return = r, u = u.sibling; + return (i = id(i, o, i.expirationTime)).return = e, r.sibling = i, r.childExpirationTime = 0, e.memoizedState = r4, e.child = r, i; } return r = eK(e, t.child, o.children, r), e.memoizedState = null, e.child = r; } if (t = t.child, u) { - if (u = o.fallback, (o = ig(null, i, 0, null)).return = e, o.child = t, null !== t && (t.return = o), 0 == (2 & e.mode)) for(t = null !== e.memoizedState ? e.child.child : e.child, o.child = t; null !== t;)t.return = o, t = t.sibling; - return (r = ig(u, i, r, null)).return = e, o.sibling = r, r.effectTag |= 2, o.childExpirationTime = 0, e.memoizedState = r5, e.child = o, r; + if (u = o.fallback, (o = iy(null, i, 0, null)).return = e, o.child = t, null !== t && (t.return = o), 0 == (2 & e.mode)) for(t = null !== e.memoizedState ? e.child.child : e.child, o.child = t; null !== t;)t.return = o, t = t.sibling; + return (r = iy(u, i, r, null)).return = e, o.sibling = r, r.effectTag |= 2, o.childExpirationTime = 0, e.memoizedState = r4, e.child = o, r; } return e.memoizedState = null, e.child = eK(e, t, o.children, r); } - function r6(t, e) { + function r8(t, e) { t.expirationTime < e && (t.expirationTime = e); var r = t.alternate; null !== r && r.expirationTime < e && (r.expirationTime = e), ex(t.return, e); } - function r7(t, e, r, n, i, o) { + function r6(t, e, r, n, i, o) { var a = t.memoizedState; null === a ? t.memoizedState = { isBackwards: e, @@ -25984,13 +25982,13 @@ lastEffect: o } : (a.isBackwards = e, a.rendering = null, a.last = n, a.tail = r, a.tailExpiration = 0, a.tailMode = i, a.lastEffect = o); } - function r9(t, e, r) { + function r7(t, e, r) { var n = e.pendingProps, i = n.revealOrder, o = n.tail; - if (rY(t, e, n.children, r), 0 != (2 & (n = e7.current))) n = 1 & n | 2, e.effectTag |= 64; + if (rJ(t, e, n.children, r), 0 != (2 & (n = e7.current))) n = 1 & n | 2, e.effectTag |= 64; else { if (null !== t && 0 != (64 & t.effectTag)) r: for(t = e.child; null !== t;){ - if (13 === t.tag) null !== t.memoizedState && r6(t, r); - else if (19 === t.tag) r6(t, r); + if (13 === t.tag) null !== t.memoizedState && r8(t, r); + else if (19 === t.tag) r8(t, r); else if (null !== t.child) { t.child.return = t, t = t.child; continue; @@ -26004,11 +26002,11 @@ } n &= 1; } - if (tM(e7, n, e), 0 == (2 & e.mode)) e.memoizedState = null; + if (tM(e7, n), 0 == (2 & e.mode)) e.memoizedState = null; else switch(i){ case "forwards": for(i = null, r = e.child; null !== r;)null !== (t = r.alternate) && null === e9(t) && (i = r), r = r.sibling; - null === (r = i) ? (i = e.child, e.child = null) : (i = r.sibling, r.sibling = null), r7(e, !1, i, r, o, e.lastEffect); + null === (r = i) ? (i = e.child, e.child = null) : (i = r.sibling, r.sibling = null), r6(e, !1, i, r, o, e.lastEffect); break; case "backwards": for(r = null, i = e.child, e.child = null; null !== i;){ @@ -26018,28 +26016,28 @@ } t = i.sibling, i.sibling = r, r = i, i = t; } - r7(e, !0, r, null, o, e.lastEffect); + r6(e, !0, r, null, o, e.lastEffect); break; case "together": - r7(e, !1, null, null, void 0, e.lastEffect); + r6(e, !1, null, null, void 0, e.lastEffect); break; default: e.memoizedState = null; } return e.child; } - function nt(t, e, r) { + function r9(t, e, r) { null !== t && (e.dependencies = t.dependencies); var n = e.expirationTime; - if (0 !== n && n5(n), e.childExpirationTime < r) return null; + if (0 !== n && n4(n), e.childExpirationTime < r) return null; if (null !== t && e.child !== t.child) throw Error(p(153)); if (null !== e.child) { - for(r = ih(t = e.child, t.pendingProps, t.expirationTime), e.child = r, r.return = e; null !== t.sibling;)t = t.sibling, (r = r.sibling = ih(t, t.pendingProps, t.expirationTime)).return = e; + for(r = id(t = e.child, t.pendingProps, t.expirationTime), e.child = r, r.return = e; null !== t.sibling;)t = t.sibling, (r = r.sibling = id(t, t.pendingProps, t.expirationTime)).return = e; r.sibling = null; } return e.child; } - function ne(t) { + function nt(t) { t.effectTag |= 4; } if (K) i = function(t, e) { @@ -26059,10 +26057,10 @@ }, o = function() {}, a = function(t, e, r, n, i) { if ((t = t.memoizedProps) !== n) { var o = e.stateNode; - (e.updateQueue = r = G(o, r, t, n, i, e3(e0.current))) && ne(e); + (e.updateQueue = r = G(o, r, t, n, i, e3(e0.current))) && nt(e); } }, u = function(t, e, r, n) { - r !== n && ne(e); + r !== n && nt(e); }; else if (Q) { i = function(t, e, r, n) { @@ -26092,7 +26090,7 @@ o.sibling.return = o.return, o = o.sibling; } }; - var nr = function(t, e, r, n) { + var ne = function(t, e, r, n) { for(var i = e.child; null !== i;){ if (5 === i.tag) { var o = i.stateNode; @@ -26101,7 +26099,7 @@ else if (4 !== i.tag) { if (13 === i.tag && 0 != (4 & i.effectTag) && (o = null !== i.memoizedState)) { var a = i.child; - if (null !== a && (null !== a.child && (a.child.return = a, nr(t, a, !0, o)), null !== (o = a.sibling))) { + if (null !== a && (null !== a.child && (a.child.return = a, ne(t, a, !0, o)), null !== (o = a.sibling))) { o.return = i, i = o; continue; } @@ -26123,20 +26121,20 @@ var e = t.stateNode; if (null !== t.firstEffect) { var r = e.containerInfo, n = ty(r); - nr(n, t, !1, !1), e.pendingChildren = n, ne(t), tv(r, n); + ne(n, t, !1, !1), e.pendingChildren = n, nt(t), tv(r, n); } }, a = function(t, e, r, n, o) { var a = t.stateNode, u = t.memoizedProps; if ((t = null === e.firstEffect) && u === n) e.stateNode = a; else { var l = e.stateNode, s = e3(e0.current), c = null; - u !== n && (c = G(l, r, u, n, o, s)), t && null === c ? e.stateNode = a : (W(a = th(a, c, r, u, n, e, t, l), r, n, o, s) && ne(e), e.stateNode = a, t ? ne(e) : i(a, e, !1, !1)); + u !== n && (c = G(l, r, u, n, o, s)), t && null === c ? e.stateNode = a : (W(a = th(a, c, r, u, n, e, t, l), r, n, o, s) && nt(e), e.stateNode = a, t ? nt(e) : i(a, e, !1, !1)); } }, u = function(t, e, r, n) { - r !== n && (e.stateNode = H(n, e3(e2.current), r = e3(e0.current), e), ne(e)); + r !== n && (e.stateNode = H(n, e3(e2.current), r = e3(e0.current), e), nt(e)); }; } else o = function() {}, a = function() {}, u = function() {}; - function nn(t, e) { + function nr(t, e) { switch(t.tailMode){ case "hidden": e = t.tail; @@ -26149,15 +26147,15 @@ null === n ? e || null === t.tail ? t.tail = null : t.tail.sibling = null : n.sibling = null; } } - function ni(t, e) { + function nn(t, e) { return { value: t, source: e, stack: tR(e) }; } - var no = "function" == typeof WeakSet ? WeakSet : Set; - function na(t, e) { + var ni = "function" == typeof WeakSet ? WeakSet : Set; + function no(t, e) { var r = e.source, n = e.stack; null === n && null !== r && (n = tR(r)), null !== r && C(r.type), e = e.value, null !== t && 1 === t.tag && C(t.type); try { @@ -26168,16 +26166,16 @@ }); } } - function nu(t) { + function na(t) { var e = t.ref; if (null !== e) if ("function" == typeof e) try { e(null); } catch (e) { - io(t, e); + ii(t, e); } else e.current = null; } - function nl(t, e, r) { + function nu(t, e, r) { if (null !== (r = null !== (r = r.updateQueue) ? r.lastEffect : null)) { var n = r = r.next; do { @@ -26189,8 +26187,8 @@ }while (n !== r) } } - function ns(t, e, r) { - switch("function" == typeof is && is(e), e.tag){ + function nl(t, e, r) { + switch("function" == typeof il && il(e), e.tag){ case 0: case 11: case 14: @@ -26204,7 +26202,7 @@ if (void 0 !== r) try { r(); } catch (t) { - io(e, t); + ii(e, t); } t = t.next; }while (t !== n) @@ -26212,19 +26210,19 @@ } break; case 1: - nu(e), "function" == typeof (r = e.stateNode).componentWillUnmount && function(t, e) { + na(e), "function" == typeof (r = e.stateNode).componentWillUnmount && function(t, e) { try { e.props = t.memoizedProps, e.state = t.memoizedState, e.componentWillUnmount(); } catch (e) { - io(t, e); + ii(t, e); } }(e, r); break; case 5: - nu(e); + na(e); break; case 4: - K ? nd(t, e, r) : Q && function(t) { + K ? np(t, e, r) : Q && function(t) { if (Q) { var e = ty(t = t.stateNode.containerInfo); tb(t, e); @@ -26232,8 +26230,8 @@ }(e); } } - function nc(t, e, r) { - for(var n = e;;)if (ns(t, n, r), null === n.child || K && 4 === n.tag) { + function ns(t, e, r) { + for(var n = e;;)if (nl(t, n, r), null === n.child || K && 4 === n.tag) { if (n === e) break; for(; null === n.sibling;){ if (null === n.return || n.return === e) return; @@ -26242,14 +26240,14 @@ n.sibling.return = n.return, n = n.sibling; } else n.child.return = n, n = n.child; } - function nf(t) { + function nc(t) { return 5 === t.tag || 3 === t.tag || 4 === t.tag; } - function np(t) { + function nf(t) { if (K) { r: { for(var e = t.return; null !== e;){ - if (nf(e)) { + if (nc(e)) { var r = e; break r; } @@ -26271,7 +26269,7 @@ 16 & r.effectTag && (ts(e), r.effectTag &= -17); r: n: for(r = t;;){ for(; null === r.sibling;){ - if (null === r.return || nf(r.return)) { + if (null === r.return || nc(r.return)) { r = null; break r; } @@ -26302,7 +26300,7 @@ } } } - function nd(t, e, r) { + function np(t, e, r) { for(var n, i, o = e, a = !1;;){ if (!a) { a = o.return; @@ -26321,13 +26319,13 @@ } a = !0; } - if (5 === o.tag || 6 === o.tag) nc(t, o, r), i ? tl(n, o.stateNode) : tu(n, o.stateNode); + if (5 === o.tag || 6 === o.tag) ns(t, o, r), i ? tl(n, o.stateNode) : tu(n, o.stateNode); else if (4 === o.tag) { if (null !== o.child) { n = o.stateNode.containerInfo, i = !0, o.child.return = o, o = o.child; continue; } - } else if (ns(t, o, r), null !== o.child) { + } else if (nl(t, o, r), null !== o.child) { o.child.return = o, o = o.child; continue; } @@ -26339,13 +26337,13 @@ o.sibling.return = o.return, o = o.sibling; } } - function nh(t, e) { + function nd(t, e) { if (K) switch(e.tag){ case 0: case 11: case 14: case 15: - nl(4, 8, e); + nu(4, 8, e); break; case 1: case 12: @@ -26370,10 +26368,10 @@ $ && (e = e.stateNode).hydrate && (e.hydrate = !1, tC(e.containerInfo)); break; case 13: - ny(e), ng(e); + nh(e), ny(e); break; case 19: - ng(e); + ny(e); break; default: throw Error(p(163)); @@ -26384,15 +26382,15 @@ case 11: case 14: case 15: - nl(4, 8, e); + nu(4, 8, e); return; case 12: return; case 13: - ny(e), ng(e); + nh(e), ny(e); return; case 19: - ng(e); + ny(e); return; case 3: $ && (r = e.stateNode).hydrate && (r.hydrate = !1, tC(r.containerInfo)); @@ -26412,10 +26410,10 @@ } } } - function ny(t) { + function nh(t) { var e = t; if (null === t.memoizedState) var r = !1; - else r = !0, e = t.child, nI = ei(); + else r = !0, e = t.child, nR = ei(); if (K && null !== e) { r: if (t = e, K) for(e = t;;){ if (5 === e.tag) { @@ -26438,56 +26436,56 @@ } } } - function ng(t) { + function ny(t) { var e = t.updateQueue; if (null !== e) { t.updateQueue = null; var r = t.stateNode; - null === r && (r = t.stateNode = new no()), e.forEach(function(e) { - var n = iu.bind(null, t, e); + null === r && (r = t.stateNode = new ni()), e.forEach(function(e) { + var n = ia.bind(null, t, e); r.has(e) || (r.add(e), e.then(n, n)); }); } } - var nv = "function" == typeof WeakMap ? WeakMap : Map; - function nb(t, e, r) { + var ng = "function" == typeof WeakMap ? WeakMap : Map; + function nv(t, e, r) { (r = eC(r, null)).tag = 3, r.payload = { element: null }; var n = e.value; return r.callback = function() { - nB || (nB = !0, nM = n), na(t, e); + nj || (nj = !0, nB = n), no(t, e); }, r; } - function nm(t, e, r) { + function nb(t, e, r) { (r = eC(r, null)).tag = 3; var n = t.type.getDerivedStateFromError; if ("function" == typeof n) { var i = e.value; r.payload = function() { - return na(t, e), n(i); + return no(t, e), n(i); }; } var o = t.stateNode; return null !== o && "function" == typeof o.componentDidCatch && (r.callback = function() { - "function" != typeof n && (null === nN ? nN = new Set([ + "function" != typeof n && (null === nM ? nM = new Set([ this - ]) : nN.add(this), na(t, e)); + ]) : nM.add(this), no(t, e)); var r = e.stack; this.componentDidCatch(e.value, { componentStack: null !== r ? r : "" }); }), r; } - var nD = Math.ceil, nw = d.ReactCurrentDispatcher, nE = d.ReactCurrentOwner, n_ = 0, nx = null, nS = null, nA = 0, nk = 0, nT = null, nO = 1073741823, nC = 1073741823, nP = null, nF = 0, nR = !1, nI = 0, nj = null, nB = !1, nM = null, nN = null, nL = !1, nU = null, nz = 90, nW = null, nG = 0, nq = null, nV = 0; - function nH() { - return (48 & n_) != 0 ? 1073741821 - (ei() / 10 | 0) : 0 !== nV ? nV : nV = 1073741821 - (ei() / 10 | 0); + var nm = Math.ceil, nD = d.ReactCurrentDispatcher, nw = d.ReactCurrentOwner, nE = 0, n_ = null, nx = null, nS = 0, nA = 0, nk = null, nT = 1073741823, nO = 1073741823, nC = null, nP = 0, nF = !1, nR = 0, nI = null, nj = !1, nB = null, nM = null, nN = !1, nL = null, nU = 90, nz = null, nW = 0, nG = null, nq = 0; + function nV() { + return (48 & nE) != 0 ? 1073741821 - (ei() / 10 | 0) : 0 !== nq ? nq : nq = 1073741821 - (ei() / 10 | 0); } - function nZ(t, e, r) { + function nH(t, e, r) { if (0 == (2 & (e = e.mode))) return 1073741823; var n = eo(); if (0 == (4 & e)) return 99 === n ? 1073741823 : 1073741822; - if ((16 & n_) != 0) return nA; + if ((16 & nE) != 0) return nS; if (null !== r) t = ep(t, 0 | r.timeoutMs || 5e3, 250); else switch(n){ case 99: @@ -26506,21 +26504,21 @@ default: throw Error(p(326)); } - return null !== nx && t === nA && --t, t; + return null !== n_ && t === nS && --t, t; } - function nX(t, e) { - if (50 < nG) throw nG = 0, nq = null, Error(p(185)); - if (null !== (t = nJ(t, e))) { + function nZ(t, e) { + if (50 < nW) throw nW = 0, nG = null, Error(p(185)); + if (null !== (t = nX(t, e))) { var r = eo(); - 1073741823 === e ? (8 & n_) != 0 && (48 & n_) == 0 ? n$(t) : (nK(t), 0 === n_ && es()) : nK(t), (4 & n_) == 0 || 98 !== r && 99 !== r || (null === nW ? nW = new Map([ + 1073741823 === e ? (8 & nE) != 0 && (48 & nE) == 0 ? nQ(t) : (nY(t), 0 === nE && es()) : nY(t), (4 & nE) == 0 || 98 !== r && 99 !== r || (null === nz ? nz = new Map([ [ t, e ] - ]) : (void 0 === (r = nW.get(t)) || r > e) && nW.set(t, e)); + ]) : (void 0 === (r = nz.get(t)) || r > e) && nz.set(t, e)); } } - function nJ(t, e) { + function nX(t, e) { t.expirationTime < e && (t.expirationTime = e); var r = t.alternate; null !== r && r.expirationTime < e && (r.expirationTime = e); @@ -26533,141 +26531,141 @@ } n = n.return; } - return null !== i && (nx === i && (n5(e), 4 === nk && iw(i, nA)), iE(i, e)), i; + return null !== i && (n_ === i && (n4(e), 4 === nA && iD(i, nS)), iw(i, e)), i; } - function nY(t) { + function nJ(t) { var e = t.lastExpiredTime; - return 0 !== e ? e : (e = t.firstPendingTime, iD(t, e)) ? (e = t.lastPingedTime) > (t = t.nextKnownPendingLevel) ? e : t : e; + return 0 !== e ? e : (e = t.firstPendingTime, im(t, e)) ? (e = t.lastPingedTime) > (t = t.nextKnownPendingLevel) ? e : t : e; } - function nK(t) { - if (0 !== t.lastExpiredTime) t.callbackExpirationTime = 1073741823, t.callbackPriority = 99, t.callbackNode = el(n$.bind(null, t)); + function nY(t) { + if (0 !== t.lastExpiredTime) t.callbackExpirationTime = 1073741823, t.callbackPriority = 99, t.callbackNode = el(nQ.bind(null, t)); else { - var e = nY(t), r = t.callbackNode; + var e = nJ(t), r = t.callbackNode; if (0 === e) null !== r && (t.callbackNode = null, t.callbackExpirationTime = 0, t.callbackPriority = 90); else { - var n, i, o, a = nH(); + var n, i, o, a = nV(); if (a = 1073741823 === e ? 99 : 1 === e || 2 === e ? 95 : 0 >= (a = 10 * (1073741821 - e) - 10 * (1073741821 - a)) ? 99 : 250 >= a ? 98 : 5250 >= a ? 97 : 95, null !== r) { var u = t.callbackPriority; if (t.callbackExpirationTime === e && u >= a) return; r !== t7 && tQ(r); } - t.callbackExpirationTime = e, t.callbackPriority = a, e = 1073741823 === e ? el(n$.bind(null, t)) : (n = a, i = nQ.bind(null, t), o = { + t.callbackExpirationTime = e, t.callbackPriority = a, e = 1073741823 === e ? el(nQ.bind(null, t)) : (n = a, i = nK.bind(null, t), o = { timeout: 10 * (1073741821 - e) - ei() }, tK(n = ea(n), i, o)), t.callbackNode = e; } } } - function nQ(t, e) { - if (nV = 0, e) return i_(t, e = nH()), nK(t), null; - var r = nY(t); + function nK(t, e) { + if (nq = 0, e) return iE(t, e = nV()), nY(t), null; + var r = nJ(t); if (0 !== r) { - if (e = t.callbackNode, (48 & n_) != 0) throw Error(p(327)); - if (ie(), t === nx && r === nA || n1(t, r), null !== nS) { - var n = n_; - n_ |= 16; - for(var i = n3(t);;)try { - for(; null !== nS && !t$();)nS = n8(nS); + if (e = t.callbackNode, (48 & nE) != 0) throw Error(p(327)); + if (it(), t === n_ && r === nS || n0(t, r), null !== nx) { + var n = nE; + nE |= 16; + for(var i = n2(t);;)try { + for(; null !== nx && !t$();)nx = n5(nx); break; } catch (e) { - n2(t, e); + n1(t, e); } - if (ew(), n_ = n, nw.current = i, 1 === nk) throw e = nT, n1(t, r), iw(t, r), nK(t), e; - if (null === nS) switch(i = t.finishedWork = t.current.alternate, t.finishedExpirationTime = r, nx = null, n = nk){ + if (ew(), nE = n, nD.current = i, 1 === nA) throw e = nk, n0(t, r), iD(t, r), nY(t), e; + if (null === nx) switch(i = t.finishedWork = t.current.alternate, t.finishedExpirationTime = r, n_ = null, n = nA){ case 0: case 1: throw Error(p(345)); case 2: - i_(t, 2 < r ? 2 : r); + iE(t, 2 < r ? 2 : r); break; case 3: - if (iw(t, r), r === (n = t.lastSuspendedTime) && (t.nextKnownPendingLevel = n7(i)), 1073741823 === nO && 10 < (i = nI + 500 - ei())) { - if (nR) { + if (iD(t, r), r === (n = t.lastSuspendedTime) && (t.nextKnownPendingLevel = n6(i)), 1073741823 === nT && 10 < (i = nR + 500 - ei())) { + if (nF) { var o = t.lastPingedTime; if (0 === o || o >= r) { - t.lastPingedTime = r, n1(t, r); + t.lastPingedTime = r, n0(t, r); break; } } - if (0 !== (o = nY(t)) && o !== r) break; + if (0 !== (o = nJ(t)) && o !== r) break; if (0 !== n && n !== r) { t.lastPingedTime = n; break; } - t.timeoutHandle = Z(n9.bind(null, t), i); + t.timeoutHandle = Z(n7.bind(null, t), i); break; } - n9(t); + n7(t); break; case 4: - if (iw(t, r), r === (n = t.lastSuspendedTime) && (t.nextKnownPendingLevel = n7(i)), nR && (0 === (i = t.lastPingedTime) || i >= r)) { - t.lastPingedTime = r, n1(t, r); + if (iD(t, r), r === (n = t.lastSuspendedTime) && (t.nextKnownPendingLevel = n6(i)), nF && (0 === (i = t.lastPingedTime) || i >= r)) { + t.lastPingedTime = r, n0(t, r); break; } - if (0 !== (i = nY(t)) && i !== r) break; + if (0 !== (i = nJ(t)) && i !== r) break; if (0 !== n && n !== r) { t.lastPingedTime = n; break; } - if (1073741823 !== nC ? n = 10 * (1073741821 - nC) - ei() : 1073741823 === nO ? n = 0 : (n = 10 * (1073741821 - nO) - 5e3, r = 10 * (1073741821 - r) - (i = ei()), 0 > (n = i - n) && (n = 0), r < (n = (120 > n ? 120 : 480 > n ? 480 : 1080 > n ? 1080 : 1920 > n ? 1920 : 3e3 > n ? 3e3 : 4320 > n ? 4320 : 1960 * nD(n / 1960)) - n) && (n = r)), 10 < n) { - t.timeoutHandle = Z(n9.bind(null, t), n); + if (1073741823 !== nO ? n = 10 * (1073741821 - nO) - ei() : 1073741823 === nT ? n = 0 : (n = 10 * (1073741821 - nT) - 5e3, r = 10 * (1073741821 - r) - (i = ei()), 0 > (n = i - n) && (n = 0), r < (n = (120 > n ? 120 : 480 > n ? 480 : 1080 > n ? 1080 : 1920 > n ? 1920 : 3e3 > n ? 3e3 : 4320 > n ? 4320 : 1960 * nm(n / 1960)) - n) && (n = r)), 10 < n) { + t.timeoutHandle = Z(n7.bind(null, t), n); break; } - n9(t); + n7(t); break; case 5: - if (1073741823 !== nO && null !== nP) { - o = nO; - var a = nP; + if (1073741823 !== nT && null !== nC) { + o = nT; + var a = nC; if (0 >= (n = 0 | a.busyMinDurationMs) ? n = 0 : (i = 0 | a.busyDelayMs, n = (o = ei() - (10 * (1073741821 - o) - (0 | a.timeoutMs || 5e3))) <= i ? 0 : i + n - o), 10 < n) { - iw(t, r), t.timeoutHandle = Z(n9.bind(null, t), n); + iD(t, r), t.timeoutHandle = Z(n7.bind(null, t), n); break; } } - n9(t); + n7(t); break; default: throw Error(p(329)); } - if (nK(t), t.callbackNode === e) return nQ.bind(null, t); + if (nY(t), t.callbackNode === e) return nK.bind(null, t); } } return null; } - function n$(t) { + function nQ(t) { var e = t.lastExpiredTime; - if (e = 0 !== e ? e : 1073741823, t.finishedExpirationTime === e) n9(t); + if (e = 0 !== e ? e : 1073741823, t.finishedExpirationTime === e) n7(t); else { - if ((48 & n_) != 0) throw Error(p(327)); - if (ie(), t === nx && e === nA || n1(t, e), null !== nS) { - var r = n_; - n_ |= 16; - for(var n = n3(t);;)try { - for(; null !== nS;)nS = n8(nS); + if ((48 & nE) != 0) throw Error(p(327)); + if (it(), t === n_ && e === nS || n0(t, e), null !== nx) { + var r = nE; + nE |= 16; + for(var n = n2(t);;)try { + for(; null !== nx;)nx = n5(nx); break; } catch (e) { - n2(t, e); + n1(t, e); } - if (ew(), n_ = r, nw.current = n, 1 === nk) throw r = nT, n1(t, e), iw(t, e), nK(t), r; - if (null !== nS) throw Error(p(261)); - t.finishedWork = t.current.alternate, t.finishedExpirationTime = e, nx = null, n9(t), nK(t); + if (ew(), nE = r, nD.current = n, 1 === nA) throw r = nk, n0(t, e), iD(t, e), nY(t), r; + if (null !== nx) throw Error(p(261)); + t.finishedWork = t.current.alternate, t.finishedExpirationTime = e, n_ = null, n7(t), nY(t); } } return null; } - function n0(t, e) { - if ((48 & n_) != 0) throw Error(p(187)); - var r = n_; - n_ |= 1; + function n$(t, e) { + if ((48 & nE) != 0) throw Error(p(187)); + var r = nE; + nE |= 1; try { return eu(99, t.bind(null, e)); } finally{ - n_ = r, es(); + nE = r, es(); } } - function n1(t, e) { + function n0(t, e) { t.finishedWork = null, t.finishedExpirationTime = 0; var r = t.timeoutHandle; - if (r !== J && (t.timeoutHandle = J, X(r)), null !== nS) for(r = nS.return; null !== r;){ + if (r !== J && (t.timeoutHandle = J, X(r)), null !== nx) for(r = nx.return; null !== r;){ var n = r; switch(n.tag){ case 1: @@ -26684,22 +26682,22 @@ break; case 13: case 19: - tB(e7, n); + tB(e7); break; case 10: e_(n); } r = r.return; } - nx = t, nS = ih(t.current, null, e), nA = e, nk = 0, nT = null, nC = nO = 1073741823, nP = null, nF = 0, nR = !1; + n_ = t, nx = id(t.current, null, e), nS = e, nA = 0, nk = null, nO = nT = 1073741823, nC = null, nP = 0, nF = !1; } - function n2(t, e) { + function n1(t, e) { for(;;){ try { - if (ew(), rm(), null === nS || null === nS.return) return nk = 1, nT = e, null; + if (ew(), rm(), null === nx || null === nx.return) return nA = 1, nk = e, null; r: { - var r = nS.return, n = nS, i = e; - if (e = nA, n.effectTag |= 2048, n.firstEffect = n.lastEffect = null, null !== i && "object" == typeof i && "function" == typeof i.then) { + var r = nx.return, n = nx, i = e; + if (e = nS, n.effectTag |= 2048, n.firstEffect = n.lastEffect = null, null !== i && "object" == typeof i && "function" == typeof i.then) { var o, a = i, u = 0 != (1 & e7.current), l = r; do { if (o = 13 === l.tag) { @@ -26727,9 +26725,9 @@ } i = void 0, n = e; var h = t.pingCache; - if (null === h ? (h = t.pingCache = new nv(), i = new Set(), h.set(a, i)) : (i = h.get(a), void 0 === i && (i = new Set(), h.set(a, i))), !i.has(n)) { + if (null === h ? (h = t.pingCache = new ng(), i = new Set(), h.set(a, i)) : (i = h.get(a), void 0 === i && (i = new Set(), h.set(a, i))), !i.has(n)) { i.add(n); - var y = ia.bind(null, t, a, n); + var y = io.bind(null, t, a, n); a.then(y, y); } l.effectTag |= 4096, l.expirationTime = e; @@ -26739,20 +26737,20 @@ }while (null !== l) i = Error((C(n.type) || "A React component") + " suspended while rendering, but no fallback UI was specified.\n\nAdd a component higher in the tree to provide a loading indicator or placeholder to display." + tR(n)); } - 5 !== nk && (nk = 2), i = ni(i, n), l = r; + 5 !== nA && (nA = 2), i = nn(i, n), l = r; do { switch(l.tag){ case 3: a = i, l.effectTag |= 4096, l.expirationTime = e; - var g = nb(l, a, e); + var g = nv(l, a, e); eR(l, g); break r; case 1: a = i; var v = l.type, b = l.stateNode; - if (0 == (64 & l.effectTag) && ("function" == typeof v.getDerivedStateFromError || null !== b && "function" == typeof b.componentDidCatch && (null === nN || !nN.has(b)))) { + if (0 == (64 & l.effectTag) && ("function" == typeof v.getDerivedStateFromError || null !== b && "function" == typeof b.componentDidCatch && (null === nM || !nM.has(b)))) { l.effectTag |= 4096, l.expirationTime = e; - var m = nm(l, a, e); + var m = nb(l, a, e); eR(l, m); break r; } @@ -26760,7 +26758,7 @@ l = l.return; }while (null !== l) } - nS = n6(nS); + nx = n8(nx); } catch (t) { e = t; continue; @@ -26768,27 +26766,27 @@ break; } } - function n3() { - var t = nw.current; - return nw.current = rB, null === t ? rB : t; + function n2() { + var t = nD.current; + return nD.current = rj, null === t ? rj : t; + } + function n3(t, e) { + t < nT && 2 < t && (nT = t), null !== e && t < nO && 2 < t && (nO = t, nC = e); } - function n4(t, e) { - t < nO && 2 < t && (nO = t), null !== e && t < nC && 2 < t && (nC = t, nP = e); + function n4(t) { + t > nP && (nP = t); } function n5(t) { - t > nF && (nF = t); + var e = l(t.alternate, t, nS); + return t.memoizedProps = t.pendingProps, null === e && (e = n8(t)), nw.current = null, e; } function n8(t) { - var e = l(t.alternate, t, nA); - return t.memoizedProps = t.pendingProps, null === e && (e = n6(t)), nE.current = null, e; - } - function n6(t) { - nS = t; + nx = t; do { - var e = nS.alternate; - if (t = nS.return, 0 == (2048 & nS.effectTag)) { + var e = nx.alternate; + if (t = nx.return, 0 == (2048 & nx.effectTag)) { r: { - var r = e, n = nA, l = (e = nS).pendingProps; + var r = e, n = nS, l = (e = nx).pendingProps; switch(e.tag){ case 2: case 16: @@ -26808,19 +26806,19 @@ tG(e.type) && tq(e); break; case 3: - e5(e), tV(e), (l = e.stateNode).pendingContext && (l.context = l.pendingContext, l.pendingContext = null), (null === r || null === r.child) && rH(e) && ne(e), o(e); + e5(e), tV(e), (l = e.stateNode).pendingContext && (l.context = l.pendingContext, l.pendingContext = null), (null === r || null === r.child) && rV(e) && nt(e), o(e); break; case 5: e6(e); var s = e3(e2.current); if (n = e.type, null !== r && null != e.stateNode) a(r, e, n, l, s), r.ref !== e.ref && (e.effectTag |= 128); else if (l) { - if (r = e3(e0.current), rH(e)) { + if (r = e3(e0.current), rV(e)) { if (l = e, !$) throw Error(p(175)); - r = tk(l.stateNode, l.type, l.memoizedProps, s, r, l), l.updateQueue = r, (r = null !== r) && ne(e); + r = tk(l.stateNode, l.type, l.memoizedProps, s, r, l), l.updateQueue = r, (r = null !== r) && nt(e); } else { var c = U(n, l, s, r, e); - i(c, e, !1, !1), e.stateNode = c, W(c, n, l, s, r) && ne(e); + i(c, e, !1, !1), e.stateNode = c, W(c, n, l, s, r) && nt(e); } null !== e.ref && (e.effectTag |= 128); } else if (null === e.stateNode) throw Error(p(166)); @@ -26829,18 +26827,18 @@ if (r && null != e.stateNode) u(r, e, r.memoizedProps, l); else { if ("string" != typeof l && null === e.stateNode) throw Error(p(166)); - if (r = e3(e2.current), s = e3(e0.current), rH(e)) { + if (r = e3(e2.current), s = e3(e0.current), rV(e)) { if (r = e, !$) throw Error(p(176)); - (r = tT(r.stateNode, r.memoizedProps, r)) && ne(e); + (r = tT(r.stateNode, r.memoizedProps, r)) && nt(e); } else e.stateNode = H(l, r, s, e); } break; case 13: - if (tB(e7, e), l = e.memoizedState, 0 != (64 & e.effectTag)) { + if (tB(e7), l = e.memoizedState, 0 != (64 & e.effectTag)) { e.expirationTime = n; break r; } - l = null !== l, s = !1, null === r ? void 0 !== e.memoizedProps.fallback && rH(e) : (s = null !== (n = r.memoizedState), l || null === n || null !== (n = r.child.sibling) && (null !== (c = e.firstEffect) ? (e.firstEffect = n, n.nextEffect = c) : (e.firstEffect = e.lastEffect = n, n.nextEffect = null), n.effectTag = 8)), l && !s && 0 != (2 & e.mode) && (null === r && !0 !== e.memoizedProps.unstable_avoidThisFallback || 0 != (1 & e7.current) ? 0 === nk && (nk = 3) : ((0 === nk || 3 === nk) && (nk = 4), 0 !== nF && null !== nx && (iw(nx, nA), iE(nx, nF)))), Q && l && (e.effectTag |= 4), K && (l || s) && (e.effectTag |= 4); + l = null !== l, s = !1, null === r ? void 0 !== e.memoizedProps.fallback && rV(e) : (s = null !== (n = r.memoizedState), l || null === n || null !== (n = r.child.sibling) && (null !== (c = e.firstEffect) ? (e.firstEffect = n, n.nextEffect = c) : (e.firstEffect = e.lastEffect = n, n.nextEffect = null), n.effectTag = 8)), l && !s && 0 != (2 & e.mode) && (null === r && !0 !== e.memoizedProps.unstable_avoidThisFallback || 0 != (1 & e7.current) ? 0 === nA && (nA = 3) : ((0 === nA || 3 === nA) && (nA = 4), 0 !== nP && null !== n_ && (iD(n_, nS), iw(n_, nP)))), Q && l && (e.effectTag |= 4), K && (l || s) && (e.effectTag |= 4); break; case 4: e5(e), o(e); @@ -26849,32 +26847,32 @@ e_(e); break; case 19: - if (tB(e7, e), null === (l = e.memoizedState)) break; + if (tB(e7), null === (l = e.memoizedState)) break; if (s = 0 != (64 & e.effectTag), null === (c = l.rendering)) { - if (s) nn(l, !1); - else if (0 !== nk || null !== r && 0 != (64 & r.effectTag)) for(r = e.child; null !== r;){ + if (s) nr(l, !1); + else if (0 !== nA || null !== r && 0 != (64 & r.effectTag)) for(r = e.child; null !== r;){ if (null !== (c = e9(r))) { - for(e.effectTag |= 64, nn(l, !1), null !== (r = c.updateQueue) && (e.updateQueue = r, e.effectTag |= 4), null === l.lastEffect && (e.firstEffect = null), e.lastEffect = l.lastEffect, r = n, l = e.child; null !== l;)s = l, n = r, s.effectTag &= 2, s.nextEffect = null, s.firstEffect = null, s.lastEffect = null, null === (c = s.alternate) ? (s.childExpirationTime = 0, s.expirationTime = n, s.child = null, s.memoizedProps = null, s.memoizedState = null, s.updateQueue = null, s.dependencies = null) : (s.childExpirationTime = c.childExpirationTime, s.expirationTime = c.expirationTime, s.child = c.child, s.memoizedProps = c.memoizedProps, s.memoizedState = c.memoizedState, s.updateQueue = c.updateQueue, n = c.dependencies, s.dependencies = null === n ? null : { + for(e.effectTag |= 64, nr(l, !1), null !== (r = c.updateQueue) && (e.updateQueue = r, e.effectTag |= 4), null === l.lastEffect && (e.firstEffect = null), e.lastEffect = l.lastEffect, r = n, l = e.child; null !== l;)s = l, n = r, s.effectTag &= 2, s.nextEffect = null, s.firstEffect = null, s.lastEffect = null, null === (c = s.alternate) ? (s.childExpirationTime = 0, s.expirationTime = n, s.child = null, s.memoizedProps = null, s.memoizedState = null, s.updateQueue = null, s.dependencies = null) : (s.childExpirationTime = c.childExpirationTime, s.expirationTime = c.expirationTime, s.child = c.child, s.memoizedProps = c.memoizedProps, s.memoizedState = c.memoizedState, s.updateQueue = c.updateQueue, n = c.dependencies, s.dependencies = null === n ? null : { expirationTime: n.expirationTime, firstContext: n.firstContext, responders: n.responders }), l = l.sibling; - tM(e7, 1 & e7.current | 2, e), e = e.child; + tM(e7, 1 & e7.current | 2), e = e.child; break r; } r = r.sibling; } } else { if (!s) if (null !== (r = e9(c))) { - if (e.effectTag |= 64, s = !0, null !== (r = r.updateQueue) && (e.updateQueue = r, e.effectTag |= 4), nn(l, !0), null === l.tail && "hidden" === l.tailMode) { + if (e.effectTag |= 64, s = !0, null !== (r = r.updateQueue) && (e.updateQueue = r, e.effectTag |= 4), nr(l, !0), null === l.tail && "hidden" === l.tailMode) { null !== (e = e.lastEffect = l.lastEffect) && (e.nextEffect = null); break; } - } else ei() > l.tailExpiration && 1 < n && (e.effectTag |= 64, s = !0, nn(l, !1), e.expirationTime = e.childExpirationTime = n - 1); + } else ei() > l.tailExpiration && 1 < n && (e.effectTag |= 64, s = !0, nr(l, !1), e.expirationTime = e.childExpirationTime = n - 1); l.isBackwards ? (c.sibling = e.child, e.child = c) : (null !== (r = l.last) ? r.sibling = c : e.child = c, l.last = c); } if (null !== l.tail) { - 0 === l.tailExpiration && (l.tailExpiration = ei() + 500), r = l.tail, l.rendering = r, l.tail = r.sibling, l.lastEffect = e.lastEffect, r.sibling = null, l = e7.current, tM(e7, l = s ? 1 & l | 2 : 1 & l, e), e = r; + 0 === l.tailExpiration && (l.tailExpiration = ei() + 500), r = l.tail, l.rendering = r, l.tail = r.sibling, l.lastEffect = e.lastEffect, r.sibling = null, l = e7.current, tM(e7, l = s ? 1 & l | 2 : 1 & l), e = r; break r; } break; @@ -26883,12 +26881,12 @@ } e = null; } - if (r = nS, 1 === nA || 1 !== r.childExpirationTime) { + if (r = nx, 1 === nS || 1 !== r.childExpirationTime) { for(l = 0, s = r.child; null !== s;)n = s.expirationTime, c = s.childExpirationTime, n > l && (l = n), c > l && (l = c), s = s.sibling; r.childExpirationTime = l; } if (null !== e) return e; - null !== t && 0 == (2048 & t.effectTag) && (null === t.firstEffect && (t.firstEffect = nS.firstEffect), null !== nS.lastEffect && (null !== t.lastEffect && (t.lastEffect.nextEffect = nS.firstEffect), t.lastEffect = nS.lastEffect), 1 < nS.effectTag && (null !== t.lastEffect ? t.lastEffect.nextEffect = nS : t.firstEffect = nS, t.lastEffect = nS)); + null !== t && 0 == (2048 & t.effectTag) && (null === t.firstEffect && (t.firstEffect = nx.firstEffect), null !== nx.lastEffect && (null !== t.lastEffect && (t.lastEffect.nextEffect = nx.firstEffect), t.lastEffect = nx.lastEffect), 1 < nx.effectTag && (null !== t.lastEffect ? t.lastEffect.nextEffect = nx : t.firstEffect = nx, t.lastEffect = nx)); } else { if (null !== (e = function(t) { switch(t.tag){ @@ -26902,9 +26900,9 @@ case 5: return e6(t), null; case 13: - return tB(e7, t), 4096 & (e = t.effectTag) ? (t.effectTag = -4097 & e | 64, t) : null; + return tB(e7), 4096 & (e = t.effectTag) ? (t.effectTag = -4097 & e | 64, t) : null; case 19: - return tB(e7, t), null; + return tB(e7), null; case 4: return e5(t), null; case 10: @@ -26912,40 +26910,40 @@ default: return null; } - }(nS))) return e.effectTag &= 2047, e; + }(nx))) return e.effectTag &= 2047, e; null !== t && (t.firstEffect = t.lastEffect = null, t.effectTag |= 2048); } - if (null !== (e = nS.sibling)) return e; - nS = t; - }while (null !== nS) - return 0 === nk && (nk = 5), null; + if (null !== (e = nx.sibling)) return e; + nx = t; + }while (null !== nx) + return 0 === nA && (nA = 5), null; } - function n7(t) { + function n6(t) { var e = t.expirationTime; return e > (t = t.childExpirationTime) ? e : t; } - function n9(t) { - return eu(99, it.bind(null, t, eo())), null; + function n7(t) { + return eu(99, n9.bind(null, t, eo())), null; } - function it(t, e) { - if (ie(), (48 & n_) != 0) throw Error(p(327)); + function n9(t, e) { + if (it(), (48 & nE) != 0) throw Error(p(327)); var r = t.finishedWork, n = t.finishedExpirationTime; if (null === r) return null; if (t.finishedWork = null, t.finishedExpirationTime = 0, r === t.current) throw Error(p(177)); t.callbackNode = null, t.callbackExpirationTime = 0, t.callbackPriority = 90, t.nextKnownPendingLevel = 0; - var i = n7(r); - if (t.firstPendingTime = i, n <= t.lastSuspendedTime ? t.firstSuspendedTime = t.lastSuspendedTime = t.nextKnownPendingLevel = 0 : n <= t.firstSuspendedTime && (t.firstSuspendedTime = n - 1), n <= t.lastPingedTime && (t.lastPingedTime = 0), n <= t.lastExpiredTime && (t.lastExpiredTime = 0), t === nx && (nS = nx = null, nA = 0), 1 < r.effectTag ? null !== r.lastEffect ? (r.lastEffect.nextEffect = r, i = r.firstEffect) : i = r : i = r.firstEffect, null !== i) { - var o = n_; - n_ |= 32, nE.current = null, N(t.containerInfo), nj = i; + var i = n6(r); + if (t.firstPendingTime = i, n <= t.lastSuspendedTime ? t.firstSuspendedTime = t.lastSuspendedTime = t.nextKnownPendingLevel = 0 : n <= t.firstSuspendedTime && (t.firstSuspendedTime = n - 1), n <= t.lastPingedTime && (t.lastPingedTime = 0), n <= t.lastExpiredTime && (t.lastExpiredTime = 0), t === n_ && (nx = n_ = null, nS = 0), 1 < r.effectTag ? null !== r.lastEffect ? (r.lastEffect.nextEffect = r, i = r.firstEffect) : i = r : i = r.firstEffect, null !== i) { + var o = nE; + nE |= 32, nw.current = null, N(t.containerInfo), nI = i; do try { - for(; null !== nj;){ - var a, u, l = nj.effectTag; + for(; null !== nI;){ + var a, u, l = nI.effectTag; 0 != (256 & l) && function(t, e) { switch(e.tag){ case 0: case 11: case 15: - nl(2, 0, e); + nu(2, 0, e); break; case 1: if (256 & e.effectTag && null !== t) { @@ -26962,21 +26960,21 @@ default: throw Error(p(163)); } - }(nj.alternate, nj), 0 == (512 & l) || nL || (nL = !0, a = 97, u = function() { - return ie(), null; - }, tK(a = ea(a), u, void 0)), nj = nj.nextEffect; + }(nI.alternate, nI), 0 == (512 & l) || nN || (nN = !0, a = 97, u = function() { + return it(), null; + }, tK(a = ea(a), u, void 0)), nI = nI.nextEffect; } } catch (t) { - if (null === nj) throw Error(p(330)); - io(nj, t), nj = nj.nextEffect; + if (null === nI) throw Error(p(330)); + ii(nI, t), nI = nI.nextEffect; } - while (null !== nj) - nj = i; + while (null !== nI) + nI = i; do try { - for(var s = t, c = e; null !== nj;){ - var f = nj.effectTag; - if (16 & f && K && ts(nj.stateNode), 128 & f) { - var d = nj.alternate; + for(var s = t, c = e; null !== nI;){ + var f = nI.effectTag; + if (16 & f && K && ts(nI.stateNode), 128 & f) { + var d = nI.alternate; if (null !== d) { var h = d.ref; null !== h && ("function" == typeof h ? h(null) : h.current = null); @@ -26984,45 +26982,45 @@ } switch(1038 & f){ case 2: - np(nj), nj.effectTag &= -3; + nf(nI), nI.effectTag &= -3; break; case 6: - np(nj), nj.effectTag &= -3, nh(nj.alternate, nj); + nf(nI), nI.effectTag &= -3, nd(nI.alternate, nI); break; case 1024: - nj.effectTag &= -1025; + nI.effectTag &= -1025; break; case 1028: - nj.effectTag &= -1025, nh(nj.alternate, nj); + nI.effectTag &= -1025, nd(nI.alternate, nI); break; case 4: - nh(nj.alternate, nj); + nd(nI.alternate, nI); break; case 8: - var y = s, g = nj; - K ? nd(y, g, c) : nc(y, g, c), function t(e) { + var y = s, g = nI; + K ? np(y, g, c) : ns(y, g, c), function t(e) { var r = e.alternate; e.return = null, e.child = null, e.memoizedState = null, e.updateQueue = null, e.dependencies = null, e.alternate = null, e.firstEffect = null, e.lastEffect = null, e.pendingProps = null, e.memoizedProps = null, null !== r && t(r); }(g); } - nj = nj.nextEffect; + nI = nI.nextEffect; } } catch (t) { - if (null === nj) throw Error(p(330)); - io(nj, t), nj = nj.nextEffect; + if (null === nI) throw Error(p(330)); + ii(nI, t), nI = nI.nextEffect; } - while (null !== nj) - L(t.containerInfo), t.current = r, nj = i; + while (null !== nI) + L(t.containerInfo), t.current = r, nI = i; do try { - for(f = n; null !== nj;){ - var v = nj.effectTag; + for(f = n; null !== nI;){ + var v = nI.effectTag; if (36 & v) { - var b = nj.alternate; - switch(d = nj, h = f, d.tag){ + var b = nI.alternate; + switch(d = nI, h = f, d.tag){ case 0: case 11: case 15: - nl(16, 32, d); + nu(16, 32, d); break; case 1: var m = d.stateNode; @@ -27032,7 +27030,7 @@ m.componentDidUpdate(D, b.memoizedState, m.__reactInternalSnapshotBeforeUpdate); } var w = d.updateQueue; - null !== w && eM(d, w, m, h); + null !== w && eM(d, w, m); break; case 3: var E = d.updateQueue; @@ -27044,7 +27042,7 @@ case 1: s = d.child.stateNode; } - eM(d, E, s, h); + eM(d, E, s); } break; case 5: @@ -27077,92 +27075,92 @@ } if (128 & v) { d = void 0; - var k = nj.ref; + var k = nI.ref; if (null !== k) { - var T = nj.stateNode; - d = 5 === nj.tag ? j(T) : T, "function" == typeof k ? k(d) : k.current = d; + var T = nI.stateNode; + d = 5 === nI.tag ? j(T) : T, "function" == typeof k ? k(d) : k.current = d; } } - nj = nj.nextEffect; + nI = nI.nextEffect; } } catch (t) { - if (null === nj) throw Error(p(330)); - io(nj, t), nj = nj.nextEffect; + if (null === nI) throw Error(p(330)); + ii(nI, t), nI = nI.nextEffect; } - while (null !== nj) - nj = null, t9(), n_ = o; + while (null !== nI) + nI = null, t9(), nE = o; } else t.current = r; - if (nL) nL = !1, nU = t, nz = e; - else for(nj = i; null !== nj;)e = nj.nextEffect, nj.nextEffect = null, nj = e; - if (0 === (e = t.firstPendingTime) && (nN = null), 1073741823 === e ? t === nq ? nG++ : (nG = 0, nq = t) : nG = 0, "function" == typeof il && il(r.stateNode, n), nK(t), nB) throw nB = !1, t = nM, nM = null, t; - return (8 & n_) != 0 || es(), null; + if (nN) nN = !1, nL = t, nU = e; + else for(nI = i; null !== nI;)e = nI.nextEffect, nI.nextEffect = null, nI = e; + if (0 === (e = t.firstPendingTime) && (nM = null), 1073741823 === e ? t === nG ? nW++ : (nW = 0, nG = t) : nW = 0, "function" == typeof iu && iu(r.stateNode, n), nY(t), nj) throw nj = !1, t = nB, nB = null, t; + return (8 & nE) != 0 || es(), null; } - function ie() { - if (90 !== nz) { - var t = 97 < nz ? 97 : nz; - return nz = 90, eu(t, ir); + function it() { + if (90 !== nU) { + var t = 97 < nU ? 97 : nU; + return nU = 90, eu(t, ie); } } - function ir() { - if (null === nU) return !1; - var t = nU; - if (nU = null, (48 & n_) != 0) throw Error(p(331)); - var e = n_; - for(n_ |= 32, t = t.current.firstEffect; null !== t;){ + function ie() { + if (null === nL) return !1; + var t = nL; + if (nL = null, (48 & nE) != 0) throw Error(p(331)); + var e = nE; + for(nE |= 32, t = t.current.firstEffect; null !== t;){ try { var r = t; if (0 != (512 & r.effectTag)) switch(r.tag){ case 0: case 11: case 15: - nl(128, 0, r), nl(0, 64, r); + nu(128, 0, r), nu(0, 64, r); } } catch (e) { if (null === t) throw Error(p(330)); - io(t, e); + ii(t, e); } r = t.nextEffect, t.nextEffect = null, t = r; } - return n_ = e, es(), !0; + return nE = e, es(), !0; } - function ii(t, e, r) { - e = nb(t, e = ni(r, e), 1073741823), eF(t, e), null !== (t = nJ(t, 1073741823)) && nK(t); + function ir(t, e, r) { + e = nv(t, e = nn(r, e), 1073741823), eF(t, e), null !== (t = nX(t, 1073741823)) && nY(t); } - function io(t, e) { - if (3 === t.tag) ii(t, t, e); + function ii(t, e) { + if (3 === t.tag) ir(t, t, e); else for(var r = t.return; null !== r;){ if (3 === r.tag) { - ii(r, t, e); + ir(r, t, e); break; } if (1 === r.tag) { var n = r.stateNode; - if ("function" == typeof r.type.getDerivedStateFromError || "function" == typeof n.componentDidCatch && (null === nN || !nN.has(n))) { - t = nm(r, t = ni(e, t), 1073741823), eF(r, t), null !== (r = nJ(r, 1073741823)) && nK(r); + if ("function" == typeof r.type.getDerivedStateFromError || "function" == typeof n.componentDidCatch && (null === nM || !nM.has(n))) { + t = nb(r, t = nn(e, t), 1073741823), eF(r, t), null !== (r = nX(r, 1073741823)) && nY(r); break; } } r = r.return; } } - function ia(t, e, r) { + function io(t, e, r) { var n = t.pingCache; - null !== n && n.delete(e), nx === t && nA === r ? 4 === nk || 3 === nk && 1073741823 === nO && ei() - nI < 500 ? n1(t, nA) : nR = !0 : iD(t, r) && (0 !== (e = t.lastPingedTime) && e < r || (t.lastPingedTime = r, t.finishedExpirationTime === r && (t.finishedExpirationTime = 0, t.finishedWork = null), nK(t))); + null !== n && n.delete(e), n_ === t && nS === r ? 4 === nA || 3 === nA && 1073741823 === nT && ei() - nR < 500 ? n0(t, nS) : nF = !0 : im(t, r) && (0 !== (e = t.lastPingedTime) && e < r || (t.lastPingedTime = r, t.finishedExpirationTime === r && (t.finishedExpirationTime = 0, t.finishedWork = null), nY(t))); } - function iu(t, e) { + function ia(t, e) { var r = t.stateNode; - null !== r && r.delete(e), 0 == (e = 0) && (e = nZ(e = nH(), t, null)), null !== (t = nJ(t, e)) && nK(t); + null !== r && r.delete(e), 0 == (e = 0) && (e = nH(e = nV(), t, null)), null !== (t = nX(t, e)) && nY(t); } l = function(t, e, r) { var n = e.expirationTime; if (null !== t) { var i = e.pendingProps; - if (t.memoizedProps !== i || tU.current) rJ = !0; + if (t.memoizedProps !== i || tU.current) rX = !0; else { if (n < r) { - switch(rJ = !1, e.tag){ + switch(rX = !1, e.tag){ case 3: - r4(e), rZ(); + r3(e), rH(); break; case 5: if (e8(e), 4 & e.mode && 1 !== r && V(e.type, i)) return e.expirationTime = e.childExpirationTime = 1, null; @@ -27178,23 +27176,23 @@ break; case 13: if (null !== e.memoizedState) { - if (0 !== (n = e.child.childExpirationTime) && n >= r) return r8(t, e, r); - return tM(e7, 1 & e7.current, e), null !== (e = nt(t, e, r)) ? e.sibling : null; + if (0 !== (n = e.child.childExpirationTime) && n >= r) return r5(t, e, r); + return tM(e7, 1 & e7.current), null !== (e = r9(t, e, r)) ? e.sibling : null; } - tM(e7, 1 & e7.current, e); + tM(e7, 1 & e7.current); break; case 19: if (n = e.childExpirationTime >= r, 0 != (64 & t.effectTag)) { - if (n) return r9(t, e, r); + if (n) return r7(t, e, r); e.effectTag |= 64; } - if (null !== (i = e.memoizedState) && (i.rendering = null, i.tail = null), tM(e7, e7.current, e), !n) return null; + if (null !== (i = e.memoizedState) && (i.rendering = null, i.tail = null), tM(e7, e7.current), !n) return null; } - return nt(t, e, r); + return r9(t, e, r); } - rJ = !1; + rX = !1; } - } else rJ = !1; + } else rX = !1; switch(e.expirationTime = 0, e.tag){ case 2: if (n = e.type, null !== t && (t.alternate = null, e.alternate = null, e.effectTag |= 2), t = e.pendingProps, i = tW(e, tL.current), eS(e, r), i = rb(null, e, n, t, i, r), e.effectTag |= 1, "object" == typeof i && null !== i && "function" == typeof i.render && void 0 === i.$$typeof) { @@ -27204,8 +27202,8 @@ } else o = !1; e.memoizedState = null !== i.state && void 0 !== i.state ? i.state : null; var a = n.getDerivedStateFromProps; - "function" == typeof a && ez(e, n, a, t), i.updater = eW, e.stateNode = i, i._reactInternalFiber = e, eH(e, n, t, r), e = r3(null, e, n, !0, o, r); - } else e.tag = 0, rY(null, e, i, r), e = e.child; + "function" == typeof a && ez(e, n, a, t), i.updater = eW, e.stateNode = i, i._reactInternalFiber = e, eH(e, n, t, r), e = r2(null, e, n, !0, o, r); + } else e.tag = 0, rJ(null, e, i, r), e = e.child; return e; case 16: i = e.elementType, null !== t && (t.alternate = null, e.alternate = null, e.effectTag |= 2), t = e.pendingProps; @@ -27221,7 +27219,7 @@ } if (1 !== i._status) throw i._result; switch(i = i._result, e.type = i, o = e.tag = function(t) { - if ("function" == typeof t) return +!!id(t); + if ("function" == typeof t) return +!!ip(t); if (null != t) { if ((t = t.$$typeof) === _) return 11; if (t === A) return 14; @@ -27229,56 +27227,56 @@ return 2; }(i), t = eg(i, t), o){ case 0: - e = r1(null, e, i, t, r); + e = r0(null, e, i, t, r); break; case 1: - e = r2(null, e, i, t, r); + e = r1(null, e, i, t, r); break; case 11: - e = rK(null, e, i, t, r); + e = rY(null, e, i, t, r); break; case 14: - e = rQ(null, e, i, eg(i.type, t), n, r); + e = rK(null, e, i, eg(i.type, t), n, r); break; default: throw Error(p(306, i, "")); } return e; case 0: - return n = e.type, i = e.pendingProps, i = e.elementType === n ? i : eg(n, i), r1(t, e, n, i, r); + return n = e.type, i = e.pendingProps, i = e.elementType === n ? i : eg(n, i), r0(t, e, n, i, r); case 1: - return n = e.type, i = e.pendingProps, i = e.elementType === n ? i : eg(n, i), r2(t, e, n, i, r); + return n = e.type, i = e.pendingProps, i = e.elementType === n ? i : eg(n, i), r1(t, e, n, i, r); case 3: - if (r4(e), null === (n = e.updateQueue)) throw Error(p(282)); - if (i = null !== (i = e.memoizedState) ? i.element : null, eB(e, n, e.pendingProps, null, r), (n = e.memoizedState.element) === i) rZ(), e = nt(t, e, r); + if (r3(e), null === (n = e.updateQueue)) throw Error(p(282)); + if (i = null !== (i = e.memoizedState) ? i.element : null, eB(e, n, e.pendingProps, null, r), (n = e.memoizedState.element) === i) rH(), e = r9(t, e, r); else { - if ((i = e.stateNode.hydrate) && ($ ? (rU = tA(e.stateNode.containerInfo), rL = e, i = rz = !0) : i = !1), i) for(r = eQ(e, null, n, r), e.child = r; r;)r.effectTag = -3 & r.effectTag | 1024, r = r.sibling; - else rY(t, e, n, r), rZ(); + if ((i = e.stateNode.hydrate) && ($ ? (rL = tA(e.stateNode.containerInfo), rN = e, i = rU = !0) : i = !1), i) for(r = eQ(e, null, n, r), e.child = r; r;)r.effectTag = -3 & r.effectTag | 1024, r = r.sibling; + else rJ(t, e, n, r), rH(); e = e.child; } return e; case 5: - return e8(e), null === t && rq(e), n = e.type, i = e.pendingProps, o = null !== t ? t.memoizedProps : null, a = i.children, q(n, i) ? a = null : null !== o && q(n, o) && (e.effectTag |= 16), r0(t, e), 4 & e.mode && 1 !== r && V(n, i) ? (e.expirationTime = e.childExpirationTime = 1, e = null) : (rY(t, e, a, r), e = e.child), e; + return e8(e), null === t && rG(e), n = e.type, i = e.pendingProps, o = null !== t ? t.memoizedProps : null, a = i.children, q(n, i) ? a = null : null !== o && q(n, o) && (e.effectTag |= 16), r$(t, e), 4 & e.mode && 1 !== r && V(n, i) ? (e.expirationTime = e.childExpirationTime = 1, e = null) : (rJ(t, e, a, r), e = e.child), e; case 6: - return null === t && rq(e), null; + return null === t && rG(e), null; case 13: - return r8(t, e, r); + return r5(t, e, r); case 4: - return e4(e, e.stateNode.containerInfo), n = e.pendingProps, null === t ? e.child = eK(e, null, n, r) : rY(t, e, n, r), e.child; + return e4(e, e.stateNode.containerInfo), n = e.pendingProps, null === t ? e.child = eK(e, null, n, r) : rJ(t, e, n, r), e.child; case 11: - return n = e.type, i = e.pendingProps, i = e.elementType === n ? i : eg(n, i), rK(t, e, n, i, r); + return n = e.type, i = e.pendingProps, i = e.elementType === n ? i : eg(n, i), rY(t, e, n, i, r); case 7: - return rY(t, e, e.pendingProps, r), e.child; + return rJ(t, e, e.pendingProps, r), e.child; case 8: case 12: - return rY(t, e, e.pendingProps.children, r), e.child; + return rJ(t, e, e.pendingProps.children, r), e.child; case 10: r: { if (n = e.type._context, i = e.pendingProps, a = e.memoizedProps, eE(e, o = i.value), null !== a) { var s = a.value; if (0 == (o = ed(s, o) ? 0 : ("function" == typeof n._calculateChangedBits ? n._calculateChangedBits(s, o) : 1073741823) | 0)) { if (a.children === i.children && !tU.current) { - e = nt(t, e, r); + e = r9(t, e, r); break r; } } else for(null !== (s = e.child) && (s.return = e); null !== s;){ @@ -27308,47 +27306,47 @@ s = a; } } - rY(t, e, i.children, r), e = e.child; + rJ(t, e, i.children, r), e = e.child; } return e; case 9: - return i = e.type, n = (o = e.pendingProps).children, eS(e, r), n = n(i = eA(i, o.unstable_observedBits)), e.effectTag |= 1, rY(t, e, n, r), e.child; + return i = e.type, n = (o = e.pendingProps).children, eS(e, r), n = n(i = eA(i, o.unstable_observedBits)), e.effectTag |= 1, rJ(t, e, n, r), e.child; case 14: - return o = eg(i = e.type, e.pendingProps), o = eg(i.type, o), rQ(t, e, i, o, n, r); + return o = eg(i = e.type, e.pendingProps), o = eg(i.type, o), rK(t, e, i, o, n, r); case 15: - return r$(t, e, e.type, e.pendingProps, n, r); + return rQ(t, e, e.type, e.pendingProps, n, r); case 17: - return n = e.type, i = e.pendingProps, i = e.elementType === n ? i : eg(n, i), null !== t && (t.alternate = null, e.alternate = null, e.effectTag |= 2), e.tag = 1, tG(n) ? (t = !0, tX(e)) : t = !1, eS(e, r), eq(e, n, i, r), eH(e, n, i, r), r3(null, e, n, !0, t, r); + return n = e.type, i = e.pendingProps, i = e.elementType === n ? i : eg(n, i), null !== t && (t.alternate = null, e.alternate = null, e.effectTag |= 2), e.tag = 1, tG(n) ? (t = !0, tX(e)) : t = !1, eS(e, r), eq(e, n, i), eH(e, n, i, r), r2(null, e, n, !0, t, r); case 19: - return r9(t, e, r); + return r7(t, e, r); } throw Error(p(156, e.tag)); }; - var il = null, is = null; - function ic(t, e, r, n) { + var iu = null, il = null; + function is(t, e, r, n) { this.tag = t, this.key = r, this.sibling = this.child = this.return = this.stateNode = this.type = this.elementType = null, this.index = 0, this.ref = null, this.pendingProps = e, this.dependencies = this.memoizedState = this.updateQueue = this.memoizedProps = null, this.mode = n, this.effectTag = 0, this.lastEffect = this.firstEffect = this.nextEffect = null, this.childExpirationTime = this.expirationTime = 0, this.alternate = null; } - function ip(t, e, r, n) { - return new ic(t, e, r, n); + function ic(t, e, r, n) { + return new is(t, e, r, n); } - function id(t) { + function ip(t) { return !(!(t = t.prototype) || !t.isReactComponent); } - function ih(t, e) { + function id(t, e) { var r = t.alternate; - return null === r ? ((r = ip(t.tag, e, t.key, t.mode)).elementType = t.elementType, r.type = t.type, r.stateNode = t.stateNode, r.alternate = t, t.alternate = r) : (r.pendingProps = e, r.effectTag = 0, r.nextEffect = null, r.firstEffect = null, r.lastEffect = null), r.childExpirationTime = t.childExpirationTime, r.expirationTime = t.expirationTime, r.child = t.child, r.memoizedProps = t.memoizedProps, r.memoizedState = t.memoizedState, r.updateQueue = t.updateQueue, e = t.dependencies, r.dependencies = null === e ? null : { + return null === r ? ((r = ic(t.tag, e, t.key, t.mode)).elementType = t.elementType, r.type = t.type, r.stateNode = t.stateNode, r.alternate = t, t.alternate = r) : (r.pendingProps = e, r.effectTag = 0, r.nextEffect = null, r.firstEffect = null, r.lastEffect = null), r.childExpirationTime = t.childExpirationTime, r.expirationTime = t.expirationTime, r.child = t.child, r.memoizedProps = t.memoizedProps, r.memoizedState = t.memoizedState, r.updateQueue = t.updateQueue, e = t.dependencies, r.dependencies = null === e ? null : { expirationTime: e.expirationTime, firstContext: e.firstContext, responders: e.responders }, r.sibling = t.sibling, r.index = t.index, r.ref = t.ref, r; } - function iy(t, e, r, n, i, o) { + function ih(t, e, r, n, i, o) { var a = 2; - if (n = t, "function" == typeof t) id(t) && (a = 1); + if (n = t, "function" == typeof t) ip(t) && (a = 1); else if ("string" == typeof t) a = 5; else r: switch(t){ case v: - return ig(r.children, i, o, e); + return iy(r.children, i, o, e); case E: a = 8, i |= 7; break; @@ -27356,11 +27354,11 @@ a = 8, i |= 1; break; case m: - return (t = ip(12, r, e, 8 | i)).elementType = m, t.type = m, t.expirationTime = o, t; + return (t = ic(12, r, e, 8 | i)).elementType = m, t.type = m, t.expirationTime = o, t; case x: - return (t = ip(13, r, e, i)).type = x, t.elementType = x, t.expirationTime = o, t; + return (t = ic(13, r, e, i)).type = x, t.elementType = x, t.expirationTime = o, t; case S: - return (t = ip(19, r, e, i)).elementType = S, t.expirationTime = o, t; + return (t = ic(19, r, e, i)).elementType = S, t.expirationTime = o, t; default: if ("object" == typeof t && null !== t) switch(t.$$typeof){ case D: @@ -27381,42 +27379,42 @@ } throw Error(p(130, null == t ? t : typeof t, "")); } - return (e = ip(a, r, e, i)).elementType = t, e.type = n, e.expirationTime = o, e; + return (e = ic(a, r, e, i)).elementType = t, e.type = n, e.expirationTime = o, e; } - function ig(t, e, r, n) { - return (t = ip(7, t, n, e)).expirationTime = r, t; + function iy(t, e, r, n) { + return (t = ic(7, t, n, e)).expirationTime = r, t; } - function iv(t, e, r) { - return (t = ip(6, t, null, e)).expirationTime = r, t; + function ig(t, e, r) { + return (t = ic(6, t, null, e)).expirationTime = r, t; } - function ib(t, e, r) { - return (e = ip(4, null !== t.children ? t.children : [], t.key, e)).expirationTime = r, e.stateNode = { + function iv(t, e, r) { + return (e = ic(4, null !== t.children ? t.children : [], t.key, e)).expirationTime = r, e.stateNode = { containerInfo: t.containerInfo, pendingChildren: null, implementation: t.implementation }, e; } - function im(t, e, r) { + function ib(t, e, r) { this.tag = e, this.current = null, this.containerInfo = t, this.pingCache = this.pendingChildren = null, this.finishedExpirationTime = 0, this.finishedWork = null, this.timeoutHandle = J, this.pendingContext = this.context = null, this.hydrate = r, this.callbackNode = null, this.callbackPriority = 90, this.lastExpiredTime = this.lastPingedTime = this.nextKnownPendingLevel = this.lastSuspendedTime = this.firstSuspendedTime = this.firstPendingTime = 0; } - function iD(t, e) { + function im(t, e) { var r = t.firstSuspendedTime; return t = t.lastSuspendedTime, 0 !== r && r >= e && t <= e; } - function iw(t, e) { + function iD(t, e) { var r = t.firstSuspendedTime, n = t.lastSuspendedTime; r < e && (t.firstSuspendedTime = e), (n > e || 0 === r) && (t.lastSuspendedTime = e), e <= t.lastPingedTime && (t.lastPingedTime = 0), e <= t.lastExpiredTime && (t.lastExpiredTime = 0); } - function iE(t, e) { + function iw(t, e) { e > t.firstPendingTime && (t.firstPendingTime = e); var r = t.firstSuspendedTime; 0 !== r && (e >= r ? t.firstSuspendedTime = t.lastSuspendedTime = t.nextKnownPendingLevel = 0 : e >= t.lastSuspendedTime && (t.lastSuspendedTime = e + 1), e > t.nextKnownPendingLevel && (t.nextKnownPendingLevel = e)); } - function i_(t, e) { + function iE(t, e) { var r = t.lastExpiredTime; (0 === r || r > e) && (t.lastExpiredTime = e); } - function ix(t) { + function i_(t) { var e = t._reactInternalFiber; if (void 0 === e) { if ("function" == typeof t.render) throw Error(p(188)); @@ -27424,19 +27422,19 @@ } return null === (t = I(e)) ? null : t.stateNode; } - function iS(t, e) { + function ix(t, e) { null !== (t = t.memoizedState) && null !== t.dehydrated && t.retryTime < e && (t.retryTime = e); } - function iA(t, e) { - iS(t, e), (t = t.alternate) && iS(t, e); + function iS(t, e) { + ix(t, e), (t = t.alternate) && ix(t, e); } - var ik = { + var iA = { createContainer: function(t, e, r) { - return t = new im(t, e, r), e = ip(3, null, null, 2 === e ? 7 : 3 * (1 === e)), t.current = e, e.stateNode = t; + return t = new ib(t, e, r), e = ic(3, null, null, 2 === e ? 7 : 3 * (1 === e)), t.current = e, e.stateNode = t; }, updateContainer: function(t, e, r, n) { - var i = e.current, o = nH(), a = eL.suspense; - o = nZ(o, i, a); + var i = e.current, o = nV(), a = eL.suspense; + o = nH(o, i, a); r: if (r) { r = r._reactInternalFiber; n: { @@ -27468,33 +27466,33 @@ } else r = tN; return null === e.context ? e.context = r : e.pendingContext = r, (e = eC(o, a)).payload = { element: t - }, null !== (n = void 0 === n ? null : n) && (e.callback = n), eF(i, e), nX(i, o), o; + }, null !== (n = void 0 === n ? null : n) && (e.callback = n), eF(i, e), nZ(i, o), o; }, batchedEventUpdates: function(t, e) { - var r = n_; - n_ |= 2; + var r = nE; + nE |= 2; try { return t(e); } finally{ - 0 === (n_ = r) && es(); + 0 === (nE = r) && es(); } }, batchedUpdates: function(t, e) { - var r = n_; - n_ |= 1; + var r = nE; + nE |= 1; try { return t(e); } finally{ - 0 === (n_ = r) && es(); + 0 === (nE = r) && es(); } }, unbatchedUpdates: function(t, e) { - var r = n_; - n_ &= -2, n_ |= 8; + var r = nE; + nE &= -2, nE |= 8; try { return t(e); } finally{ - 0 === (n_ = r) && es(); + 0 === (nE = r) && es(); } }, deferredUpdates: function(t) { @@ -27504,35 +27502,35 @@ return eu(99, t.bind(null, e, r, n)); }, discreteUpdates: function(t, e, r, n) { - var i = n_; - n_ |= 4; + var i = nE; + nE |= 4; try { return eu(98, t.bind(null, e, r, n)); } finally{ - 0 === (n_ = i) && es(); + 0 === (nE = i) && es(); } }, flushDiscreteUpdates: function() { - (49 & n_) == 0 && (function() { - if (null !== nW) { - var t = nW; - nW = null, t.forEach(function(t, e) { - i_(e, t), nK(e); + (49 & nE) == 0 && (function() { + if (null !== nz) { + var t = nz; + nz = null, t.forEach(function(t, e) { + iE(e, t), nY(e); }), es(); } - }(), ie()); + }(), it()); }, flushControlled: function(t) { - var e = n_; - n_ |= 1; + var e = nE; + nE |= 1; try { eu(99, t); } finally{ - 0 === (n_ = e) && es(); + 0 === (nE = e) && es(); } }, - flushSync: n0, - flushPassiveEffects: ie, + flushSync: n$, + flushPassiveEffects: it, IsThisRendererActing: { current: !1 }, @@ -27543,36 +27541,36 @@ switch(t.tag){ case 3: var e, r = t.stateNode; - r.hydrate && (i_(e = r, r.firstPendingTime), nK(e), (48 & n_) == 0 && es()); + r.hydrate && (iE(e = r, r.firstPendingTime), nY(e), (48 & nE) == 0 && es()); break; case 13: - n0(function() { - return nX(t, 1073741823); - }), iA(t, r = ep(nH(), 150, 100)); + n$(function() { + return nZ(t, 1073741823); + }), iS(t, r = ep(nV(), 150, 100)); } }, attemptUserBlockingHydration: function(t) { if (13 === t.tag) { - var e = ep(nH(), 150, 100); - nX(t, e), iA(t, e); + var e = ep(nV(), 150, 100); + nZ(t, e), iS(t, e); } }, attemptContinuousHydration: function(t) { if (13 === t.tag) { - nH(); + nV(); var e = ef++; - nX(t, e), iA(t, e); + nZ(t, e), iS(t, e); } }, attemptHydrationAtCurrentPriority: function(t) { if (13 === t.tag) { - var e = nH(); - e = nZ(e, t, null), nX(t, e), iA(t, e); + var e = nV(); + e = nH(e, t, null), nZ(t, e), iS(t, e); } }, - findHostInstance: ix, + findHostInstance: i_, findHostInstanceWithWarning: function(t) { - return ix(t); + return i_(t); }, findHostInstanceWithNoPortals: function(t) { return null === (t = function(t) { @@ -27619,11 +27617,11 @@ if (n.isDisabled || !n.supportsFiber) return !0; try { var i = n.inject(r); - il = function(t) { + iu = function(t) { try { n.onCommitFiberRoot(i, t, void 0, 64 == (64 & t.current.effectTag)); } catch (t) {} - }, is = function(t) { + }, il = function(t) { try { n.onCommitFiberUnmount(i, t); } catch (t) {} @@ -27632,9 +27630,9 @@ return !0; } }; - t.exports = ik.default || ik; - var iT = t.exports; - return t.exports = e, iT; + t.exports = iA.default || iA; + var ik = t.exports; + return t.exports = e, ik; }; /***/ }, /***/ 8448: /***/ function(t, e, r) { diff --git a/crates/swc_ecma_minifier/tests/fixture/next/regression-1/framework-798bab57daac3897/output.js b/crates/swc_ecma_minifier/tests/fixture/next/regression-1/framework-798bab57daac3897/output.js index d3eb1b38da26..ff283d23976b 100644 --- a/crates/swc_ecma_minifier/tests/fixture/next/regression-1/framework-798bab57daac3897/output.js +++ b/crates/swc_ecma_minifier/tests/fixture/next/regression-1/framework-798bab57daac3897/output.js @@ -4845,8 +4845,8 @@ for(; null !== f;)T = f, gk(f, b, c), f = f.sibling; T = e, Hj = h, S = l; } - ik(a, b, c); - } else 0 != (8772 & e.subtreeFlags) && null !== f ? (f.return = e, T = f) : ik(a, b, c); + ik(a); + } else 0 != (8772 & e.subtreeFlags) && null !== f ? (f.return = e, T = f) : ik(a); } }(a2, b3, e), cc(), W = h, C = g, mk.transition = f; } else a.current = c; diff --git a/crates/swc_ecma_minifier/tests/fixture/next/wrap-contracts/output.js b/crates/swc_ecma_minifier/tests/fixture/next/wrap-contracts/output.js index e9a427d3df20..6838f58b185a 100644 --- a/crates/swc_ecma_minifier/tests/fixture/next/wrap-contracts/output.js +++ b/crates/swc_ecma_minifier/tests/fixture/next/wrap-contracts/output.js @@ -15877,7 +15877,7 @@ var W = this.W, ah = this.h[0], al = this.h[1], bh = this.h[2], bl = this.h[3], ch = this.h[4], cl = this.h[5], dh = this.h[6], dl = this.h[7], eh = this.h[8], el = this.h[9], fh = this.h[10], fl = this.h[11], gh = this.h[12], gl = this.h[13], hh = this.h[14], hl = this.h[15]; assert(this.k.length === W.length); for(var i = 0; i < W.length; i += 2){ - var c0_hi = hh, c0_lo = hl, c1_hi = s1_512_hi(eh, el), c1_lo = s1_512_lo(eh, el), c2_hi = ch64_hi(eh, el, fh, fl, gh, gl), c2_lo = ch64_lo(eh, el, fh, fl, gh, gl), c3_hi = this.k[i], c3_lo = this.k[i + 1], c4_hi = W[i], c4_lo = W[i + 1], T1_hi = sum64_5_hi(c0_hi, c0_lo, c1_hi, c1_lo, c2_hi, c2_lo, c3_hi, c3_lo, c4_hi, c4_lo), T1_lo = sum64_5_lo(c0_hi, c0_lo, c1_hi, c1_lo, c2_hi, c2_lo, c3_hi, c3_lo, c4_hi, c4_lo), T2_hi = sum64_hi(c0_hi = s0_512_hi(ah, al), c0_lo = s0_512_lo(ah, al), c1_hi = maj64_hi(ah, al, bh, bl, ch, cl), c1_lo = maj64_lo(ah, al, bh, bl, ch, cl)), T2_lo = sum64_lo(c0_hi, c0_lo, c1_hi, c1_lo); + var c0_hi = hh, c0_lo = hl, c1_hi = s1_512_hi(eh, el), c1_lo = s1_512_lo(eh, el), c2_hi = ch64_hi(eh, el, fh, fl, gh), c2_lo = ch64_lo(eh, el, fh, fl, gh, gl), c3_hi = this.k[i], c3_lo = this.k[i + 1], c4_hi = W[i], c4_lo = W[i + 1], T1_hi = sum64_5_hi(c0_hi, c0_lo, c1_hi, c1_lo, c2_hi, c2_lo, c3_hi, c3_lo, c4_hi, c4_lo), T1_lo = sum64_5_lo(c0_hi, c0_lo, c1_hi, c1_lo, c2_hi, c2_lo, c3_hi, c3_lo, c4_hi, c4_lo), T2_hi = sum64_hi(c0_hi = s0_512_hi(ah, al), c0_lo = s0_512_lo(ah, al), c1_hi = maj64_hi(ah, al, bh, bl, ch), c1_lo = maj64_lo(ah, al, bh, bl, ch, cl)), T2_lo = sum64_lo(c0_hi, c0_lo, c1_hi, c1_lo); hh = gh, hl = gl, gh = fh, gl = fl, fh = eh, fl = el, eh = sum64_hi(dh, dl, T1_hi, T1_lo), el = sum64_lo(dl, dl, T1_hi, T1_lo), dh = ch, dl = cl, ch = bh, cl = bl, bh = ah, bl = al, ah = sum64_hi(T1_hi, T1_lo, T2_hi, T2_lo), al = sum64_lo(T1_hi, T1_lo, T2_hi, T2_lo); } sum64(this.h, 0, ah, al), sum64(this.h, 2, bh, bl), sum64(this.h, 4, ch, cl), sum64(this.h, 6, dh, dl), sum64(this.h, 8, eh, el), sum64(this.h, 10, fh, fl), sum64(this.h, 12, gh, gl), sum64(this.h, 14, hh, hl); diff --git a/crates/swc_ecma_minifier/tests/libs-size.snapshot.md b/crates/swc_ecma_minifier/tests/libs-size.snapshot.md index 3d5af177eafa..0ee77f57b914 100644 --- a/crates/swc_ecma_minifier/tests/libs-size.snapshot.md +++ b/crates/swc_ecma_minifier/tests/libs-size.snapshot.md @@ -10,5 +10,5 @@ | terser.js | 1.08 MiB | 446.63 KiB | 120.49 KiB | | three.js | 1.19 MiB | 630.55 KiB | 154.77 KiB | | typescript.js | 10.45 MiB | 3.17 MiB | 840.61 KiB | -| victory.js | 2.30 MiB | 694.04 KiB | 154.19 KiB | +| victory.js | 2.30 MiB | 694.04 KiB | 154.18 KiB | | vue.js | 334.13 KiB | 113.56 KiB | 41.81 KiB | diff --git a/crates/swc_ecma_minifier/tests/passing.txt b/crates/swc_ecma_minifier/tests/passing.txt index 9ae9370c8100..30e8ffa12799 100644 --- a/crates/swc_ecma_minifier/tests/passing.txt +++ b/crates/swc_ecma_minifier/tests/passing.txt @@ -441,6 +441,7 @@ drop_unused/drop_value/input.js drop_unused/function_argument_modified_by_function_statement/input.js drop_unused/global_var/input.js drop_unused/iife/input.js +drop_unused/issue_11089/input.js drop_unused/issue_1539/input.js drop_unused/issue_1656/input.js drop_unused/issue_1709/input.js diff --git a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2436_12/output.js b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2436_12/output.js index 55bb1ee68e39..10674c970d7d 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2436_12/output.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2436_12/output.js @@ -1,5 +1,5 @@ function isUndefined() {} function f() { var modelValue = this.$$lastCommittedViewValue; - return isUndefined(modelValue) ? modelValue : null; + return isUndefined() ? modelValue : null; } diff --git a/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/config.json b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/config.json new file mode 100644 index 000000000000..40e781323e81 --- /dev/null +++ b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/config.json @@ -0,0 +1,9 @@ +{ + "arrows": true, + "keep_fargs": true, + "module": true, + "passes": 3, + "reduce_funcs": false, + "reduce_vars": false, + "unused": true +} diff --git a/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/input.js b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/input.js new file mode 100644 index 000000000000..3b1f3a6c2693 --- /dev/null +++ b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/input.js @@ -0,0 +1,4 @@ +let k = 0; +const fn = () => console.log(k++); +fn("Hi"); +fn("Hi"); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/output.js b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/output.js new file mode 100644 index 000000000000..2772a36ebfe2 --- /dev/null +++ b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/output.js @@ -0,0 +1,4 @@ +let k = 0; +const fn = ()=>console.log(k++); +fn(); +fn(); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/output.mangleOnly.js new file mode 100644 index 000000000000..08a6a4dd14cd --- /dev/null +++ b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/output.mangleOnly.js @@ -0,0 +1,4 @@ +let o = 0; +const l = ()=>console.log(o++); +l("Hi"); +l("Hi"); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/output.terser.js b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/output.terser.js new file mode 100644 index 000000000000..f866fabed092 --- /dev/null +++ b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_11089/output.terser.js @@ -0,0 +1,3 @@ +let k = 0; +const fn = ()=>console.log(k++); +fn(), fn(); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/export/issue_2131/output.js b/crates/swc_ecma_minifier/tests/terser/compress/export/issue_2131/output.js index 5324206c0b77..2b9d455e7391 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/export/issue_2131/output.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/export/issue_2131/output.js @@ -1,7 +1,6 @@ function go() { console.log(42); } -var X = 1; export function main() { - go(X); + go(); }