Skip to content

Commit 651967d

Browse files
committed
Merge branch 'release/v8'
2 parents e25d6cb + 798dfff commit 651967d

File tree

18 files changed

+1177
-1062
lines changed

18 files changed

+1177
-1062
lines changed

README.md

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,33 @@ Run `npm run build`, and nextron outputs packaged bundles under the `dist` folde
8686
}
8787
```
8888

89+
## Basic Directory Structures
90+
91+
```
92+
.
93+
├── main
94+
│   ├── background.ts
95+
│   └── preload.ts
96+
├── renderer
97+
│   ├── next.config.js
98+
│   ├── pages
99+
│   │   ├── home.tsx
100+
│   │   └── next.tsx
101+
│   ├── preload.d.ts
102+
│   ├── public
103+
│   │   └── images
104+
│   │   └── logo.png
105+
│   └── tsconfig.json
106+
├── resources
107+
│   ├── icon.icns
108+
│   └── icon.ico
109+
├── nextron.config.js
110+
├── electron-builder.yml
111+
├── package.json
112+
├── tsconfig.json
113+
└── README.md
114+
```
115+
89116
## `nextron` or `nextron dev` Options
90117

91118
### `--renderer-port` (default: `8888`)
@@ -242,8 +269,6 @@ We can extends the default babel config of main process by putting `.babelrc` in
242269

243270
## Examples
244271

245-
See [examples](./examples) folder for more information.
246-
247272
### [examples/basic-lang-javascript](./examples/basic-lang-javascript)
248273

249274
<p align="center"><img src="https://i.imgur.com/X7dSE68.png"></p>
@@ -433,6 +458,21 @@ $ yarn create nextron-app my-app --example with-material-ui
433458
$ pnpm dlx create-nextron-app my-app --example with-material-ui
434459
```
435460

461+
### [examples/with-next-i18next](./examples/with-next-i18next)
462+
463+
<p align="center"><img src="https://i.imgur.com/uhXCr6v.png"></p>
464+
465+
```
466+
# with npx
467+
$ npx create-nextron-app my-app --example with-next-i18next
468+
469+
# with yarn
470+
$ yarn create nextron-app my-app --example with-next-i18next
471+
472+
# with pnpm
473+
$ pnpm dlx create-nextron-app my-app --example with-next-i18next
474+
```
475+
436476
### [examples/with-tailwindcss](./examples/with-tailwindcss)
437477

438478
<p align="center"><img src="https://i.imgur.com/a9QWW0v.png"></p>

examples/basic-lang-javascript-python/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
},
1313
"dependencies": {
1414
"electron-serve": "^1.3.0",
15-
"electron-store": "^8.1.0"
15+
"electron-store": "^8.2.0"
1616
},
1717
"devDependencies": {
18-
"electron": "^28.2.1",
19-
"electron-builder": "^24.9.1",
18+
"electron": "^29.3.0",
19+
"electron-builder": "^24.13.3",
2020
"next": "^13.5.6",
21-
"nextron": "^8.14.0",
21+
"nextron": "^8.15.0",
2222
"react": "^18.2.0",
2323
"react-dom": "^18.2.0"
2424
}

examples/basic-lang-javascript/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
},
1313
"dependencies": {
1414
"electron-serve": "^1.3.0",
15-
"electron-store": "^8.1.0"
15+
"electron-store": "^8.2.0"
1616
},
1717
"devDependencies": {
18-
"electron": "^28.2.1",
19-
"electron-builder": "^24.9.1",
18+
"electron": "^29.3.0",
19+
"electron-builder": "^24.13.3",
2020
"next": "^13.5.6",
21-
"nextron": "^8.14.0",
21+
"nextron": "^8.15.0",
2222
"react": "^18.2.0",
2323
"react-dom": "^18.2.0"
2424
}

examples/basic-lang-typescript/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
},
1313
"dependencies": {
1414
"electron-serve": "^1.3.0",
15-
"electron-store": "^8.1.0"
15+
"electron-store": "^8.2.0"
1616
},
1717
"devDependencies": {
1818
"@types/node": "^20.11.16",
1919
"@types/react": "^18.2.52",
20-
"electron": "^28.2.1",
21-
"electron-builder": "^24.9.1",
20+
"electron": "^29.3.0",
21+
"electron-builder": "^24.13.3",
2222
"next": "^13.5.6",
23-
"nextron": "^8.14.0",
23+
"nextron": "^8.15.0",
2424
"react": "^18.2.0",
2525
"react-dom": "^18.2.0",
26-
"typescript": "^5.3.3"
26+
"typescript": "^5.4.5"
2727
}
2828
}

