From a6173aa69343d68c9626ebbb49e2eaae7313aac0 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 9 Sep 2022 14:19:51 +0100
Subject: [PATCH 1/3] fix: allow matching virtual id with query parameters

---
 packages/shared-integration/src/layers.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/shared-integration/src/layers.ts b/packages/shared-integration/src/layers.ts
index cbff6d4f2c..3db5d8eff7 100644
--- a/packages/shared-integration/src/layers.ts
+++ b/packages/shared-integration/src/layers.ts
@@ -3,7 +3,11 @@ export const VIRTUAL_ENTRY_ALIAS = [
 ]
 export const LAYER_MARK_ALL = '__ALL__'
 
+const RESOLVED_ID_WITH_QUERY_RE = /\/__uno(?:(_.*?))?\.css(\?.*)?$/
 export function resolveId(id: string) {
+  if (id.match(RESOLVED_ID_WITH_QUERY_RE)) {
+    return id
+  }
   for (const alias of VIRTUAL_ENTRY_ALIAS) {
     const match = id.match(alias)
     if (match) {

From c24e0acc95216d25e1bd4aa9a943c12d548d30ad Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 9 Sep 2022 14:45:13 +0100
Subject: [PATCH 2/3] style: remove unnecessary brace

---
 packages/shared-integration/src/layers.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/shared-integration/src/layers.ts b/packages/shared-integration/src/layers.ts
index 3db5d8eff7..062a5b478d 100644
--- a/packages/shared-integration/src/layers.ts
+++ b/packages/shared-integration/src/layers.ts
@@ -5,9 +5,8 @@ export const LAYER_MARK_ALL = '__ALL__'
 
 const RESOLVED_ID_WITH_QUERY_RE = /\/__uno(?:(_.*?))?\.css(\?.*)?$/
 export function resolveId(id: string) {
-  if (id.match(RESOLVED_ID_WITH_QUERY_RE)) {
-    return id
-  }
+  if (id.match(RESOLVED_ID_WITH_QUERY_RE)) return id
+  
   for (const alias of VIRTUAL_ENTRY_ALIAS) {
     const match = id.match(alias)
     if (match) {

From e8bbaab54dfa8e93dcf2dce92fb3ecbb7080ca87 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 9 Sep 2022 15:09:26 +0100
Subject: [PATCH 3/3] style: lint...
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I'm so sorry ... 🙈
---
 packages/shared-integration/src/layers.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/shared-integration/src/layers.ts b/packages/shared-integration/src/layers.ts
index 062a5b478d..9166dc3675 100644
--- a/packages/shared-integration/src/layers.ts
+++ b/packages/shared-integration/src/layers.ts
@@ -5,8 +5,9 @@ export const LAYER_MARK_ALL = '__ALL__'
 
 const RESOLVED_ID_WITH_QUERY_RE = /\/__uno(?:(_.*?))?\.css(\?.*)?$/
 export function resolveId(id: string) {
-  if (id.match(RESOLVED_ID_WITH_QUERY_RE)) return id
-  
+  if (id.match(RESOLVED_ID_WITH_QUERY_RE))
+    return id
+
   for (const alias of VIRTUAL_ENTRY_ALIAS) {
     const match = id.match(alias)
     if (match) {