Skip to content

Commit

Permalink
Merge branch 'release/v8'
Browse files Browse the repository at this point in the history
  • Loading branch information
saltyshiomix committed Jun 16, 2024
2 parents ca08ec9 + b6bd219 commit b5646bb
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 15 deletions.
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": "^29.3.0",
"electron-builder": "^24.13.3",
"next": "^13.5.6",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
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": "^29.3.0",
"electron-builder": "^24.13.3",
"next": "^13.5.6",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
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": "^29.3.0",
"electron-builder": "^24.13.3",
"next": "^13.5.6",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"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": "^29.3.0",
"electron-builder": "^24.13.3",
"next": "^13.5.6",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"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": "^29.3.0",
"electron-builder": "^24.13.3",
"next": "^13.5.6",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"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": "^29.3.0",
"electron-builder": "^24.13.3",
"next": "^13.5.6",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"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": "^29.3.0",
"electron-builder": "^24.13.3",
"next": "^13.5.6",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"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": "^29.3.0",
"electron-builder": "^24.13.3",
"next": "^13.5.6",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"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": "^13.5.6",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"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": "^29.3.0",
"electron-builder": "^24.13.3",
"next": "^13.5.6",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"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": "^29.3.0",
"electron-builder": "^24.13.3",
"next": "^13.5.6",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"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.1",
"next": "^13.5.6",
"next-i18next": "^15.2.0",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-i18next": "^14.1.0"
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": "^29.3.0",
"electron-builder": "^24.13.3",
"next": "^13.5.6",
"nextron": "^8.16.0",
"nextron": "^8.17.0",
"postcss": "^8.4.38",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
4 changes: 3 additions & 1 deletion lib/configs/useExportCommand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,16 @@ export const useExportCommand = async (): Promise<boolean> => {
const majorVersion = ~~nextronVersion
.split('.')
.filter((v) => v.trim() !== '')[0]
.replace('^', '')
.replace('~', '')
if (majorVersion < 13) {
return true
}
if (majorVersion === 13) {
const { output } = await fs.readJSON(nextConfigPath)
return output !== 'export'
}
if (majorVersion > 13) {
if (majorVersion > 13 || majorVersion === 0) {
const { output } = await fs.readJSON(nextConfigPath)
if (output !== 'export') {
logger.error(
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nextron",
"version": "8.16.0",
"version": "8.17.0",
"description": "⚡ NEXT.js + Electron ⚡",
"repository": "[email protected]:saltyshiomix/nextron.git",
"author": {
Expand Down

0 comments on commit b5646bb

Please sign in to comment.