@gjsify/cli 0.64.3-next.260 → 0.64.3-next.262

package/lib/actions/build.d.ts

@@ -113,7 +113,8 @@ export declare class BuildAction {
     /**
      * Post-bundle step for a `--app browser` HTML entry: write the processed
      * `index.html` beside the JS bundle, with the entry `<script>`'s `src`
-     * rewritten to point at the built bundle. Mirrors `applyShebang` — kept in
+     * rewritten to point at the built bundle and the page's linked icons copied
+     * to `assets/` beside it. Mirrors `applyShebang` — kept in
      * the CLI (not a Rolldown plugin) because the native rolldown engine
      * exposes no `emitFile`.
      */

package/lib/actions/build.js

@@ -6,10 +6,10 @@ import { resolveGlobalsList, writeRegisterInjectFile, detectAutoGlobals, detectN
 import { pnpPlugin } from '@gjsify/rolldown-plugin-pnp';
 import { basename, dirname, extname, join, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import { chmod, mkdir, readdir, readFile, stat, writeFile } from 'node:fs/promises';
+import { chmod, copyFile, mkdir, readdir, readFile, stat, writeFile } from 'node:fs/promises';
 import { normalizeBundlerOptions, mergeBundlerOptions } from '../utils/normalize-bundler-options.js';
 import { inputSourceDirs, isOutdirInsideSource, libraryOutputLeakError } from '../utils/library-output.js';
-import { detectHtmlEntry, parseHtmlEntry, emitBrowserHtml, htmlOutPathFor } from '../utils/html-entry.js';
+import { collectLinkedAssets, detectHtmlEntry, emitBrowserHtml, htmlOutPathFor, parseHtmlEntry, } from '../utils/html-entry.js';
 import { assertGjsBundleLoadable, assertGjsBundleParses } from '../utils/gjs-bundle-guard.js';
 import { collectEntryPaths, describeJsxConfig, findJsxEntryPoint, jsxConfigMissingError } from '../utils/jsx-config.js';
 import { giSystemProbes } from '../utils/gi-runtime-paths.js';
@@ -489,7 +489,8 @@ export class BuildAction {
     /**
      * Post-bundle step for a `--app browser` HTML entry: write the processed
      * `index.html` beside the JS bundle, with the entry `<script>`'s `src`
-     * rewritten to point at the built bundle. Mirrors `applyShebang` — kept in
+     * rewritten to point at the built bundle and the page's linked icons copied
+     * to `assets/` beside it. Mirrors `applyShebang` — kept in
      * the CLI (not a Rolldown plugin) because the native rolldown engine
      * exposes no `emitFile`.
      */
@@ -502,9 +503,15 @@ export class BuildAction {
             scriptSrc: htmlEntry.scriptSrc,
             jsOutPath,
             outHtmlPath,
+            assets: htmlEntry.assets,
         });
         await mkdir(dirname(outHtmlPath), { recursive: true });
         await writeFile(outHtmlPath, html);
+        for (const { source, target } of new Map(htmlEntry.assets.map((a) => [a.target, a])).values()) {
+            const dest = resolve(dirname(outHtmlPath), target);
+            await mkdir(dirname(dest), { recursive: true });
+            await copyFile(source, dest);
+        }
         if (verbose)
             console.debug(`[gjsify] --app browser: wrote ${outHtmlPath}`);
     }
@@ -667,7 +674,7 @@ export class BuildAction {
                 const htmlSource = await readFile(htmlPath, 'utf-8');
                 const { moduleEntry, scriptTag, scriptSrc } = parseHtmlEntry(htmlPath, htmlSource);
                 userBundler.input = moduleEntry;
-                htmlEntry = { htmlSource, scriptTag, scriptSrc };
+                htmlEntry = { htmlSource, scriptTag, scriptSrc, assets: collectLinkedAssets(htmlPath, htmlSource) };
             }
         }
         const formatRaw = userBundler.output?.format ??

package/lib/utils/html-entry.d.ts

@@ -18,6 +18,22 @@ export declare function detectHtmlEntry(input: RolldownOptions['input'] | undefi
  * path, with the module resolved against the HTML file's directory. Throws when there is none.
  */
 export declare function parseHtmlEntry(htmlPath: string, htmlSource: string): ParsedHtmlEntry;
+export interface LinkedAsset {
+    /** The full matched `<link …>` tag text. */
+    linkTag: string;
+    /** The raw `href` attribute value from that tag (as authored in the HTML). */
+    href: string;
+    /** Absolute path to the referenced file. */
+    source: string;
+    /** Where the copy goes, relative to the emitted HTML's directory (`assets/<name>`). */
+    target: string;
+}
+/**
+ * Every `<link>` whose `rel` names an icon and whose `href` is a local path, resolved against
+ * the HTML file's directory, each with a unique `assets/` target. The same file linked twice
+ * shares one target; two files with one basename get `-1`, `-2`, … suffixes.
+ */
+export declare function collectLinkedAssets(htmlPath: string, htmlSource: string): LinkedAsset[];
 export interface EmitBrowserHtmlInput {
     /** The original HTML source. */
     htmlSource: string;
@@ -29,11 +45,13 @@ export interface EmitBrowserHtmlInput {
     jsOutPath: string;
     /** Absolute path the emitted HTML will be written to. */
     outHtmlPath: string;
+    /** The page's linked icons from {@link collectLinkedAssets}; their `href`s point at the copies. */
+    assets?: readonly LinkedAsset[];
 }
 /**
  * The original source with the entry script's `src` rewritten to the built JS bundle, relative
- * to the output HTML's own directory so the page is portable wherever `dist/` is served from.
- * All other markup is preserved.
+ * to the output HTML's own directory so the page is portable wherever `dist/` is served from,
+ * and each linked icon's `href` rewritten to its `assets/` copy. All other markup is preserved.
  */
 export declare function emitBrowserHtml(input: EmitBrowserHtmlInput): string;
 /** Convenience: the emitted HTML filename for a given JS outfile (sibling `index.html`). */

package/lib/utils/html-entry.js

@@ -8,9 +8,11 @@
 // plugin `emitFile`: the native `@gjsify/rolldown-native` engine implements no `emitFile`, so a
 // plugin-based emit would work on the npm engine (Node) and throw under the GJS-bundled CLI.
 // Parsing is regex-based and tolerant on purpose — this is a shell-page rewrite, not a full HTML
-// pipeline. CSS is NOT extracted here: it travels in the JS bundle as a string via
+// pipeline. The page's own icons — a local `<link rel="icon" href>` and its kin — are copied
+// beside the page under `assets/` with the `href` rewritten, as Vite does, so a favicon the HTML
+// names is one the built page serves. CSS is NOT extracted here: it travels in the JS bundle as a string via
 // css-as-string and is injected by the app, the same pattern the `--app gjs` target uses.
-import { basename, dirname, isAbsolute, relative, resolve } from 'node:path';
+import { basename, dirname, extname, isAbsolute, relative, resolve } from 'node:path';
 /**
  * The `.html` path when `input` is a SINGLE html entry (a literal `.html` string, a 1-element
  * array of one, or a 1-key record whose value is one) — else `null`. Multi-entry inputs and
@@ -54,20 +56,65 @@ export function parseHtmlEntry(htmlPath, htmlSource) {
     throw new Error(`gjsify build: ${htmlPath} has no local <script type="module" src="…"> to bundle. ` +
         `Add one pointing at your app entry (e.g. <script type="module" src="./main.ts">).`);
 }
+const LINK_TAG_RE = /<link\b[^>]*>/gi;
+const HREF_ATTR_RE = /\bhref\s*=\s*["']([^"']+)["']/i;
+const REL_ATTR_RE = /\brel\s*=\s*["']([^"']+)["']/i;
+/** `rel` tokens whose `href` is a file the page itself needs; `shortcut icon` splits to `icon`. */
+const ASSET_RELS = new Set(['icon', 'apple-touch-icon', 'mask-icon']);
+/** Hosted (`https://`, `//`), inline (`data:`, `blob:`) or root-relative (`/…`, the server's) hrefs stay as authored. */
+const NOT_LOCAL_HREF_RE = /^(?:[a-z][a-z0-9+.-]*:|\/)/i;
+/**
+ * Every `<link>` whose `rel` names an icon and whose `href` is a local path, resolved against
+ * the HTML file's directory, each with a unique `assets/` target. The same file linked twice
+ * shares one target; two files with one basename get `-1`, `-2`, … suffixes.
+ */
+export function collectLinkedAssets(htmlPath, htmlSource) {
+    const assets = [];
+    const targetBySource = new Map();
+    const taken = new Set();
+    for (const match of htmlSource.matchAll(LINK_TAG_RE)) {
+        const linkTag = match[0];
+        const rel = REL_ATTR_RE.exec(linkTag)?.[1].toLowerCase().split(/\s+/) ?? [];
+        if (!rel.some((token) => ASSET_RELS.has(token)))
+            continue;
+        const href = HREF_ATTR_RE.exec(linkTag)?.[1];
+        if (!href || NOT_LOCAL_HREF_RE.test(href))
+            continue;
+        const path = href.replace(/[?#].*$/, '');
+        const source = isAbsolute(path) ? path : resolve(dirname(htmlPath), path);
+        let target = targetBySource.get(source);
+        if (!target) {
+            const ext = extname(source);
+            const stem = basename(source, ext);
+            target = `assets/${stem}${ext}`;
+            for (let n = 1; taken.has(target); n++)
+                target = `assets/${stem}-${n}${ext}`;
+            taken.add(target);
+            targetBySource.set(source, target);
+        }
+        assets.push({ linkTag, href, source, target });
+    }
+    return assets;
+}
 /**
  * The original source with the entry script's `src` rewritten to the built JS bundle, relative
- * to the output HTML's own directory so the page is portable wherever `dist/` is served from.
- * All other markup is preserved.
+ * to the output HTML's own directory so the page is portable wherever `dist/` is served from,
+ * and each linked icon's `href` rewritten to its `assets/` copy. All other markup is preserved.
  */
 export function emitBrowserHtml(input) {
-    const { htmlSource, scriptTag, scriptSrc, jsOutPath, outHtmlPath } = input;
+    const { htmlSource, scriptTag, scriptSrc, jsOutPath, outHtmlPath, assets = [] } = input;
     let rel = relative(dirname(outHtmlPath), jsOutPath).split(/[\\/]/).join('/');
     if (!rel.startsWith('.'))
         rel = `./${rel}`;
     // Rewrite the src WITHIN the matched tag, then swap that tag back in — so no other `src=`
     // in the document is touched.
     const newTag = scriptTag.replace(SRC_ATTR_RE, (whole) => whole.replace(scriptSrc, rel));
-    return htmlSource.replace(scriptTag, newTag);
+    let html = htmlSource.replace(scriptTag, newTag);
+    for (const { linkTag, href, target } of new Map(assets.map((a) => [a.linkTag, a])).values()) {
+        const newLink = linkTag.replace(HREF_ATTR_RE, (whole) => whole.replace(href, `./${target}`));
+        html = html.split(linkTag).join(newLink);
+    }
+    return html;
 }
 /** Convenience: the emitted HTML filename for a given JS outfile (sibling `index.html`). */
 export function htmlOutPathFor(jsOutPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/cli",
-    "version": "0.64.3-next.260",
+    "version": "0.64.3-next.262",
     "description": "CLI for Gjsify",
     "type": "module",
     "main": "lib/index.js",
@@ -142,22 +142,22 @@
         "cli"
     ],
     "dependencies": {
-        "@gjsify/blueprint": "0.64.3-next.260",
-        "@gjsify/buffer": "0.64.3-next.260",
-        "@gjsify/create-app": "0.64.3-next.260",
-        "@gjsify/node-globals": "0.64.3-next.260",
-        "@gjsify/node-polyfills": "0.64.3-next.260",
-        "@gjsify/npm-registry": "0.64.3-next.260",
-        "@gjsify/resolve-npm": "0.64.3-next.260",
-        "@gjsify/rolldown-plugin-gjsify": "0.64.3-next.260",
-        "@gjsify/vite-plugin-blueprint": "0.64.3-next.260",
-        "@gjsify/rolldown-plugin-pnp": "0.64.3-next.260",
-        "@gjsify/semver": "0.64.3-next.260",
-        "@gjsify/tar": "0.64.3-next.260",
-        "@gjsify/tsc": "0.64.3-next.260",
-        "@gjsify/utils": "0.64.3-next.260",
-        "@gjsify/web-polyfills": "0.64.3-next.260",
-        "@gjsify/workspace": "0.64.3-next.260",
+        "@gjsify/blueprint": "0.64.3-next.262",
+        "@gjsify/buffer": "0.64.3-next.262",
+        "@gjsify/create-app": "0.64.3-next.262",
+        "@gjsify/node-globals": "0.64.3-next.262",
+        "@gjsify/node-polyfills": "0.64.3-next.262",
+        "@gjsify/npm-registry": "0.64.3-next.262",
+        "@gjsify/resolve-npm": "0.64.3-next.262",
+        "@gjsify/rolldown-plugin-gjsify": "0.64.3-next.262",
+        "@gjsify/vite-plugin-blueprint": "0.64.3-next.262",
+        "@gjsify/rolldown-plugin-pnp": "0.64.3-next.262",
+        "@gjsify/semver": "0.64.3-next.262",
+        "@gjsify/tar": "0.64.3-next.262",
+        "@gjsify/tsc": "0.64.3-next.262",
+        "@gjsify/utils": "0.64.3-next.262",
+        "@gjsify/web-polyfills": "0.64.3-next.262",
+        "@gjsify/workspace": "0.64.3-next.262",
         "acorn": "^8.17.0",
         "cosmiconfig": "^9.0.2",
         "get-tsconfig": "^4.14.0",
@@ -166,13 +166,13 @@
         "yargs": "^18.0.0"
     },
     "devDependencies": {
-        "@gjsify/unit": "0.64.3-next.260",
+        "@gjsify/unit": "0.64.3-next.262",
         "@types/yargs": "^17.0.35",
         "typescript": "^6.0.3"
     },
     "peerDependencies": {
-        "@gjsify/oxfmt-native": "0.64.3-next.260",
-        "@gjsify/rolldown-native": "0.64.3-next.260"
+        "@gjsify/oxfmt-native": "0.64.3-next.262",
+        "@gjsify/rolldown-native": "0.64.3-next.262"
     },
     "peerDependenciesMeta": {
         "@gjsify/oxfmt-native": {
@@ -192,5 +192,5 @@
         "url": "https://github.com/gjsify/gjsify/issues"
     },
     "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/infra/cli#readme",
-    "gitHead": "886de21be840429ce043cdbf8195172530e230d4"
+    "gitHead": "0f5ca82aab25bf9df8d1e790d28483b1f90fe3a9"
 }