1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76

diff --git a/package-lock.json b/package-lock.json
index b70acddf3ef6224a57c12b7a2e30247de751d3a3..702217c5f854d3107dcdb3a30f9c5ba49291b05a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8040,9 +8040,9 @@ 				"safer-buffer": "^2.1.0"
 			}
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.4.492",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.492.tgz",
-			"integrity": "sha512-36K9b/6skMVwAIEsC7GiQ8I8N3soCALVSHqWHzNDtGemAcI9Xu8hP02cywWM0A794rTHm0b0zHPeLJHtgFVamQ=="
+			"version": "1.4.493",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.493.tgz",
+			"integrity": "sha512-T1k9mhYPdjnmS4VAz4J1oKVn6/M6LxoqQEVtYRL0swJVj73bA2NzqF0HjwxGsW3zL3ir0oPmLfd7lyi/RYzreg=="
 		},
 		"node_modules/emoji-regex": {
 			"version": "9.2.2",
@@ -8220,15 +8220,19 @@ 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/es-iterator-helpers": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.12.tgz",
-			"integrity": "sha512-T6Ldv67RYULYtZ1k1omngDTVQSTVNX/ZSjDiwlw0PMokhy8kq2LFElleaEjpvlSaXh9ugJ4zrBgbQ7L+Bjdm3Q==",
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.13.tgz",
+			"integrity": "sha512-LK3VGwzvaPWobO8xzXXGRUOGw8Dcjyfk62CsY/wfHN75CwsJPbuypOYJxK6g5RyEL8YDjIWcl6jgd8foO6mmrA==",
 			"dependencies": {
 				"asynciterator.prototype": "^1.0.0",
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.2.0",
 				"es-abstract": "^1.21.3",
 				"es-set-tostringtag": "^2.0.1",
 				"function-bind": "^1.1.1",
+				"get-intrinsic": "^1.2.1",
 				"globalthis": "^1.0.3",
+				"has-property-descriptors": "^1.0.0",
 				"has-proto": "^1.0.1",
 				"has-symbols": "^1.0.3",
 				"internal-slot": "^1.0.5",
@@ -28358,9 +28362,9 @@ 				"safer-buffer": "^2.1.0"
 			}
 		},
 		"electron-to-chromium": {
-			"version": "1.4.492",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.492.tgz",
-			"integrity": "sha512-36K9b/6skMVwAIEsC7GiQ8I8N3soCALVSHqWHzNDtGemAcI9Xu8hP02cywWM0A794rTHm0b0zHPeLJHtgFVamQ=="
+			"version": "1.4.493",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.493.tgz",
+			"integrity": "sha512-T1k9mhYPdjnmS4VAz4J1oKVn6/M6LxoqQEVtYRL0swJVj73bA2NzqF0HjwxGsW3zL3ir0oPmLfd7lyi/RYzreg=="
 		},
 		"emoji-regex": {
 			"version": "9.2.2",
@@ -28506,15 +28510,19 @@ 				"which-typed-array": "^1.1.10"
 			}
 		},
 		"es-iterator-helpers": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.12.tgz",
-			"integrity": "sha512-T6Ldv67RYULYtZ1k1omngDTVQSTVNX/ZSjDiwlw0PMokhy8kq2LFElleaEjpvlSaXh9ugJ4zrBgbQ7L+Bjdm3Q==",
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.13.tgz",
+			"integrity": "sha512-LK3VGwzvaPWobO8xzXXGRUOGw8Dcjyfk62CsY/wfHN75CwsJPbuypOYJxK6g5RyEL8YDjIWcl6jgd8foO6mmrA==",
 			"requires": {
 				"asynciterator.prototype": "^1.0.0",
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.2.0",
 				"es-abstract": "^1.21.3",
 				"es-set-tostringtag": "^2.0.1",
 				"function-bind": "^1.1.1",
+				"get-intrinsic": "^1.2.1",
 				"globalthis": "^1.0.3",
+				"has-property-descriptors": "^1.0.0",
 				"has-proto": "^1.0.1",
 				"has-symbols": "^1.0.3",
 				"internal-slot": "^1.0.5",

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14

diff --git a/packages/vscode-tailwindcss/CHANGELOG.md b/packages/vscode-tailwindcss/CHANGELOG.md
index e0fe5bed72ffc4f80e85db07e1c9a1aeb409b3c1..5b97f6628ab1139664907180989110bf32f3a703 100644
--- a/packages/vscode-tailwindcss/CHANGELOG.md
+++ b/packages/vscode-tailwindcss/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.9.13
+
+- Fix CSS conflict regression (#842)
+
 ## 0.9.12
 
 - Increase class search range (#760)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13

diff --git a/packages/vscode-tailwindcss/package.json b/packages/vscode-tailwindcss/package.json
index 8e3d23deaf7b6247441bb5efa28303e6b885f4a2..73c9d1960cec65cf8eea70ed2918b16d7a90b094 100755
--- a/packages/vscode-tailwindcss/package.json
+++ b/packages/vscode-tailwindcss/package.json
@@ -4,7 +4,7 @@   "displayName": "Tailwind CSS IntelliSense",
   "description": "Intelligent Tailwind CSS tooling for VS Code",
   "author": "Brad Cornes <hello@bradley.dev>",
   "license": "MIT",
-  "version": "0.9.12",
+  "version": "0.9.13",
   "homepage": "https://github.com/tailwindlabs/tailwindcss-intellisense",
   "bugs": {
     "url": "https://github.com/tailwindlabs/tailwindcss-intellisense/issues",