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

Merge remote-tracking branch 'origin/main' into sync-7-11-15-22

Browse Source
This commit is contained in:
Sean Perkins
2022-11-15 15:40:21 -05:00
parent 44472aeb9f 7a990ff403
commit c149b42d0b
437 changed files with 1449 additions and 1499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/react-router/CHANGELOG.md
View File

@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [6.3.6](https://github.com/ionic-team/ionic/compare/v6.3.5...v6.3.6) (2022-11-10)
**Note:** Version bump only for package @ionic/react-router
## [6.3.5](https://github.com/ionic-team/ionic/compare/v6.3.4...v6.3.5) (2022-11-09)
**Note:** Version bump only for package @ionic/react-router
## [6.3.4](https://github.com/ionic-team/ionic/compare/v6.3.3...v6.3.4) (2022-11-02)
**Note:** Version bump only for package @ionic/react-router

73
packages/react-router/package-lock.json generated
View File

@ -1,15 +1,15 @@
{
"name": "@ionic/react-router",
"version": "6.3.4",
"version": "6.3.6",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@ionic/react-router",
"version": "6.3.4",
"version": "6.3.6",
"license": "MIT",
"dependencies": {
"@ionic/react": "^6.3.4",
"@ionic/react": "^6.3.6",
"tslib": "*"
},
"devDependencies": {
@ -147,21 +147,21 @@
}
},
"node_modules/@ionic/core": {
"version": "6.3.4",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.4.tgz",
"integrity": "sha512-3EnKqFdon7Im8JNvuPoq/iGyYK7hskdb9u5hlQE0fHU/9Q0DvFVh17QTq1sQjXntoJovfRhaPJhG+kvZK3mVAQ==",
"version": "6.3.6",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.6.tgz",
"integrity": "sha512-QbLp9XNRfFHUVpSEEcFJYEyxek6Vi82EDIdJj0JvUPqMFdzF93dfzRoEIOos52jWxTG4LwGHLHlWem/3stF5Rg==",
"dependencies": {
"@stencil/core": "^2.18.0",
"ionicons": "^6.0.3",
"ionicons": "^6.0.4",
"tslib": "^2.1.0"
}
},
"node_modules/@ionic/react": {
"version": "6.3.4",
"resolved": "https://registry.npmjs.org/@ionic/react/-/react-6.3.4.tgz",
"integrity": "sha512-0AHyFpzk2Q3BikzbfQryiAwkzW+Y+GaXfaxPvKm+vmFiwCDcIwsCS/JZGDxcmR7G5Ps1QrfNLq5IgvZb+XSjAA==",
"version": "6.3.6",
"resolved": "https://registry.npmjs.org/@ionic/react/-/react-6.3.6.tgz",
"integrity": "sha512-g5S5wHfVnNQ+2n+jlT7U1thn9g9Xj2JPaz+0EwD/qmyzlt8ikyzDAoaWCxla7hm2+5IvR1pIkENnKxRAH6FZzg==",
"dependencies": {
"@ionic/core": "^6.3.4",
"@ionic/core": "^6.3.6",
"ionicons": "^6.0.2",
"tslib": "*"
},
@ -493,23 +493,11 @@
"license": "ISC"
},
"node_modules/ionicons": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.3.tgz",
"integrity": "sha512-kVOWER991EMqLiVShrCSWKMHkgHZP7XfVdyN6YPMuoO33W7pc5CPNVNfR8OMe/I8rYEbaunyBs6dXNYpR6gGZw==",
"version": "6.0.4",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
"integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
"dependencies": {
"@stencil/core": "~2.16.0"
}
},
"node_modules/ionicons/node_modules/@stencil/core": {
"version": "2.16.1",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
"integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw==",
"bin": {
"stencil": "bin/stencil"
},
"engines": {
"node": ">=12.10.0",
"npm": ">=6.0.0"
"@stencil/core": "^2.18.0"
}
},
"node_modules/is-core-module": {
@ -1157,21 +1145,21 @@
}
},
"@ionic/core": {
"version": "6.3.4",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.4.tgz",
"integrity": "sha512-3EnKqFdon7Im8JNvuPoq/iGyYK7hskdb9u5hlQE0fHU/9Q0DvFVh17QTq1sQjXntoJovfRhaPJhG+kvZK3mVAQ==",
"version": "6.3.6",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.6.tgz",
"integrity": "sha512-QbLp9XNRfFHUVpSEEcFJYEyxek6Vi82EDIdJj0JvUPqMFdzF93dfzRoEIOos52jWxTG4LwGHLHlWem/3stF5Rg==",
"requires": {
"@stencil/core": "^2.18.0",
"ionicons": "^6.0.3",
"ionicons": "^6.0.4",
"tslib": "^2.1.0"
}
},
"@ionic/react": {
"version": "6.3.4",
"resolved": "https://registry.npmjs.org/@ionic/react/-/react-6.3.4.tgz",
"integrity": "sha512-0AHyFpzk2Q3BikzbfQryiAwkzW+Y+GaXfaxPvKm+vmFiwCDcIwsCS/JZGDxcmR7G5Ps1QrfNLq5IgvZb+XSjAA==",
"version": "6.3.6",
"resolved": "https://registry.npmjs.org/@ionic/react/-/react-6.3.6.tgz",
"integrity": "sha512-g5S5wHfVnNQ+2n+jlT7U1thn9g9Xj2JPaz+0EwD/qmyzlt8ikyzDAoaWCxla7hm2+5IvR1pIkENnKxRAH6FZzg==",
"requires": {
"@ionic/core": "^6.3.4",
"@ionic/core": "^6.3.6",
"ionicons": "^6.0.2",
"tslib": "*"
}
@ -1397,18 +1385,11 @@
"dev": true
},
"ionicons": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.3.tgz",
"integrity": "sha512-kVOWER991EMqLiVShrCSWKMHkgHZP7XfVdyN6YPMuoO33W7pc5CPNVNfR8OMe/I8rYEbaunyBs6dXNYpR6gGZw==",
"version": "6.0.4",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
"integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
"requires": {
"@stencil/core": "~2.16.0"
},
"dependencies": {
"@stencil/core": {
"version": "2.16.1",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
"integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw=="
}
"@stencil/core": "^2.18.0"
}
},
"is-core-module": {

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

@ -1,6 +1,6 @@
{
"name": "@ionic/react-router",
"version": "6.3.4",
"version": "6.3.6",
"description": "React Router wrapper for @ionic/react",
"keywords": [
"ionic",
@ -36,7 +36,7 @@
"dist/"
],
"dependencies": {
"@ionic/react": "^6.3.4",
"@ionic/react": "^6.3.6",
"tslib": "*"
},
"peerDependencies": {

8
packages/react-router/scripts/sync.sh
View File

@ -1,3 +1,7 @@
#!/bin/bash
set -e
# Copy ionic react dist
rm -rf node_modules/@ionic/react/dist node_modules/@ionic/react/css
cp -a ../react/dist node_modules/@ionic/react/dist
@ -9,7 +13,3 @@ rm -rf node_modules/@ionic/core/dist node_modules/@ionic/core/components
cp -a ../../core/dist node_modules/@ionic/core/dist
cp -a ../../core/components node_modules/@ionic/core/components
cp -a ../../core/package.json node_modules/@ionic/core/package.json
# Copy ionicons
rm -rf node_modules/ionicons
cp -a ../../core/node_modules/ionicons node_modules/ionicons

2
packages/react-router/src/ReactRouter/IonRouter.tsx
View File

@ -116,7 +116,7 @@ class IonRouterInner extends React.PureComponent<IonRouteProps, IonRouteState> {
this.incomingRouteParams = {
routeAction: 'replace',
routeDirection: 'none',
tab: this.currentTab, // TODO this isn't legit if replacing to a page that is not in the tabs
tab: this.currentTab,
};
}
if (action === 'POP') {

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

@ -20,7 +20,7 @@
"@types/react-dom": "^16.9.4",
"@types/react-router": "^5.1.8",
"@types/react-router-dom": "^5.1.7",
"ionicons": "^5.4.0",
"ionicons": "^6.0.4",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-router": "^5.2.0",
@ -2341,14 +2341,6 @@
"tslib": "^2.1.0"
}
},
"node_modules/@ionic/core/node_modules/ionicons": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.2.tgz",
"integrity": "sha512-AyKfFaUKVoBz4eB8XkU7H1R5HFnVsgq5ijqSdbXC0lES9PDK/J6LUQz6XUJq0mVVQF5k9kczSPOLMW3mszG0mQ==",
"dependencies": {
"@stencil/core": "~2.16.0"
}
},
"node_modules/@ionic/react": {
"version": "6.1.9",
"resolved": "https://registry.npmjs.org/@ionic/react/-/react-6.1.9.tgz",
@ -2378,14 +2370,6 @@
"react-router-dom": "^5.0.1"
}
},
"node_modules/@ionic/react/node_modules/ionicons": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.2.tgz",
"integrity": "sha512-AyKfFaUKVoBz4eB8XkU7H1R5HFnVsgq5ijqSdbXC0lES9PDK/J6LUQz6XUJq0mVVQF5k9kczSPOLMW3mszG0mQ==",
"dependencies": {
"@stencil/core": "~2.16.0"
}
},
"node_modules/@ionic/utils-array": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.5.tgz",
@ -4069,9 +4053,9 @@
}
},
"node_modules/@stencil/core": {
"version": "2.16.1",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
"integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw==",
"version": "2.19.2",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.19.2.tgz",
"integrity": "sha512-TK3sHqyQAACwcac4fWntypFtN9c/y+y9ioZojeCnNDY3dxF33Ax70lL9ZLDyQnWWR+aTh1WFoqB5sYOnZIUKMA==",
"bin": {
"stencil": "bin/stencil"
},
@ -11448,23 +11432,11 @@
}
},
"node_modules/ionicons": {
"version": "5.5.4",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.4.tgz",
"integrity": "sha512-3ph8X9my3inhabWEZ7N0XRA0MnnNQ1v9a602mLNgWsIXnxE9G5BybIZ/pws/OZZ/hoNlvSjk801N03yL9/FNgQ==",
"version": "6.0.4",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
"integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
"dependencies": {
"@stencil/core": "~2.10.0"
}
},
"node_modules/ionicons/node_modules/@stencil/core": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.10.0.tgz",
"integrity": "sha512-15rWMTPQ/sp0lSV82HVCXkIya3QLN+uBl7pqK4JnTrp4HiLrzLmNbWjbvgCs55gw0lULbCIGbRIEsFz+Pe/Q+A==",
"bin": {
"stencil": "bin/stencil"
},
"engines": {
"node": ">=12.10.0",
"npm": ">=6.0.0"
"@stencil/core": "^2.18.0"
}
},
"node_modules/ipaddr.js": {
@ -24687,16 +24659,6 @@
"@stencil/core": "^2.16.0",
"ionicons": "^6.0.2",
"tslib": "^2.1.0"
},
"dependencies": {
"ionicons": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.2.tgz",
"integrity": "sha512-AyKfFaUKVoBz4eB8XkU7H1R5HFnVsgq5ijqSdbXC0lES9PDK/J6LUQz6XUJq0mVVQF5k9kczSPOLMW3mszG0mQ==",
"requires": {
"@stencil/core": "~2.16.0"
}
}
}
},
"@ionic/react": {
@ -24707,16 +24669,6 @@
"@ionic/core": "^6.1.9",
"ionicons": "^6.0.2",
"tslib": "*"
},
"dependencies": {
"ionicons": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.2.tgz",
"integrity": "sha512-AyKfFaUKVoBz4eB8XkU7H1R5HFnVsgq5ijqSdbXC0lES9PDK/J6LUQz6XUJq0mVVQF5k9kczSPOLMW3mszG0mQ==",
"requires": {
"@stencil/core": "~2.16.0"
}
}
}
},
"@ionic/react-router": {
@ -25989,9 +25941,9 @@
}
},
"@stencil/core": {
"version": "2.16.1",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
"integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw=="
"version": "2.19.2",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.19.2.tgz",
"integrity": "sha512-TK3sHqyQAACwcac4fWntypFtN9c/y+y9ioZojeCnNDY3dxF33Ax70lL9ZLDyQnWWR+aTh1WFoqB5sYOnZIUKMA=="
},
"@surma/rollup-plugin-off-main-thread": {
"version": "2.2.3",
@ -31405,18 +31357,11 @@
"dev": true
},
"ionicons": {
"version": "5.5.4",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.4.tgz",
"integrity": "sha512-3ph8X9my3inhabWEZ7N0XRA0MnnNQ1v9a602mLNgWsIXnxE9G5BybIZ/pws/OZZ/hoNlvSjk801N03yL9/FNgQ==",
"version": "6.0.4",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
"integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
"requires": {
"@stencil/core": "~2.10.0"
},
"dependencies": {
"@stencil/core": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.10.0.tgz",
"integrity": "sha512-15rWMTPQ/sp0lSV82HVCXkIya3QLN+uBl7pqK4JnTrp4HiLrzLmNbWjbvgCs55gw0lULbCIGbRIEsFz+Pe/Q+A=="
}
"@stencil/core": "^2.18.0"
}
},
"ipaddr.js": {

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

@ -15,7 +15,7 @@
"@types/react-dom": "^16.9.4",
"@types/react-router": "^5.1.8",
"@types/react-router-dom": "^5.1.7",
"ionicons": "^5.4.0",
"ionicons": "^6.0.4",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-router": "^5.2.0",

12
packages/react-router/test-app/scripts/sync.sh
View File

@ -1,3 +1,7 @@
#!/bin/bash
set -e
# Copy ionic react dist
rm -rf node_modules/@ionic/react/dist node_modules/@ionic/react/css
cp -a ../../react/dist node_modules/@ionic/react/dist
@ -14,11 +18,3 @@ rm -rf node_modules/@ionic/core/dist node_modules/@ionic/core/components
cp -a ../../../core/package.json node_modules/@ionic/core/package.json
cp -a ../../../core/dist node_modules/@ionic/core/dist
cp -a ../../../core/components node_modules/@ionic/core/components
# Copy stencil
rm -rf node_modules/@stencil/core
cp -a ../../../core/node_modules/@stencil/core node_modules/@stencil/core
# Copy ionicons
rm -rf node_modules/ionicons
cp -a ../../../core/node_modules/ionicons node_modules/ionicons

1
packages/react-router/test-app/tests/e2e/specs/routing.cy.js
View File

@ -133,7 +133,6 @@ describe('Routing Tests', () => {
it('Tab 3 > Other Page > Back, should be back on Tab 3', () => {
// Tests transferring from one outlet to another and back again with animation
// TODO: how to test the transition animation happens?
cy.visit(`http://localhost:${port}/routing/tabs/tab3`);
cy.ionNav('ion-button', 'Go to Other Page');
cy.ionPageVisible('other-page');

2
packages/react-router/test-app/tests/e2e/support/commands.js vendored
View File

@ -101,7 +101,7 @@ Cypress.Commands.add('ionMenuNav', (contains) => {
});
Cypress.Commands.add('ionTabClick', (tabText) => {
// TODO: figure out how to get rid of this wait. Switching tabs after a forward nav to a details page needs it
// TODO FW-2800: figure out how to get rid of this wait. Switching tabs after a forward nav to a details page needs it
cy.wait(500);
cy.contains('ion-tab-button', tabText).click({ force: true });
// cy.get('ion-tab-button.tab-selected').contains(tabText)