← All changes | assets/js/app-packages.js +63 -135 4.2.0-dev2 → 3.33.0-beta1 View file →

		@@ -578,9 +578,9 @@
578	578	className: "eps-app__header"
579	579	}, /*#__PURE__*/_react.default.createElement(TitleTag, (0, _extends2.default)({
580	580	className: "eps-app__logo-title-wrapper"
581	581	}, titleAttrs), /*#__PURE__*/_react.default.createElement("i", {
582		- className: "eps-app__logo eicon-elementor-circle"
	582	+ className: "eps-app__logo eicon-elementor"
583	583	}), /*#__PURE__*/_react.default.createElement("h1", {
584	584	className: "eps-app__title"
585	585	}, props.title)), /*#__PURE__*/_react.default.createElement(_headerButtons.default, {
586	586	buttons: props.buttons,
		@@ -2271,10 +2271,9 @@
2271	2271	var image = /*#__PURE__*/_react.default.createElement("img", {
2272	2272	src: props.src,
2273	2273	alt: props.alt,
2274	2274	className: "eps-card__image",
2275		- loading: "lazy",
2276		- onError: props.onError
	2275	+ loading: "lazy"
2277	2276	});
2278	2277	return /*#__PURE__*/_react.default.createElement("figure", {
2279	2278	className: "eps-card__figure ".concat(props.className)
2280	2279	}, image, props.children);
		@@ -2282,14 +2281,12 @@
2282	2281	CardImage.propTypes = {
2283	2282	className: PropTypes.string,
2284	2283	src: PropTypes.string.isRequired,
2285	2284	alt: PropTypes.string.isRequired,
2286		- children: PropTypes.any,
2287		- onError: PropTypes.func
	2285	+ children: PropTypes.any
2288	2286	};
2289	2287	CardImage.defaultProps = {
2290		- className: '',
2291		- onError: function onError() {}
	2288	+ className: ''
2292	2289	};
2293	2290
2294	2291	/***/ }),
2295	2292
		@@ -4080,64 +4077,8 @@
4080	4077	};
4081	4078
4082	4079	/***/ }),
4083	4080
4084		-/***/ "../app/modules/import-export/assets/js/shared/utils/is-valid-redirect-url.js":
4085		-/*!************************************************************************************!*\
4086		- !*** ../app/modules/import-export/assets/js/shared/utils/is-valid-redirect-url.js ***!
4087		- \************************************************************************************/
4088		-/***/ ((__unused_webpack_module, exports) => {
4089		-
4090		-"use strict";
4091		-
4092		-
4093		-Object.defineProperty(exports, "__esModule", ({
4094		- value: true
4095		-}));
4096		-exports["default"] = isValidRedirectUrl;
4097		-function isValidRedirectUrl(url) {
4098		- try {
4099		- var parsedUrl = new URL(url);
4100		- return parsedUrl.hostname === window.location.hostname && ('http:' === parsedUrl.protocol || 'https:' === parsedUrl.protocol);
4101		- } catch (e) {
4102		- return false;
4103		- }
4104		-}
4105		-
4106		-/***/ }),
4107		-
4108		-/***/ "../app/modules/import-export/assets/js/shared/utils/redirect.js":
4109		-/*!***********************************************************************!*\
4110		- !*** ../app/modules/import-export/assets/js/shared/utils/redirect.js ***!
4111		- \***********************************************************************/
4112		-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
4113		-
4114		-"use strict";
4115		-
4116		-
4117		-var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ "../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
4118		-Object.defineProperty(exports, "__esModule", ({
4119		- value: true
4120		-}));
4121		-exports["default"] = safeRedirect;
4122		-var _isValidRedirectUrl = _interopRequireDefault(__webpack_require__(/*! ./is-valid-redirect-url */ "../app/modules/import-export/assets/js/shared/utils/is-valid-redirect-url.js"));
4123		-function safeRedirect(url) {
4124		- try {
4125		- if (url.startsWith('/')) {
4126		- url = window.location.origin + url;
4127		- }
4128		- var decodedUrl = decodeURIComponent(url);
4129		- if ((0, _isValidRedirectUrl.default)(decodedUrl)) {
4130		- window.location.href = decodedUrl;
4131		- return true;
4132		- }
4133		- } catch (e) {
4134		- return false;
4135		- }
4136		-}
4137		-
4138		-/***/ }),
4139		-
4140	4081	/***/ "../app/modules/site-editor/assets/js/context/template-types.js":
4141	4082	/*!**********************************************************************!*\
4142	4083	!*** ../app/modules/site-editor/assets/js/context/template-types.js ***!
4143	4084	\**********************************************************************/
		@@ -4851,44 +4792,29 @@
