[astro-purgecss] Fix regression with windows paths (#894)

* [astro-purgecss] Fix regression with windows paths * fix code style * docs(changeset): fix regression in handling windows paths
codiume · Feb 9, 2025 · 796821b · 796821b
1 parent 39bddfd
commit 796821b
Show file tree

Hide file tree

Showing 5 changed files with 336 additions and 245 deletions.
diff --git a/.changeset/wild-camels-shake.md b/.changeset/wild-camels-shake.md
@@ -0,0 +1,5 @@
+---
+'astro-purgecss': minor
+---
+
+fix regression in handling windows paths
diff --git a/package.json b/package.json
@@ -18,23 +18,23 @@
     "changeset:publish": "pnpm run build && changeset publish"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.17.2",
+    "@arethetypeswrong/cli": "^0.17.3",
     "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.11",
-    "@types/node": "^22.10.5",
-    "astro": "^5.2.2",
-    "commander": "^13.0.0",
+    "@changesets/cli": "^2.27.12",
+    "@types/node": "^22.13.1",
+    "astro": "^5.2.5",
+    "commander": "^13.1.0",
     "esbuild": "^0.25.0",
     "esbuild-plugin-clean": "^1.0.1",
     "kleur": "^4.1.5",
-    "ora": "^8.1.1",
+    "ora": "^8.2.0",
     "pkg-pr-new": "^0.0.39",
-    "prettier": "^3.4.2",
+    "prettier": "^3.5.0",
     "prettier-plugin-astro": "^0.14.1",
     "tiny-glob": "^0.2.9",
-    "tsup": "^8.3.5",
-    "turbo": "^2.3.3",
-    "typescript": "^5.7.2",
+    "tsup": "^8.3.6",
+    "turbo": "^2.4.0",
+    "typescript": "^5.7.3",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.0.5"
   }

diff --git a/packages/astro-purgecss/src/index.ts b/packages/astro-purgecss/src/index.ts
@@ -1,10 +1,10 @@
 import type { AstroConfig, AstroIntegration } from 'astro';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
 import { PurgeCSS, type UserDefinedOptions } from 'purgecss';
 
 import {
+  cleanPath,
   generateFileHash,
   readFileContent,
   success,
@@ -46,7 +46,7 @@ function Plugin(options: PurgeCSSOptions = {}): AstroIntegration {
         logger.info(`📦 Running in '${buildMode}' mode`);
 
         // Convert the URL to a filesystem path
-        const outDir = fileURLToPath(dir);
+        const outDir = cleanPath(dir);
 
         // Used to skip file rehashing for SSR/Hybrid modes
         const isSSR = buildMode !== 'static';

diff --git a/packages/astro-purgecss/src/utils.ts b/packages/astro-purgecss/src/utils.ts
@@ -2,6 +2,7 @@ import { dim, green, red } from 'kleur/colors';
 import { createHash } from 'node:crypto';
 import { existsSync } from 'node:fs';
 import { readFile, unlink, writeFile } from 'node:fs/promises';
+import { fileURLToPath } from 'node:url';
 
 export async function readFileContent(filePath: string): Promise<string> {
   try {
@@ -43,6 +44,19 @@ export function generateFileHash(filePath: string, content: string) {
   return `${filePath.slice(0, -13)}.${hash}.css`;
 }
 
+// Clean from extra slash on windows and trailing forward slash on non-windows
+export function cleanPath(file: URL): string {
+  if (!(file instanceof URL)) {
+    throw new TypeError('Expected a URL object');
+  }
+
+  // Remove trailing forward slash if present
+  let path = fileURLToPath(file).replace(/\/+$/, '');
+
+  // Remove leading forward slash on windows if present
+  return process.platform === 'win32' ? path.replace(/^\/+/, '') : path;
+}
+
 export const dt = new Intl.DateTimeFormat('en-us', {
   hour: '2-digit',
   minute: '2-digit',