@pinegrow/vite-plugin 3.0.0-beta.46 → 3.0.0-beta.48

package/dist/vue-plugin.js

@@ -43,17 +43,20 @@ export function usePinegrow() {
 						if (
 							value.instance.isMounted &&
 							!value.instance.isUnmounted &&
-							value.pgId &&
+							value.pgIds &&
+							value.pgIds.length &&
 							(!value.rootEl || value.isRootFragment)
 						) {
-							if (!pgIds[value.pgId]) {
-								pgIds[value.pgId] = []
-							}
-							if (value.key === undefined || value.key === null) {
-								pgIds[value.pgId].push(value)
-							} else {
-								pgIds[value.pgId].push([value.key, value])
-							}
+							value.pgIds.forEach(pgId => {
+								if (!pgIds[pgId]) {
+									pgIds[pgId] = []
+								}
+								if (value.key === undefined || value.key === null) {
+									pgIds[pgId].push(value)
+								} else {
+									pgIds[pgId].push([value.key, value])
+								}
+							})
 						}
 					}
 					return pgIds
@@ -149,10 +152,10 @@ export function usePinegrow() {
 			//   return
 			// }
 
-			if (pinegrow.elCache.has(el)) {
-				// pgId could have been updated
-				if (pgId) {
-					pinegrow.elCache.get(el).pgId = pgId
+			const prevElCache = pinegrow.elCache.get(el)
+			if (prevElCache) {
+				if (pgId && !prevElCache.pgIds.includes(pgId)) {
+					prevElCache.pgIds.push(pgId)
 				}
 				if (key !== null && key !== undefined) {
 					pinegrow.elCache.get(el).key = key
@@ -224,6 +227,13 @@ export function usePinegrow() {
 							lastEl = childVNodes[childVNodes.length - 1].el
 						}
 
+						if (firstEl && firstEl.nodeType !== 1) {
+							firstEl = firstEl.nextElementSibling
+						}
+						if (lastEl && lastEl.nodeType !== 1) {
+							lastEl = lastEl.nextElementSibling
+						}
+
 						childVNodes.forEach(childVNode => {
 							pgUpdateElCache(hook, pgId, isRootFragment ? el : rootEl, key)(childVNode)
 						})
@@ -239,7 +249,7 @@ export function usePinegrow() {
 					isFragment,
 					firstEl,
 					lastEl,
-					pgId,
+					pgIds: pgId ? [pgId] : [],
 					key,
 					localFile,
 					isIsland,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@pinegrow/vite-plugin",
-	"version": "3.0.0-beta.46",
+	"version": "3.0.0-beta.48",
 	"description": "Pinegrow Vite Plugin",
 	"type": "module",
 	"files": [