4851	4792	/* provided dependency */ var PropTypes = __webpack_require__(/*! prop-types */ "../node_modules/prop-types/index.js");
4852	4793
4853	4794
4854	4795	var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ "../node_modules/@babel/runtime/helpers/interopRequireDefault.js");
4855		-var _typeof = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "../node_modules/@babel/runtime/helpers/typeof.js");
4856	4796	Object.defineProperty(exports, "__esModule", ({
4857	4797	value: true
4858	4798	}));
4859	4799	exports["default"] = Layout;
4860		-var _react = _interopRequireWildcard(__webpack_require__(/*! react */ "react"));
	4800	+var _react = _interopRequireDefault(__webpack_require__(/*! react */ "react"));
4861	4801	var _page = _interopRequireDefault(__webpack_require__(/*! elementor-app/layout/page */ "../app/assets/js/layout/page.js"));
4862	4802	var _menu = _interopRequireDefault(__webpack_require__(/*! ../organisms/menu */ "../app/modules/site-editor/assets/js/organisms/menu.js"));
4863	4803	var _templateTypes = _interopRequireDefault(__webpack_require__(/*! ../context/template-types */ "../app/modules/site-editor/assets/js/context/template-types.js"));
4864		-var _useQueryParams = _interopRequireDefault(__webpack_require__(/*! elementor-app/hooks/use-query-params */ "../app/assets/js/hooks/use-query-params.js"));
4865		-var _redirect = _interopRequireDefault(__webpack_require__(/*! ../../../../import-export/assets/js/shared/utils/redirect */ "../app/modules/import-export/assets/js/shared/utils/redirect.js"));
4866	4804	__webpack_require__(/*! ./site-editor.scss */ "../app/modules/site-editor/assets/js/templates/site-editor.scss");
4867		-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
4868	4805	function Layout(props) {
4869		- var _useQueryParams$getAl = (0, _useQueryParams.default)().getAll(),
4870		- returnTo = _useQueryParams$getAl.return_to;
4871		- var onClose = (0, _react.useCallback)(function () {
4872		- if (returnTo && (0, _redirect.default)(returnTo)) {
4873		- return;
4874		- }
4875		- window.top.location = elementorAppConfig.admin_url;
4876		- }, [returnTo]);
4877		- var config = (0, _react.useMemo)(function () {
4878		- var _props$titleRedirectR;
4879		- return {
4880		- title: __('Theme Builder', 'elementor'),
4881		- titleRedirectRoute: (_props$titleRedirectR = props.titleRedirectRoute) !== null && _props$titleRedirectR !== void 0 ? _props$titleRedirectR : null,
4882		- headerButtons: props.headerButtons,
4883		- sidebar: /*#__PURE__*/_react.default.createElement(_menu.default, {
4884		- allPartsButton: props.allPartsButton,
4885		- promotion: props.promotion
4886		- }),
4887		- content: props.children,
4888		- onClose: onClose
4889		- };
4890		- }, [props.titleRedirectRoute, props.headerButtons, props.allPartsButton, props.promotion, props.children, onClose]);
	4806	+ var _props$titleRedirectR;
	4807	+ var config = {
	4808	+ title: __('Theme Builder', 'elementor'),
	4809	+ titleRedirectRoute: (_props$titleRedirectR = props.titleRedirectRoute) !== null && _props$titleRedirectR !== void 0 ? _props$titleRedirectR : null,
	4810	+ headerButtons: props.headerButtons,
	4811	+ sidebar: /*#__PURE__*/_react.default.createElement(_menu.default, {
	4812	+ allPartsButton: props.allPartsButton,
	4813	+ promotion: props.promotion
	4814	+ }),
	4815	+ content: props.children
	4816	+ };
4891	4817	return /*#__PURE__*/_react.default.createElement(_templateTypes.default, null, /*#__PURE__*/_react.default.createElement(_page.default, config));
4892	4818	}
4893	4819	Layout.propTypes = {
4894	4820	headerButtons: PropTypes.arrayOf(PropTypes.object),
		@@ -5492,19 +5418,21 @@
5492	5418	} catch (e) {
5493	5419	i = 0;
5494	5420	}
5495	5421	module.exports = _regeneratorDefine = function regeneratorDefine(e, r, n, t) {
5496		- function o(r, n) {
5497		- _regeneratorDefine(e, r, function (e) {
5498		- return this._invoke(r, n, e);
5499		- });
5500		- }
5501		- r ? i ? i(e, r, {
	5422	+ if (r) i ? i(e, r, {
5502	5423	value: n,
5503	5424	enumerable: !t,
5504	5425	configurable: !t,
5505	5426	writable: !t
5506		- }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2));
	5427	+ }) : e[r] = n;else {
	5428	+ var o = function o(r, n) {
	5429	+ _regeneratorDefine(e, r, function (e) {
	5430	+ return this._invoke(r, n, e);
	5431	+ });
	5432	+ };
	5433	+ o("next", 0), o("throw", 1), o("return", 2);
	5434	+ }
