Merge branch 'release/v8'

saltyshiomix · Jun 16, 2024 · ebb89d4 · ebb89d4
2 parents b5646bb + ce416d2
commit ebb89d4
Show file tree

Hide file tree

Showing 29 changed files with 81 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -22,16 +22,16 @@
 
 ### 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`            |
+| next              | nextron         |
+| ----------------- | --------------- |
+| `v14.x`           | `v8.x`          |
+| `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
 

diff --git a/examples/basic-lang-javascript-python/package.json b/examples/basic-lang-javascript-python/package.json
@@ -18,7 +18,7 @@
     "electron": "^29.3.0",
     "electron-builder": "^24.13.3",
     "next": "^13.5.6",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/examples/basic-lang-javascript-python/renderer/next.config.js b/examples/basic-lang-javascript-python/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/examples/basic-lang-javascript/package.json b/examples/basic-lang-javascript/package.json
@@ -18,7 +18,7 @@
     "electron": "^29.3.0",
     "electron-builder": "^24.13.3",
     "next": "^13.5.6",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/examples/basic-lang-javascript/renderer/next.config.js b/examples/basic-lang-javascript/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/examples/basic-lang-typescript/package.json b/examples/basic-lang-typescript/package.json
@@ -20,7 +20,7 @@
     "electron": "^29.3.0",
     "electron-builder": "^24.13.3",
     "next": "^13.5.6",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.4.5"

diff --git a/examples/basic-lang-typescript/renderer/next.config.js b/examples/basic-lang-typescript/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/examples/basic-launch-app-from-url/package.json b/examples/basic-launch-app-from-url/package.json
@@ -20,7 +20,7 @@
     "electron": "^29.3.0",
     "electron-builder": "^24.13.3",
     "next": "^13.5.6",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.4.5"

diff --git a/examples/basic-launch-app-from-url/renderer/next.config.js b/examples/basic-launch-app-from-url/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/examples/basic-store-data/package.json b/examples/basic-store-data/package.json
@@ -20,7 +20,7 @@
     "electron": "^29.3.0",
     "electron-builder": "^24.13.3",
     "next": "^13.5.6",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.4.5"

diff --git a/examples/basic-store-data/renderer/next.config.js b/examples/basic-store-data/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/examples/custom-build-options/package.json b/examples/custom-build-options/package.json
@@ -25,7 +25,7 @@
     "electron": "^29.3.0",
     "electron-builder": "^24.13.3",
     "next": "^13.5.6",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.4.5"

diff --git a/examples/custom-build-options/renderer/next.config.js b/examples/custom-build-options/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/examples/custom-renderer-port/package.json b/examples/custom-renderer-port/package.json
@@ -20,7 +20,7 @@
     "electron": "^29.3.0",
     "electron-builder": "^24.13.3",
     "next": "^13.5.6",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.4.5"

diff --git a/examples/custom-renderer-port/renderer/next.config.js b/examples/custom-renderer-port/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/examples/with-ant-design/package.json b/examples/with-ant-design/package.json
@@ -22,7 +22,7 @@
     "electron": "^29.3.0",
     "electron-builder": "^24.13.3",
     "next": "^13.5.6",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.4.5"

diff --git a/examples/with-ant-design/renderer/next.config.js b/examples/with-ant-design/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/examples/with-chakra-ui/package.json b/examples/with-chakra-ui/package.json
@@ -26,7 +26,7 @@
     "electron-builder": "^24.13.3",
     "framer-motion": "^11.0.28",
     "next": "^13.5.6",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.4.5"

diff --git a/examples/with-chakra-ui/renderer/next.config.js b/examples/with-chakra-ui/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/examples/with-emotion/package.json b/examples/with-emotion/package.json
@@ -23,7 +23,7 @@
     "electron": "^29.3.0",
     "electron-builder": "^24.13.3",
     "next": "^13.5.6",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.4.5"

diff --git a/examples/with-emotion/renderer/next.config.js b/examples/with-emotion/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/examples/with-material-ui/package.json b/examples/with-material-ui/package.json
@@ -27,7 +27,7 @@
     "electron": "^29.3.0",
     "electron-builder": "^24.13.3",
     "next": "^13.5.6",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.4.5"

diff --git a/examples/with-material-ui/renderer/next.config.js b/examples/with-material-ui/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/examples/with-next-i18next/package.json b/examples/with-next-i18next/package.json
@@ -23,7 +23,7 @@
     "i18next": "^23.11.1",
     "next": "^13.5.6",
     "next-i18next": "^15.2.0",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-i18next": "^14.1.0"

diff --git a/examples/with-next-i18next/renderer/next.config.js b/examples/with-next-i18next/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -21,7 +21,7 @@
     "electron": "^29.3.0",
     "electron-builder": "^24.13.3",
     "next": "^13.5.6",
-    "nextron": "^8.17.0",
+    "nextron": "^8.23.0",
     "postcss": "^8.4.38",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/examples/with-tailwindcss/renderer/next.config.js b/examples/with-tailwindcss/renderer/next.config.js
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
+  output: 'export',
+  distDir: '../app',
   trailingSlash: true,
   images: {
     unoptimized: true,

diff --git a/lib/configs/useExportCommand.ts b/lib/configs/useExportCommand.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+
 import fs from 'fs-extra'
 import path from 'path'
 import { getNextronConfig } from './getNextronConfig'
@@ -6,31 +8,30 @@ import * as logger from '../logger'
 const cwd = process.cwd()
 const pkgPath = path.join(cwd, 'package.json')
 const nextConfigPath = path.join(
+  cwd,
   getNextronConfig().rendererSrcDir || 'renderer',
   'next.config.js'
 )
 
 export const useExportCommand = async (): Promise<boolean> => {
   const { dependencies, devDependencies } = await fs.readJSON(pkgPath)
 
-  let nextronVersion: string
-  nextronVersion = dependencies.nextron
-  if (nextronVersion) {
+  let nextVersion: string
+  nextVersion = dependencies.next
+  if (nextVersion) {
     logger.info(
-      'To reduce the bundle size of the electron app, we recommend placing nextron in devDependencies instead of dependencies.'
+      'To reduce the bundle size of the electron app, we recommend placing next and nextron in devDependencies instead of dependencies.'
     )
   }
-  if (!nextronVersion) {
-    nextronVersion = devDependencies.nextron
-    if (!nextronVersion) {
-      logger.error(
-        'Nextron not found in both dependencies and devDependencies.'
-      )
+  if (!nextVersion) {
+    nextVersion = devDependencies.next
+    if (!nextVersion) {
+      logger.error('Next not found in both dependencies and devDependencies.')
       process.exit(1)
     }
   }
 
-  const majorVersion = ~~nextronVersion
+  const majorVersion = ~~nextVersion
     .split('.')
     .filter((v) => v.trim() !== '')[0]
     .replace('^', '')
@@ -39,17 +40,32 @@ export const useExportCommand = async (): Promise<boolean> => {
     return true
   }
   if (majorVersion === 13) {
-    const { output } = await fs.readJSON(nextConfigPath)
-    return output !== 'export'
+    const { output, distDir } = require(nextConfigPath)
+    if (output === 'export') {
+      if (distDir !== '../app') {
+        logger.error(
+          'Nextron export the build results to "app" directory, so please set "distDir" to "../app" in next.config.js.'
+        )
+        process.exit(1)
+      }
+      return false
+    }
+    return true
   }
-  if (majorVersion > 13 || majorVersion === 0) {
-    const { output } = await fs.readJSON(nextConfigPath)
+  if (majorVersion > 13) {
+    const { output, distDir } = require(nextConfigPath)
     if (output !== 'export') {
       logger.error(
         'We must export static files so as Electron can handle them. Please set next.config.js#output to "export".'
       )
       process.exit(1)
     }
+    if (distDir !== '../app') {
+      logger.error(
+        'Nextron exports the build results to "app" directory, so please set "distDir" to "../app" in next.config.js.'
+      )
+      process.exit(1)
+    }
     return false
   }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nextron",
-  "version": "8.17.0",
+  "version": "8.23.0",
   "description": "⚡ NEXT.js + Electron ⚡",
   "repository": "[email protected]:saltyshiomix/nextron.git",
   "author": {