Merge branch 'release/v8'

examples/basic-javascript/package.json

@@ -18,7 +18,7 @@
     "electron": "^26.2.2",
     "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.9.0",
+    "nextron": "^8.10.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/basic-typescript/package.json

@@ -20,7 +20,7 @@
     "electron": "^26.2.2",
     "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.9.0",
+    "nextron": "^8.10.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^4.9.4"

examples/custom-build-options/package.json

@@ -24,7 +24,7 @@
     "electron": "^26.2.2",
     "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.9.0",
+    "nextron": "^8.10.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/custom-main-entry/package.json

@@ -18,7 +18,7 @@
     "electron": "^26.2.2",
     "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.9.0",
+    "nextron": "^8.10.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/custom-renderer-port/package.json

@@ -18,7 +18,7 @@
     "electron": "^26.2.2",
     "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.9.0",
+    "nextron": "^8.10.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/ipc-communication/package.json

@@ -18,7 +18,7 @@
     "electron": "^26.2.2",
     "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.9.0",
+    "nextron": "^8.10.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/store-data/package.json

@@ -18,7 +18,7 @@
     "electron": "^26.2.2",
     "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.9.0",
+    "nextron": "^8.10.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/with-ant-design/package.json

@@ -22,7 +22,7 @@
     "electron": "^26.2.2",
     "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.9.0",
+    "nextron": "^8.10.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^4.9.4"

examples/with-chakra-ui/package.json

@@ -27,7 +27,7 @@
     "electron-builder": "^24.6.4",
     "framer-motion": "^6.5.1",
     "next": "^12.3.4",
-    "nextron": "^8.9.0",
+    "nextron": "^8.10.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^4.9.5"

examples/with-emotion/package.json

@@ -23,7 +23,7 @@
     "electron": "^26.2.2",
     "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.9.0",
+    "nextron": "^8.10.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^4.9.4"

examples/with-emotion/renderer/pages/next.tsx

@@ -18,7 +18,7 @@ function Next() {
             <a>Go to home page</a>
           </Link>
         </BasicCard>
-        <AnimatedCard animation={bounce}>Let's bounce.</AnimatedCard>
+        <AnimatedCard animation={bounce}>Let&apos;s bounce.</AnimatedCard>
       </div>
     </React.Fragment>
   )

examples/with-material-ui/package.json

@@ -25,7 +25,7 @@
     "electron": "^26.2.2",
     "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.9.0",
+    "nextron": "^8.10.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^4.9.4"

examples/with-tailwindcss/package.json

@@ -21,7 +21,7 @@
     "electron": "^26.2.2",
     "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.9.0",
+    "nextron": "^8.10.0",
     "postcss": "^8.4.30",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

lib/helpers/getNextronConfig.ts

@@ -0,0 +1,11 @@
+import fs from 'fs'
+import path from 'path'
+
+export const getNextronConfig = () => {
+  const nextronConfigPath = path.join(process.cwd(), 'nextron.config.js')
+  if (fs.existsSync(nextronConfigPath)) {
+    return require(nextronConfigPath)
+  } else {
+    return {}
+  }
+}

lib/webpack/webpack.config.ts → lib/helpers/getWebpackConfig/configureWebpack.ts

@@ -1,22 +1,12 @@
-import fs from 'fs'
 import path from 'path'
 import webpack from 'webpack'
+import { getBabelConfig } from './getBabelConfig'
 
 const cwd = process.cwd()
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const externals = require(path.join(cwd, 'package.json')).dependencies
 
