From ccfdde75ed9c4961450f26c0f3f072ab352bec3d Mon Sep 17 00:00:00 2001
From: sorrycc <sorrycc@gmail.com>
Date: Fri, 5 Jan 2024 11:35:37 +0800
Subject: [PATCH 1/2] fix: less support none-root css imports and urls

---
 e2e/fixtures/less.normal/expect.js               |  12 ++++++++++++
 e2e/fixtures/less.normal/src/index.less          |   2 +-
 .../src/{theme.less => theme/foo.css}            |   2 +-
 e2e/fixtures/less.normal/src/theme/theme.less    |   6 ++++++
 e2e/fixtures/less.normal/src/theme/umi.png       | Bin 0 -> 2009 bytes
 packages/bundler-okam/index.js                   |   1 +
 6 files changed, 21 insertions(+), 2 deletions(-)
 rename e2e/fixtures/less.normal/src/{theme.less => theme/foo.css} (64%)
 create mode 100644 e2e/fixtures/less.normal/src/theme/theme.less
 create mode 100644 e2e/fixtures/less.normal/src/theme/umi.png

diff --git a/e2e/fixtures/less.normal/expect.js b/e2e/fixtures/less.normal/expect.js
index 7a9f42ef6..d2cd807c1 100644
--- a/e2e/fixtures/less.normal/expect.js
+++ b/e2e/fixtures/less.normal/expect.js
@@ -18,3 +18,15 @@ assert(
   ),
   "should not panic when parsing grid-template"
 );
+assert(
+  files["index.css"].includes(
+    `.foo {`
+  ),
+  "should support none-root css imports"
+);
+assert(
+  files["index.css"].includes(
+    `background: url(data:image/png;base64,`
+  ),
+  "should support none-root urls"
+);
diff --git a/e2e/fixtures/less.normal/src/index.less b/e2e/fixtures/less.normal/src/index.less
index b278c681e..4ee230002 100644
--- a/e2e/fixtures/less.normal/src/index.less
+++ b/e2e/fixtures/less.normal/src/index.less
@@ -1,4 +1,4 @@
-@import "theme.less";
+@import "theme/theme.less";
 @import "failed-when-math-is-on.less";
 .container {
   padding-top: 80px;
diff --git a/e2e/fixtures/less.normal/src/theme.less b/e2e/fixtures/less.normal/src/theme/foo.css
similarity index 64%
rename from e2e/fixtures/less.normal/src/theme.less
rename to e2e/fixtures/less.normal/src/theme/foo.css
index 943c42bad..a15c877ac 100644
--- a/e2e/fixtures/less.normal/src/theme.less
+++ b/e2e/fixtures/less.normal/src/theme/foo.css
@@ -1,3 +1,3 @@
-.theme {
+.foo {
   color: red;
 }
diff --git a/e2e/fixtures/less.normal/src/theme/theme.less b/e2e/fixtures/less.normal/src/theme/theme.less
new file mode 100644
index 000000000..ef9f2f2ab
--- /dev/null
+++ b/e2e/fixtures/less.normal/src/theme/theme.less
@@ -0,0 +1,6 @@
+@import "./foo.css";
+
+.theme {
+  color: red;
+  background: url(umi.png);
+}
diff --git a/e2e/fixtures/less.normal/src/theme/umi.png b/e2e/fixtures/less.normal/src/theme/umi.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad9c6ff9ba88c5310118a81f2fb3e53af86eb84c
GIT binary patch
literal 2009
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

literal 0
HcmV?d00001

diff --git a/packages/bundler-okam/index.js b/packages/bundler-okam/index.js
index 72deb169e..38509e90f 100644
--- a/packages/bundler-okam/index.js
+++ b/packages/bundler-okam/index.js
@@ -23,6 +23,7 @@ const onCompileLess = async function (opts, filePath) {
     plugins: [resolvePlugin],
     modifyVars,
     sourceMap,
+    relativeUrls: true,
   });
   return result.css;
 };

From a50ab805ce6903e1b1209f63da139bb3eab322aa Mon Sep 17 00:00:00 2001
From: sorrycc <sorrycc@gmail.com>
Date: Fri, 5 Jan 2024 11:38:18 +0800
Subject: [PATCH 2/2] chore: update

---
 packages/bundler-okam/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bundler-okam/index.js b/packages/bundler-okam/index.js
index 38509e90f..21b361dbf 100644
--- a/packages/bundler-okam/index.js
+++ b/packages/bundler-okam/index.js
@@ -23,7 +23,7 @@ const onCompileLess = async function (opts, filePath) {
     plugins: [resolvePlugin],
     modifyVars,
     sourceMap,
-    relativeUrls: true,
+    rewriteUrls: 'all',
   });
   return result.css;
 };