5507	5435	}, module.exports.__esModule = true, module.exports["default"] = module.exports, _regeneratorDefine(e, r, n, t);
5508	5436	}
5509	5437	module.exports = _regeneratorDefine, module.exports.__esModule = true, module.exports["default"] = module.exports;
5510	5438
		@@ -5821,14 +5749,14 @@
5821	5749	/* harmony export */ Match: () => (/* binding */ Match),
5822	5750	/* harmony export */ Redirect: () => (/* binding */ Redirect),
5823	5751	/* harmony export */ Router: () => (/* binding */ Router),
5824	5752	/* harmony export */ ServerLocation: () => (/* binding */ ServerLocation),
5825		-/* harmony export */ createHistory: () => (/* reexport safe */ _lib_history__WEBPACK_IMPORTED_MODULE_6__.createHistory),
5826		-/* harmony export */ createMemorySource: () => (/* reexport safe */ _lib_history__WEBPACK_IMPORTED_MODULE_6__.createMemorySource),
5827		-/* harmony export */ globalHistory: () => (/* reexport safe */ _lib_history__WEBPACK_IMPORTED_MODULE_6__.globalHistory),
	5753	+/* harmony export */ createHistory: () => (/* reexport safe */ _lib_history__WEBPACK_IMPORTED_MODULE_5__.createHistory),
	5754	+/* harmony export */ createMemorySource: () => (/* reexport safe */ _lib_history__WEBPACK_IMPORTED_MODULE_5__.createMemorySource),
	5755	+/* harmony export */ globalHistory: () => (/* reexport safe */ _lib_history__WEBPACK_IMPORTED_MODULE_5__.globalHistory),
5828	5756	/* harmony export */ isRedirect: () => (/* binding */ isRedirect),
5829		-/* harmony export */ matchPath: () => (/* reexport safe */ _lib_utils__WEBPACK_IMPORTED_MODULE_5__.match),
5830		-/* harmony export */ navigate: () => (/* reexport safe */ _lib_history__WEBPACK_IMPORTED_MODULE_6__.navigate),
	5757	+/* harmony export */ matchPath: () => (/* reexport safe */ _lib_utils__WEBPACK_IMPORTED_MODULE_4__.match),
	5758	+/* harmony export */ navigate: () => (/* reexport safe */ _lib_history__WEBPACK_IMPORTED_MODULE_5__.navigate),
5831	5759	/* harmony export */ redirectTo: () => (/* binding */ redirectTo),
5832	5760	/* harmony export */ useLocation: () => (/* binding */ useLocation),
5833	5761	/* harmony export */ useMatch: () => (/* binding */ useMatch),
5834	5762	/* harmony export */ useNavigate: () => (/* binding */ useNavigate),
		@@ -5835,17 +5763,17 @@
