@lumeland/core 1.0.0-beta-4 → 1.0.0-beta-5

package/build/src/components.d.ts

@@ -48,8 +48,6 @@ export interface ComponentFile {
     /** Extra default data stored in the component */
     [key: string]: unknown;
 }
-export declare function compileCSS(filename: string, imports: Map<string, string | Entry>, entries: Map<string, Entry>): Promise<string>;
-export declare function compileJS(filename: string, imports: Map<string, string | Entry>, entries: Map<string, Entry>): Promise<string>;
 export interface ProxyComponents {
     (props?: Record<string, unknown>): any;
     [key: string]: ProxyComponents;

package/build/src/components.js

@@ -1,6 +1,3 @@
-import textLoader from "./loaders/text.js";
-import { posix } from "../deps/path.js";
-import { log } from "./utils/log.js";
 /**
  * Class to load components from the _components folder.
  */
@@ -109,92 +106,6 @@ function findChild(entry, filter) {
         }
     }
 }
-export async function compileCSS(filename, imports, entries) {
-    const mainCode = Array.from(imports.keys())
-        .map((path) => `@import "${path}";`)
-        .join("\n");
-    const { bundleAsync } = await import("../deps/lightningcss.js");
-    const { code } = await bundleAsync({
-        filename,
-        sourceMap: false,
-        resolver: {
-            resolve(id, importer) {
-                if (id.startsWith(".")) {
-                    id = posix.join(posix.dirname(importer), id);
-                }
-                return id;
-            },
-            async read(filePath) {
-                if (filePath === filename) {
-                    return mainCode;
-                }
-                const content = await getEntryContent(imports.get(filePath) || entries.get(filePath));
-                if (!content) {
-                    log.error(`[components] File "${filePath}" not found or is empty`);
-                }
-                return content;
-            },
-        },
-    });
-    const decoder = new TextDecoder();
-    return decoder.decode(code);
-}
-export async function compileJS(filename, imports, entries) {
-    const mainCode = Array.from(imports.keys())
-        .map((path) => `import "${path}";`)
-        .join("\n");
-    const { build, stop } = await import("../deps/esbuild.js");
-    const { outputFiles } = await build({
-        bundle: true,
-        entryPoints: [filename],
-        write: false,
-        format: "esm",
-        minify: false,
-        target: "esnext",
-        outfile: filename,
-        plugins: [
-            {
-                name: "components-resolver",
-                setup(build) {
-                    build.onResolve({ filter: /.*/ }, ({ path, importer }) => {
-                        if (path.startsWith(".")) {
-                            path = posix.join(posix.dirname(importer), path);
-                        }
-                        if (path === filename || imports.has(path) || entries.has(path)) {
-                            return { path, namespace: "fs" };
-                        }
-                        return { path, external: true };
-                    });
-                    build.onLoad({ filter: /.*/, namespace: "fs" }, async ({ path }) => {
-                        const contents = path === filename
-                            ? mainCode
-                            : await getEntryContent(imports.get(path) || entries.get(path));
-                        if (!contents) {
-                            log.error(`[components] File "${path}" not found or is empty`);
-                        }
-                        return {
-                            contents,
-                            loader: path.endsWith(".ts") ? "ts" : "js",
-                        };
-                    });
-                },
-            },
-        ],
-    });
-    await stop();
-    const decoder = new TextDecoder();
-    return decoder.decode(outputFiles[0].contents);
-}
-async function getEntryContent(entry) {
-    if (typeof entry === "string") {
-        return entry;
-    }
-    if (entry) {
-        const { content } = await entry.getContent(textLoader);
-        return content || "";
-    }
-    return "";
-}
 /**
  * Create and returns a proxy to use the components
  * as comp.name() instead of components.get("name").render()

package/build/src/services/fs.d.ts

@@ -48,11 +48,11 @@ export interface FileInfo {
 export declare function statSync(path: string): FileInfo;
 export declare class FileWatcher {
     #private;
-    constructor(paths: string[]);
+    constructor(path: string);
     close(): void;
     [Symbol.asyncIterator](): AsyncGenerator<string[]>;
 }
-export declare function watchFiles(paths: string[]): FileWatcher;
+export declare function watchFiles(path: string): FileWatcher;
 export interface FsStream {
     readable: ReadableStream<Uint8Array<ArrayBuffer>>;
     [Symbol.dispose]: () => void;

package/build/src/services/fs.js

@@ -131,23 +131,25 @@ export function statSync(path) {
 }
 export class FileWatcher {
     #controller = new AbortController();
-    #paths;
-    constructor(paths) {
-        this.#paths = paths;
+    #path;
+    constructor(path) {
+        this.#path = path;
     }
     close() {
         this.#controller.abort();
     }
     async *[Symbol.asyncIterator]() {
         const { signal } = this.#controller;
-        const iterator = mergeIterators(this.#paths.map((p) => [p, fsPromises.watch(p, { signal, recursive: true })]));
+        const iterator = fsPromises.watch(this.#path, { signal, recursive: true });
         for await (const change of iterator) {
-            yield change;
+            if (change.filename) {
+                yield [join(this.#path, change.filename)];
+            }
         }
     }
 }
-export function watchFiles(paths) {
-    return new FileWatcher(paths.map(toPath));
+export function watchFiles(path) {
+    return new FileWatcher(path);
 }
 export function readStream(file, start) {
     const nodeStream = fs.createReadStream(toPath(file), { start });
@@ -158,41 +160,6 @@ export function readStream(file, start) {
         },
     };
 }
-function mergeIterators(iterators) {
-    let done = false;
-    return new ReadableStream({
-        start(controller) {
-            let active = iterators.length;
-            for (const [root, it] of iterators) {
-                (async () => {
-                    try {
-                        for await (const item of it) {
-                            if (item.filename) {
-                                controller.enqueue([join(root, item.filename)]);
-                            }
-                        }
-                    }
-                    catch (error) {
-                        if (error?.name !== "AbortError" && !done) {
-                            done = true;
-                            controller.error(error);
-                        }
-                    }
-                    finally {
-                        active--;
-                        if (active === 0 && !done) {
-                            done = true;
-                            controller.close();
-                        }
-                    }
-                })();
-            }
-        },
-        cancel() {
-            done = true;
-        },
-    });
-}
 // Ensure file: URLs are converted to paths
 function toPath(urlOrPath) {
     return urlOrPath.startsWith("file:") ? fileURLToPath(urlOrPath) : urlOrPath;

package/build/src/services/hmr.d.ts

@@ -11,3 +11,8 @@ export declare function hmr(): void;
 export declare function updateDependencies(url: string): Generator<string>;
 /** Increment the version number */
 export declare function updateVersion(): void;
