@vivliostyle/cli 9.1.0 → 9.1.1

package/dist/{chunk-KSJHCVYG.js → chunk-23EG3WEZ.js}

@@ -25,10 +25,10 @@ import {
   touchTmpFile,
   useTmpDirectory,
   writeFileIfChanged
-} from "./chunk-7BGVK3JL.js";
+} from "./chunk-U63QI2TT.js";
 import {
   VivliostyleConfigSchema
-} from "./chunk-ASL7KKVE.js";
+} from "./chunk-SEVGSYUZ.js";
 import {
   CONTAINER_LOCAL_HOSTNAME,
   CONTAINER_URL,
@@ -230,7 +230,7 @@ function mergeInlineConfig({ tasks, inlineOptions }, inlineConfig) {
 import { VFM } from "@vivliostyle/vfm";
 import { lookup as mime } from "mime-types";
 import fs3 from "node:fs";
-import { pathToFileURL as pathToFileURL2 } from "node:url";
+import { fileURLToPath, pathToFileURL as pathToFileURL2 } from "node:url";
 import npa from "npm-package-arg";
 import upath2 from "upath";
 
@@ -446,9 +446,9 @@ function resolveTaskConfig(config, options) {
   const outputs = (() => {
     const defaultPdfOptions = {
       format: "pdf",
-      renderMode: "local",
-      preflight: config.pressReady ? "press-ready" : void 0,
-      preflightOption: []
+      renderMode: options.renderMode ?? "local",
+      preflight: options.preflight ?? (config.pressReady ? "press-ready" : void 0),
+      preflightOption: options.preflightOption ?? []
     };
     if (config.output) {
       return config.output.map((target) => {
@@ -490,18 +490,23 @@ function resolveTaskConfig(config, options) {
   })();
   const { server, rootUrl } = (() => {
     let host = config.server?.host ?? false;
+    let allowedHosts = config.server?.allowedHosts || [];
     const port = config.server?.port ?? 13e3;
     if (outputs.some(
       (target) => target.format === "pdf" && target.renderMode === "docker"
-    )) {
+    ) && !isInContainer()) {
       host = true;
+      if (Array.isArray(allowedHosts) && !allowedHosts.includes(CONTAINER_LOCAL_HOSTNAME)) {
+        allowedHosts.push(CONTAINER_LOCAL_HOSTNAME);
+      }
     }
-    const rootHostname = isInContainer() ? CONTAINER_LOCAL_HOSTNAME : !host ? "localhost" : host === true ? "0.0.0.0" : host;
+    const rootHostname = !host ? "localhost" : host === true ? "0.0.0.0" : host;
     return {
       server: {
         host,
         port,
-        proxy: config.server?.proxy ?? {}
+        proxy: config.server?.proxy ?? {},
+        allowedHosts
       },
       rootUrl: `http://${rootHostname}:${port}`
     };
@@ -620,12 +625,19 @@ function resolveSingleInputConfig({
   const author = config?.author;
   const entries = [];
   const exportAliases = [];
+  let isLocalResource = true;
   if (isValidUri(input.entry)) {
-    sourcePath = input.entry;
-    serverRootDir = UseTemporaryServerRoot;
-    workspaceDir = context;
+    const url = new URL(input.entry);
+    if (url.protocol === "file:") {
+      sourcePath = fileURLToPath(url);
+    } else {
+      isLocalResource = false;
+      sourcePath = input.entry;
+    }
   } else {
     sourcePath = upath2.resolve(context, input.entry);
+  }
+  if (isLocalResource) {
     statFileSync(sourcePath);
     switch (input.format) {
       case "webbook":
@@ -648,6 +660,9 @@ function resolveSingleInputConfig({
         return input.format;
     }
     serverRootDir = workspaceDir;
+  } else {
+    serverRootDir = UseTemporaryServerRoot;
+    workspaceDir = context;
   }
   const themesDir = upath2.resolve(workspaceDir, "themes");
   if (input.format === "markdown") {
@@ -1190,7 +1205,7 @@ import jsdom, {
 } from "@vivliostyle/jsdom";
 import DOMPurify from "dompurify";
 import { toHtml } from "hast-util-to-html";
-import { fileURLToPath, pathToFileURL as pathToFileURL3 } from "node:url";
+import { fileURLToPath as fileURLToPath2, pathToFileURL as pathToFileURL3 } from "node:url";
 import upath3 from "upath";
 import MIMEType from "whatwg-mimetype";
 import { jsx, jsxs } from "hastscript/jsx-runtime";
@@ -1228,7 +1243,8 @@ var htmlPurify = DOMPurify(
   // @ts-expect-error: jsdom.DOMWindow should have trustedTypes property
   new JSDOM("").window
 );
-var ResourceLoader = class extends BaseResourceLoader {
+var ResourceLoader = class _ResourceLoader extends BaseResourceLoader {
+  static dataUrlOrigin = "http://localhost/";
   fetcherMap = /* @__PURE__ */ new Map();
   fetch(url, options) {
     Logger.debug(`[JSDOM] Fetching resource: ${url}`);
@@ -1244,7 +1260,7 @@ var ResourceLoader = class extends BaseResourceLoader {
     outputDir,
     onError
   }) {
-    const rootHref = /^https?:/i.test(new URL(rootUrl).protocol) ? new URL("/", rootUrl).href : new URL(".", rootUrl).href;
+    const rootHref = rootUrl.startsWith("data:") ? _ResourceLoader.dataUrlOrigin : /^https?:/i.test(rootUrl) ? new URL("/", rootUrl).href : new URL(".", rootUrl).href;
     const normalizeToLocalPath = (urlString, mimeType) => {
       let url = new URL(urlString);
       url.hash = "";
@@ -1295,14 +1311,40 @@ async function getJsdomFromUrlOrFile({
     });
   } else if (url.protocol === "file:") {
     if (resourceLoader) {
-      const file = resourceLoader._readFile(fileURLToPath(url));
+      const file = resourceLoader._readFile(fileURLToPath2(url));
       resourceLoader.fetcherMap.set(url.href, file);
     }
-    dom = await JSDOM.fromFile(fileURLToPath(url), {
+    dom = await JSDOM.fromFile(fileURLToPath2(url), {
       virtualConsole,
       resources: resourceLoader,
       contentType: "text/html; charset=UTF-8"
     });
+  } else if (url.protocol === "data:") {
+    const [head, body] = url.href.split(",", 2);
+    const data = decodeURIComponent(body);
+    const buffer = Buffer.from(
+      data,
+      /;base64$/i.test(head) ? "base64" : "utf8"
+    );
+    const dummyUrl = `${ResourceLoader.dataUrlOrigin}index.html`;
+    if (resourceLoader) {
+      let timeoutId;
+      const promise = new Promise((resolve) => {
+        timeoutId = setTimeout(resolve, 0, buffer);
+      });
+      promise.abort = () => {
+        if (timeoutId !== void 0) {
+          clearTimeout(timeoutId);
+        }
+      };
+      resourceLoader.fetcherMap.set(dummyUrl, promise);
+    }
+    dom = new JSDOM(buffer.toString(), {
+      virtualConsole,
+      resources: resourceLoader,
+      contentType: "text/html; charset=UTF-8",
+      url: dummyUrl
+    });
   } else {
     throw new Error(`Unsupported protocol: ${url.protocol}`);
   }
@@ -2429,8 +2471,13 @@ async function retrieveWebbookEntry({
     resourceLoader,
     baseUrl: webbookEntryUrl
   }) || {};
-  const rootUrl = /^https?:/i.test(webbookEntryUrl) ? new URL("/", webbookEntryUrl).href : new URL(".", webbookEntryUrl).href;
-  const pathContains2 = (url) => !upath5.relative(rootUrl, url).startsWith("..");
+  let pathContains2;
+  if (webbookEntryUrl.startsWith("data:")) {
+    pathContains2 = (url) => false;
+  } else {
+    const rootUrl = /^https?:/i.test(webbookEntryUrl) ? new URL("/", webbookEntryUrl).href : new URL(".", webbookEntryUrl).href;
+    pathContains2 = (url) => !upath5.relative(rootUrl, url).startsWith("..");
+  }
   const retriever = new Map(resourceLoader.fetcherMap);
   if (manifest && manifestUrl) {
     [manifest.resources || []].flat().forEach((v2) => {
@@ -3800,4 +3847,4 @@ export {
   getViewerFullUrl,
   createViteServer
 };
-//# sourceMappingURL=chunk-KSJHCVYG.js.map
+//# sourceMappingURL=chunk-23EG3WEZ.js.map