5835	5763	/* harmony export */ useParams: () => (/* binding */ useParams)
5836	5764	/* harmony export */ });
5837	5765	/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "react");
5838	5766	/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
5839		-/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! prop-types */ "../node_modules/prop-types/index.js");
5840		-/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_1__);
5841		-/* harmony import */ var invariant__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! invariant */ "../node_modules/invariant/browser.js");
5842		-/* harmony import */ var invariant__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(invariant__WEBPACK_IMPORTED_MODULE_2__);
5843		-/* harmony import */ var create_react_context__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! create-react-context */ "../node_modules/create-react-context/lib/index.js");
5844		-/* harmony import */ var create_react_context__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(create_react_context__WEBPACK_IMPORTED_MODULE_3__);
5845		-/* harmony import */ var react_lifecycles_compat__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-lifecycles-compat */ "../node_modules/react-lifecycles-compat/react-lifecycles-compat.es.js");
5846		-/* harmony import */ var _lib_utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./lib/utils */ "../node_modules/@reach/router/es/lib/utils.js");
5847		-/* harmony import */ var _lib_history__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./lib/history */ "../node_modules/@reach/router/es/lib/history.js");
	5767	+/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! prop-types */ "../node_modules/prop-types/index.js");
	5768	+/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_6__);
	5769	+/* harmony import */ var invariant__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! invariant */ "../node_modules/invariant/browser.js");
	5770	+/* harmony import */ var invariant__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(invariant__WEBPACK_IMPORTED_MODULE_1__);
	5771	+/* harmony import */ var create_react_context__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! create-react-context */ "../node_modules/create-react-context/lib/index.js");
	5772	+/* harmony import */ var create_react_context__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(create_react_context__WEBPACK_IMPORTED_MODULE_2__);
	5773	+/* harmony import */ var react_lifecycles_compat__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-lifecycles-compat */ "../node_modules/react-lifecycles-compat/react-lifecycles-compat.es.js");
	5774	+/* harmony import */ var _lib_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./lib/utils */ "../node_modules/@reach/router/es/lib/utils.js");
	5775	+/* harmony import */ var _lib_history__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./lib/history */ "../node_modules/@reach/router/es/lib/history.js");
5848	5776	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
5849	5777
5850	5778	function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
5851	5779
		@@ -5866,9 +5794,9 @@
5866	5794
5867	5795	////////////////////////////////////////////////////////////////////////////////
5868	5796
5869	5797	var createNamedContext = function createNamedContext(name, defaultValue) {
5870		- var Ctx = create_react_context__WEBPACK_IMPORTED_MODULE_3___default()(defaultValue);
	5798	+ var Ctx = create_react_context__WEBPACK_IMPORTED_MODULE_2___default()(defaultValue);
5871	5799	Ctx.displayName = name;
5872	5800	return Ctx;
5873	5801	};
5874	5802
		@@ -5980,12 +5908,12 @@
5980	5908	////////////////////////////////////////////////////////////////////////////////
5981	5909
5982	5910
5983	5911	LocationProvider.defaultProps = {
5984		- history: _lib_history__WEBPACK_IMPORTED_MODULE_6__.globalHistory
	5912	+ history: _lib_history__WEBPACK_IMPORTED_MODULE_5__.globalHistory
5985	5913	};
5986	5914	true ? LocationProvider.propTypes = {
5987		- history: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().object).isRequired
	5915	+ history: (prop_types__WEBPACK_IMPORTED_MODULE_6___default().object).isRequired
5988	5916	} : 0;
5989	5917	var ServerLocation = function ServerLocation(_ref2) {
5990	5918	var url = _ref2.url,
5991	5919	children = _ref2.children;
		@@ -6069,9 +5997,9 @@
6069	5997	}, []);
6070	5998	var pathname = location.pathname;
6071	5999
6072	6000
6073		- var match = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.pick)(routes, pathname);
	6001	+ var match = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.pick)(routes, pathname);
6074	6002
6075	6003	if (match) {
6076	6004	var params = match.params,
6077	6005	uri = match.uri,
		@@ -6085,9 +6013,9 @@
6085	6013	var props = _extends({}, params, {
6086	6014	uri: uri,
6087	6015	location: location,
6088	6016	navigate: function navigate(to, options) {
6089		- return _navigate2((0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.resolve)(to, uri), options);
	6017	+ return _navigate2((0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.resolve)(to, uri), options);
6090	6018	}
6091	6019	});
6092	6020
6093	6021	var clone = react__WEBPACK_IMPORTED_MODULE_0___default().cloneElement(element, props, element.props.children ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(
		@@ -6268,9 +6196,9 @@
6268	6196
6269	6197	return FocusHandlerImpl;
6270	6198	}((react__WEBPACK_IMPORTED_MODULE_0___default().Component));
6271	6199
6272		-(0,react_lifecycles_compat__WEBPACK_IMPORTED_MODULE_4__.polyfill)(FocusHandlerImpl);
	6200	+(0,react_lifecycles_compat__WEBPACK_IMPORTED_MODULE_3__.polyfill)(FocusHandlerImpl);
6273	6201
6274	6202	var k = function k() {};
6275	6203
6276	6204	////////////////////////////////////////////////////////////////////////////////
		@@ -6305,12 +6233,12 @@
6305	6233	_props$getProps = props.getProps,
6306	6234	getProps = _props$getProps === undefined ? k : _props$getProps,
6307	6235	anchorProps = _objectWithoutProperties(props, ["to", "state", "replace", "getProps"]);
6308	6236
6309		- var href = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.resolve)(to, baseuri);
	6237	+ var href = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.resolve)(to, baseuri);
