Merge branch 'release/v8'

saltyshiomix · Sep 22, 2023 · f5fd6fa · f5fd6fa
2 parents 7b033e6 + bc12abc
commit f5fd6fa
Show file tree

Hide file tree

Showing 31 changed files with 531 additions and 634 deletions.
diff --git a/README.md b/README.md
@@ -161,65 +161,6 @@ We can extends the default babel config of main process by putting `.babelrc` in
 }
 ```
 
-## Tips
-
-### Next.js' Webpack Processes
-
-There are two webpack processes: server process and client one.
-
-If we want to use some libraries that don't support SSR, we should check if the current process is whether server or client:
-
-```jsx
-// pages/home.jsx
-
-import electron from 'electron'
-
-const Home = () => {
-  // we can't use `electron.ipcRenderer` directly!
-  const ipcRenderer = electron.ipcRenderer
-
-  // we should check it like this
-  const ipcRenderer = electron.ipcRenderer || false
-  if (ipcRenderer) {
-    // we can use `electron.ipcRenderer`
-    // because this scope is the client webpack process
-  }
-}
-
-export default Home
-```
-
-### The Basic of React Hooks :)
-
-As mentioned above, we should check if the webpack process is a client because the renderer process is a web client:
-
-```jsx
-// pages/home.jsx
-
-import electron from 'electron'
-import React from 'react'
-
-const Home = () => {
-  // In this scope, both of server and client processes are running
-  // So if the process is server, `window` object is undefined
-
-  React.useEffect(() => {
-    // componentDidMount() like
-
-    // In this scope, only the client process is running
-    window.alert('wow')
-
-    return () => {
-      // componentWillUnmount() like
-    }
-  }, [])
-
-  return <p>Hello Nextron</p>
-}
-
-export default Home
-```
-
 ## Examples
 
 See [examples](./examples) folder for more information.
@@ -439,7 +380,6 @@ $ npm link
 
 ```
 $ cd your-project
