From 2bc2858781ec3f0c61e30d57e2a66bf756126100 Mon Sep 17 00:00:00 2001
From: Jinjiang <zhaojinjiang@me.com>
Date: Fri, 7 Jul 2023 23:41:57 +0800
Subject: [PATCH 1/2] feat: skip normal css files without scoped flag in
 stylePostLoader

---
 src/stylePostLoader.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/stylePostLoader.ts b/src/stylePostLoader.ts
index 544924ea6..7e269c53d 100644
--- a/src/stylePostLoader.ts
+++ b/src/stylePostLoader.ts
@@ -9,6 +9,13 @@ const { compileStyle } = compiler
 // for any <style scoped> selection requests initiated from within vue files.
 const StylePostLoader: LoaderDefinitionFunction = function (source, inMap) {
   const query = qs.parse(this.resourceQuery.slice(1))
+
+  // skip normal CSS files without scoped flag
+  if (!('vue' in query) && !query.scoped) {
+    this.callback(null, source, inMap)
+    return
+  }
+
   const { code, map, errors } = compileStyle({
     source: source as string,
     filename: this.resourcePath,

From 41121e2551c3a36ec2cf90de400a13a7aa90e4e8 Mon Sep 17 00:00:00 2001
From: Jinjiang <zhaojinjiang@me.com>
Date: Wed, 4 Oct 2023 11:04:27 +0800
Subject: [PATCH 2/2] feat: optimize perf of stylePostLoader

---
 src/stylePostLoader.ts | 7 ++++++-
 test/core.spec.ts      | 4 ++--
 test/template.spec.ts  | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/stylePostLoader.ts b/src/stylePostLoader.ts
index 7e269c53d..59c664d5b 100644
--- a/src/stylePostLoader.ts
+++ b/src/stylePostLoader.ts
@@ -11,7 +11,12 @@ const StylePostLoader: LoaderDefinitionFunction = function (source, inMap) {
   const query = qs.parse(this.resourceQuery.slice(1))
 
   // skip normal CSS files without scoped flag
-  if (!('vue' in query) && !query.scoped) {
+  if (
+    !('vue' in query) ||
+    query.type !== 'style' ||
+    !query.id ||
+    !query.scoped
+  ) {
     this.callback(null, source, inMap)
     return
   }
diff --git a/test/core.spec.ts b/test/core.spec.ts
index 1fffaaa32..a166d16e1 100644
--- a/test/core.spec.ts
+++ b/test/core.spec.ts
@@ -75,7 +75,7 @@ test('style import', async () => {
   })
 
   const styles = window.document.querySelectorAll('style')
-  expect(styles[0].textContent).toContain('h1 { color: red;\n}')
+  expect(styles[0].textContent).toContain('h1 { color: red; }')
 
   // import with scoped
   const id = 'data-v-' + genId('style-import.vue')
@@ -89,7 +89,7 @@ test('style import for a same file twice', async () => {
 
   const styles = window.document.querySelectorAll('style')
   expect(styles.length).toBe(3)
-  expect(styles[0].textContent).toContain('h1 { color: red;\n}')
+  expect(styles[0].textContent).toContain('h1 { color: red; }')
 
   // import with scoped
   const id = 'data-v-' + genId('style-import-twice-sub.vue')
diff --git a/test/template.spec.ts b/test/template.spec.ts
index e46758a54..52fe64dbf 100644
--- a/test/template.spec.ts
+++ b/test/template.spec.ts
@@ -56,8 +56,8 @@ test('transform relative URLs and respects resolve alias', async () => {
   const style = normalizeNewline(
     window.document.querySelector('style')!.textContent!
   )
-  expect(style).toContain('html { background-image: url(logo.cab72b.png);\n}')
-  expect(style).toContain('body { background-image: url(logo.cab72b.png);\n}')
+  expect(style).toContain('html { background-image: url(logo.cab72b.png); }')
+  expect(style).toContain('body { background-image: url(logo.cab72b.png); }')
 })
 
 test('customizing template loaders', async () => {