javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-08 15:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): sync with master

Browse Source
This commit is contained in:
Liam DeBeasi
2020-09-21 11:36:45 -04:00
parent fbe11582e9 ec9e0a2ee7
commit 9ca8b9de46
139 changed files with 4398 additions and 1926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/angular-server/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@ionic/angular-server",
"version": "5.3.2",
"version": "5.3.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -99,9 +99,9 @@
}
},
"@ionic/core": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.3.1.tgz",
"integrity": "sha512-psOiYZbpL5uGKi7MZ9BXCfQIdJVVVW1n8AvrWAiifFE/ebI1x0wbO+D5QLmF2Mc2t/d0nbk4N1V8XyF2bjjiLg==",
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.3.2.tgz",
"integrity": "sha512-s/SDnS993fnZ3d6EzOlURHBbc2aI2/WsZSsCLgnJz3G+KUO4hY/2RQvdmtl0FZpDHMSyehG6tRgFFXvnFSI9CQ==",
"dev": true,
"requires": {
"ionicons": "^5.1.2",

4
packages/angular-server/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ionic/angular-server",
"version": "5.3.2",
"version": "5.3.3",
"description": "Angular SSR Module for Ionic",
"keywords": [
"ionic",
@ -49,7 +49,7 @@
"@angular/core": "8.2.13",
"@angular/platform-browser": "8.2.13",
"@angular/platform-server": "8.2.13",
"@ionic/core": "5.3.2",
"@ionic/core": "5.3.3",
"ng-packagr": "5.7.1",
"tslint": "^5.12.1",
"tslint-ionic-rules": "0.0.21",

10
packages/react-router/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ionic/react-router",
"version": "5.3.2",
"version": "5.3.3",
"description": "React Router wrapper for @ionic/react",
"keywords": [
"ionic",
@ -39,16 +39,16 @@
"tslib": "*"
},
"peerDependencies": {
"@ionic/core": "5.3.2",
"@ionic/react": "5.3.2",
"@ionic/core": "5.3.3",
"@ionic/react": "5.3.3",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-router": "^5.0.1",
"react-router-dom": "^5.0.1"
},
"devDependencies": {
"@ionic/core": "5.3.2",
"@ionic/react": "5.3.2",
"@ionic/core": "5.3.3",
"@ionic/react": "5.3.3",
"@rollup/plugin-node-resolve": "^8.1.0",
"@testing-library/jest-dom": "^5.11.0",
"@testing-library/react": "^10.4.9",

6
packages/react-router/src/ReactRouter/IonReactHashRouter.tsx
View File

@ -4,12 +4,12 @@ import { BrowserRouterProps, Router } from 'react-router-dom';
import { IonRouter } from './IonRouter';
interface IonReactHashRouterProps<THistoryLocationState = History.PoorMansUnknown> extends BrowserRouterProps {
history?: History<THistoryLocationState>;
interface IonReactHashRouterProps extends BrowserRouterProps {
history?: History;
}
export class IonReactHashRouter extends React.Component<IonReactHashRouterProps> {
history: History<History.PoorMansUnknown>;
history: History;
historyListenHandler?: ((location: HistoryLocation, action: HistoryAction) => void);
constructor(props: IonReactHashRouterProps) {

6
packages/react-router/src/ReactRouter/IonReactMemoryRouter.tsx
View File

@ -2,14 +2,14 @@ import { Action as HistoryAction, Location as HistoryLocation, MemoryHistory } f
import React from 'react';
import { MemoryRouterProps, Router } from 'react-router';
import { IonRouter, LocationState } from './IonRouter';
import { IonRouter } from './IonRouter';
interface IonReactMemoryRouterProps extends MemoryRouterProps {
history: MemoryHistory<LocationState>;
history: MemoryHistory;
}
export class IonReactMemoryRouter extends React.Component<IonReactMemoryRouterProps> {
history: MemoryHistory<LocationState>;
history: MemoryHistory;
historyListenHandler?: ((location: HistoryLocation, action: HistoryAction) => void);
constructor(props: IonReactMemoryRouterProps) {

6
packages/react-router/src/ReactRouter/IonReactRouter.tsx
View File

@ -4,14 +4,14 @@ import { BrowserRouterProps, Router } from 'react-router-dom';
import { IonRouter } from './IonRouter';
interface IonReactRouterProps<THistoryLocationState = History.PoorMansUnknown> extends BrowserRouterProps {
history?: History<THistoryLocationState>;
interface IonReactRouterProps extends BrowserRouterProps {
history?: History;
}
export class IonReactRouter extends React.Component<IonReactRouterProps> {
historyListenHandler?: ((location: HistoryLocation, action: HistoryAction) => void);
history: History<History.PoorMansUnknown>;
history: History;
constructor(props: IonReactRouterProps) {
super(props);

2887
packages/react-router/test-app/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
packages/react-router/test-app/package.json
View File

@ -7,7 +7,6 @@
"@capacitor/android": "^2.2.0",
"@capacitor/core": "1.5.2",
"@capacitor/ios": "^2.2.0",
"@ionic/core": "^5.3.0-dev.202006121329.e968bd0",
"@ionic/react": "file:../../react/ionic-react-5.3.2.tgz",
"@svgr/webpack": "4.3.3",
"@testing-library/jest-dom": "^4.2.4",
@ -17,7 +16,7 @@
"@types/node": "^12.12.24",
"@types/react": "^16.9.17",
"@types/react-dom": "^16.9.4",
"@types/react-router": "^5.1.4",
"@types/react-router": "^5.1.8",
"@types/react-router-dom": "^5.1.3",
"@typescript-eslint/eslint-plugin": "^2.10.0",
"@typescript-eslint/parser": "^2.10.0",

4
packages/react/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ionic/react",
"version": "5.3.2",
"version": "5.3.3",
"description": "React specific wrapper for @ionic/core",
"keywords": [
"ionic",
@ -39,7 +39,7 @@
"css/"
],
"dependencies": {
"@ionic/core": "5.3.2",
"@ionic/core": "5.3.3",
"ionicons": "^5.1.2",
"tslib": "*"
},