+/** Files that reload the process when they changed (not HMR available) */
+export declare function addReloadFile(path: string): void;
+/** Reload the current process */
+export declare function reloadProcess(): void;
+export declare function startProcess(mainEntry: string, importer: string): void;

package/build/src/services/hmr.js

@@ -1,7 +1,10 @@
 import { registerHooks } from "node:module";
 import { pathToFileURL } from "node:url";
+import process from "node:process";
 import { cwd } from "./process.js";
+import { fork } from "node:child_process";
 let version = 0;
+const reloadFiles = new Set();
 const root = pathToFileURL(cwd()).href;
 const files = new Map();
 const dependencies = new Map();
@@ -51,6 +54,10 @@ export function hmr() {
  * This updates all modules that import the module that just changed.
  */
 export function* updateDependencies(url) {
+    if (reloadFiles.has(url)) {
+        reloadProcess();
+        return;
+    }
     files.delete(url);
     for (const dep of dependencies.get(url) ?? []) {
         yield dep;
@@ -61,3 +68,32 @@ export function* updateDependencies(url) {
 export function updateVersion() {
     ++version;
 }
+/** Files that reload the process when they changed (not HMR available) */
+export function addReloadFile(path) {
+    reloadFiles.add(path);
+}
+/** Reload the current process */
+export function reloadProcess() {
+    if (process.send) {
+        process.send({ type: "reload" });
+    }
+}
+let child;
+export function startProcess(mainEntry, importer) {
+    child = fork(mainEntry, process.argv.slice(2), {
+        stdio: ["inherit", "inherit", "inherit", "ipc"],
+        execArgv: [...process.execArgv, "--import", importer],
+    });
+    let relaunch = false;
+    child.on("message", (msg) => {
+        if (msg.type === "reload") {
+            relaunch = true;
+            child?.kill("SIGTERM");
+        }
+    });
+    child.on("exit", (code, signal) => {
+        if (relaunch)
+            return startProcess(mainEntry, importer);
+        process.exit(code ?? (signal ? 1 : 0));
+    });
+}

package/build/src/services/process.d.ts

@@ -17,5 +17,3 @@ export declare function inspect(value: unknown): string;
 export declare function runPipedCommand(cmd: string, args?: string[], cwd?: string): [string | undefined, string | undefined];
 /** Run an command and return if it's success */
 export declare function runCommand(cmd: string, args?: string[], cwd?: string): Promise<boolean>;
-/** Reload the process */
-export declare function reloadProcess(): void;

package/build/src/services/process.js

@@ -66,9 +66,3 @@ export async function runCommand(cmd, args = [], cwd) {
         child.on("close", (code) => resolve(code === 0));
     });
 }
-/** Reload the process */
-export function reloadProcess() {
-    if (process.send) {
-        process.send({ type: "reload" });
-    }
-}

package/build/src/site.d.ts

@@ -54,7 +54,7 @@ declare const defaults: {
     watcher: {
         ignore: never[];
         debounce: number;
-        include: never[];
+        reload: never[];
         dependencies: {};
     };
     components: {};
@@ -303,8 +303,8 @@ export interface WatcherOptions {
     ignore?: (string | ((path: string) => boolean))[];
     /** The interval in milliseconds to check for changes */
     debounce?: number;
-    /** Extra files and folders to watch (ouside the src folder) */
-    include?: string[];
+    /** Extra files that cause the process to reload */
+    reload?: string[];
     /** Manual dependencies not detected by the watcher */
     dependencies?: Record<string, string[]>;
 }

package/build/src/site.js

@@ -8,7 +8,7 @@ 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 { ComponentLoader } from "./components.js";
 import DataLoader from "./data_loader.js";
 import Source from "./source.js";
 import Scopes from "./scopes.js";
@@ -28,6 +28,8 @@ import Server from "./server.js";
 import Cache from "./cache.js";
 import DebugBar from "./debugbar.js";
 import { cwd } from "./services/process.js";
+import { compileComponentsCSS } from "@lumeland/plugin-lightningcss/comp.ts";
+import { compileComponentsJS } from "@lumeland/plugin-esbuild/comp.ts";
 /** Default options of the site */
 const defaults = {
     cwd: cwd(),
@@ -51,7 +53,7 @@ const defaults = {
     watcher: {
         ignore: [],
         debounce: 100,
-        include: [],
+        reload: [],
         dependencies: {},
     },
     components: {},
@@ -672,7 +674,7 @@ export default class Site {
             if (path.endsWith(".css")) {
                 this.debugBar?.startMeasure("components-css");
                 const page = await this.getOrCreatePage(path);
-                page.text = insertContent(page.text, await compileCSS(path, entries, this.fs.entries), this.options.components.placeholder);
+                page.text = insertContent(page.text, await compileComponentsCSS(path, entries, this.fs.entries), this.options.components.placeholder);
                 this.debugBar?.endMeasure("components-css", `[Components] Compiled CSS code into <code>${path}</code>`);
                 continue;
             }
@@ -681,7 +683,7 @@ export default class Site {
                 // https://github.com/lumeland/lume/issues/659
                 const existingFile = this.search.file(path.replace(/.m?js$/, "{.mjs,.js,.ts}"));
                 const page = await this.getOrCreatePage(existingFile || path);
-                page.text = insertContent(page.text, await compileJS(path, entries, this.fs.entries), this.options.components.placeholder);
+                page.text = insertContent(page.text, await compileComponentsJS(path, entries, this.fs.entries), this.options.components.placeholder);
                 this.debugBar?.endMeasure("components-js", `[Components] Compiled JS code into <code>${path}</code>`);
             }
         }
@@ -850,9 +852,7 @@ export default class Site {
             return this.watcher;
         }
         this.watcher = new FSWatcher({
-            src: this.src(),
             root: this.root(),
-            paths: this.options.watcher.include,
             ignore: this.options.watcher.ignore,
             debounce: this.options.watcher.debounce,
             dependencies: this.options.watcher.dependencies,

package/build/src/watcher.d.ts

@@ -5,10 +5,6 @@ import type { Event, EventListener, EventOptions } from "./events.ts";
 export interface Options {
     /** The root folder */
     root: string;
-    /** The src folder to watch */
-    src: string;
-    /** Extra files to watch */
-    paths?: string[];
     /** Paths ignored by the watcher */
     ignore?: (string | ((path: string) => boolean))[];
     /** The debounce waiting time */

package/build/src/watcher.js

@@ -21,8 +21,8 @@ export default class FSWatcher {
     }
     /** Start the file watcher */
     async start() {
-        const { root, src, paths, ignore, debounce, dependencies } = this.options;
-        const watcher = watchFiles([src, ...(paths ?? [])]);
+        const { root, ignore, debounce, dependencies } = this.options;
+        const watcher = watchFiles(root);
         const changes = new Set();
         let timer = undefined;
         let runningCallback = false;

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@lumeland/core",
-  "version": "1.0.0-beta-4",
+  "version": "1.0.0-beta-5",
   "description": "The core of Lume SSG",
   "license": "MIT",
+  "author": "Óscar Otero",
   "files": [
     "build",
     "CHANGELOG.md"
@@ -20,15 +21,11 @@
   },
   "dependencies": {
     "@lumeland/dom": "^0.1.56",
-    "@resvg/resvg-js": "^2.6.2",
-    "@types/ws": "^8.18.2",
+    "@lumeland/plugin-esbuild": "^1.0.0-beta-3",
+    "@lumeland/plugin-lightningcss": "^1.0.0-beta-3",
     "deno-std": "1.5.1",
-    "esbuild": "0.28.2",
-    "ico-endec": "^0.1.6",
-    "lightningcss": "1.33.0",
     "remove-markdown": "0.8.0",
-    "sharp": "^0.35.5",
-    "temporal-polyfill": "^1.0.5",
+    "temporal-polyfill": "^1.0.6",
     "ws": "^8.22.0"
   }
 }

package/build/deps/esbuild.d.ts

@@ -1 +0,0 @@
-export * from "esbuild";

package/build/deps/esbuild.js

@@ -1 +0,0 @@
-export * from "esbuild";

package/build/deps/lightningcss.d.ts

@@ -1 +0,0 @@
-export * from "lightningcss";

package/build/deps/lightningcss.js

@@ -1 +0,0 @@
-export * from "lightningcss";

package/build/deps/resvg.d.ts

@@ -1,3 +0,0 @@
-import { type ResvgRenderOptions } from "@resvg/resvg-js";
-export type { ResvgRenderOptions };
-export declare function toPng(svg: string, options?: ResvgRenderOptions): Uint8Array;

package/build/deps/resvg.js

@@ -1,6 +0,0 @@
-import { Resvg } from "@resvg/resvg-js";
-export function toPng(svg, options = { fitTo: { mode: "original" } }) {
-    const resvg = new Resvg(svg, options);
-    const pngData = resvg.render();
-    return pngData.asPng();
-}

package/build/deps/sharp.d.ts

@@ -1,5 +0,0 @@
-export type { FormatEnum, ResizeOptions, Sharp } from "sharp";
-import type { Sharp, SharpOptions } from "sharp";
-import { type ResvgRenderOptions } from "./resvg.ts";
-export declare function sharpsToIco(...images: Sharp[]): Promise<any>;
-export declare function create(content: Uint8Array | string, config?: SharpOptions, svgOptions?: ResvgRenderOptions): Sharp;

package/build/deps/sharp.js

@@ -1,16 +0,0 @@
-import sharp from "sharp";
-// @ts-expect-error: no types for ico-endec
-import icoEndec from "ico-endec";
-import { toPng } from "./resvg.js";
-export async function sharpsToIco(...images) {
-    const buffers = await Promise.all(images.map((image) => image.toFormat("png").toBuffer()));
-    // deno-lint-ignore no-explicit-any
-    return icoEndec.encode(buffers.map((buffer) => buffer.buffer));
-}
-export function create(content, config = {}, svgOptions) {
-    // It's a SVG
-    if (typeof content === "string") {
-        return sharp(toPng(content, svgOptions));
-    }
-    return sharp(content, config);
-}

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

@@ -1,3 +0,0 @@
-import type { FormatEnum } from "../../deps/sharp.ts";
-import type Cache from "../cache.ts";
-export declare function buildIcon(content: Uint8Array | string, format: keyof FormatEnum | "ico", size: number[], cache?: Cache): Promise<Uint8Array<ArrayBuffer>>;

package/build/src/utils/image.js

@@ -1,28 +0,0 @@
-import { create, sharpsToIco } from "../../deps/sharp.js";
-export async function buildIcon(content, format, size, cache) {
-    if (cache) {
-        const result = cache.getBytes([content, format, size]);
-        if (result) {
-            return result;
-        }
-    }
-    const svgOptions = {
-        fitTo: { mode: "width", value: Math.max(...size) },
-    };
-    let image;
-    if (format === "ico") {
-        const resizeOptions = { background: { r: 0, g: 0, b: 0, alpha: 0 } };
-        const img = create(content, undefined, svgOptions);
-        image = await sharpsToIco(...size.map((size) => img.clone().resize(size, size, resizeOptions)));
-    }
-    else {
-        image = (await create(content, undefined, svgOptions)
-            .resize(size[0], size[0])
-            .toFormat(format)
-            .toBuffer());
-    }
-    if (cache) {
-        cache.set([content, format, size], image);
-    }
-    return image;
-}