6310	6238	var encodedHref = encodeURI(href);
6311	6239	var isCurrent = location.pathname === encodedHref;
6312		- var isPartiallyCurrent = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.startsWith)(location.pathname, encodedHref);
	6240	+ var isPartiallyCurrent = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.startsWith)(location.pathname, encodedHref);
6313	6241
6314	6242	return react__WEBPACK_IMPORTED_MODULE_0___default().createElement("a", _extends({
6315	6243	ref: ref || innerRef,
6316	6244	"aria-current": isCurrent ? "page" : undefined
		@@ -6325,9 +6253,9 @@
6325	6253	var _location$state = _extends({}, location.state),
6326	6254	key = _location$state.key,
6327	6255	restState = _objectWithoutProperties(_location$state, ["key"]);
6328	6256
6329		- shouldReplace = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.shallowCompare)(_extends({}, state), restState);
	6257	+ shouldReplace = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.shallowCompare)(_extends({}, state), restState);
6330	6258	}
6331	6259	navigate(href, {
6332	6260	state: state,
6333	6261	replace: shouldReplace
		@@ -6343,9 +6271,9 @@
6343	6271
6344	6272	Link.displayName = "Link";
6345	6273
6346	6274	true ? Link.propTypes = {
6347		- to: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().string).isRequired
	6275	+ to: (prop_types__WEBPACK_IMPORTED_MODULE_6___default().string).isRequired
6348	6276	} : 0;
6349	6277
6350	6278	////////////////////////////////////////////////////////////////////////////////
6351	6279	function RedirectRequest(uri) {
		@@ -6382,10 +6310,10 @@
6382	6310	baseuri = _props3.baseuri,
6383	6311	props = _objectWithoutProperties(_props3, ["navigate", "to", "from", "replace", "state", "noThrow", "baseuri"]);
6384	6312
6385	6313	Promise.resolve().then(function () {
6386		- var resolvedTo = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.resolve)(to, baseuri);
6387		- navigate((0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.insertParams)(resolvedTo, props), { replace: replace, state: state });
	6314	+ var resolvedTo = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.resolve)(to, baseuri);
	6315	+ navigate((0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.insertParams)(resolvedTo, props), { replace: replace, state: state });
6388	6316	});
6389	6317	};
6390	6318
6391	6319	RedirectImpl.prototype.render = function render() {
		@@ -6398,10 +6326,10 @@
6398	6326	noThrow = _props4.noThrow,
6399	6327	baseuri = _props4.baseuri,
6400	6328	props = _objectWithoutProperties(_props4, ["navigate", "to", "from", "replace", "state", "noThrow", "baseuri"]);
6401	6329
6402		- var resolvedTo = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.resolve)(to, baseuri);
6403		- if (!noThrow) redirectTo((0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.insertParams)(resolvedTo, props));
	6330	+ var resolvedTo = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.resolve)(to, baseuri);
	6331	+ if (!noThrow) redirectTo((0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.insertParams)(resolvedTo, props));
6404	6332	return null;
6405	6333	};
6406	6334
6407	6335	return RedirectImpl;
		@@ -6424,10 +6352,10 @@
6424	6352	);
6425	6353	};
6426	6354
6427	6355	true ? Redirect.propTypes = {
6428		- from: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().string),
6429		- to: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().string).isRequired
	6356	+ from: (prop_types__WEBPACK_IMPORTED_MODULE_6___default().string),
	6357	+ to: (prop_types__WEBPACK_IMPORTED_MODULE_6___default().string).isRequired
