fix(generator/background): inconsistant variable names

Author: nklayman

__tests__/checkLogs.helper.js

@@ -86,17 +86,13 @@ module.exports = async ({ client, projectPath, projectName, mode }) => {
   })
 
   await client.getMainProcessLogs().then(logs => {
-    logs.forEach(log => {
-      //   Make sure there are no fatal errors
-      expect(log.level).not.toBe('SEVERE')
-    })
     let appStatic = logs
       //   Find __static log
       .find(m => m.indexOf('__static=') !== -1)
       // Get just the value
       .split('=')[1]
     // Remove any quotes
-    appStatic = appStatic.replace('"', '')
+    appStatic = appStatic.replace('"', '').split(',')[0]
     //   __static should point to public folder or packaged asar
     expect(path.normalize(appStatic)).toBe(
       isBuild ? outputPath : projectPath('public')
@@ -110,7 +106,7 @@ module.exports = async ({ client, projectPath, projectName, mode }) => {
     // Parse modulePaths array
     modulePaths = modulePaths.split(',')
     // Normalize paths
-    modulePaths = modulePaths.map(p => path.normalize(p))
+    modulePaths = modulePaths.map(p => path.normalize(p.replace('"', '')))
     // module.paths should include path to project's node_modules unless in build
     if (isBuild) {
       expect(modulePaths).not.toContain(
@@ -128,7 +124,7 @@ module.exports = async ({ client, projectPath, projectName, mode }) => {
       // Get just the value
       .split('=')[1]
     // Remove any quotes
-    mockExternalPath = mockExternalPath.replace('"', '')
+    mockExternalPath = mockExternalPath.replace('"', '').split(',')[0]
     // mockExternal should be externalized (can't check in build because of NamedModulePlugin)
     if (!isBuild) {
       expect(mockExternalPath).toBe('mockExternal')

generator/template/src/background.js

@@ -1,8 +1,6 @@
 'use strict'
 
 import { app, protocol, BrowserWindow } from 'electron'
-import * as path from 'path'
-import { format as formatUrl } from 'url'
 import {
   createProtocol,
   installVueDevtools
@@ -13,64 +11,55 @@ if (isDevelopment) {
   require('module').globalPaths.push(process.env.NODE_MODULES_PATH)
 }
 
-// global reference to mainWindow (necessary to prevent window from being garbage collected)
-let mainWindow
+// Keep a global reference of the window object, if you don't, the window will
+// be closed automatically when the JavaScript object is garbage collected.
+let win
 
 // Standard scheme must be registered before the app is ready
 protocol.registerStandardSchemes(['app'], { secure: true })
-function createMainWindow () {
-  const window = new BrowserWindow()
+function createWindow () {
+  // Create the browser window.
+  win = new BrowserWindow({ width: 800, height: 600 })
 
   if (isDevelopment) {
     // Load the url of the dev server if in development mode
-    window.loadURL(process.env.WEBPACK_DEV_SERVER_URL)
-    if (!process.env.IS_TEST) window.webContents.openDevTools()
+    win.loadURL(process.env.WEBPACK_DEV_SERVER_URL)
+    if (!process.env.IS_TEST) win.webContents.openDevTools()
   } else {
     createProtocol('app')
-    //   Load the index.html when not in development
-    window.loadURL(
-      formatUrl({
-        pathname: path.join(__dirname, 'index.html'),
-        protocol: 'file',
-        slashes: true
-      })
-    )
+    // Load the index.html when not in development
+    win.loadFile('index.html')
   }
 
-  window.on('closed', () => {
-    mainWindow = null
+  win.on('closed', () => {
+    win = null
   })
-
-  window.webContents.on('devtools-opened', () => {
-    window.focus()
-    setImmediate(() => {
-      window.focus()
-    })
-  })
-
-  return window
 }
 
-// quit application when all windows are closed
+// Quit when all windows are closed.
 app.on('window-all-closed', () => {
-  // on macOS it is common for applications to stay open until the user explicitly quits
+  // On macOS it is common for applications and their menu bar
+  // to stay active until the user quits explicitly with Cmd + Q
   if (process.platform !== 'darwin') {
     app.quit()
   }
 })
 
 app.on('activate', () => {
-  // on macOS it is common to re-create a window even after all windows have been closed
-  if (mainWindow === null) {
-    mainWindow = createMainWindow()
+  // On macOS it's common to re-create a window in the app when the
+  // dock icon is clicked and there are no other windows open.
+  if (win === null) {
+    createWindow()
   }
 })
 
-// create main BrowserWindow when electron is ready
+// This method will be called when Electron has finished
+// initialization and is ready to create browser windows.
+// Some APIs can only be used after this event occurs.
 app.on('ready', async () => {
   if (isDevelopment && !process.env.IS_TEST) {
     // Install Vue Devtools
     await installVueDevtools()
   }
-  mainWindow = createMainWindow()
+  createWindow()
 })