Merge branch 'release/v7'

MikeDupree · Jul 24, 2021 · d0f13ab · d0f13ab
2 parents 743e96c + f43ff78
commit d0f13ab
Show file tree

Hide file tree

Showing 39 changed files with 206 additions and 2,188 deletions.
diff --git a/README.md b/README.md
@@ -18,6 +18,7 @@
 
 | nextron | next |
 | --- | --- |
+| `v7.x` | `v11.x` |
 | `v6.x` | `v10.x` |
 | `v5.x` | `v9.x` |
 | `v4.x` | `v8.x` |
@@ -127,9 +128,9 @@ module.exports = {
   rendererSrcDir: 'renderer',
 
   // main process' webpack config
-  webpack: (defaultConfig, env) => {
+  webpack: (config, env) => {
     // do some stuff here
-    return defaultConfig;
+    return config;
   },
 };
 ```

diff --git a/examples/custom-build-options/package.json b/examples/custom-build-options/package.json
@@ -22,8 +22,8 @@
   "devDependencies": {
     "electron": "^13.1.7",
     "electron-builder": "^22.11.7",
-    "next": "^10.2.3",
-    "nextron": "^6.1.0",
+    "next": "^11.0.1",
+    "nextron": "^7.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }

diff --git a/examples/custom-build-options/renderer/next.config.js b/examples/custom-build-options/renderer/next.config.js
@@ -1,5 +1,9 @@
 module.exports = {
-  webpack: (config) => Object.assign(config, {
-    target: 'electron-renderer',
-  }),
+  webpack: (config, { isServer }) => {
+    if (!isServer) {
+      config.target = 'electron-renderer';
+    }
+
+    return config;
+  },
 };
diff --git a/examples/custom-main-entry/package.json b/examples/custom-main-entry/package.json
@@ -17,8 +17,8 @@
   "devDependencies": {
     "electron": "^13.1.7",
     "electron-builder": "^22.11.7",
-    "next": "^10.2.3",
-    "nextron": "^6.1.0",
+    "next": "^11.0.1",
+    "nextron": "^7.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }

diff --git a/examples/custom-main-entry/renderer/next.config.js b/examples/custom-main-entry/renderer/next.config.js
@@ -1,5 +1,9 @@
 module.exports = {
-  webpack: (config) => Object.assign(config, {
-    target: 'electron-renderer',
-  }),
+  webpack: (config, { isServer }) => {
+    if (!isServer) {
+      config.target = 'electron-renderer';
+    }
+
+    return config;
+  },
 };
diff --git a/examples/custom-renderer-port/package.json b/examples/custom-renderer-port/package.json
@@ -17,8 +17,8 @@
   "devDependencies": {
     "electron": "^13.1.7",
     "electron-builder": "^22.11.7",
-    "next": "^10.2.3",
-    "nextron": "^6.1.0",
+    "next": "^11.0.1",
+    "nextron": "^7.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }

diff --git a/examples/custom-renderer-port/renderer/next.config.js b/examples/custom-renderer-port/renderer/next.config.js
@@ -1,5 +1,9 @@
 module.exports = {
-  webpack: (config) => Object.assign(config, {
-    target: 'electron-renderer',
-  }),
+  webpack: (config, { isServer }) => {
+    if (!isServer) {
+      config.target = 'electron-renderer';
+    }
+
+    return config;
+  },
 };
diff --git a/examples/ipc-communication/package.json b/examples/ipc-communication/package.json
@@ -17,8 +17,8 @@
   "devDependencies": {
     "electron": "^13.1.7",
     "electron-builder": "^22.11.7",
-    "next": "^10.2.3",
-    "nextron": "^6.1.0",
+    "next": "^11.0.1",
+    "nextron": "^7.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }

diff --git a/examples/ipc-communication/renderer/next.config.js b/examples/ipc-communication/renderer/next.config.js
@@ -1,5 +1,9 @@
 module.exports = {
-  webpack: (config) => Object.assign(config, {
-    target: 'electron-renderer',
-  }),
+  webpack: (config, { isServer }) => {
+    if (!isServer) {
+      config.target = 'electron-renderer';
+    }
+
+    return config;
+  },
 };
diff --git a/examples/store-data/package.json b/examples/store-data/package.json
@@ -17,8 +17,8 @@
   "devDependencies": {
     "electron": "^13.1.7",
     "electron-builder": "^22.11.7",
-    "next": "^10.2.3",
-    "nextron": "^6.1.0",
+    "next": "^11.0.1",
+    "nextron": "^7.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }

diff --git a/examples/store-data/renderer/next.config.js b/examples/store-data/renderer/next.config.js
@@ -1,5 +1,9 @@
 module.exports = {
-  webpack: (config) => Object.assign(config, {
-    target: 'electron-renderer',
-  }),
+  webpack: (config, { isServer }) => {
+    if (!isServer) {
+      config.target = 'electron-renderer';
+    }
+
+    return config;
+  },
 };
diff --git a/examples/with-javascript-ant-design/package.json b/examples/with-javascript-ant-design/package.json
@@ -15,18 +15,18 @@
     "electron-store": "^8.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.13.14",
+    "@babel/core": "^7.14.8",
     "@zeit/next-css": "^1.0.1",
-    "antd": "^4.15.0",
+    "antd": "^4.16.8",
     "babel-loader": "^8.2.2",
     "babel-plugin-import": "^1.13.3",
     "electron": "^13.1.7",
     "electron-builder": "^22.11.7",
-    "next": "^10.2.3",
-    "nextron": "^6.1.0",
+    "next": "^11.0.1",
+    "nextron": "^7.0.0",
     "null-loader": "^4.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "webpack": "4.44.1"
+    "webpack": "^4.46.0"
   }
 }
diff --git a/examples/with-javascript-ant-design/renderer/next.config.js b/examples/with-javascript-ant-design/renderer/next.config.js
@@ -1,14 +1,17 @@
 const withCss = require('@zeit/next-css');
 
 module.exports = withCss({
+  webpack5: false,
   webpack: (config, { isServer }) => {
-    config.target = 'electron-renderer';
+    if (!isServer) {
+      config.target = 'electron-renderer';
+    }
 
     if (isServer) {
       const antStyles = /antd\/.*?\/style\/css.*?/;
       const origExternals = [...config.externals];
-      config.externals = [
-        (context, request, callback) => {
+      config.externals = [ // eslint-disable-line
+        (context, request, callback) => { // eslint-disable-line
           if (request.match(antStyles)) return callback();
           if (typeof origExternals[0] === 'function') {
             origExternals[0](context, request, callback);

diff --git a/examples/with-javascript-ant-design/renderer/pages/_document.jsx b/examples/with-javascript-ant-design/renderer/pages/_document.jsx
@@ -6,7 +6,6 @@ export default class MyDocument extends Document {
       <Html>
         <Head>
           <meta charSet='utf-8' />
-          <title>Home - Nextron (with-typescript-ant-design)</title>
         </Head>
         <body>
           <Main />

diff --git a/examples/with-javascript-ant-design/renderer/pages/next.jsx b/examples/with-javascript-ant-design/renderer/pages/next.jsx
@@ -17,11 +17,13 @@ function Next() {
       <Head>
         <title>Next - Nextron (with-javascript-ant-design)</title>
       </Head>
+
       <Header>
         <Link href="/home">
           <a>Go to home page</a>
         </Link>
       </Header>
+
       <Content style={{ padding: 48 }}>
         <Result
           status="success"

diff --git a/examples/with-javascript-emotion/package.json b/examples/with-javascript-emotion/package.json
@@ -20,8 +20,8 @@
     "@emotion/styled": "^11.3.0",
     "electron": "^13.1.7",
     "electron-builder": "^22.11.7",
-    "next": "^10.2.3",
-    "nextron": "^6.1.0",
+    "next": "^11.0.1",
+    "nextron": "^7.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }

diff --git a/examples/with-javascript-emotion/renderer/next.config.js b/examples/with-javascript-emotion/renderer/next.config.js
@@ -1,5 +1,9 @@
 module.exports = {
-  webpack: (config) => Object.assign(config, {
-    target: 'electron-renderer',
-  }),
+  webpack: (config, { isServer }) => {
+    if (!isServer) {
+      config.target = 'electron-renderer';
+    }
+
+    return config;
+  },
 };
diff --git a/examples/with-javascript-material-ui/package.json b/examples/with-javascript-material-ui/package.json
@@ -18,8 +18,8 @@
     "@material-ui/core": "^4.12.2",
     "electron": "^13.1.7",
     "electron-builder": "^22.11.7",
-    "next": "^10.2.3",
-    "nextron": "^6.1.0",
+    "next": "^11.0.1",
+    "nextron": "^7.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }

diff --git a/examples/with-javascript-material-ui/renderer/next.config.js b/examples/with-javascript-material-ui/renderer/next.config.js
@@ -1,5 +1,9 @@
 module.exports = {
-  webpack: (config) => Object.assign(config, {
-    target: 'electron-renderer',
-  }),
+  webpack: (config, { isServer }) => {
+    if (!isServer) {
+      config.target = 'electron-renderer';
+    }
+
+    return config;
+  },
 };
diff --git a/examples/with-javascript-tailwindcss/package.json b/examples/with-javascript-tailwindcss/package.json
@@ -18,8 +18,8 @@
     "autoprefixer": "^10.3.1",
     "electron": "^13.1.7",
     "electron-builder": "^22.11.7",
-    "next": "^10.2.3",
-    "nextron": "^6.1.0",
+    "next": "^11.0.1",
+    "nextron": "^7.0.0",
     "postcss": "^8.3.6",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/examples/with-javascript-tailwindcss/renderer/next.config.js b/examples/with-javascript-tailwindcss/renderer/next.config.js
@@ -1,5 +1,9 @@
 module.exports = {
-  webpack: (config) => Object.assign(config, {
-    target: 'electron-renderer',
-  }),
+  webpack: (config, { isServer }) => {
+    if (!isServer) {
+      config.target = 'electron-renderer';
+    }
+
+    return config;
+  },
 };
diff --git a/examples/with-javascript/package.json b/examples/with-javascript/package.json
@@ -17,8 +17,8 @@
   "devDependencies": {
     "electron": "^13.1.7",
     "electron-builder": "^22.11.7",
-    "next": "^10.2.3",
-    "nextron": "^6.1.0",
+    "next": "^11.0.1",
+    "nextron": "^7.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }

diff --git a/examples/with-javascript/renderer/next.config.js b/examples/with-javascript/renderer/next.config.js
@@ -1,5 +1,9 @@
 module.exports = {
-  webpack: (config) => Object.assign(config, {
-    target: 'electron-renderer',
-  }),
+  webpack: (config, { isServer }) => {
+    if (!isServer) {
+      config.target = 'electron-renderer';
+    }
+
+    return config;
+  },
 };
diff --git a/examples/with-typescript-ant-design/package.json b/examples/with-typescript-ant-design/package.json
@@ -15,22 +15,21 @@
     "electron-store": "^8.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.13.14",
-    "@zeit/next-css": "^1.0.1",
+    "@babel/core": "^7.14.8",
     "@types/node": "^14.14.31",
     "@types/react": "^16.9.49",
-    "@babel/preset-typescript": "^7.13.0",
-    "antd": "^4.15.0",
+    "@zeit/next-css": "^1.0.1",
+    "antd": "^4.16.8",
     "babel-loader": "^8.2.2",
     "babel-plugin-import": "^1.13.3",
     "electron": "^13.1.7",
     "electron-builder": "^22.11.7",
-    "next": "^10.2.3",
-    "nextron": "^6.1.0",
+    "next": "^11.0.1",
+    "nextron": "^7.0.0",
     "null-loader": "^4.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "webpack": "4.44.1",
-    "typescript": "^4.3.5"
+    "typescript": "^4.3.5",
+    "webpack": "^4.46.0"
   }
 }
diff --git a/examples/with-typescript-ant-design/renderer/.babelrc b/examples/with-typescript-ant-design/renderer/.babelrc
@@ -1,7 +1,6 @@
 {
   "presets": [
-    "next/babel",
-    "@babel/preset-typescript"
+    "next/babel"
   ],
   "plugins": [
     [

diff --git a/examples/with-typescript-ant-design/renderer/next.config.js b/examples/with-typescript-ant-design/renderer/next.config.js
@@ -1,14 +1,17 @@
 const withCss = require('@zeit/next-css');
 
 module.exports = withCss({
+  webpack5: false,
   webpack: (config, { isServer }) => {
-    config.target = 'electron-renderer';
+    if (!isServer) {
+      config.target = 'electron-renderer';
+    }
 
     if (isServer) {
       const antStyles = /antd\/.*?\/style\/css.*?/;
       const origExternals = [...config.externals];
-      config.externals = [
-        (context, request, callback) => {
+      config.externals = [ // eslint-disable-line
+        (context, request, callback) => { // eslint-disable-line
           if (request.match(antStyles)) return callback();
           if (typeof origExternals[0] === 'function') {
             origExternals[0](context, request, callback);

diff --git a/examples/with-typescript-ant-design/renderer/pages/_document.tsx b/examples/with-typescript-ant-design/renderer/pages/_document.tsx
@@ -6,7 +6,6 @@ export default class MyDocument extends Document {
       <Html>
         <Head>
           <meta charSet='utf-8' />
-          <title>Home - Nextron (with-typescript-ant-design)</title>
         </Head>
         <body>
           <Main />

diff --git a/examples/with-typescript-ant-design/renderer/pages/home.tsx b/examples/with-typescript-ant-design/renderer/pages/home.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import Head from 'next/head';
 import Link from 'next/link';
 import {
   Layout,
@@ -21,6 +22,10 @@ const { Option } = Select;
 function Home() {
   return (
     <React.Fragment>
+      <Head>
+        <title>Home - Nextron (with-javascript-ant-design)</title>
+      </Head>
+
       <Header>
         <Link href="/next">
           <a>Go to next page</a>
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ export default class MyDocument extends Document { @@
           <Html>
             <Head>
               <meta charSet='utf-8' />
-              <title>Home - Nextron (with-typescript-ant-design)</title>
             </Head>
             <body>
               <Main />
@@ Expand Down @@