-$ npm install -D @babel/runtime-corejs3 # required for nextron
 $ npm link nextron
 ```
 

diff --git a/examples/_template/js/main/helpers/create-window.js b/examples/_template/js/main/helpers/create-window.js
@@ -66,9 +66,9 @@ export const createWindow = (windowName, options) => {
     ...state,
     ...options,
     webPreferences: {
-      nodeIntegration: true,
-      contextIsolation: false,
       ...options.webPreferences,
+      nodeIntegration: false,
+      contextIsolation: true,
     },
   })
 

diff --git a/examples/_template/ts/main/helpers/create-window.ts b/examples/_template/ts/main/helpers/create-window.ts
@@ -70,16 +70,15 @@ export const createWindow = (
 
   state = ensureVisibleOnSomeDisplay(restore())
 
-  const browserOptions: BrowserWindowConstructorOptions = {
+  const win = new BrowserWindow({
     ...state,
     ...options,
     webPreferences: {
-      nodeIntegration: true,
-      contextIsolation: false,
       ...options.webPreferences,
+      nodeIntegration: false,
+      contextIsolation: true,
     },
-  }
-  const win = new BrowserWindow(browserOptions)
+  })
 
   win.on('close', saveState)
 

diff --git a/examples/basic-javascript/package.json b/examples/basic-javascript/package.json
@@ -15,10 +15,10 @@
     "electron-store": "^8.1.0"
   },
   "devDependencies": {
-    "electron": "^21.3.3",
-    "electron-builder": "^23.6.0",
+    "electron": "^26.2.2",
+    "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.8.0",
+    "nextron": "^8.9.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/examples/basic-javascript/renderer/next.config.js b/examples/basic-javascript/renderer/next.config.js
@@ -1,13 +1,10 @@
+/** @type {import('next').NextConfig} */
 module.exports = {
   trailingSlash: true,
   images: {
     unoptimized: true,
   },
-  webpack: (config, { isServer }) => {
-    if (!isServer) {
-      config.target = 'electron-renderer'
-    }
-
+  webpack: (config) => {
     return config
   },
 }
diff --git a/examples/basic-typescript/package.json b/examples/basic-typescript/package.json
@@ -17,10 +17,10 @@
   "devDependencies": {
     "@types/node": "^18.11.18",
     "@types/react": "^18.0.26",
-    "electron": "^21.3.3",
-    "electron-builder": "^23.6.0",
+    "electron": "^26.2.2",
+    "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.8.0",
+    "nextron": "^8.9.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^4.9.4"

diff --git a/examples/basic-typescript/renderer/next.config.js b/examples/basic-typescript/renderer/next.config.js
@@ -1,13 +1,10 @@
+/** @type {import('next').NextConfig} */
 module.exports = {
   trailingSlash: true,
   images: {
     unoptimized: true,
   },
-  webpack: (config, { isServer }) => {
-    if (!isServer) {
-      config.target = 'electron-renderer'
-    }
-
+  webpack: (config) => {
     return config
   },
 }
diff --git a/examples/custom-build-options/package.json b/examples/custom-build-options/package.json
@@ -21,10 +21,10 @@
     "electron-store": "^8.1.0"
   },
   "devDependencies": {
-    "electron": "^21.3.3",
-    "electron-builder": "^23.6.0",
+    "electron": "^26.2.2",
+    "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.8.0",
+    "nextron": "^8.9.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/examples/custom-build-options/renderer/next.config.js b/examples/custom-build-options/renderer/next.config.js
@@ -1,13 +1,10 @@
+/** @type {import('next').NextConfig} */
 module.exports = {
   trailingSlash: true,
   images: {
     unoptimized: true,
   },
-  webpack: (config, { isServer }) => {
-    if (!isServer) {
-      config.target = 'electron-renderer'
-    }
-
+  webpack: (config) => {
     return config
   },
 }
diff --git a/examples/custom-main-entry/package.json b/examples/custom-main-entry/package.json
@@ -15,10 +15,10 @@
     "electron-store": "^8.1.0"
   },
   "devDependencies": {
-    "electron": "^21.3.3",
-    "electron-builder": "^23.6.0",
+    "electron": "^26.2.2",
+    "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.8.0",
+    "nextron": "^8.9.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/examples/custom-main-entry/renderer/next.config.js b/examples/custom-main-entry/renderer/next.config.js
@@ -1,13 +1,10 @@
+/** @type {import('next').NextConfig} */
 module.exports = {
   trailingSlash: true,
   images: {
     unoptimized: true,
   },
-  webpack: (config, { isServer }) => {
-    if (!isServer) {
-      config.target = 'electron-renderer'
-    }
-
+  webpack: (config) => {
     return config
   },
 }
diff --git a/examples/custom-renderer-port/package.json b/examples/custom-renderer-port/package.json
@@ -15,10 +15,10 @@
     "electron-store": "^8.1.0"
   },
   "devDependencies": {
-    "electron": "^21.3.3",
-    "electron-builder": "^23.6.0",
+    "electron": "^26.2.2",
+    "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.8.0",
+    "nextron": "^8.9.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/examples/custom-renderer-port/renderer/next.config.js b/examples/custom-renderer-port/renderer/next.config.js
@@ -1,13 +1,10 @@
+/** @type {import('next').NextConfig} */
 module.exports = {
   trailingSlash: true,
   images: {
     unoptimized: true,
   },
-  webpack: (config, { isServer }) => {
-    if (!isServer) {
-      config.target = 'electron-renderer'
-    }
-
+  webpack: (config) => {
     return config
   },
 }
diff --git a/examples/ipc-communication/package.json b/examples/ipc-communication/package.json
@@ -15,10 +15,10 @@
     "electron-store": "^8.1.0"
   },
   "devDependencies": {
-    "electron": "^21.3.3",
-    "electron-builder": "^23.6.0",
+    "electron": "^26.2.2",
+    "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.8.0",
+    "nextron": "^8.9.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/examples/ipc-communication/renderer/next.config.js b/examples/ipc-communication/renderer/next.config.js
@@ -1,13 +1,10 @@
+/** @type {import('next').NextConfig} */
 module.exports = {
   trailingSlash: true,
   images: {
     unoptimized: true,
   },
-  webpack: (config, { isServer }) => {
-    if (!isServer) {
-      config.target = 'electron-renderer';
-    }
-
-    return config;
+  webpack: (config) => {
+    return config
   },
-};
+}
diff --git a/examples/store-data/package.json b/examples/store-data/package.json
@@ -15,10 +15,10 @@
     "electron-store": "^8.1.0"
   },
   "devDependencies": {
-    "electron": "^21.3.3",
-    "electron-builder": "^23.6.0",
+    "electron": "^26.2.2",
+    "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.8.0",
+    "nextron": "^8.9.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/examples/store-data/renderer/next.config.js b/examples/store-data/renderer/next.config.js
@@ -1,13 +1,10 @@
+/** @type {import('next').NextConfig} */
 module.exports = {
   trailingSlash: true,
   images: {
     unoptimized: true,
   },
-  webpack: (config, { isServer }) => {
-    if (!isServer) {
-      config.target = 'electron-renderer'
-    }
-
+  webpack: (config) => {
     return config
   },
 }
diff --git a/examples/with-ant-design/package.json b/examples/with-ant-design/package.json
@@ -19,10 +19,10 @@
     "@types/node": "^18.11.18",
     "@types/react": "^18.0.26",
     "antd": "^4.22.8",
-    "electron": "^21.3.3",
-    "electron-builder": "^23.6.0",
+    "electron": "^26.2.2",
+    "electron-builder": "^24.6.4",
     "next": "^12.3.4",
-    "nextron": "^8.8.0",
+    "nextron": "^8.9.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^4.9.4"

diff --git a/examples/with-ant-design/renderer/next.config.js b/examples/with-ant-design/renderer/next.config.js
@@ -1,13 +1,10 @@
+/** @type {import('next').NextConfig} */
 module.exports = {
   trailingSlash: true,
   images: {
     unoptimized: true,
   },
-  webpack: (config, { isServer }) => {
-    if (!isServer) {
-      config.target = 'electron-renderer'
-    }
-
+  webpack: (config) => {
     return config
   },
 }
diff --git a/examples/with-chakra-ui/package.json b/examples/with-chakra-ui/package.json
@@ -23,11 +23,11 @@
     "@types/node": "^18.0.0",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "electron": "^21.3.3",
-    "electron-builder": "^23.6.0",
+    "electron": "^26.2.2",
+    "electron-builder": "^24.6.4",
     "framer-motion": "^6.5.1",
     "next": "^12.3.4",
-    "nextron": "^8.8.0",
+    "nextron": "^8.9.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^4.9.5"

diff --git a/examples/with-chakra-ui/renderer/next.config.js b/examples/with-chakra-ui/renderer/next.config.js
@@ -1,13 +1,10 @@
+/** @type {import('next').NextConfig} */
 module.exports = {
   trailingSlash: true,
   images: {
     unoptimized: true,
   },
-  webpack: (config, { isServer }) => {
-    if (!isServer) {
-      config.target = 'electron-renderer'
-    }
-
+  webpack: (config) => {
     return config
   },
 }