examples/basic-launch-app-from-url/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
},
1313
"dependencies": {
1414
"electron-serve": "^1.3.0",
15-
"electron-store": "^8.1.0"
15+
"electron-store": "^8.2.0"
1616
},
1717
"devDependencies": {
1818
"@types/node": "^20.11.16",
1919
"@types/react": "^18.2.52",
20-
"electron": "^28.2.1",
21-
"electron-builder": "^24.9.1",
20+
"electron": "^29.3.0",
21+
"electron-builder": "^24.13.3",
2222
"next": "^13.5.6",
23-
"nextron": "^8.14.0",
23+
"nextron": "^8.15.0",
2424
"react": "^18.2.0",
2525
"react-dom": "^18.2.0",
26-
"typescript": "^5.3.3"
26+
"typescript": "^5.4.5"
2727
}
2828
}

examples/basic-store-data/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
},
1313
"dependencies": {
1414
"electron-serve": "^1.3.0",
15-
"electron-store": "^8.1.0"
15+
"electron-store": "^8.2.0"
1616
},
1717
"devDependencies": {
1818
"@types/node": "^20.11.16",
1919
"@types/react": "^18.2.52",
20-
"electron": "^28.2.1",
21-
"electron-builder": "^24.9.1",
20+
"electron": "^29.3.0",
21+
"electron-builder": "^24.13.3",
2222
"next": "^13.5.6",
23-
"nextron": "^8.14.0",
23+
"nextron": "^8.15.0",
2424
"react": "^18.2.0",
2525
"react-dom": "^18.2.0",
26-
"typescript": "^5.3.3"
26+
"typescript": "^5.4.5"
2727
}
2828
}

examples/custom-build-options/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
},
1818
"dependencies": {
1919
"electron-serve": "^1.3.0",
20-
"electron-store": "^8.1.0"
20+
"electron-store": "^8.2.0"
2121
},
2222
"devDependencies": {
2323
"@types/node": "^20.11.16",
2424
"@types/react": "^18.2.52",
25-
"electron": "^28.2.1",
26-
"electron-builder": "^24.9.1",
25+
"electron": "^29.3.0",
26+
"electron-builder": "^24.13.3",
2727
"next": "^13.5.6",
28-
"nextron": "^8.14.0",
28+
"nextron": "^8.15.0",
2929
"react": "^18.2.0",
3030
"react-dom": "^18.2.0",
31-
"typescript": "^5.3.3"
31+
"typescript": "^5.4.5"
3232
}
3333
}

examples/custom-renderer-port/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
},
1313
"dependencies": {
1414
"electron-serve": "^1.3.0",
15-
"electron-store": "^8.1.0"
15+
"electron-store": "^8.2.0"
1616
},
1717
"devDependencies": {
1818
"@types/node": "^20.11.16",
1919
"@types/react": "^18.2.52",
20-
"electron": "^28.2.1",
21-
"electron-builder": "^24.9.1",
20+
"electron": "^29.3.0",
21+
"electron-builder": "^24.13.3",
2222
"next": "^13.5.6",
23-
"nextron": "^8.14.0",
23+
"nextron": "^8.15.0",
2424
"react": "^18.2.0",
2525
"react-dom": "^18.2.0",
26-
"typescript": "^5.3.3"
26+
"typescript": "^5.4.5"
2727
}
2828
}

examples/with-ant-design/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
},
1313
"dependencies": {
1414
"electron-serve": "^1.3.0",
15-
"electron-store": "^8.1.0"
15+
"electron-store": "^8.2.0"
1616
},
1717
"devDependencies": {
18-
"@ant-design/icons": "^4.7.0",
18+
"@ant-design/icons": "^5.3.6",
1919
"@types/node": "^20.11.16",
2020
"@types/react": "^18.2.52",
21-
"antd": "^4.22.8",
22-
"electron": "^28.2.1",
23-
"electron-builder": "^24.9.1",
21+
"antd": "^5.16.1",
22+
"electron": "^29.3.0",
23+
"electron-builder": "^24.13.3",
2424
"next": "^13.5.6",
25-
"nextron": "^8.14.0",
25+
"nextron": "^8.15.0",
2626
"react": "^18.2.0",
2727
"react-dom": "^18.2.0",
28-
"typescript": "^5.3.3"
28+
"typescript": "^5.4.5"
2929
}
3030
}

examples/with-ant-design/renderer/pages/_app.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react'
22
import Head from 'next/head'
33
import type { AppProps } from 'next/app'
44

5-
import 'antd/dist/antd.css'
5+
import 'antd/dist/reset.css'
66

