Skip to content

Commit

Permalink
Merge branch 'release/v8'
Browse files Browse the repository at this point in the history
  • Loading branch information
@saltyshiomix
saltyshiomix committed Apr 14, 2024
2 parents 205f1b0 + 8b453d6 commit e25d6cb
Show file tree
Hide file tree
Showing 53 changed files with 341 additions and 377 deletions.
24 changes: 12 additions & 12 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@

## Support

### Nextron vs Next.js

| nextron | next |
| --------------- | ------------------ |
| `v9.x` | `v13.x` (upcoming) |
| `v8.x` | `v12.x` |
| `v7.x` | `v11.x` |
| `v6.x` | `v10.x` |
| `v5.x` | `v9.x` |
| `v4.x` | `v8.x` |
| `v2.x` / `v3.x` | `v7.x` |
| `v1.x` | `v6.x` |
### Next.js vs Nextron

| next | nextron |
| ----------------- | ----------------- |
| `v14.x` | `v9.x` (upcoming) |
| `v12.x` / `v13.x` | `v8.x` |
| `v11.x` | `v7.x` |
| `v10.x` | `v6.x` |
| `v9.x` | `v5.x` |
| `v8.x` | `v4.x` |
| `v7.x` | `v2.x` / `v3.x` |
| `v6.x` | `v1.x` |

### Package Manager

