@lumeland/core 1.0.0-beta-2 → 1.0.0-beta-3

package/build/src/site.js

@@ -6,6 +6,7 @@ import { log } from "./utils/log.js";
 import { filter404page } from "./utils/page_url.js";
 import { insertContent } from "./utils/page_content.js";
 import { getFile, getFiles, isFromCdn } from "./utils/cdn.js";
+import { setCache } from "./utils/read.js";
 import FS from "./fs.js";
 import { compileCSS, compileJS, ComponentLoader } from "./components.js";
 import DataLoader from "./data_loader.js";
@@ -195,6 +196,7 @@ export default class Site {
         // Initialize the cache if LUME_NOCACHE is not enabled
         if (envBoolean("LUME_NOCACHE") !== true) {
             this.cache = new Cache({ folder: this.root("_cache") });
+            setCache(this.cache);
         }
         // Initialize the debug bar
         const initDebugBar = this.options.server.debugBar ?? envBoolean("LUME_LIVE_RELOAD");

package/build/src/utils/read.d.ts

@@ -1,10 +1,11 @@
+import type Cache from "../cache.ts";
+export declare function setCache(instance: Cache): void;
 /**
  * Read a local or remote file and return its content.
  * If the file is remote, it will be cached in the `lume_remote_files` cache.
  */
-export declare function read(path: string, isBinary: boolean): Promise<Uint8Array<ArrayBuffer> | string>;
-export declare function read(path: string, isBinary: true, init?: RequestInit): Promise<Uint8Array<ArrayBuffer>>;
 export declare function read(path: string, isBinary: false, init?: RequestInit): Promise<string>;
+export declare function read(path: string, isBinary: true, init?: RequestInit): Promise<Uint8Array<ArrayBuffer>>;
 /** Read a text file like a browser */
 export declare function readFile(path: string): Promise<string>;
 /**

package/build/src/utils/read.js

@@ -1,9 +1,11 @@
 import { isUrl } from "./path.js";
-import { envBoolean } from "./env.js";
 import { tokens } from "./tokens.js";
 import { readFile as readFile_, readTextFile } from "../services/fs.js";
 import { fromFileUrl } from "../../deps/path.js";
-const useCache = envBoolean("LUME_NOCACHE") !== true;
+let cache;
+export function setCache(instance) {
+    cache = instance;
+}
 export async function read(path, isBinary, init) {
     if (!isUrl(path)) {
         if (path.startsWith("data:")) {
@@ -23,23 +25,9 @@ export async function read(path, isBinary, init) {
         headers.set("Authorization", authorization);
         init = { ...init, headers };
     }
-    if (!useCache) {
-        const response = await fetch(url, init);
-        if (!response.ok) {
-            throw new Error(`Failed to fetch "${url}"`);
-        }
-        return isBinary ? new Uint8Array(await response.arrayBuffer()) : response.text();
-    }
-    const cache = await caches.open("lume_remote_files");
-    // Prevent https://github.com/denoland/deno/issues/19696
-    try {
-        const cached = await cache.match(url);
-        if (cached) {
-            return isBinary ? new Uint8Array(await cached.arrayBuffer()) : cached.text();
-        }
-    }
-    catch {
-        // ignore
+    const cached = isBinary ? cache?.getBytes([url]) : cache?.getText([url]);
+    if (cached) {
+        return cached;
     }
     const response = await fetch(url, {
         signal: AbortSignal.timeout(1000 * 10), // 10s
@@ -48,8 +36,9 @@ export async function read(path, isBinary, init) {
     if (!response.ok) {
         throw new Error(`Failed to fetch "${url}"`);
     }
-    await cache.put(url, response.clone());
-    return isBinary ? new Uint8Array(await response.arrayBuffer()) : response.text();
+    const content = isBinary ? new Uint8Array(await response.arrayBuffer()) : await response.text();
+    cache?.set([url], content);
+    return content;
 }
 /** Read a text file like a browser */
 export async function readFile(path) {
@@ -63,5 +52,5 @@ export async function readFile(path) {
  * Clear the cache of remote files.
  */
 export async function clearCache() {
-    await caches.delete("lume_remote_files");
+    cache?.clear();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumeland/core",
-  "version": "1.0.0-beta-2",
+  "version": "1.0.0-beta-3",
   "description": "The core of Lume SSG",
   "license": "MIT",
   "files": [