Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v2.15.8 #9661

Closed
wants to merge 3 commits into from
Closed

v2.15.8 #9661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af49199
fix(babel): loose option for babel private-property-in-object (#9631)
clarkdo Aug 9, 2021
1ccd151
fix(vue-app): don't normalise route path if it's valid (#9460)
danielroe Jun 28, 2021
af1d3e9
chore: skip audit due to outdated lockfile
pi0 Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 4 additions & 2 deletions packages/babel-preset-app/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 7 additions & 5 deletions packages/vue-app/template/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down