diff --git a/packages/capacitor/CHANGELOG.md b/packages/capacitor/CHANGELOG.md index 7f08bf19..95211b44 100644 --- a/packages/capacitor/CHANGELOG.md +++ b/packages/capacitor/CHANGELOG.md @@ -2,6 +2,8 @@ # 13.0.0 +## Features + - support Nx 13 # 12.1.0 diff --git a/packages/firebase/CHANGELOG.md b/packages/firebase/CHANGELOG.md index 5889011a..d348300f 100644 --- a/packages/firebase/CHANGELOG.md +++ b/packages/firebase/CHANGELOG.md @@ -2,6 +2,8 @@ # 13.0.0 +## Features + - support Nx 13 # 12.1.0 diff --git a/packages/ionic-angular/CHANGELOG.md b/packages/ionic-angular/CHANGELOG.md index b703156c..62120840 100644 --- a/packages/ionic-angular/CHANGELOG.md +++ b/packages/ionic-angular/CHANGELOG.md @@ -2,6 +2,8 @@ # 13.0.0 +## Features + - support Nx 13 # 12.1.0 diff --git a/packages/ionic-react/CHANGELOG.md b/packages/ionic-react/CHANGELOG.md index 077fdf48..18b45c53 100644 --- a/packages/ionic-react/CHANGELOG.md +++ b/packages/ionic-react/CHANGELOG.md @@ -2,7 +2,10 @@ # 13.0.0 +## Features + - support Nx 13 +- generate applications with Ionic 6 # 12.1.0 diff --git a/packages/ionic-react/migrations.json b/packages/ionic-react/migrations.json index 427e3503..d280390f 100644 --- a/packages/ionic-react/migrations.json +++ b/packages/ionic-react/migrations.json @@ -79,6 +79,12 @@ "version": "11.0.0-beta.1", "description": "Update Webpack config", "factory": "./src/migrations/update-11-0-0/update-webpack-config-11-0-0" + }, + "ionic-6-migration-13-0-0": { + "version": "13.0.0-beta.0", + "description": "Display Ionic 6 migration guide.", + "cli": "nx", + "factory": "./src/migrations/update-13-0-0/ionic-6-migration-13-0-0" } }, "packageJsonUpdates": { diff --git a/packages/ionic-react/src/generators/application/files/blank/src/app/App.tsx.template b/packages/ionic-react/src/generators/application/files/blank/src/app/App.tsx.template index c6811130..190255af 100644 --- a/packages/ionic-react/src/generators/application/files/blank/src/app/App.tsx.template +++ b/packages/ionic-react/src/generators/application/files/blank/src/app/App.tsx.template @@ -1,6 +1,6 @@ import React from 'react'; import { Redirect, Route } from 'react-router-dom'; -import { IonApp, IonRouterOutlet } from '@ionic/react'; +import { IonApp, IonRouterOutlet, setupIonicReact } from '@ionic/react'; import { IonReactRouter } from '@ionic/react-router'; import Home from './pages/Home'; @@ -23,6 +23,8 @@ import '@ionic/react/css/display.css'; /* Theme variables */ import './theme/variables.css'; +setupIonicReact(); + const App: React.FC = () => ( diff --git a/packages/ionic-react/src/generators/application/files/list/src/app/App.tsx.template b/packages/ionic-react/src/generators/application/files/list/src/app/App.tsx.template index bf830dc5..848a5d1c 100644 --- a/packages/ionic-react/src/generators/application/files/list/src/app/App.tsx.template +++ b/packages/ionic-react/src/generators/application/files/list/src/app/App.tsx.template @@ -1,6 +1,6 @@ import React from 'react'; import { Redirect, Route } from 'react-router-dom'; -import { IonApp, IonRouterOutlet } from '@ionic/react'; +import { IonApp, IonRouterOutlet, setupIonicReact } from '@ionic/react'; import { IonReactRouter } from '@ionic/react-router'; import Home from './pages/Home'; import ViewMessage from './pages/ViewMessage'; @@ -24,6 +24,8 @@ import '@ionic/react/css/display.css'; /* Theme variables */ import './theme/variables.css'; +setupIonicReact(); + const App: React.FC = () => ( diff --git a/packages/ionic-react/src/generators/application/files/sidemenu/src/app/App.tsx.template b/packages/ionic-react/src/generators/application/files/sidemenu/src/app/App.tsx.template index 725b17bf..82401608 100644 --- a/packages/ionic-react/src/generators/application/files/sidemenu/src/app/App.tsx.template +++ b/packages/ionic-react/src/generators/application/files/sidemenu/src/app/App.tsx.template @@ -1,7 +1,7 @@ import Menu from './components/Menu'; import Page from './pages/Page'; import React from 'react'; -import { IonApp, IonRouterOutlet, IonSplitPane } from '@ionic/react'; +import { IonApp, IonRouterOutlet, IonSplitPane, setupIonicReact } from '@ionic/react'; import { IonReactRouter } from '@ionic/react-router'; import { Redirect, Route } from 'react-router-dom'; @@ -24,6 +24,8 @@ import '@ionic/react/css/display.css'; /* Theme variables */ import './theme/variables.css'; +setupIonicReact(); + const App: React.FC = () => { return ( diff --git a/packages/ionic-react/src/generators/application/files/tabs/src/app/App.tsx.template b/packages/ionic-react/src/generators/application/files/tabs/src/app/App.tsx.template index f49a54ec..ea0dd0a1 100644 --- a/packages/ionic-react/src/generators/application/files/tabs/src/app/App.tsx.template +++ b/packages/ionic-react/src/generators/application/files/tabs/src/app/App.tsx.template @@ -7,7 +7,8 @@ import { IonRouterOutlet, IonTabBar, IonTabButton, - IonTabs + IonTabs, + setupIonicReact } from '@ionic/react'; import { IonReactRouter } from '@ionic/react-router'; import { ellipse, square, triangle } from 'ionicons/icons'; @@ -34,6 +35,8 @@ import '@ionic/react/css/display.css'; /* Theme variables */ import './theme/variables.css'; +setupIonicReact(); + const App: React.FC = () => ( diff --git a/packages/ionic-react/src/migrations/update-13-0-0/ionic-6-migration-13-0-0.ts b/packages/ionic-react/src/migrations/update-13-0-0/ionic-6-migration-13-0-0.ts new file mode 100644 index 00000000..3dbb91ac --- /dev/null +++ b/packages/ionic-react/src/migrations/update-13-0-0/ionic-6-migration-13-0-0.ts @@ -0,0 +1,9 @@ +import { logger, stripIndents } from '@nrwl/devkit'; + +export default async function update() { + logger.info(stripIndents` + Ionic 6 has been released and it is recommended that you upgrade your application if you have not already. + + https://ionicframework.com/docs/intro/upgrading-to-ionic-6 + `); +} diff --git a/packages/ionic-react/src/utils/versions.ts b/packages/ionic-react/src/utils/versions.ts index 95d88f6a..6e1c5410 100644 --- a/packages/ionic-react/src/utils/versions.ts +++ b/packages/ionic-react/src/utils/versions.ts @@ -1,5 +1,5 @@ export const nxVersion = '^13.0.0'; export const nxtendCapacitorVersion = '^13.0.0'; -export const ionicReactVersion = '^5.8.3'; -export const ionicReactRouterVersion = '^5.8.3'; -export const ioniconsVersion = '^5.5.3'; +export const ionicReactVersion = '^6.0.3'; +export const ionicReactRouterVersion = '^6.0.3'; +export const ioniconsVersion = '^6.0.1';