diff --git a/packages/react-router/package-lock.json b/packages/react-router/package-lock.json index 77ad91105d..2f0d6157d6 100644 --- a/packages/react-router/package-lock.json +++ b/packages/react-router/package-lock.json @@ -32,7 +32,7 @@ "rimraf": "^3.0.2", "rollup": "^2.26.4", "rollup-plugin-sourcemaps": "^0.6.2", - "typescript": "^3.9.5" + "typescript": "^4.0.5" }, "peerDependencies": { "react": ">=16.8.6", @@ -3389,9 +3389,10 @@ } }, "node_modules/typescript": { - "version": "3.9.10", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true, - "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -5853,7 +5854,9 @@ } }, "typescript": { - "version": "3.9.10", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true }, "unbox-primitive": { diff --git a/packages/react-router/package.json b/packages/react-router/package.json index ad1b4116fb..1d0f6e5cac 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -66,7 +66,7 @@ "rimraf": "^3.0.2", "rollup": "^2.26.4", "rollup-plugin-sourcemaps": "^0.6.2", - "typescript": "^3.9.5" + "typescript": "^4.0.5" }, "prettier": "@ionic/prettier-config" } diff --git a/packages/react-router/src/ReactRouter/IonRouteInner.tsx b/packages/react-router/src/ReactRouter/IonRouteInner.tsx index a0729f4768..ddeb0e74d3 100644 --- a/packages/react-router/src/ReactRouter/IonRouteInner.tsx +++ b/packages/react-router/src/ReactRouter/IonRouteInner.tsx @@ -9,15 +9,21 @@ export class IonRouteInner extends React.PureComponent { path={this.props.path} exact={this.props.exact} render={this.props.render} - /** - * `computedMatch` is a private API in react-router v5 that - * has been removed in v6. - * - * This needs to be removed when we support v6. - * - * TODO: FW-647 - */ - computedMatch={(this.props as any).computedMatch} + { + /** + * `computedMatch` is a private API in react-router v5 that + * has been removed in v6. + * + * This needs to be removed when we support v6. + * + * TODO: FW-647 + */ + ...((this.props as any).computedMatch !== undefined + ? { + computedMatch: (this.props as any).computedMatch, + } + : {}) + } /> ); } diff --git a/packages/react/package-lock.json b/packages/react/package-lock.json index 336f751414..5b48b6d9fc 100644 --- a/packages/react/package-lock.json +++ b/packages/react/package-lock.json @@ -38,7 +38,7 @@ "rollup": "^2.26.4", "rollup-plugin-sourcemaps": "^0.6.2", "ts-jest": "^26.4.4", - "typescript": "^3.9.5" + "typescript": "^4.0.5" }, "peerDependencies": { "react": ">=16.8.6", @@ -10826,9 +10826,10 @@ } }, "node_modules/typescript": { - "version": "3.9.10", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true, - "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -18571,7 +18572,9 @@ } }, "typescript": { - "version": "3.9.10", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true }, "unbox-primitive": { diff --git a/packages/react/package.json b/packages/react/package.json index 1bd78a101b..3e25835668 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -74,7 +74,7 @@ "rollup": "^2.26.4", "rollup-plugin-sourcemaps": "^0.6.2", "ts-jest": "^26.4.4", - "typescript": "^3.9.5" + "typescript": "^4.0.5" }, "jest": { "preset": "ts-jest",