From bd2fa26bc7d3be96d65683c89b8346f52433943e Mon Sep 17 00:00:00 2001 From: Harlan Wilton Date: Sat, 15 Oct 2022 09:01:30 +1100 Subject: [PATCH 1/4] fix(nuxt): ensure dom updates are paused before unpausing --- packages/nuxt/src/head/runtime/lib/vueuse-head.plugin.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/head/runtime/lib/vueuse-head.plugin.ts b/packages/nuxt/src/head/runtime/lib/vueuse-head.plugin.ts index c055d3ef62b..1b2c412ffc2 100644 --- a/packages/nuxt/src/head/runtime/lib/vueuse-head.plugin.ts +++ b/packages/nuxt/src/head/runtime/lib/vueuse-head.plugin.ts @@ -27,8 +27,11 @@ export default defineNuxtPlugin((nuxtApp) => { }) // watch for new route before unpausing dom updates (triggered after suspense resolved) useRouter().afterEach(() => { - pauseDOMUpdates = false - head.updateDOM() + // only if we have paused (clicking on a link to the current route triggers this) + if (pauseDOMUpdates) { + pauseDOMUpdates = false + head.updateDOM() + } }) }) } From f1281437f1ba7c77732c355fce22620fcc2208e8 Mon Sep 17 00:00:00 2001 From: Harlan Wilton Date: Sat, 15 Oct 2022 10:09:31 +1100 Subject: [PATCH 2/4] chore: bump @vueuse/head --- packages/nuxt/package.json | 2 +- packages/schema/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index b2daa818662..6ce4d0e67f7 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -44,7 +44,7 @@ "@nuxt/vite-builder": "3.0.0-rc.11", "@vue/reactivity": "^3.2.40", "@vue/shared": "^3.2.40", - "@vueuse/head": "~1.0.0-rc.7", + "@vueuse/head": "~1.0.0-rc.9", "chokidar": "^3.5.3", "cookie-es": "^0.5.0", "defu": "^6.1.0", diff --git a/packages/schema/package.json b/packages/schema/package.json index 23dcac64ba1..858b5b74ebb 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -17,7 +17,7 @@ "@types/lodash.template": "^4", "@types/semver": "^7", "@vitejs/plugin-vue": "^3.1.2", - "@vueuse/head": "~1.0.0-rc.7", + "@vueuse/head": "~1.0.0-rc.9", "unbuild": "latest", "vite": "~3.1.8" }, From eccc246a4d7a74d40d0674472b3bb9b8e193db9e Mon Sep 17 00:00:00 2001 From: Harlan Wilton Date: Sat, 15 Oct 2022 10:09:46 +1100 Subject: [PATCH 3/4] chore: bump @vueuse/head --- yarn.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/yarn.lock b/yarn.lock index c03e61cfdd9..23c580d823c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1835,7 +1835,7 @@ __metadata: "@types/lodash.template": ^4 "@types/semver": ^7 "@vitejs/plugin-vue": ^3.1.2 - "@vueuse/head": ~1.0.0-rc.7 + "@vueuse/head": ~1.0.0-rc.9 c12: ^0.2.13 create-require: ^1.1.1 defu: ^6.1.0 @@ -3534,16 +3534,16 @@ __metadata: languageName: node linkType: hard -"@vueuse/head@npm:~1.0.0-rc.7": - version: 1.0.0-rc.7 - resolution: "@vueuse/head@npm:1.0.0-rc.7" +"@vueuse/head@npm:~1.0.0-rc.9": + version: 1.0.0-rc.9 + resolution: "@vueuse/head@npm:1.0.0-rc.9" dependencies: "@vueuse/shared": ^9.3.0 - "@zhead/schema": ^0.9.5 - "@zhead/schema-vue": ^0.9.5 + "@zhead/schema": ^0.9.7 + "@zhead/schema-vue": ^0.9.7 peerDependencies: vue: ">=2.7 || >=3" - checksum: cfb3b0edc92b97a93e0cd0af6ea082b1c44b41462fb231996be821f698396234804586baa29ad056add4de1e115bb4fb031ac62436f59182b2f3eaae432d70ea + checksum: d27a5c2b4f42092c9a0e3891410c7228686c297b65855f09821caccbfea301c2470756a8eb256980f08c953acb25c0511cba20f14ccf5d94eacf5aafb1ed5643 languageName: node linkType: hard @@ -3812,22 +3812,22 @@ __metadata: languageName: node linkType: hard -"@zhead/schema-vue@npm:^0.9.5": - version: 0.9.5 - resolution: "@zhead/schema-vue@npm:0.9.5" +"@zhead/schema-vue@npm:^0.9.7": + version: 0.9.7 + resolution: "@zhead/schema-vue@npm:0.9.7" dependencies: "@vueuse/shared": ^9.2.0 - "@zhead/schema": 0.9.5 + "@zhead/schema": 0.9.7 peerDependencies: vue: ">=2.7 || >=3" - checksum: dda369075fa47cbfed41cdb414a39002b61231ed7d2098547edd1cf70b287523b10fdbc7351acc338c31d2885e2b8ab5b6c8fd1f4b70b9a591ac457afafe6a3b + checksum: 743416d642ec2ccc0f2a446c4749f0bbc83f47711e78d425d0990cae403e57dcad4c5f2b820517bc8fca01855e77c0a0743354e35fd957298a2a26036aeca013 languageName: node linkType: hard -"@zhead/schema@npm:0.9.5, @zhead/schema@npm:^0.9.5": - version: 0.9.5 - resolution: "@zhead/schema@npm:0.9.5" - checksum: 88577289337b5f7b3e38d80c004f0733cdb44d0be2fc73bf13de8325dca701d5eeec53fffa176a19f56ad7d8c04c81c3e734bb650752bef91a0d72d0a61e8f5d +"@zhead/schema@npm:0.9.7, @zhead/schema@npm:^0.9.7": + version: 0.9.7 + resolution: "@zhead/schema@npm:0.9.7" + checksum: e3778c920044c0bb8d14b68cb1b0bb1216e7336842ae406d333002a5d42eba6869f1a83979d73ae81cb10f93bb99bb545d54a49806d2d812356d76474a14e0e7 languageName: node linkType: hard @@ -11019,7 +11019,7 @@ __metadata: "@types/hash-sum": ^1.0.0 "@vue/reactivity": ^3.2.40 "@vue/shared": ^3.2.40 - "@vueuse/head": ~1.0.0-rc.7 + "@vueuse/head": ~1.0.0-rc.9 chokidar: ^3.5.3 cookie-es: ^0.5.0 defu: ^6.1.0 From 60206103db596c9a5ce44ad9422050634b193758 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Sat, 15 Oct 2022 18:57:24 +0200 Subject: [PATCH 4/4] update package.json --- packages/nuxt/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index bdb3407220f..be76893e8d8 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -42,9 +42,9 @@ "@nuxt/telemetry": "^2.1.6", "@nuxt/ui-templates": "^0.4.0", "@nuxt/vite-builder": "3.0.0-rc.11", - "@vueuse/head": "~1.0.0-rc.9", "@vue/reactivity": "^3.2.41", "@vue/shared": "^3.2.41", + "@vueuse/head": "~1.0.0-rc.9", "chokidar": "^3.5.3", "cookie-es": "^0.5.0", "defu": "^6.1.0",