Expand Down
4 changes: 2 additions & 2 deletions examples/basic-lang-javascript-python/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"devDependencies": {
"electron": "^28.2.1",
"electron-builder": "^24.9.1",
"next": "^12.3.4",
"nextron": "^8.13.0",
"next": "^13.5.6",
"nextron": "^8.14.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
Expand Down
9 changes: 3 additions & 6 deletions examples/basic-lang-javascript-python/renderer/pages/home.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,13 @@ export default function HomePage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/next">
<a>Go to next page</a>
</Link>
⚡ Electron + Next.js ⚡ - <Link href="/next">Go to next page</Link>
</p>
<Image
src="/images/logo.png"
alt="Logo image"
width="256px"
height="256px"
width={256}
height={256}
/>
</div>
<div>
Expand Down
5 changes: 1 addition & 4 deletions examples/basic-lang-javascript-python/renderer/pages/next.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ export default function NextPage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/home">
<a>Go to home page</a>
</Link>
⚡ Electron + Next.js ⚡ - <Link href="/home">Go to home page</Link>
</p>
</div>
</React.Fragment>
Expand Down
4 changes: 2 additions & 2 deletions examples/basic-lang-javascript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"devDependencies": {
"electron": "^28.2.1",
"electron-builder": "^24.9.1",
"next": "^12.3.4",
"nextron": "^8.13.0",
"next": "^13.5.6",
"nextron": "^8.14.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
Expand Down
9 changes: 3 additions & 6 deletions examples/basic-lang-javascript/renderer/pages/home.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,13 @@ export default function HomePage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/next">
<a>Go to next page</a>
</Link>
⚡ Electron + Next.js ⚡ - <Link href="/next">Go to next page</Link>
</p>
<Image
src="/images/logo.png"
alt="Logo image"
width="256px"
height="256px"
width={256}
height={256}
/>
</div>
<div>
Expand Down
5 changes: 1 addition & 4 deletions examples/basic-lang-javascript/renderer/pages/next.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ export default function NextPage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/home">
<a>Go to home page</a>
</Link>
⚡ Electron + Next.js ⚡ - <Link href="/home">Go to home page</Link>
</p>
</div>
</React.Fragment>
Expand Down
4 changes: 2 additions & 2 deletions examples/basic-lang-typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"@types/react": "^18.2.52",
"electron": "^28.2.1",
"electron-builder": "^24.9.1",
"next": "^12.3.4",
"nextron": "^8.13.0",
"next": "^13.5.6",
"nextron": "^8.14.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^5.3.3"
Expand Down
9 changes: 3 additions & 6 deletions examples/basic-lang-typescript/renderer/pages/home.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,13 @@ export default function HomePage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/next">
<a>Go to next page</a>
</Link>
⚡ Electron + Next.js ⚡ -<Link href="/next">Go to next page</Link>
</p>
<Image
src="/images/logo.png"
alt="Logo image"
width="256px"
height="256px"
width={256}
height={256}
/>
</div>
<div>
Expand Down
5 changes: 1 addition & 4 deletions examples/basic-lang-typescript/renderer/pages/next.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ export default function NextPage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/home">
<a>Go to home page</a>
</Link>
⚡ Electron + Next.js ⚡ -<Link href="/home">Go to home page</Link>
</p>
</div>
</React.Fragment>
Expand Down
4 changes: 2 additions & 2 deletions examples/basic-launch-app-from-url/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"@types/react": "^18.2.52",
"electron": "^28.2.1",
"electron-builder": "^24.9.1",
"next": "^12.3.4",
"nextron": "^8.13.0",
"next": "^13.5.6",
"nextron": "^8.14.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^5.3.3"
Expand Down
9 changes: 3 additions & 6 deletions examples/basic-launch-app-from-url/renderer/pages/home.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,14 @@ export default function HomePage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/next">
<a>Go to next page</a>
</Link>
⚡ Electron + Next.js ⚡ - <Link href="/next">Go to next page</Link>
</p>
{launcherUrl && <p>Welcome back from URL: {launcherUrl}</p>}
<Image
src="/images/logo.png"
alt="Logo image"
width="256px"
height="256px"
width={256}
height={256}
/>
</div>
</React.Fragment>
Expand Down
5 changes: 1 addition & 4 deletions examples/basic-launch-app-from-url/renderer/pages/next.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ export default function NextPage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/home">
<a>Go to home page</a>
</Link>
⚡ Electron + Next.js ⚡ - <Link href="/home">Go to home page</Link>
</p>
</div>
</React.Fragment>
Expand Down
4 changes: 2 additions & 2 deletions examples/basic-store-data/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"@types/react": "^18.2.52",
"electron": "^28.2.1",
"electron-builder": "^24.9.1",
"next": "^12.3.4",
"nextron": "^8.13.0",
"next": "^13.5.6",
"nextron": "^8.14.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^5.3.3"
Expand Down
9 changes: 3 additions & 6 deletions examples/basic-store-data/renderer/pages/home.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,13 @@ export default function HomePage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/next">
<a>Go to next page</a>
</Link>
⚡ Electron + Next.js ⚡ - <Link href="/next">Go to next page</Link>
</p>
<Image
src="/images/logo.png"
alt="Logo image"
width="256px"
height="256px"
width={256}
height={256}
/>
<hr />
<h2>Enter your message:</h2>
Expand Down
5 changes: 1 addition & 4 deletions examples/basic-store-data/renderer/pages/next.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ export default function NextPage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/home">
<a>Go to home page</a>
</Link>
⚡ Electron + Next.js ⚡ - <Link href="/home">Go to home page</Link>
</p>
</div>
</React.Fragment>
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-build-options/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"@types/react": "^18.2.52",
"electron": "^28.2.1",
"electron-builder": "^24.9.1",
"next": "^12.3.4",
"nextron": "^8.13.0",
"next": "^13.5.6",
"nextron": "^8.14.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^5.3.3"
Expand Down
9 changes: 3 additions & 6 deletions examples/custom-build-options/renderer/pages/home.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,13 @@ export default function HomePage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/next">
<a>Go to next page</a>
</Link>
⚡ Electron + Next.js ⚡ - <Link href="/next">Go to next page</Link>
</p>
<Image
src="/images/logo.png"
alt="Logo image"
width="256px"
height="256px"
width={256}
height={256}
/>
</div>
<div>
Expand Down
5 changes: 1 addition & 4 deletions examples/custom-build-options/renderer/pages/next.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ export default function NextPage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/home">
<a>Go to home page</a>
</Link>
⚡ Electron + Next.js ⚡ - <Link href="/home">Go to home page</Link>
</p>
</div>
</React.Fragment>
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-renderer-port/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"@types/react": "^18.2.52",
"electron": "^28.2.1",
"electron-builder": "^24.9.1",
"next": "^12.3.4",
"nextron": "^8.13.0",
"next": "^13.5.6",
"nextron": "^8.14.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^5.3.3"
Expand Down
9 changes: 3 additions & 6 deletions examples/custom-renderer-port/renderer/pages/home.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,13 @@ export default function HomePage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/next">
<a>Go to next page</a>
</Link>
⚡ Electron + Next.js ⚡ - <Link href="/next">Go to next page</Link>
</p>
<Image
src="/images/logo.png"
alt="Logo image"
width="256px"
height="256px"
width={256}
height={256}
/>
</div>
<div>
Expand Down
5 changes: 1 addition & 4 deletions examples/custom-renderer-port/renderer/pages/next.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ export default function NextPage() {
</Head>
<div>
<p>
⚡ Electron + Next.js ⚡ -
<Link href="/home">
<a>Go to home page</a>
</Link>
⚡ Electron + Next.js ⚡ - <Link href="/home">Go to home page</Link>
</p>
</div>
</React.Fragment>
Expand Down
4 changes: 2 additions & 2 deletions examples/with-ant-design/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"antd": "^4.22.8",
"electron": "^28.2.1",
"electron-builder": "^24.9.1",
"next": "^12.3.4",
"nextron": "^8.13.0",
"next": "^13.5.6",
"nextron": "^8.14.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^5.3.3"
Expand Down
4 changes: 1 addition & 3 deletions examples/with-ant-design/renderer/pages/home.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ export default function HomePage() {
</Head>

<Header>
<Link href="/next">
<a>Go to next page</a>
</Link>
<Link href="/next">Go to next page</Link>
</Header>

<Content style={{ padding: 48 }}>
Expand Down
4 changes: 1 addition & 3 deletions examples/with-ant-design/renderer/pages/next.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ export default function NextPage() {
</Head>

<Header>
<Link href="/home">
<a>Go to home page</a>
</Link>
<Link href="/home">Go to home page</Link>
</Header>

<Content style={{ padding: 48 }}>
Expand Down
4 changes: 2 additions & 2 deletions examples/with-chakra-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"electron": "^28.2.1",
"electron-builder": "^24.9.1",
"framer-motion": "^6.5.1",
"next": "^12.3.4",
"nextron": "^8.13.0",
"next": "^13.5.6",
"nextron": "^8.14.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^5.3.3"
Expand Down
4 changes: 2 additions & 2 deletions examples/with-chakra-ui/renderer/pages/home.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ export default function HomePage() {
<Image
src="/images/logo.png"
alt="Logo image"
width="200px"
height="200px"
width={200}
height={200}
/>
<Hero title={`⚡Electron⚡ + Next.js + Chakra UI = 🔥`} />
<Footer>
Expand Down
4 changes: 2 additions & 2 deletions examples/with-chakra-ui/renderer/pages/next.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ export default function NextPage() {
<Image
src="/images/logo.png"
alt="Logo image"
width="200px"
height="200px"
width={200}
height={200}
/>
<Hero title={`⚡ Nextron ⚡`} />
<Footer>
Expand Down
Loading

0 comments on commit e25d6cb

Please sign in to comment.