diff --git a/examples/layout-transitions/pages/users-2.vue b/examples/layout-transitions/pages/users-2.vue index bb03a64fdc..665ba8f15b 100644 --- a/examples/layout-transitions/pages/users-2.vue +++ b/examples/layout-transitions/pages/users-2.vue @@ -48,7 +48,7 @@ export default { watch: { async '$route.query.page' (page) { this.$nuxt.$loading.start() - const { data } = await axios.get(`https://reqres.in/api/users?page=${page}`) + const data = await fetch(`https://reqres.in/api/users?page=${page}`).then(res => res.json()) this.users = data.data this.transitionName = this.getTransitionName(page) this.page = +(page || 1) diff --git a/packages/generator/src/generator.js b/packages/generator/src/generator.js index 5f72dcb872..25b2087231 100644 --- a/packages/generator/src/generator.js +++ b/packages/generator/src/generator.js @@ -104,7 +104,13 @@ export default class Generator { if (this.options.router.mode === 'hash') { routes = ['/'] } else { - routes = flatRoutes(this.getAppRoutes()) + try { + routes = flatRoutes(this.getAppRoutes()) + } catch (err) { + // Case: where we use custom router.js + // https://github.com/nuxt-community/router-module/issues/83 + routes = ['/'] + } } routes = routes.filter(route => this.shouldGenerateRoute(route)) routes = this.decorateWithPayloads(routes, generateRoutes)