Skip to content

Commit

Permalink
Merge branch 'release/v9'
Browse files Browse the repository at this point in the history
  • Loading branch information
saltyshiomix committed Jun 16, 2024
2 parents 03b9dd2 + 0fad9be commit 6907722
Show file tree
Hide file tree
Showing 15 changed files with 49 additions and 15 deletions.
31 changes: 31 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,36 @@ Run `npm run build`, and nextron outputs packaged bundles under the `dist` folde
└── README.md
```

## `next.config.js`

```js
// in `./renderer/next.config.js`
module.exports = {
// we need to export static files so as Electron can handle them
output: 'export',

distDir:
process.env.NODE_ENV === 'production'
? // we want to change `distDir` to "../app" so as nextron can build the app in production mode!
'../app'
: // default `distDir` value
'.next',

// e.g. home.html => home/index.html
trailingSlash: true,

// we need to disable image optimization, because it is not compatible with `{ output: 'export' }`
images: {
unoptimized: true,
},

// webpack config for next.js
webpack: (config) => {
return config
},
}
```

## `nextron` or `nextron dev` Options

### `--renderer-port` (default: `8888`)
Expand Down Expand Up @@ -534,6 +564,7 @@ $ npm link nextron
- [andirsun (Anderson Laverde)](https://github.com/andirsun)
- [bm777 (Bayang)](https://github.com/bm777)
- [FranciscoJBrito (Francisco Brito)](https://github.com/FranciscoJBrito)
- [pixelass (Gregor Adams)](https://github.com/pixelass)

For more information, please see [Looking for maintainers ⚡ #244](https://github.com/saltyshiomix/nextron/discussions/244).

Expand Down
2 changes: 1 addition & 1 deletion examples/basic-lang-javascript-python/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"electron": "^31.0.1",
"electron-builder": "^24.13.3",
"next": "^14.2.4",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-lang-javascript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"electron": "^31.0.1",
"electron-builder": "^24.13.3",
"next": "^14.2.4",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-lang-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"electron": "^31.0.1",
"electron-builder": "^24.13.3",
"next": "^14.2.4",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-launch-app-from-url/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"electron": "^31.0.1",
"electron-builder": "^24.13.3",
"next": "^14.2.4",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-store-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"electron": "^31.0.1",
"electron-builder": "^24.13.3",
"next": "^14.2.4",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-build-options/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"electron": "^31.0.1",
"electron-builder": "^24.13.3",
"next": "^14.2.4",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-renderer-port/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"electron": "^31.0.1",
"electron-builder": "^24.13.3",
"next": "^14.2.4",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-ant-design/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"electron": "^31.0.1",
"electron-builder": "^24.13.3",
"next": "^14.2.4",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-chakra-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"electron-builder": "^24.13.3",
"framer-motion": "^11.0.28",
"next": "^14.2.4",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-emotion/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"electron": "^31.0.1",
"electron-builder": "^24.13.3",
"next": "^14.2.4",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-material-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"electron": "^31.0.1",
"electron-builder": "^24.13.3",
"next": "^14.2.4",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-next-i18next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"i18next": "^23.11.5",
"next": "^14.2.4",
"next-i18next": "^15.2.0",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-i18next": "^14.1.2"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"electron": "^31.0.1",
"electron-builder": "^24.13.3",
"next": "^14.2.4",
"nextron": "^9.0.0",
"nextron": "^9.1.0",
"postcss": "^8.4.38",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "nextron",
"version": "9.0.0",
"version": "9.1.0",
"description": "⚡ NEXT.js + Electron ⚡",
"repository": "[email protected]:saltyshiomix/nextron.git",
"repository": {
"type": "git",
"url": "https://github.com/saltyshiomix/nextron.git"
},
"author": {
"name": "Shiono Yoshihide",
"email": "[email protected]",
Expand Down

0 comments on commit 6907722

Please sign in to comment.