@nuxt/vue-app - npm Package Compare versions

Comparing version 2.13.2 to 2.13.3

dist/vue-app.js

 /*!
- * @nuxt/vue-app v2.13.2 (c) 2016-2020
+ * @nuxt/vue-app v2.13.3 (c) 2016-2020
 
@@ -25,3 +25,3 @@ * - All the amazing contributors
 	"vue-template-compiler": "^2.6.11",
-	vuex: "^3.4.0"
+	vuex: "^3.5.1"
 };
@@ -28,0 +28,0 @@

package.json

 {
   "name": "@nuxt/vue-app",
-  "version": "2.13.2",
+  "version": "2.13.3",
   "repository": "nuxt/nuxt.js",
@@ -23,3 +23,3 @@ "license": "MIT",
     "vue-template-compiler": "^2.6.11",
-    "vuex": "^3.4.0"
+    "vuex": "^3.5.1"
   },
@@ -26,0 +26,0 @@ "publishConfig": {

template/client.js

@@ -63,3 +63,3 @@ import Vue from 'vue'
   const defaultErrorHandler = Vue.config.errorHandler
-  Vue.config.errorHandler = (err, vm, info, ...rest) => {
+  Vue.config.errorHandler = async (err, vm, info, ...rest) => {
     // Call other handler if exist
@@ -80,3 +80,15 @@ let handled = null
       if (nuxtApp && vm.$root[nuxtApp].error && info !== 'render function') {
-        vm.$root[nuxtApp].error(err)
+        const currentApp = vm.$root[nuxtApp]
+        <% if (features.layouts) { %>
+        // Load error layout
+        let layout = (NuxtError.options || NuxtError).layout
+        if (typeof layout === 'function') {
+          layout = layout(currentApp.context)
+        }
+        if (layout) {
+          await currentApp.loadLayout(layout).catch(() => {})
+        }
+        currentApp.setLayout(layout)
+        <% } %>
+        currentApp.error(err)
       }
@@ -279,4 +291,6 @@ }
   // Handle first render on SPA mode
+  let spaFallback = false
   if (to === from) {
     _lastPaths = []
+    spaFallback = true
   } else {
@@ -494,3 +508,3 @@ const fromMatches = []
 
-          if (this.isPreview) {
+          if (this.isPreview || spaFallback) {
             promise = promisify(Component.options.asyncData, app.context)
@@ -529,3 +543,3 @@ } else {
         <% if (isFullStatic) { %>
-        if (!this.isPreview) {
+        if (!this.isPreview && !spaFallback) {
           // Catching the error here for letting the SPA fallback and normal fetch behaviour
@@ -532,0 +546,0 @@ promises.push(this.fetchPayload(to.path).catch(err => null))

template/index.js

@@ -192,3 +192,3 @@ import Vue from 'vue'
     Vue.use(() => {
-      if (!Object.prototype.hasOwnProperty.call(Vue, key)) {
+      if (!Object.prototype.hasOwnProperty.call(Vue.prototype, key)) {
         Object.defineProperty(Vue.prototype, key, {
@@ -195,0 +195,0 @@ get () {

template/utils.js

@@ -285,3 +285,4 @@ import Vue from 'vue'
   }
-  if (base && path.indexOf(base) === 0) {
+  // To get matched with sanitized router.base add trailing slash
+  if (base && (path.endsWith('/') ? path : path + '/').startsWith(base)) {
     path = path.slice(base.length)
@@ -288,0 +289,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

155640

increased by0.39%

Lines of code

3288

increased by0.46%

Dependency changes

• Updatedvuex@^3.5.1