update reset resolving for @unocss/resets to handle pnpm and npm

jacob-8 · May 19, 2023 · 7344d8f · 7344d8f
1 parent 33257be
commit 7344d8f
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 7 deletions.
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -4,7 +4,7 @@
   "commit": false,
   "fixed": [],
   "linked": [
-    ["svelte-scoped-uno", "svelte-preprocess-unocss"]
+    ["svelte-preprocess-unocss", "svelte-scoped-uno"]
   ],
   "access": "public",
   "baseBranch": "main",

diff --git a/examples/svelte-vite-plugin/package.json b/examples/svelte-vite-plugin/package.json
@@ -17,7 +17,7 @@
     "marked": "^5.0.2",
     "svelte": "^3.59.1",
     "svelte-check": "^3.3.2",
-    "svelte-scoped-uno": "^0.1.1",
+    "svelte-scoped-uno": "^0.1.2",
     "tslib": "^2.5.2",
     "typescript": "^5.0.4",
     "vite": "^4.3.8"

diff --git a/examples/sveltekit-preprocess/package.json b/examples/sveltekit-preprocess/package.json
@@ -29,7 +29,7 @@
 		"publint": "^0.1.11",
 		"svelte": "^3.59.1",
 		"svelte-check": "^3.3.2",
-		"svelte-preprocess-unocss": "^0.1.1",
+		"svelte-preprocess-unocss": "^0.1.2",
 		"tslib": "^2.5.2",
 		"typescript": "^5.0.4",
 		"vite": "^4.3.8",

diff --git a/examples/sveltekit-vite-plugin/package.json b/examples/sveltekit-vite-plugin/package.json
@@ -19,7 +19,7 @@
     "marked": "^5.0.2",
     "svelte": "^3.59.1",
     "svelte-check": "^3.3.2",
-    "svelte-scoped-uno": "^0.1.1",
+    "svelte-scoped-uno": "^0.1.2",
     "tslib": "^2.5.2",
     "typescript": "^5.0.4",
     "vite": "^4.3.8"

diff --git a/packages/svelte-preprocess-unocss/CHANGELOG.md b/packages/svelte-preprocess-unocss/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte-preprocess-unocss
 
+## 0.1.2
+
+### Patch Changes
+
+- update reset resolving for @unocss/resets to handle pnpm and npm
+- Updated dependencies
+  - svelte-scoped-uno@0.1.2
+
 ## 0.1.1
 
 ### Patch Changes

diff --git a/packages/svelte-preprocess-unocss/package.json b/packages/svelte-preprocess-unocss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte-preprocess-unocss",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Run UnoCSS in svelte-scoped mode via a svelte-preprocessor for use in component libraries",
   "type": "module",
   "scripts": {
@@ -21,7 +21,7 @@
     "dist"
   ],
   "dependencies": {
-    "svelte-scoped-uno": "^0.1.1"
+    "svelte-scoped-uno": "^0.1.2"
   },
   "devDependencies": {
     "@vitest/ui": "^0.31.1",

diff --git a/packages/svelte-scoped-uno/CHANGELOG.md b/packages/svelte-scoped-uno/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte-scoped-uno
 
+## 0.1.2
+
+### Patch Changes
+
+- update reset resolving for @unocss/resets to handle pnpm and npm
+
 ## 0.1.1
 
 ### Patch Changes

diff --git a/packages/svelte-scoped-uno/package.json b/packages/svelte-scoped-uno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte-scoped-uno",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Use UnoCSS utility styles in a modular fashion in Svelte, with styles being stored only where needed.",
   "type": "module",
   "scripts": {

diff --git a/packages/svelte-scoped-uno/src/vite/getReset.ts b/packages/svelte-scoped-uno/src/vite/getReset.ts
@@ -7,6 +7,16 @@ const _dirname = typeof __dirname !== 'undefined'
   : dirname(fileURLToPath(import.meta.url))
 
 export function getReset(injectReset: string): string {
+  if (injectReset.startsWith("@unocss/reset")) {
+    const resolvedPNPM = resolve(resolve(_dirname, `../node_modules/${injectReset}`));
+    if (isFile(resolvedPNPM))
+      return readFileSync(resolvedPNPM, "utf-8");
+
+    const resolvedNPM = resolve(process.cwd(), "node_modules", injectReset);
+    return readFileSync(resolvedNPM, "utf-8");
+  }
+
+
   if (injectReset.startsWith('@unocss/reset'))
     return readFileSync(resolve(_dirname, `../node_modules/${injectReset}`), 'utf-8')