Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ionic-react): generate applications with Ionic 6 #596

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −7
Open

feat(ionic-react): generate applications with Ionic 6 #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/capacitor/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# 13.0.0

## Features

- support Nx 13

# 12.1.0
Expand Down
2 changes: 2 additions & 0 deletions packages/firebase/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# 13.0.0

## Features

- support Nx 13

# 12.1.0
Expand Down
2 changes: 2 additions & 0 deletions packages/ionic-angular/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# 13.0.0

## Features

- support Nx 13

# 12.1.0
Expand Down
3 changes: 3 additions & 0 deletions packages/ionic-react/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

# 13.0.0

## Features

- support Nx 13
- generate applications with Ionic 6

# 12.1.0

Expand Down
6 changes: 6 additions & 0 deletions packages/ionic-react/migrations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 3 additions & 1 deletion packages/ionic-react/src/generators/application/files/blank/src/app/App.tsx.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -23,6 +23,8 @@ import '@ionic/react/css/display.css';
/* Theme variables */
import './theme/variables.css';

setupIonicReact();

const App: React.FC = () => (
<IonApp>
<IonReactRouter>
Expand Down
4 changes: 3 additions & 1 deletion packages/ionic-react/src/generators/application/files/list/src/app/App.tsx.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -24,6 +24,8 @@ import '@ionic/react/css/display.css';
/* Theme variables */
import './theme/variables.css';

setupIonicReact();

const App: React.FC = () => (
<IonApp>
<IonReactRouter>
Expand Down
4 changes: 3 additions & 1 deletion packages/ionic-react/src/generators/application/files/sidemenu/src/app/App.tsx.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -24,6 +24,8 @@ import '@ionic/react/css/display.css';
/* Theme variables */
import './theme/variables.css';

setupIonicReact();

const App: React.FC = () => {

return (
Expand Down
5 changes: 4 additions & 1 deletion packages/ionic-react/src/generators/application/files/tabs/src/app/App.tsx.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -34,6 +35,8 @@ import '@ionic/react/css/display.css';
/* Theme variables */
import './theme/variables.css';

setupIonicReact();

const App: React.FC = () => (
<IonApp>
<IonReactRouter>
Expand Down
9 changes: 9 additions & 0 deletions packages/ionic-react/src/migrations/update-13-0-0/ionic-6-migration-13-0-0.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
`);
}
6 changes: 3 additions & 3 deletions packages/ionic-react/src/utils/versions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';