feat(command/dev): implement support for router.base setting

BREAKING CHANGE: change file-path logic in command/build

Author: mentAl-maZe

dist/classes/nuxtCommand.js

@@ -40,9 +40,9 @@ export class NuxtLaravelCommand extends NuxtCommand {
     // get Nuxt from cli imports
     const { Nuxt } = await imports.core()
 
-    // disable auto init
-    options._ready = false
+    // initialize the nuxt instance
     const nuxt = new Nuxt(options)
+    await nuxt.ready()
 
     // apply nuxt hooks if they have been provided
     if (typeof this.cmd._nuxtHooks === 'object') {
@@ -55,9 +55,6 @@ export class NuxtLaravelCommand extends NuxtCommand {
       }
     }
 
-    // initialize the nuxt instance
-    await nuxt.ready()
-
     return nuxt
   }
 

dist/subcommands/build.js

@@ -71,20 +71,29 @@ const config: NuxtLaravelCommandConfig = {
     },
     'file-path': {
       type: 'string',
-      default: process.env.NUXT_URL || 'storage/app/index.html',
+      default: process.env.NUXT_URL,
       description: 'Location for the SPA index file',
       prepare: (cmd, _, argv) => {
         // add hook to output index file
         cmd.cmd.addNuxtHook!('build:done', async ({ options, nuxt }) => {
+          // get html for single page app
           const { html } = await nuxt.server.renderRoute('/', {
             url: '/'
           })
 
+          let filePath = argv['file-path'] as string
+
+          // fallback to public path if file path option is not set
+          if (!filePath) {
+            filePath = path.join(
+              `${argv['public-path']}`,
+              options.router.base,
+              'index.html'
+            )
+          }
+
           // resolve the file path relative to configured rootDir
-          const destination = path.resolve(
-            options.rootDir,
-            `${argv['file-path']}`
-          )
+          const destination = path.resolve(options.rootDir, filePath)
 
           // create directory if it does not exist
           const dir = path.dirname(destination)
@@ -104,45 +113,33 @@ const config: NuxtLaravelCommandConfig = {
         if (argv['public-path']) {
           // add hook move built assets to public path
           cmd.cmd.addNuxtHook!('build:done', ({ options }) => {
-            // resolve public root for static assets
-            const publicRoot = path.resolve(
-              options.rootDir,
-              `${argv['public-path']}`
-            )
-
-            // resolve public path for compiled assets
-            let assetsPath = ''
-            if (options.router && options.router.base) {
-              assetsPath = options.router.base.replace(/^\/$/g, '') + '/'
-            }
-            assetsPath += options.build.publicPath.replace(/^\//, '')
-            const publicPath = path.resolve(
-              publicRoot,
-              assetsPath.replace(/^\//, '')
+            // resolve public path for assets
+            const publicPath = path.join(
+              path.resolve(options.rootDir, `${argv['public-path']}`),
+              options.router.base,
+              options.build.publicPath
             )
 
             // create directory if it does not exist
             if (!fs.existsSync(publicPath)) {
               fs.mkdirpSync(publicPath)
             }
 
-            // copy static assets to public root
+            // resolve static assets path
             const staticDir = path.resolve(
               options.rootDir,
               options.srcDir,
               options.dir.static
             )
+            // copy static assets to public path if folder exists
             if (fs.existsSync(staticDir)) {
-              fs.copySync(staticDir, publicRoot)
+              fs.copySync(staticDir, publicPath)
             }
 
-            // move compiled assets to public path
-            fs.moveSync(
+            // copy compiled assets to public path
+            fs.copySync(
               path.resolve(options.rootDir, options.buildDir, 'dist', 'client'),
-              publicPath,
-              {
-                overwrite: true
-              }
+              publicPath
             )
           })
         }

dist/subcommands/dev.js

@@ -137,8 +137,9 @@ const config: NuxtLaravelCommandConfig = {
     const options = await loadNuxtConfig(cmd.argv)
 
     // retrieve dev server URL
+    const basePrefix = (options.router && options.router.base) || '/'
     const nuxtUrl = new URL(
-      cmd.argv['render-path'] as string,
+      path.join(basePrefix, cmd.argv['render-path'] as string),
       `http://${options.server!.host}:${options.server!.port}`
     )
 

src/classes/nuxtCommand.ts

@@ -6,7 +6,9 @@ const config = jest.requireActual('@nuxt/config')
 export const setup = cli.setup
 export const commands = cli.commands
 export const NuxtCommand = cli.NuxtCommand
-export const loadNuxtConfig = cli.loadNuxtConfig
+export const loadNuxtConfig = jest
+  .fn()
+  .mockImplementation(argv => cli.loadNuxtConfig(argv))
 
 export const helpSpy = jest.fn()
 export const versionSpy = jest.fn()
@@ -21,6 +23,7 @@ NuxtCommand.prototype.getBuilder = jest.fn().mockReturnValue({
 NuxtCommand.prototype.getGenerator = jest.fn().mockReturnValue({
   generate: generateSpy
 })
+
 export const configSpy = jest.spyOn(NuxtCommand.prototype, 'getNuxtConfig')
 
 export const hookSpy = jest.fn()