fix(command/dev): move proxy path to respect router.base

mentAl-maZe · mentAl-maZe · commit 28441825d8fe · 2019-06-19T13:00:49.000+02:00
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/Coverage-91.23%25-brightgreen.svg) | ![Branches](https://img.shields.io/badge/Coverage-72.22%25-red.svg) | ![Functions](https://img.shields.io/badge/Coverage-86.67%25-yellow.svg) | ![Lines](https://img.shields.io/badge/Coverage-92.04%25-brightgreen.svg) |
+| ![Statements](https://img.shields.io/badge/Coverage-91.45%25-brightgreen.svg) | ![Branches](https://img.shields.io/badge/Coverage-71.93%25-red.svg) | ![Functions](https://img.shields.io/badge/Coverage-86.67%25-yellow.svg) | ![Lines](https://img.shields.io/badge/Coverage-92.24%25-brightgreen.svg) |
 
 This package allows to develop a nuxt SPA as frontend for a laravel backend.  
 The implementation is based on [laravel-nuxt-js](https://github.com/skyrpex/laravel-nuxt-js) by [skyrpex](https://github.com/skyrpex).
diff --git a/dist/subcommands/dev.js b/dist/subcommands/dev.js
diff --git a/src/subcommands/dev.ts b/src/subcommands/dev.ts
@@ -101,6 +101,10 @@ const config: NuxtLaravelCommandConfig = {
           )
         }
 
+        const renderRoot = (options.router && options.router.base) || ''
+        const proxyPath = path.join(renderRoot, '**/*')
+        const renderPath = path.join(renderRoot, `${argv['render-path']}`)
+
         const overrides: typeof options = {
           // use @nuxtjs/proxy module
           axios: {
@@ -109,7 +113,7 @@ const config: NuxtLaravelCommandConfig = {
           // proxy all calls except the render path to laravel
           proxy: [
             [
-              ['**/*', `!${argv['render-path']}`],
+              [proxyPath, `!${renderPath}`],
               {
                 target: `http://${options.server!.host}:${+options.server!
                   .port! + 1}`,

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,10 @@ const config: NuxtLaravelCommandConfig = {`
`101`	`101`	`)`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ const renderRoot = (options.router && options.router.base) \|\| ''`
	`105`	`+ const proxyPath = path.join(renderRoot, '*/')`
	`106`	+ const renderPath = path.join(renderRoot, `${argv['render-path']}`)
	`107`	`+`
`104`	`108`	`const overrides: typeof options = {`
`105`	`109`	`// use @nuxtjs/proxy module`
`106`	`110`	`axios: {`
`@@ -109,7 +113,7 @@ const config: NuxtLaravelCommandConfig = {`
`109`	`113`	`// proxy all calls except the render path to laravel`
`110`	`114`	`proxy: [`
`111`	`115`	`[`
`112`		- ['*/', `!${argv['render-path']}`],
	`116`	+ [proxyPath, `!${renderPath}`],
`113`	`117`	`{`
`114`	`118`	target: `http://${options.server!.host}:${+options.server!
`115`	`119`	.port! + 1}`,