6430	6358	} : 0;
6431	6359
6432	6360	////////////////////////////////////////////////////////////////////////////////
6433	6361	var Match = function Match(_ref8) {
		@@ -6444,10 +6372,10 @@
6444	6372	function (_ref10) {
6445	6373	var navigate = _ref10.navigate,
6446	6374	location = _ref10.location;
6447	6375
6448		- var resolvedPath = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.resolve)(path, baseuri);
6449		- var result = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.match)(resolvedPath, location.pathname);
	6376	+ var resolvedPath = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.resolve)(path, baseuri);
	6377	+ var result = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.match)(resolvedPath, location.pathname);
6450	6378	return children({
6451	6379	navigate: navigate,
6452	6380	location: location,
6453	6381	match: result ? _extends({}, result.params, {
		@@ -6492,9 +6420,9 @@
6492	6420	}
6493	6421
6494	6422	var location = useLocation();
6495	6423
6496		- var results = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.match)(context.basepath, location.pathname);
	6424	+ var results = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.match)(context.basepath, location.pathname);
6497	6425
6498	6426	return results ? results.params : null;
6499	6427	};
6500	6428
		@@ -6509,10 +6437,10 @@
6509	6437	}
6510	6438
6511	6439	var location = useLocation();
6512	6440
6513		- var resolvedPath = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.resolve)(path, context.baseuri);
6514		- var result = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.match)(resolvedPath, location.pathname);
	6441	+ var resolvedPath = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.resolve)(path, context.baseuri);
	6442	+ var result = (0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.match)(resolvedPath, location.pathname);
6515	6443	return result ? _extends({}, result.params, {
6516	6444	uri: result.uri,
6517	6445	path: path
6518	6446	}) : null;
		@@ -6532,13 +6460,13 @@
6532	6460
6533	6461	if (element.type === (react__WEBPACK_IMPORTED_MODULE_0___default().Fragment) && element.props.children) {
6534	6462	return react__WEBPACK_IMPORTED_MODULE_0___default().Children.map(element.props.children, createRoute(basepath));
6535	6463	}
6536		- !(element.props.path || element.props.default || element.type === Redirect) ? true ? invariant__WEBPACK_IMPORTED_MODULE_2___default()(false, "<Router>: Children of <Router> must have a `path` or `default` prop, or be a `<Redirect>`. None found on element type `" + element.type + "`") : 0 : void 0;
	6464	+ !(element.props.path || element.props.default || element.type === Redirect) ? true ? invariant__WEBPACK_IMPORTED_MODULE_1___default()(false, "<Router>: Children of <Router> must have a `path` or `default` prop, or be a `<Redirect>`. None found on element type `" + element.type + "`") : 0 : void 0;
6537	6465
6538		- !!(element.type === Redirect && (!element.props.from || !element.props.to)) ? true ? invariant__WEBPACK_IMPORTED_MODULE_2___default()(false, "<Redirect from=\"" + element.props.from + "\" to=\"" + element.props.to + "\"/> requires both \"from\" and \"to\" props when inside a <Router>.") : 0 : void 0;
	6466	+ !!(element.type === Redirect && (!element.props.from || !element.props.to)) ? true ? invariant__WEBPACK_IMPORTED_MODULE_1___default()(false, "<Redirect from=\"" + element.props.from + "\" to=\"" + element.props.to + "\"/> requires both \"from\" and \"to\" props when inside a <Router>.") : 0 : void 0;
6539	6467
6540		- !!(element.type === Redirect && !(0,_lib_utils__WEBPACK_IMPORTED_MODULE_5__.validateRedirect)(element.props.from, element.props.to)) ? true ? invariant__WEBPACK_IMPORTED_MODULE_2___default()(false, "<Redirect from=\"" + element.props.from + " to=\"" + element.props.to + "\"/> has mismatched dynamic segments, ensure both paths have the exact same dynamic segments.") : 0 : void 0;
	6468	+ !!(element.type === Redirect && !(0,_lib_utils__WEBPACK_IMPORTED_MODULE_4__.validateRedirect)(element.props.from, element.props.to)) ? true ? invariant__WEBPACK_IMPORTED_MODULE_1___default()(false, "<Redirect from=\"" + element.props.from + " to=\"" + element.props.to + "\"/> has mismatched dynamic segments, ensure both paths have the exact same dynamic segments.") : 0 : void 0;
6541	6469
6542	6470	if (element.props.default) {
6543	6471	return { value: element, default: true };
6544	6472	}