-const getBabelrc = (): string | undefined => {
-  if (fs.existsSync(path.join(cwd, '.babelrc')))
-    return path.join(cwd, '.babelrc')
-  if (fs.existsSync(path.join(cwd, '.babelrc.js')))
-    return path.join(cwd, '.babelrc.js')
-  if (fs.existsSync(path.join(cwd, 'babel.config.js')))
-    return path.join(cwd, 'babel.config.js')
-  return path.join(__dirname, '../babel.js')
-}
-
-export const configure = (
+export const configureWebpack = (
   env: 'development' | 'production'
 ): webpack.Configuration => ({
   mode: env,
@@ -42,7 +32,7 @@ export const configure = (
           loader: require.resolve('babel-loader'),
           options: {
             cacheDirectory: true,
-            extends: getBabelrc(),
+            extends: getBabelConfig(),
           },
         },
         exclude: [/node_modules/, path.join(cwd, 'renderer')],

lib/helpers/getWebpackConfig/getBabelConfig.ts

@@ -0,0 +1,14 @@
+import fs from 'fs'
+import path from 'path'
+
+const cwd = process.cwd()
+
+export const getBabelConfig = (): string | undefined => {
+  if (fs.existsSync(path.join(cwd, '.babelrc')))
+    return path.join(cwd, '.babelrc')
+  if (fs.existsSync(path.join(cwd, '.babelrc.js')))
+    return path.join(cwd, '.babelrc.js')
+  if (fs.existsSync(path.join(cwd, 'babel.config.js')))
+    return path.join(cwd, 'babel.config.js')
+  return path.join(__dirname, '../babel.js')
+}

lib/webpack/helpers.ts → lib/helpers/getWebpackConfig/getWebpackConfig.ts

@@ -1,23 +1,15 @@
 import fs from 'fs'
 import path from 'path'
 import { merge } from 'webpack-merge'
-import { configure } from './webpack.config'
+import { configureWebpack } from './configureWebpack'
+import { getNextronConfig } from '../getNextronConfig'
 
 const cwd = process.cwd()
 const ext = fs.existsSync(path.join(cwd, 'tsconfig.json')) ? '.ts' : '.js'
 
-export const getNextronConfig = () => {
-  const nextronConfigPath = path.join(cwd, 'nextron.config.js')
-  if (fs.existsSync(nextronConfigPath)) {
-    return require(nextronConfigPath)
-  } else {
-    return {}
-  }
-}
-
 export const getWebpackConfig = (env: 'development' | 'production') => {
   const { mainSrcDir, webpack } = getNextronConfig()
-  const userConfig = merge(configure(env), {
+  const userConfig = merge(configureWebpack(env), {
     entry: {
       background: path.join(cwd, mainSrcDir || 'main', `background${ext}`),
     },

lib/helpers/getWebpackConfig/index.ts

@@ -0,0 +1 @@
+export * from './getWebpackConfig'

lib/helpers/index.ts

@@ -0,0 +1,3 @@
+export * from './getWebpackConfig'
+export * from './getNextronConfig'
+export * from './log'

lib/logger.ts → lib/helpers/log.ts

@@ -1,5 +1,5 @@
 import chalk from 'chalk'
 
-export default function log(text: string) {
+export const log = (text: string) => {
   console.log(chalk`{cyan [nextron]} ${text}`)
 }

lib/nextron-build.ts

@@ -3,8 +3,7 @@ import path from 'path'
 import arg from 'arg'
 import chalk from 'chalk'
 import execa from 'execa'
-import { getNextronConfig } from './webpack/helpers'
-import log from './logger'
+import { getNextronConfig, log } from './helpers'
 
 const args = arg({
   '--help': Boolean,

lib/nextron-dev.ts

@@ -1,9 +1,9 @@
-import { ChildProcess } from 'child_process'
 import arg from 'arg'
 import chalk from 'chalk'
 import execa from 'execa'
 import webpack from 'webpack'
-import { getNextronConfig, getWebpackConfig } from './webpack/helpers'
+import { getNextronConfig, getWebpackConfig } from './helpers'
+import type { ChildProcess } from 'child_process'
 
 const args = arg({
   '--help': Boolean,

lib/nextron.ts

@@ -3,7 +3,7 @@ import execa from 'execa'
 import chalk from 'chalk'
 
 const defaultCommand = 'dev'
-const commands = new Set(['init', 'build', defaultCommand])
+const commands = new Set(['build', defaultCommand])
 
 let cmd = process.argv[2]
 let args: string[] = []

lib/webpack/build.production.ts → lib/webpack.config.ts

@@ -7,7 +7,11 @@ compiler.run((err, stats) => {
   if (err) {
     console.error(err.stack || err)
   }
-  if (stats && stats.hasErrors()) {
-    console.error(stats.toString())
+  if (stats) {
+    if (stats.hasErrors()) {
+      console.error(stats.toString())
+    } else {
+      console.log(stats.toString())
+    }
   }
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextron",
-  "version": "8.9.0",
+  "version": "8.10.0",
   "description": "⚡ NEXT.js + Electron ⚡",
   "repository": "[email protected]:saltyshiomix/nextron.git",
   "author": "Shiono Yoshihide <[email protected]>",
@@ -39,20 +39,20 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@babel/core": "7.22.20",
+    "@babel/core": "7.23.0",
     "@babel/plugin-transform-class-properties": "7.22.5",
     "@babel/plugin-transform-object-rest-spread": "7.22.15",
-    "@babel/plugin-transform-optional-chaining": "7.22.15",
+    "@babel/plugin-transform-optional-chaining": "7.23.0",
     "@babel/plugin-transform-runtime": "7.22.15",
     "@babel/preset-env": "7.22.20",
-    "@babel/preset-typescript": "7.22.15",
-    "@babel/runtime": "7.22.15",
-    "@babel/runtime-corejs3": "7.22.15",
+    "@babel/preset-typescript": "7.23.0",
+    "@babel/runtime": "7.23.1",
+    "@babel/runtime-corejs3": "7.23.1",
     "arg": "5.0.2",
     "babel-loader": "9.1.3",
     "chalk": "4.1.2",
     "execa": "5.1.1",
-    "fs-extra": "11.1.0",
+    "fs-extra": "11.1.1",
     "webpack": "5.88.2",
     "webpack-merge": "5.9.0"
   },