Skip to content

Commit 51ed47f

Browse files
authored
Merge pull request #206 from cexbrayat/chore/rc11
fix: findComponent in Suspense for rc.11
2 parents d4ffade + 153f0e8 commit 51ed47f

File tree

3 files changed

+87
-93
lines changed

3 files changed

+87
-93
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@types/estree": "^0.0.42",
2424
"@types/jest": "^24.9.1",
2525
"@types/node": "12.12.35",
26-
"@vue/compiler-sfc": "^3.0.0-rc.10",
26+
"@vue/compiler-sfc": "^3.0.0-rc.11",
2727
"babel-jest": "^25.2.3",
2828
"babel-preset-jest": "^25.2.1",
2929
"dom-event-types": "^1.0.0",
@@ -38,13 +38,13 @@
3838
"ts-jest": "^25.0.0",
3939
"tsd": "0.11.0",
4040
"typescript": "^3.7.5",
41-
"vue": "^3.0.0-rc.10",
41+
"vue": "^3.0.0-rc.11",
4242
"vue-jest": "vuejs/vue-jest#next",
4343
"vue-router": "^4.0.0-alpha.14",
4444
"vuex": "^4.0.0-beta.1"
4545
},
4646
"peerDependencies": {
47-
"vue": "^3.0.0-rc.10"
47+
"vue": "^3.0.0-rc.11"
4848
},
4949
"author": {
5050
"name": "Lachlan Miller",

src/utils/find.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,8 @@ function findAllVNodes(
115115
}
116116
if (node.suspense) {
117117
// match children if component is Suspense
118-
const { isResolved, fallbackTree, subTree } = node.suspense
119-
if (isResolved) {
120-
// if the suspense is resolved, we match its children
121-
aggregateChildren(nodes, subTree.children)
122-
} else {
123-
// otherwise we match its fallback tree
124-
aggregateChildren(nodes, fallbackTree.children)
125-
}
118+
const { activeBranch } = node.suspense
119+
aggregateChildren(nodes, [activeBranch])
126120
}
127121
if (matches(node, selector) && !matchingNodes.includes(node)) {
128122
matchingNodes.push(node)

yarn.lock

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,10 @@
250250
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
251251
integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
252252

253-
"@babel/parser@^7.10.4":
254-
version "7.10.5"
255-
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz#e7c6bf5a7deff957cec9f04b551e2762909d826b"
256-
integrity sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ==
253+
"@babel/parser@^7.11.5":
254+
version "7.11.5"
255+
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
256+
integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
257257

258258
"@babel/plugin-proposal-async-generator-functions@^7.8.3":
259259
version "7.8.3"
@@ -774,10 +774,10 @@
774774
lodash "^4.17.13"
775775
to-fast-properties "^2.0.0"
776776

777-
"@babel/types@^7.10.4":
778-
version "7.10.5"
779-
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz#d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"
780-
integrity sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==
777+
"@babel/types@^7.11.5":
778+
version "7.11.5"
779+
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d"
780+
integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==
781781
dependencies:
782782
"@babel/helper-validator-identifier" "^7.10.4"
783783
lodash "^4.17.19"
@@ -1207,83 +1207,83 @@
12071207
dependencies:
12081208
"@types/yargs-parser" "*"
12091209

1210-
1211-
version "3.0.0-rc.10"
1212-
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-rc.10.tgz#a76f713fb0462429ec0ec10a472fff1f539c5772"
1213-
integrity sha512-kQzHzRsM0NPAWHeqSTb2J4VsHhjRkGeLTsGzeMnW+sojgTnS3T94KacwvYgVS4qeZAKiDq0bMNZoJWrHVQ3T8g==
1210+
1211+
version "3.0.0-rc.11"
1212+
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-rc.11.tgz#4fb60aeab0b8e560fe4e587b02a546a5ad575754"
1213+
integrity sha512-mt4hiJG7BiKo5nbDAZ6Yd9yim2hBIorB5wVWD9bfM5rPbzpwnKp/f8MRlCvLuIjgf43xPbSW6AZ5awrgV1NDsg==
12141214
dependencies:
1215-
"@babel/parser" "^7.10.4"
1216-
"@babel/types" "^7.10.4"
1217-
"@vue/shared" "3.0.0-rc.10"
1215+
"@babel/parser" "^7.11.5"
1216+
"@babel/types" "^7.11.5"
1217+
"@vue/shared" "3.0.0-rc.11"
12181218
estree-walker "^2.0.1"
12191219
source-map "^0.6.1"
12201220

1221-
1222-
version "3.0.0-rc.10"
1223-
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.10.tgz#dd1380d1ee61170de76f9eb91e0d8ac7985f0ae0"
1224-
integrity sha512-pqIUf5leZm0P9379utrRSVBMxhV8XaqJTEFFp5etCtbEa/H5ALs29EjFMtMcm9sQaVkZlKLu86mgIacbYB9Q3w==
1225-
dependencies:
1226-
"@vue/compiler-core" "3.0.0-rc.10"
1227-
"@vue/shared" "3.0.0-rc.10"
1228-
1229-
"@vue/compiler-sfc@^3.0.0-rc.10":
1230-
version "3.0.0-rc.10"
1231-
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.10.tgz#4351ece66cdf4d758877482f69421c43d994dbaf"
1232-
integrity sha512-VIJ+VXqeM7WoRNgD9uYSARVb6CYq+JS2NNHfeerfNc7Uk3pjYHRv1MwEicAvN6zWFm5GLC1ZYTVD+WFg3xGAkQ==
1233-
dependencies:
1234-
"@babel/parser" "^7.10.4"
1235-
"@babel/types" "^7.10.4"
1236-
"@vue/compiler-core" "3.0.0-rc.10"
1237-
"@vue/compiler-dom" "3.0.0-rc.10"
1238-
"@vue/compiler-ssr" "3.0.0-rc.10"
1239-
"@vue/shared" "3.0.0-rc.10"
1240-
consolidate "^0.15.1"
1221+
1222+
version "3.0.0-rc.11"
1223+
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.11.tgz#f991bba3d312e58b80927454e42d2e75adae186f"
1224+
integrity sha512-bifgoi7/6E8F5ur9EC/7lFIXC1sUYXi9MzlOpj/VT8UVNN6Ww+2E0EImq4ZpDkZhXNkLfY7yIQIRkIE4SgcG0Q==
1225+
dependencies:
1226+
"@vue/compiler-core" "3.0.0-rc.11"
1227+
"@vue/shared" "3.0.0-rc.11"
1228+
1229+
"@vue/compiler-sfc@^3.0.0-rc.11":
1230+
version "3.0.0-rc.11"
1231+
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.11.tgz#bea07c12c5985ed97e744af1b0461169e7501a60"
1232+
integrity sha512-5rNbRiY9pG/govbwv53Y5PcL5qZRDv6twz7Nmap+hfo06u/yhjFmMeU6ftulc6fu/u/hpePVu4rrthFrmOj3hg==
1233+
dependencies:
1234+
"@babel/parser" "^7.11.5"
1235+
"@babel/types" "^7.11.5"
1236+
"@vue/compiler-core" "3.0.0-rc.11"
1237+
"@vue/compiler-dom" "3.0.0-rc.11"
1238+
"@vue/compiler-ssr" "3.0.0-rc.11"
1239+
"@vue/shared" "3.0.0-rc.11"
1240+
consolidate "^0.16.0"
12411241
estree-walker "^2.0.1"
12421242
hash-sum "^2.0.0"
12431243
lru-cache "^5.1.1"
12441244
magic-string "^0.25.7"
12451245
merge-source-map "^1.1.0"
1246-
postcss "^7.0.27"
1247-
postcss-modules "^3.1.0"
1246+
postcss "^7.0.32"
1247+
postcss-modules "^3.2.2"
12481248
postcss-selector-parser "^6.0.2"
12491249
source-map "^0.6.1"
12501250

1251-
1252-
version "3.0.0-rc.10"
1253-
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.10.tgz#95a5f6b65b19a514c94f056994ec144b3b1b03ae"
1254-
integrity sha512-JBPil8sO5j7puB8acX2CQMRXEYB/EP8PoEur7RcF/+aqATI7C4yqWcSLC5TRJpigj6xE6ku6sx8om+j7ZHvgBw==
1251+
1252+
version "3.0.0-rc.11"
1253+
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.11.tgz#b88df800c890de939955d6e620c7a1316a89b763"
1254+
integrity sha512-QXPR+68M5aU1Y5fwwbbvA467cPGmN7xZPRrcjenL1g1gD7q2Xx+dpJsuai7eS625hphFLuJ9SVqQXzk9ANSLwg==
12551255
dependencies:
1256-
"@vue/compiler-dom" "3.0.0-rc.10"
1257-
"@vue/shared" "3.0.0-rc.10"
1256+
"@vue/compiler-dom" "3.0.0-rc.11"
1257+
"@vue/shared" "3.0.0-rc.11"
12581258

1259-
1260-
version "3.0.0-rc.10"
1261-
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-rc.10.tgz#34d5f51bcc5a7c36e27d7a9c1bd7a3d25ffa7c56"
1262-
integrity sha512-mkUZfOJlbqGZx2cARmhCs5r2+xLJPL7VFNagmlA3Fd66ZXBc3ZvTQdYsY4VUbYJFe5ByIzqu9TZiAkzXY+JVaA==
1259+
1260+
version "3.0.0-rc.11"
1261+
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-rc.11.tgz#e3a856f2e4e7ebbd7050b2ef71997c91e3a28a40"
1262+
integrity sha512-dlnCZdv4rKm6z4szfaua0Hsd5LQeUeZi6BI5c9Y+CBRU1Dwo8wb9Sz3I42ZRKDrkxB2ii9WhprW4d4H50RCnCA==
12631263
dependencies:
1264-
"@vue/shared" "3.0.0-rc.10"
1264+
"@vue/shared" "3.0.0-rc.11"
12651265

1266-
1267-
version "3.0.0-rc.10"
1268-
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-rc.10.tgz#9055aef5113cbc328aaec29760c2151e0ed3cf40"
1269-
integrity sha512-VK/kq4gDDoqZ45CVwdbLLpikXLYLCt6YLhdgXX3fhf20gvPqrbEZv1ZNLruNnhhTpf9cLyU4tZ18DHeaUYPziw==
1266+
1267+
version "3.0.0-rc.11"
1268+
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-rc.11.tgz#6fade3a5d7ceed6a61683e375855bf452ce9d301"
1269+
integrity sha512-xsnvPoq7jPFuZ8Lo2jWpsPdZh3HyQjAmk5scBD7HycqtuP9m4sB/buGGll4ixBC+VnYyvQqTcCibUlNHFTgk7g==
12701270
dependencies:
1271-
"@vue/reactivity" "3.0.0-rc.10"
1272-
"@vue/shared" "3.0.0-rc.10"
1271+
"@vue/reactivity" "3.0.0-rc.11"
1272+
"@vue/shared" "3.0.0-rc.11"
12731273

1274-
1275-
version "3.0.0-rc.10"
1276-
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.10.tgz#50f95cb991483a4262163723320967ad17bb321f"
1277-
integrity sha512-bH4GuneHt3FQ+/21jba5orM/CO9N1cnT7J3wtrxopFJ4/4H5cvHXyG6v+ZVTu1d733Ij/6yMRA7xbtfi9a4zJw==
1274+
1275+
version "3.0.0-rc.11"
1276+
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.11.tgz#3700e1f95b822cb6bf9a01c8cd389ae3d54af64c"
1277+
integrity sha512-BkRhfJLZN0v7fTntaQ99U3d56VnUUXwfBwAunw5bj/WdS873i+l3AaUBLL41N8gRL3OBrDCiGl/JOsi6h/PISQ==
12781278
dependencies:
1279-
"@vue/runtime-core" "3.0.0-rc.10"
1280-
"@vue/shared" "3.0.0-rc.10"
1279+
"@vue/runtime-core" "3.0.0-rc.11"
1280+
"@vue/shared" "3.0.0-rc.11"
12811281
csstype "^2.6.8"
12821282

1283-
1284-
version "3.0.0-rc.10"
1285-
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-rc.10.tgz#e7ab62abcabbfc738545902b96a3aa78f59f3286"
1286-
integrity sha512-fI6gVhhgb3cAmEkY4oeVVA2hWZ2xvkgogHdBI5PL7gSvZnOB6XZ2eQGsYjC4W+7BegvEkoMBuZsFXVa4ZQ07XQ==
1283+
1284+
version "3.0.0-rc.11"
1285+
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-rc.11.tgz#9fea645d316771c04874b0f4c493c77609c09aea"
1286+
integrity sha512-ys6eRLHxkMM/uEqi/UfeA/AUOmjsJ9AX21WGO2OIAm0v5zDmztjZ+rgcqz8Pgrr+odHY0egOIqc9wOeNtfuMJA==
12871287

12881288
abab@^2.0.0, abab@^2.0.3:
12891289
version "2.0.3"
@@ -1609,7 +1609,7 @@ big.js@^5.2.2:
16091609
resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
16101610
integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
16111611

1612-
bluebird@^3.1.1:
1612+
bluebird@^3.7.2:
16131613
version "3.7.2"
16141614
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
16151615
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -1946,12 +1946,12 @@ configstore@^3.0.0:
19461946
write-file-atomic "^2.0.0"
19471947
xdg-basedir "^3.0.0"
19481948

1949-
consolidate@^0.15.1:
1950-
version "0.15.1"
1951-
resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
1952-
integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
1949+
consolidate@^0.16.0:
1950+
version "0.16.0"
1951+
resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.16.0.tgz#a11864768930f2f19431660a65906668f5fbdc16"
1952+
integrity sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==
19531953
dependencies:
1954-
bluebird "^3.1.1"
1954+
bluebird "^3.7.2"
19551955

19561956
convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
19571957
version "1.7.0"
@@ -4719,10 +4719,10 @@ postcss-modules-values@^3.0.0:
47194719
icss-utils "^4.0.0"
47204720
postcss "^7.0.6"
47214721

4722-
postcss-modules@^3.1.0:
4723-
version "3.2.0"
4724-
resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-3.2.0.tgz#1ca870d197cd09a7964253e12de2aac906c94256"
4725-
integrity sha512-ceodlVbBypGD3R7EI1xM7gz28J0syaXq0VKd7rJVXVlOSkxUIRBRJQjBgpoKnKVFNAcCjtLVgZqBA3mUNntWPA==
4722+
postcss-modules@^3.2.2:
4723+
version "3.2.2"
4724+
resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-3.2.2.tgz#ee390de0f9f18e761e1778dfb9be26685c02c51f"
4725+
integrity sha512-JQ8IAqHELxC0N6tyCg2UF40pACY5oiL6UpiqqcIFRWqgDYO8B0jnxzoQ0EOpPrWXvcpu6BSbQU/3vSiq7w8Nhw==
47264726
dependencies:
47274727
generic-names "^2.0.1"
47284728
icss-replace-symbols "^1.1.0"
@@ -4748,7 +4748,7 @@ postcss-value-parser@^4.0.0:
47484748
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
47494749
integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
47504750

4751-
postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
4751+
postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
47524752
version "7.0.32"
47534753
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
47544754
integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
@@ -5968,14 +5968,14 @@ vue-router@^4.0.0-alpha.14:
59685968
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.0-alpha.14.tgz#4bc5fed1db61b8d04fd95ad9c499c7428f039a0e"
59695969
integrity sha512-ydWSXxXAsTCiJ31V4x4ZAKI1CdpPMhf7b2LPi4AmG5SCgduu1zf+LhzWWHXmgbmheEiJpfecigVIZp4ABpZJmw==
59705970

5971-
vue@^3.0.0-rc.10:
5972-
version "3.0.0-rc.10"
5973-
resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-rc.10.tgz#31298a757b4fad6ee8973d0fa27c4fde8574bd01"
5974-
integrity sha512-nRsyIQtOWLDMBb5dsPwg/WdIqznCMVWN6O6wJSzhseKC768wHlZKcJ7SPHhWPid9wi3Ykhtl9vtgvxTK/qICkw==
5971+
vue@^3.0.0-rc.11:
5972+
version "3.0.0-rc.11"
5973+
resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-rc.11.tgz#c383e74262a51f6bcffd8da9b2049db617533000"
5974+
integrity sha512-5Hbgf5c17gZvKXxxwYXL3Xsf+IsknQMiNoKCf/JcS2OvzUdiwRrlu/Pk2kNFPxD/EGX7k1+OTPWUxoq5Aq55ow==
59755975
dependencies:
5976-
"@vue/compiler-dom" "3.0.0-rc.10"
5977-
"@vue/runtime-dom" "3.0.0-rc.10"
5978-
"@vue/shared" "3.0.0-rc.10"
5976+
"@vue/compiler-dom" "3.0.0-rc.11"
5977+
"@vue/runtime-dom" "3.0.0-rc.11"
5978+
"@vue/shared" "3.0.0-rc.11"
59795979

59805980
vuex@^4.0.0-beta.1:
59815981
version "4.0.0-beta.1"

0 commit comments

Comments
 (0)