fix(build): support nested pages, closes #786

Author: nklayman

__tests__/commands.spec.js

@@ -344,15 +344,17 @@ describe('electron:build', () => {
       await runCommand('electron:build', {
         pages: {
           index: stringConfig ? '' : { filename: 'index.html' },
-          subpage: stringConfig ? '' : { filename: 'subpage.html' }
+          subpage: stringConfig ? '' : { filename: 'subdir/subpage.html' }
         }
       })
       expect(fs.writeFileSync).toBeCalledWith(
         `dist_electron${path.sep}bundled${path.sep}legacy-assets-index.html.json`,
         '[]'
       )
       expect(fs.writeFileSync).toBeCalledWith(
-        `dist_electron${path.sep}bundled${path.sep}legacy-assets-subpage.html.json`,
+        `dist_electron${path.sep}bundled${path.sep}${
+          stringConfig ? '' : 'subdir' + path.sep
+        }legacy-assets-subpage.html.json`,
         '[]'
       )
     }
@@ -546,7 +548,7 @@ describe('electron:serve', () => {
     // Call exit callback because app should have quit
     await exitCb()
     // Flush promises, only required on node v10 for some reason
-    await (() => new Promise(resolve => setImmediate(resolve)))()
+    await (() => new Promise((resolve) => setImmediate(resolve)))()
     expect(mockExeca.removeListener.mock.calls[0][0]).toBe('exit')
 
     expect(execa).toHaveBeenCalledTimes(2)
@@ -629,7 +631,7 @@ describe('electron:serve', () => {
     // Call exit callback because app should have quit
     await exitCb()
     // Flush promises, only required on node v10 for some reason
-    await (() => new Promise(resolve => setImmediate(resolve)))()
+    await (() => new Promise((resolve) => setImmediate(resolve)))()
     expect(mockExeca.removeListener.mock.calls[0][0]).toBe('exit')
     // Electron was killed and listeners removed
     if (isWin) {
@@ -695,7 +697,7 @@ describe('electron:serve', () => {
     // Call exit callback because app should have quit
     await exitCb()
     // Flush promises, only required on node v10 for some reason
-    await (() => new Promise(resolve => setImmediate(resolve)))()
+    await (() => new Promise((resolve) => setImmediate(resolve)))()
     expect(mockExeca.removeListener.mock.calls[0][0]).toBe('exit')
     // Electron was killed and listeners removed
     if (isWin) {
@@ -721,7 +723,7 @@ describe('electron:serve', () => {
     // Call exit callback because app should have quit
     await exitCb()
     // Flush promises, only required on node v10 for some reason
-    await (() => new Promise(resolve => setImmediate(resolve)))()
+    await (() => new Promise((resolve) => setImmediate(resolve)))()
     expect(mockExeca.removeListener.mock.calls[0][0]).toBe('exit')
     // Electron was killed and listeners removed
     if (isWin) {

index.js

@@ -117,12 +117,18 @@ module.exports = (api, options) => {
         // Mock data from legacy build
         const pages = options.pages || { index: '' }
         Object.keys(pages).forEach((page) => {
-          if (pages[page].filename) {
-            // If page is configured as an object, use the filename (without .html)
-            page = pages[page].filename.replace(/\.html$/, '')
-          }
+          let pagePath
+          // Use the filename option and fallback to the key
+          pagePath = path.parse(pages[page].filename || page)
+          pagePath.name = `legacy-assets-${pagePath.name || page}`
+          pagePath.ext = '.html.json'
+          // Delete the base so that name/ext is used when formatting
+          delete pagePath.base
+          // Make sure parent dir exists
+          if (pagePath.dir)
+            fs.ensureDirSync(path.join(bundleOutputDir, pagePath.dir))
           fs.writeFileSync(
-            path.join(bundleOutputDir, `legacy-assets-${page}.html.json`),
+            path.join(bundleOutputDir, path.format(pagePath)),
             '[]'
           )
         })
@@ -222,7 +228,7 @@ module.exports = (api, options) => {
           buildApp()
         }
       }
-      function buildApp () {
+      function buildApp() {
         info('Building app with electron-builder:')
         // Build the app using electron builder
         builder
@@ -415,7 +421,7 @@ module.exports = (api, options) => {
           })
       }
 
-      async function launchElectron () {
+      async function launchElectron() {
         firstBundleCompleted = true
         // Don't exit process when electron is killed
         if (child) {
@@ -506,7 +512,7 @@ module.exports = (api, options) => {
         }
       }
 
-      function onChildExit () {
+      function onChildExit() {
         process.exit(0)
       }
     }
@@ -553,7 +559,7 @@ module.exports = (api, options) => {
   )
 }
 
-function bundleMain ({
+function bundleMain({
   mode,
   api,
   args,