@unocss/eslint-plugin 66.5.4 → 66.5.5

package/dist/index.cjs

@@ -46,7 +46,8 @@ const orderAttributify = createRule({
         const sorted = syncAction(
           context.settings.unocss?.configPath,
           "sort",
-          input
+          input,
+          context.filename
         );
         if (sorted !== input) {
           context.report({
@@ -317,7 +318,8 @@ const order = createRule({
       let sorted = syncAction(
         context.settings.unocss?.configPath,
         "sort",
-        input
+        input,
+        context.filename
       ).trim();
       if (addSpace === "before")
         sorted = ` ${sorted}`;
@@ -360,7 +362,8 @@ const order = createRule({
       let sorted = syncAction(
         context.settings.unocss?.configPath,
         "sort",
-        input
+        input,
+        context.filename
       ).trim();
       if (/^\s/.test(input))
         sorted = ` ${sorted}`;

package/dist/index.mjs

@@ -40,7 +40,8 @@ const orderAttributify = createRule({
         const sorted = syncAction(
           context.settings.unocss?.configPath,
           "sort",
-          input
+          input,
+          context.filename
         );
         if (sorted !== input) {
           context.report({
@@ -311,7 +312,8 @@ const order = createRule({
       let sorted = syncAction(
         context.settings.unocss?.configPath,
         "sort",
-        input
+        input,
+        context.filename
       ).trim();
       if (addSpace === "before")
         sorted = ` ${sorted}`;
@@ -354,7 +356,8 @@ const order = createRule({
       let sorted = syncAction(
         context.settings.unocss?.configPath,
         "sort",
-        input
+        input,
+        context.filename
       ).trim();
       if (/^\s/.test(input))
         sorted = ` ${sorted}`;

package/dist/worker.mjs

@@ -1,3 +1,4 @@
+import { dirname } from 'node:path';
 import process from 'node:process';
 import { parseVariantGroup, notNull, collapseVariantGroup, createGenerator } from '@unocss/core';
 import { loadConfig } from '@unocss/config';
@@ -37,9 +38,10 @@ async function sortRules(rules, uno) {
 
 const promises = /* @__PURE__ */ new Map();
 process.env.ESLINT ||= "true";
-async function _getGenerator(configPath) {
+async function _getGenerator(configPath, id) {
+  const searchFrom = configPath ? process.cwd() : id ? dirname(id) : process.cwd();
   const { config, sources } = await loadConfig(
-    process.cwd(),
+    searchFrom,
     configPath
   );
   if (!sources.length)
@@ -49,22 +51,31 @@ async function _getGenerator(configPath) {
     warn: false
   });
 }
-async function getGenerator(configPath) {
-  let promise = promises.get(configPath);
+function getCacheKey(configPath, id) {
+  if (configPath)
+    return `config:${configPath}`;
+  if (id)
+    return `dir:${dirname(id)}`;
+  return `cwd:${process.cwd()}`;
+}
+async function getGenerator(configPath, id) {
+  const cacheKey = getCacheKey(configPath, id);
+  let promise = promises.get(cacheKey);
   if (!promise) {
-    promise = _getGenerator(configPath);
-    promises.set(configPath, promise);
+    promise = _getGenerator(configPath, id);
+    promises.set(cacheKey, promise);
   }
   return await promise;
 }
 function setGenerator(generator, configPath) {
-  promises.set(configPath, Promise.resolve(generator));
+  const cacheKey = configPath ? `config:${configPath}` : `cwd:${process.cwd()}`;
+  promises.set(cacheKey, Promise.resolve(generator));
 }
-async function actionSort(configPath, classes) {
-  return await sortRules(classes, await getGenerator(configPath));
+async function actionSort(configPath, classes, id) {
+  return await sortRules(classes, await getGenerator(configPath, id));
 }
 async function actionBlocklist(configPath, classes, id) {
-  const uno = await getGenerator(configPath);
+  const uno = await getGenerator(configPath, id);
   const blocked = /* @__PURE__ */ new Map();
   const extracted = await uno.applyExtractors(classes, id);
   const values = [...extracted.values()];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/eslint-plugin",
   "type": "module",
-  "version": "66.5.4",
+  "version": "66.5.5",
   "description": "ESLint plugin for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -35,18 +35,18 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "^8.45.0",
-    "magic-string": "^0.30.19",
+    "@typescript-eslint/utils": "^8.46.3",
+    "magic-string": "^0.30.21",
     "synckit": "^0.11.11",
-    "@unocss/core": "66.5.4",
-    "@unocss/config": "66.5.4",
-    "@unocss/rule-utils": "66.5.4"
+    "@unocss/config": "66.5.5",
+    "@unocss/core": "66.5.5",
+    "@unocss/rule-utils": "66.5.5"
   },
   "devDependencies": {
     "@typescript/native-preview": "latest",
-    "svelte-eslint-parser": "^1.3.3",
+    "svelte-eslint-parser": "^1.4.0",
     "vue-eslint-parser": "^10.2.0",
-    "@unocss/eslint-plugin": "66.5.4"
+    "@unocss/eslint-plugin": "66.5.5"
   },
   "scripts": {
     "build": "unbuild",