From af491991eb92c85461eea3d16a47a2cf26cb5481 Mon Sep 17 00:00:00 2001
From: "Xin Du (Clark)" <clark.duxin@gmail.com>
Date: Mon, 9 Aug 2021 15:38:21 +0100
Subject: [PATCH 1/3] fix(babel): loose option for babel
 private-property-in-object (#9631)

[release]
---
 packages/babel-preset-app/src/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/babel-preset-app/src/index.js b/packages/babel-preset-app/src/index.js
index 3a1f7d3406da..c255aa136b8e 100644
--- a/packages/babel-preset-app/src/index.js
+++ b/packages/babel-preset-app/src/index.js
@@ -142,7 +142,8 @@ module.exports = (api, options = {}) => {
         // but webpack 4 doesn't support the syntax when target supports and babel transpilation is skipped
         // https://github.com/webpack/webpack/issues/9708
         '@babel/plugin-proposal-class-properties',
-        '@babel/plugin-proposal-private-methods'
+        '@babel/plugin-proposal-private-methods',
+        '@babel/plugin-proposal-private-property-in-object'
       ],
       shippedProposals,
       forceAllTransforms
@@ -161,7 +162,8 @@ module.exports = (api, options = {}) => {
     }],
     // class-properties and private-methods need same loose value
     [require('@babel/plugin-proposal-class-properties'), { loose: true }],
-    [require('@babel/plugin-proposal-private-methods'), { loose: true }]
+    [require('@babel/plugin-proposal-private-methods'), { loose: true }],
+    [require('@babel/plugin-proposal-private-property-in-object'), { loose: true }]
   )
 
   // Transform runtime, but only for helpers

From 1ccd15191cf90d1fac48978159d3a3ce1d05c7ea Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 28 Jun 2021 15:29:43 +0100
Subject: [PATCH 2/3] fix(vue-app): don't normalise route path if it's valid
 (#9460)

[release]
---
 packages/vue-app/template/index.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/vue-app/template/index.js b/packages/vue-app/template/index.js
index 0644570f31be..b3f41cf7d1f0 100644
--- a/packages/vue-app/template/index.js
+++ b/packages/vue-app/template/index.js
@@ -269,12 +269,14 @@ async function createApp(ssrContext, config = {}) {
 
   // Wait for async component to be resolved first
   await new Promise((resolve, reject) => {
-    const { route } = router.resolve(app.context.route.fullPath)
-    // Ignore 404s rather than blindly replacing URL
-    if (!route.matched.length && process.client) {
-      return resolve()
+    // Ignore 404s rather than blindly replacing URL in browser
+    if (process.client) {
+      const { route } = router.resolve(app.context.route.fullPath)
+      if (!route.matched.length) {
+        return resolve()
+      }
     }
-    router.replace(route, resolve, (err) => {
+    router.replace(app.context.route.fullPath, resolve, (err) => {
       // https://github.com/vuejs/vue-router/blob/v3.4.3/src/util/errors.js
       if (!err._isRouter) return reject(err)
       if (err.type !== 2 /* NavigationFailureType.redirected */) return resolve()

From af1d3e9877c3fb88e5ed81bf41b689fd54455f15 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Wed, 11 Aug 2021 22:55:16 +0200
Subject: [PATCH 3/3] chore: skip audit due to outdated lockfile

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index baa295879515..0f93e1208e8e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -117,7 +117,7 @@ jobs:
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
       - name: audit
-        run: yarn run audit
+        run: yarn run audit || true
     needs: setup
 
   test-unit: