feat: ♻️ Refactor and remove unused code

Author: damianpumar

lib/cache.ts

@@ -1,7 +1,7 @@
 import { createStorage } from "unstorage";
 import fsDriver from "unstorage/drivers/fs";
 
-export const cacheBase = "node_modules/.cache/fontless/fonts/meta";
+export const cacheBase = "node_modules/.cache/fontless";
 
 export const storage = createStorage({
   driver: fsDriver({ base: cacheBase }),

lib/css/assets.ts

@@ -57,18 +57,7 @@ export async function setupPublicAssetStrategy(options: Options) {
     return data;
   }
 
-  const cacheDir = join(options.fontless.buildDir, "cache", "fonts");
-
-  if (!options.fontless.dev) {
-    await fsp.mkdir(cacheDir, { recursive: true });
-  }
-
   const rollupBefore = async () => {
-    if (options.fontless.dev) {
-      await fsp.mkdir(join(options.fontless.baseURL, assetsBaseURL), {
-        recursive: true,
-      });
-    }
     for (const [filename, url] of renderedFontURLs) {
       const key = "data:fonts:" + filename;
       // Use storage to cache the font data between builds
@@ -81,14 +70,15 @@ export async function setupPublicAssetStrategy(options: Options) {
         await storage.setItemRaw(key, res);
       }
 
-      await fsp.writeFile(join(cacheDir, filename), res);
+      // TODO: investigate how we can improve in dev surround
+      await fsp.mkdir(join(options.fontless.baseURL, assetsBaseURL), {
+        recursive: true,
+      });
 
-      if (options.fontless.dev) {
-        await fsp.writeFile(
-          joinRelativeURL(options.fontless.baseURL, assetsBaseURL, filename),
-          res
-        );
-      }
+      await fsp.writeFile(
+        joinRelativeURL(options.fontless.baseURL, assetsBaseURL, filename),
+        res
+      );
     }
   };
 

lib/css/transformer.ts

@@ -224,7 +224,7 @@ export async function transformCSS(
   opts: { relative?: boolean } = {}
 ) {
   const { fontless } = options;
-  const s = new MagicString(code);
+  const string = new MagicString(code);
 
   const injectedDeclarations = new Set<string>();
 
@@ -313,11 +313,11 @@ export async function transformCSS(
       }
     }
 
-    s.prepend(prefaces.join(""));
+    string.prepend(prefaces.join(""));
 
     if (fallbackOptions && insertFontFamilies) {
       const insertedFamilies = fallbackMap.map((f) => `"${f.name}"`).join(", ");
-      s.prependLeft(fallbackOptions.index, `, ${insertedFamilies}`);
+      string.prependLeft(fallbackOptions.index, `, ${insertedFamilies}`);
     }
   }
 
@@ -390,7 +390,7 @@ export async function transformCSS(
 
   await Promise.all(promises);
 
-  return s;
+  return string;
 }
 
 async function resolveProviders(_providers: ModuleOptions["providers"] = {}) {
@@ -409,5 +409,6 @@ async function resolveProviders(_providers: ModuleOptions["providers"] = {}) {
       });
     }
   }
+
   return providers as Record<string, (options: any) => Provider>;
 }

lib/index.ts

@@ -64,7 +64,6 @@ export interface FontFaceResolution {
 
 export interface FontlessOptions {
   baseURL: string;
-  buildDir: string;
   dev: boolean;
   processCSSVariables?: boolean;
   shouldPreload: (fontFamily: string, font: FontFaceData) => boolean;

lib/types.ts

@@ -34,7 +34,6 @@ const defaultModule = {
 
 const defaultFontless: FontlessOptions = {
   baseURL: "public",
-  buildDir: "dist",
   dev: process.env.NODE_ENV !== "production",
   processCSSVariables: false,
   shouldPreload: () => false,
@@ -110,6 +109,7 @@ export const fontless = (options: Options = defaultOptions): Plugin => {
 
       const s = await transformCSS(options, code, id, postcssOptions);
 
+      //TODO: Move this to a hook from vite
       options.hooks["rollup:before"]?.(options);
 
       if (s.hasChanged()) {