Fix source in electron build (#9802)

* copy only compiled files into electron build for with-electron-typescript

* updated npm deps for with-electron-typescript

* copy only compiled files into electron build for with-electron

* updated npm deps for with-electron

Co-authored-by: JJ Kasper <jj@jjsweb.site>

examples/with-electron-typescript/electron-src/electron-next.d.ts

@@ -1,8 +1,4 @@
 declare module 'electron-next' {
-  function adjustRenderer(directory: string): void
-
-  function devServer(dir: string, port?: number): void
-
   interface Directories {
     production: string
     development: string
@@ -11,5 +7,5 @@ declare module 'electron-next' {
   export default function(
     directories: Directories | string,
     port?: number
-  ): adjustRenderer | devServer
+  ): Promise<void>
 }

examples/with-electron-typescript/electron-src/index.ts

@@ -23,7 +23,7 @@ app.on('ready', async () => {
   const url = isDev
     ? 'http://localhost:8000/'
     : format({
-        pathname: join(__dirname, '../renderer/index.html'),
+        pathname: join(__dirname, '../renderer/out/index.html'),
         protocol: 'file:',
         slashes: true,
       })

examples/with-electron-typescript/package.json

@@ -4,36 +4,36 @@
   "version": "1.0.0",
   "main": "main/index.js",
   "scripts": {
+    "clean": "rimraf dist main renderer/out renderer/.next",
     "start": "electron .",
     "build-renderer": "next build renderer && next export renderer",
     "build-electron": "tsc -p electron-src",
     "build": "yarn build-renderer && yarn build-electron",
-    "dist": "npm run build && electron-builder --dir",
+    "pack-app": "yarn build && electron-builder --dir",
+    "dist": "yarn build && electron-builder",
     "type-check": "tsc"
   },
   "build": {
-    "asar": false,
-    "extraResources": [
-      {
-        "from": "renderer/out",
-        "to": "app/renderer"
-      }
+    "asar": true,
+    "files": [
+      "main",
+      "renderer/out"
     ]
   },
   "devDependencies": {
-    "@types/next": "8.0.6",
-    "@types/node": "^11.13.9",
-    "@types/react": "^16.8.15",
-    "@types/react-dom": "^16.0.11",
-    "electron": "^6.0.2",
+    "@types/node": "^12.12.21",
+    "@types/react": "^16.9.17",
+    "@types/react-dom": "^16.9.4",
+    "electron": "^7.1.7",
     "electron-builder": "^21.2.0",
     "next": "latest",
-    "typescript": "^3.5.3"
+    "rimraf": "^3.0.0",
+    "typescript": "^3.7.4"
   },
   "dependencies": {
-    "electron-is-dev": "^1.0.1",
+    "electron-is-dev": "^1.1.0",
     "electron-next": "^3.1.5",
-    "react": "^16.7.0",
-    "react-dom": "^16.7.0"
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0"
   }
 }

examples/with-electron/main/index.js

@@ -21,9 +21,9 @@ app.on('ready', async () => {
   })
 
   const url = isDev
-    ? 'http://localhost:8000/start'
+    ? 'http://localhost:8000'
     : format({
-        pathname: join(__dirname, '../renderer/start.html'),
+        pathname: join(__dirname, '../renderer/out/index.html'),
         protocol: 'file:',
         slashes: true,
       })

examples/with-electron/package.json

@@ -4,28 +4,28 @@
   "version": "1.0.0",
   "main": "main/index.js",
   "scripts": {
+    "clean": "rimraf dist renderer/.next renderer/out",
     "start": "electron .",
     "build": "next build renderer && next export renderer",
-    "dist": "npm run build && electron-builder --dir"
+    "pack-app": "npm run build && electron-builder --dir",
+    "dist": "npm run build && electron-builder"
   },
   "build": {
-    "asar": false,
-    "extraResources": [
-      {
-        "from": "renderer/out",
-        "to": "app/renderer"
-      }
+    "asar": true,
+    "files": [
+      "main",
+      "renderer/out"
     ]
   },
   "devDependencies": {
-    "electron": "^6.0.2",
+    "electron": "^7.1.7",
     "electron-builder": "^21.2.0",
     "next": "latest",
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4"
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0"
   },
   "dependencies": {
-    "electron-is-dev": "^1.0.1",
+    "electron-is-dev": "^1.1.0",
     "electron-next": "^3.1.5"
   }
 }

examples/with-electron/renderer/next.config.js

@@ -1,10 +0,0 @@
-module.exports = {
-  exportPathMap() {
-    // Let Next.js know where to find the entry page
-    // when it's exporting the static bundle for the use
-    // in the production version of your app
-    return {
-      '/start': { page: '/start' },
-    }
-  },
-}