77
function MyApp({ Component, pageProps }: AppProps) {
88
return (

examples/with-chakra-ui/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@
1212
},
1313
"dependencies": {
1414
"electron-serve": "^1.3.0",
15-
"electron-store": "^8.1.0"
15+
"electron-store": "^8.2.0"
1616
},
1717
"devDependencies": {
1818
"@chakra-ui/icons": "^2.1.1",
19-
"@chakra-ui/react": "^2.8.1",
20-
"@chakra-ui/theme-tools": "^2.1.1",
21-
"@emotion/react": "^11.11.1",
22-
"@emotion/styled": "^11.11.0",
19+
"@chakra-ui/react": "^2.8.2",
20+
"@chakra-ui/theme-tools": "^2.1.2",
21+
"@emotion/react": "^11.11.4",
22+
"@emotion/styled": "^11.11.5",
2323
"@types/node": "^20.11.16",
2424
"@types/react": "^18.2.52",
25-
"electron": "^28.2.1",
26-
"electron-builder": "^24.9.1",
27-
"framer-motion": "^6.5.1",
25+
"electron": "^29.3.0",
26+
"electron-builder": "^24.13.3",
27+
"framer-motion": "^11.0.28",
2828
"next": "^13.5.6",
29-
"nextron": "^8.14.0",
29+
"nextron": "^8.15.0",
3030
"react": "^18.2.0",
3131
"react-dom": "^18.2.0",
32-
"typescript": "^5.3.3"
32+
"typescript": "^5.4.5"
3333
}
3434
}

examples/with-emotion/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
},
1313
"dependencies": {
1414
"electron-serve": "^1.3.0",
15-
"electron-store": "^8.1.0"
15+
"electron-store": "^8.2.0"
1616
},
1717
"devDependencies": {
1818
"@emotion/babel-plugin": "^11.11.0",
1919
"@emotion/react": "^11.11.1",
2020
"@emotion/styled": "^11.11.0",
2121
"@types/node": "^20.11.16",
2222
"@types/react": "^18.2.52",
23-
"electron": "^28.2.1",
24-
"electron-builder": "^24.9.1",
23+
"electron": "^29.3.0",
24+
"electron-builder": "^24.13.3",
2525
"next": "^13.5.6",
26-
"nextron": "^8.14.0",
26+
"nextron": "^8.15.0",
2727
"react": "^18.2.0",
2828
"react-dom": "^18.2.0",
29-
"typescript": "^5.3.3"
29+
"typescript": "^5.4.5"
3030
}
3131
}

examples/with-material-ui/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"dependencies": {
1414
"electron-serve": "^1.3.0",
15-
"electron-store": "^8.1.0"
15+
"electron-store": "^8.2.0"
1616
},
1717
"devDependencies": {
1818
"@emotion/cache": "^11.11.0",
@@ -24,12 +24,12 @@
2424
"@mui/material-nextjs": "^5.15.11",
2525
"@types/node": "^20.11.16",
2626
"@types/react": "^18.2.52",
27-
"electron": "^28.2.1",
28-
"electron-builder": "^24.9.1",
27+
"electron": "^29.3.0",
28+
"electron-builder": "^24.13.3",
2929
"next": "^13.5.6",
30-
"nextron": "^8.14.0",
30+
"nextron": "^8.15.0",
3131
"react": "^18.2.0",
3232
"react-dom": "^18.2.0",
33-
"typescript": "^5.3.3"
33+
"typescript": "^5.4.5"
3434
}
3535
}

examples/with-next-i18next/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<p align="center"><img src="https://i.imgur.com/X7dSE68.png"></p>
1+
<p align="center"><img src="https://i.imgur.com/uhXCr6v.png"></p>
22

33
## Usage
44

55
### Create an App
66

77
```
88
# with npx
9-
$ npx create-nextron-app my-app --example basic-lang-javascript
9+
$ npx create-nextron-app my-app --example with-next-i18next
1010
1111
# with yarn
12-
$ yarn create nextron-app my-app --example basic-lang-javascript
12+
$ yarn create nextron-app my-app --example with-next-i18next
1313
1414
# with pnpm
15-
$ pnpm dlx create-nextron-app my-app --example basic-lang-javascript
15+
$ pnpm dlx create-nextron-app my-app --example with-next-i18next
1616
```
1717

1818
### Install Dependencies

examples/with-next-i18next/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
},
1616
"dependencies": {
1717
"electron-serve": "^1.3.0",
18-
"electron-store": "^8.1.0"
18+
"electron-store": "^8.2.0"
1919
},
2020
"devDependencies": {
2121
"electron": "29.0.0-beta.4",
22-
"electron-builder": "^24.9.1",
22+
"electron-builder": "^24.13.3",
2323
"i18next": "^23.11.1",
2424
"next": "^13.5.6",
2525
"next-i18next": "^15.2.0",
26-
"nextron": "^8.14.0",
26+
"nextron": "^8.15.0",
2727
"react": "^18.2.0",
2828
"react-dom": "^18.2.0",
2929
"react-i18next": "^14.1.0"

0 commit comments

Comments
 (0)