From 60b8fa3881d83a7ecd4b37e6b43be79072243da7 Mon Sep 17 00:00:00 2001
From: Robin Malfait <malfait.robin@gmail.com>
Date: Wed, 30 Nov 2022 15:06:24 +0100
Subject: [PATCH] use `@tailwindcss/oxide` dependency

---
 package-lock.json                | 42 ++++++++++++++++----------------
 package.json                     |  4 +--
 src/lib/expandTailwindAtRules.js |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 15983a0c0..5eed79def 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
       "version": "3.2.4",
       "license": "MIT",
       "dependencies": {
+        "@tailwindcss/oxide": "file:oxide/crates/node",
         "arg": "^5.0.2",
         "chokidar": "^3.5.3",
         "color-name": "^1.1.4",
@@ -31,8 +32,7 @@
         "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
         "quick-lru": "^5.1.1",
-        "resolve": "^1.22.1",
-        "tailwind-oxide": "file:oxide/crates/node"
+        "resolve": "^1.22.1"
       },
       "bin": {
         "tailwind": "lib/cli.js",
@@ -1403,6 +1403,10 @@
         "@swc/core": "^1.0.46"
       }
     },
+    "node_modules/@tailwindcss/oxide": {
+      "resolved": "oxide/crates/node",
+      "link": true
+    },
     "node_modules/@trysound/sax": {
       "version": "0.2.0",
       "dev": true,
@@ -7053,10 +7057,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/tailwind-oxide": {
-      "resolved": "oxide/crates/node",
-      "link": true
-    },
     "node_modules/tar-stream": {
       "version": "1.6.2",
       "dev": true,
@@ -8340,6 +8340,21 @@
         "source-map-support": "^0.5.13"
       }
     },
+    "@tailwindcss/oxide": {
+      "version": "file:oxide/crates/node",
+      "requires": {
+        "@napi-rs/cli": "^2.13.0",
+        "@tailwindcss/oxide-darwin-arm64": "0.0.0",
+        "@tailwindcss/oxide-darwin-x64": "0.0.0",
+        "@tailwindcss/oxide-freebsd-x64": "0.0.0",
+        "@tailwindcss/oxide-linux-arm-gnueabihf": "0.0.0",
+        "@tailwindcss/oxide-linux-arm64-gnu": "0.0.0",
+        "@tailwindcss/oxide-linux-arm64-musl": "0.0.0",
+        "@tailwindcss/oxide-linux-x64-gnu": "0.0.0",
+        "@tailwindcss/oxide-linux-x64-musl": "0.0.0",
+        "@tailwindcss/oxide-win32-x64-msvc": "0.0.0"
+      }
+    },
     "@trysound/sax": {
       "version": "0.2.0",
       "dev": true
@@ -11920,21 +11935,6 @@
         "stable": "^0.1.8"
       }
     },
-    "tailwind-oxide": {
-      "version": "file:oxide/crates/node",
-      "requires": {
-        "@napi-rs/cli": "^2.13.0",
-        "@tailwindcss/oxide-darwin-arm64": "0.0.0",
-        "@tailwindcss/oxide-darwin-x64": "0.0.0",
-        "@tailwindcss/oxide-freebsd-x64": "0.0.0",
-        "@tailwindcss/oxide-linux-arm-gnueabihf": "0.0.0",
-        "@tailwindcss/oxide-linux-arm64-gnu": "0.0.0",
-        "@tailwindcss/oxide-linux-arm64-musl": "0.0.0",
-        "@tailwindcss/oxide-linux-x64-gnu": "0.0.0",
-        "@tailwindcss/oxide-linux-x64-musl": "0.0.0",
-        "@tailwindcss/oxide-win32-x64-msvc": "0.0.0"
-      }
-    },
     "tar-stream": {
       "version": "1.6.2",
       "dev": true,
diff --git a/package.json b/package.json
index 6ec307ac8..caac3fb3b 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "postcss": "^8.0.9"
   },
   "dependencies": {
+    "@tailwindcss/oxide": "file:oxide/crates/node",
     "arg": "^5.0.2",
     "chokidar": "^3.5.3",
     "color-name": "^1.1.4",
@@ -89,8 +90,7 @@
     "postcss-selector-parser": "^6.0.11",
     "postcss-value-parser": "^4.2.0",
     "quick-lru": "^5.1.1",
-    "resolve": "^1.22.1",
-    "tailwind-oxide": "file:oxide/crates/node"
+    "resolve": "^1.22.1"
   },
   "browserslist": [
     "> 1%",
diff --git a/src/lib/expandTailwindAtRules.js b/src/lib/expandTailwindAtRules.js
index f363bdc13..295bbc3dc 100644
--- a/src/lib/expandTailwindAtRules.js
+++ b/src/lib/expandTailwindAtRules.js
@@ -6,7 +6,7 @@ import log from '../util/log'
 import cloneNodes from '../util/cloneNodes'
 import { defaultExtractor } from './defaultExtractor'
 
-import oxide from 'tailwind-oxide'
+import oxide from '@tailwindcss/oxide'
 
 let env = sharedState.env