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: 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 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()