@vivliostyle/cli 9.0.0-next.7 → 9.0.0

package/README.md

@@ -49,8 +49,7 @@ Options:
   -l, --language <language>  language
   -s, --size  <size>         paper size
   -T, --theme <theme>        theme
-  --log-level <level>        specify a log level of console outputs (choices: "silent", "info",
-                             "verbose", "debug", default: "info")
+  --log-level <level>        specify a log level of console outputs (choices: "silent", "info", "verbose", "debug", default: "info")
   -h, --help                 display help for command
 ```
 
@@ -64,28 +63,22 @@ Put [vivliostyle.config.js](https://github.com/vivliostyle/create-book/blob/mast
 vivliostyle build
 ```
 
-![build](assets/build.gif)
-
 #### CLI options
 
 ```
 Options:
   -c, --config <config_file>         path to vivliostyle.config.js [vivliostyle.config.js]
   -o, --output <path>                specify output file name or directory [<title>.pdf]
-                                     This option can be specified multiple, then each -o options can
-                                     be supplied one -f option.
+                                     This option can be specified multiple, then each -o options can be supplied one -f option.
                                      ex: -o output1 -f webpub -o output2.pdf -f pdf
   -f, --format <format>              specify output format corresponding output target
-                                     If an extension is specified on -o option, this field will be
-                                     inferenced automatically.
+                                     If an extension is specified on -o option, this field will be inferenced automatically.
   -s, --size <size>                  output pdf size
-                                     preset: A5, A4, A3, B5, B4, JIS-B5, JIS-B4, letter, legal,
-                                     ledger
+                                     preset: A5, A4, A3, B5, B4, JIS-B5, JIS-B4, letter, legal, ledger
                                      custom(comma separated): 182mm,257mm or 8.5in,11in
   -m, --crop-marks                   print crop marks
   --bleed <bleed>                    extent of the bleed area for printing with crop marks [3mm]
-  --crop-offset <offset>             distance between the edge of the trim size and the edge of the
-                                     media size. [auto (13mm + bleed)]
+  --crop-offset <offset>             distance between the edge of the trim size and the edge of the media size. [auto (13mm + bleed)]
   --css <CSS>                        custom style CSS code. (ex: ":root {--my-color: lime;}")
   --style <stylesheet>               additional stylesheet URL or path
   --user-style <user_stylesheet>     user stylesheet URL or path
@@ -93,36 +86,32 @@ Options:
   -p, --press-ready                  make generated PDF compatible with press ready PDF/X-1a [false]
                                      This option is equivalent with "--preflight press-ready"
   -t, --timeout <seconds>            timeout limit for waiting Vivliostyle process [120]
-  -T, --theme <theme>                theme path or package name
+  -T, --theme <theme...>             theme path or package name
   --title <title>                    title
   --author <author>                  author
   -l, --language <language>          language
   --reading-progression <direction>  Direction of reading progression (choices: "ltr", "rtl")
-  --render-mode <mode>               if docker is set, Vivliostyle try to render PDF on Docker
-                                     container [local] (choices: "local", "docker")
-  --preflight <mode>                 apply the process to generate PDF for printing (choices:
-                                     "press-ready", "press-ready-local")
+  --render-mode <mode>               if docker is set, Vivliostyle try to render PDF on Docker container [local] (choices: "local", "docker")
+  --preflight <mode>                 apply the process to generate PDF for printing (choices: "press-ready", "press-ready-local")
   --preflight-option <options...>    options for preflight process (ex: gray-scale, enforce-outline)
-                                     Please refer the document of press-ready for further
-                                     information.
+                                     Please refer the document of press-ready for further information.
                                      https://github.com/vibranthq/press-ready
   --executable-browser <path>        specify a path of executable browser you installed
   --image <image>                    specify a docker image to render
-  --http                             launch an HTTP server hosting contents instead of file protocol
-                                     It is useful that requires CORS such as external web fonts.
-  --viewer <URL>                     specify a URL of displaying viewer instead of vivliostyle-cli's
-                                     one
-                                     It is useful that using own viewer that has staging features.
-                                     (ex: https://vivliostyle.vercel.app/)
-  --viewer-param <parameters>        specify viewer parameters. (ex:
-                                     "allowScripts=false&pixelRatio=16")
+  --viewer <URL>                     specify a URL of displaying viewer instead of vivliostyle-cli's one
+                                     It is useful that using own viewer that has staging features. (ex: https://vivliostyle.vercel.app/)
+  --viewer-param <parameters>        specify viewer parameters. (ex: "allowScripts=false&pixelRatio=16")
   --proxy-server <proxyServer>       HTTP/SOCK proxy server url for underlying Playwright
   --proxy-bypass <proxyBypass>       optional comma-separated domains to bypass proxy
   --proxy-user <proxyUser>           optional username for HTTP proxy authentication
   --proxy-pass <proxyPass>           optional password for HTTP proxy authentication
-  --log-level <level>                specify a log level of console outputs (choices: "silent",
-                                     "info", "verbose", "debug", default: "info")
+  --log-level <level>                specify a log level of console outputs (choices: "silent", "info", "verbose", "debug", default: "info")
   --ignore-https-errors              true to ignore HTTPS errors when Playwright browser opens a new page
+  --host <host>                      IP address the server should listen on
+  --port <port>                      port the server should listen on
+  --no-enable-static-serve           disable static file serving
+  --vite-config-file <path>          Vite config file path
+  --no-vite-config-file              ignore Vite config file even if it exists
   -h, --help                         display help for command
 ```
 
@@ -139,15 +128,13 @@ vivliostyle preview
 ```
 Options:
   -c, --config <config_file>         path to vivliostyle.config.js
-  -T, --theme <theme>                theme path or package name
+  -T, --theme <theme...>             theme path or package name
   -s, --size <size>                  output pdf size
-                                     preset: A5, A4, A3, B5, B4, JIS-B5, JIS-B4, letter, legal,
-                                     ledger
+                                     preset: A5, A4, A3, B5, B4, JIS-B5, JIS-B4, letter, legal, ledger
                                      custom(comma separated): 182mm,257mm or 8.5in,11in
   -m, --crop-marks                   print crop marks
   --bleed <bleed>                    extent of the bleed area for printing with crop marks [3mm]
-  --crop-offset <offset>             distance between the edge of the trim size and the edge of the
-                                     media size. [auto (13mm + bleed)]
+  --crop-offset <offset>             distance between the edge of the trim size and the edge of the media size. [auto (13mm + bleed)]
   --css <CSS>                        custom style CSS code. (ex: ":root {--my-color: lime;}")
   --style <stylesheet>               additional stylesheet URL or path
   --user-style <user_stylesheet>     user stylesheet URL or path
@@ -158,25 +145,24 @@ Options:
   -l, --language <language>          language
   --reading-progression <direction>  Direction of reading progression (choices: "ltr", "rtl")
   --executable-browser <path>        specify a path of executable browser you installed
-  --http                             launch an HTTP server hosting contents instead of file protocol
-                                     It is useful that requires CORS such as external web fonts.
-  --viewer <URL>                     specify a URL of displaying viewer instead of vivliostyle-cli's
-                                     one
-                                     It is useful that using own viewer that has staging features.
-                                     (ex: https://vivliostyle.vercel.app/)
-  --viewer-param <parameters>        specify viewer parameters. (ex:
-                                     "allowScripts=false&pixelRatio=16")
-  --browser <browser>                EXPERIMENTAL SUPPORT: Specify a browser type to launch
-                                     Vivliostyle viewer [chromium]
-                                     Currently, Firefox and Webkit support preview command only!
-                                     (choices: "chromium", "firefox", "webkit")
+  --viewer <URL>                     specify a URL of displaying viewer instead of vivliostyle-cli's one
+                                     It is useful that using own viewer that has staging features. (ex: https://vivliostyle.vercel.app/)
+  --viewer-param <parameters>        specify viewer parameters. (ex: "allowScripts=false&pixelRatio=16")
+  --browser <browser>                EXPERIMENTAL SUPPORT: Specify a browser type to launch Vivliostyle viewer [chromium]
+                                     Currently, Firefox and Webkit support preview command only! (choices: "chromium", "firefox", "webkit")
   --proxy-server <proxyServer>       HTTP/SOCK proxy server url for underlying Playwright
   --proxy-bypass <proxyBypass>       optional comma-separated domains to bypass proxy
   --proxy-user <proxyUser>           optional username for HTTP proxy authentication
   --proxy-pass <proxyPass>           optional password for HTTP proxy authentication
-  --log-level <level>                specify a log level of console outputs (choices: "silent",
-                                     "info", "verbose", "debug", default: "info")
+  --log-level <level>                specify a log level of console outputs (choices: "silent", "info", "verbose", "debug", default: "info")
   --ignore-https-errors              true to ignore HTTPS errors when Playwright browser opens a new page
+  --host <host>                      IP address the server should listen on
+  --port <port>                      port the server should listen on
+  --no-open-viewer                   do not open viewer
+  --no-enable-static-serve           disable static file serving
+  --no-enable-viewer-start-page      disable viewer start page
+  --vite-config-file <path>          Vite config file path
+  --no-vite-config-file              ignore Vite config file even if it exists
   -h, --help                         display help for command
 ```
 

package/dist/{chunk-NWDF2NRZ.js → chunk-4Y2QIRBA.js}

@@ -1,6 +1,6 @@
 import {
   Logger
-} from "./chunk-KJ2TDIM3.js";
+} from "./chunk-PY4J4NG6.js";
 
 // src/config/vite.ts
 import upath from "upath";

package/dist/{chunk-NABNSSUR.js → chunk-5AUWIYEK.js}

@@ -1,6 +1,6 @@
 import {
   resolveViteConfig
-} from "./chunk-NWDF2NRZ.js";
+} from "./chunk-4Y2QIRBA.js";
 import {
   Logger,
   buildPDFWithContainer,
@@ -28,7 +28,7 @@ import {
   setupConfigFromFlags,
   toContainerPath,
   warnDeprecatedConfig
-} from "./chunk-KJ2TDIM3.js";
+} from "./chunk-PY4J4NG6.js";
 import {
   coreVersion
 } from "./chunk-EX7EA34F.js";
@@ -524,20 +524,18 @@ async function build(inlineConfig) {
             __callDispose(_stack, _error, _hasError);
           }
         }
+        server = await createViteServer({
+          config,
+          viteConfig,
+          inlineConfig,
+          mode: "build"
+        });
         if (isWebPubConfig(config)) {
           await cleanupWorkspace(config);
           await prepareThemeDirectory(config);
           await compile(config);
           await copyAssets(config);
         }
-        if (config.outputs.some((o) => o.format === "pdf")) {
-          server = await createViteServer({
-            config,
-            viteConfig,
-            inlineConfig,
-            mode: "build"
-          });
-        }
       }
       for (const target of config.outputs) {
         let output = null;

package/dist/{chunk-KBYCGWN5.js → chunk-FQMQ7BWY.js}

@@ -9,7 +9,7 @@ import {
   vsStaticServePlugin,
   vsViewerPlugin,
   warnDeprecatedConfig
-} from "./chunk-KJ2TDIM3.js";
+} from "./chunk-PY4J4NG6.js";
 import {
   VivliostyleInlineConfig
 } from "./chunk-DMARNPN5.js";

package/dist/{chunk-KJ2TDIM3.js → chunk-PY4J4NG6.js}

@@ -1867,7 +1867,6 @@ function resolveTaskConfig(config, options) {
     outputs,
     temporaryFilePrefix,
     themeIndexes,
-    rootUrl,
     cover
   });
   for (const output of outputs) {
@@ -2042,7 +2041,7 @@ function resolveSingleInputConfig({
     let webbookPath;
     if (isValidUri(sourcePath)) {
       const url = new URL(sourcePath);
-      if (/^https?:/i.test(url.protocol) && !url.pathname.endsWith("/") && !/\.html?$/.test(url.pathname)) {
+      if (/^https?:/i.test(url.protocol) && !url.pathname.endsWith("/") && !/\.\w+$/.test(url.pathname)) {
         url.pathname = `${url.pathname}/`;
       }
       webbookEntryUrl = url.href;
@@ -2094,7 +2093,6 @@ function resolveComposedProjectConfig({
   outputs,
   temporaryFilePrefix,
   themeIndexes,
-  rootUrl,
   cover
 }) {
   Logger.debug("entering composed project config mode");
@@ -2156,7 +2154,7 @@ function resolveComposedProjectConfig({
       } else if (entryPath.startsWith("/")) {
         return {
           type: "uri",
-          href: `${rootUrl}${entryPath}`,
+          href: entryPath,
           rootDir: upath5.join(workspaceDir, "localhost")
         };
       }
@@ -2190,7 +2188,7 @@ function resolveComposedProjectConfig({
         case "uri": {
           const url = new URL(source.href, "a://dummy");
           let pathname = url.pathname;
-          if (!/\.html?$/.test(pathname)) {
+          if (!/\.\w+$/.test(pathname)) {
             pathname = `${pathname.replace(/\/$/, "")}/index.html`;
           }
           return upath5.join(source.rootDir, pathname);
@@ -4078,11 +4076,13 @@ async function transformManuscript(entry, {
   entries,
   language,
   documentProcessorFactory,
-  vfmOptions
+  vfmOptions,
+  rootUrl
 }) {
   const source = entry.rel === "contents" || entry.rel === "cover" ? entry.template : entry.source;
   let content;
   let resourceLoader;
+  let resourceUrl;
   const style = entry.themes.flatMap(
     (theme) => locateThemePath(theme, upath9.dirname(entry.target))
   );
@@ -4113,10 +4113,11 @@ async function transformManuscript(entry, {
       }
     }
   } else if (source?.type === "uri") {
+    resourceUrl = /^https?:/.test(source.href) ? source.href : `${rootUrl}${source.href}`;
     resourceLoader = new ResourceLoader();
     try {
       await getJsdomFromUrlOrFile({
-        src: source.href,
+        src: resourceUrl,
         resourceLoader,
         virtualConsole: createVirtualConsole((error) => {
           Logger.logError(`Failed to fetch resources: ${error.detail}`);
@@ -4124,16 +4125,16 @@ async function transformManuscript(entry, {
       });
     } catch (error) {
       throw new DetailError(
-        `Failed to fetch the content from ${source.href}`,
+        `Failed to fetch the content from ${resourceUrl}`,
         error.stack ?? error.message
       );
     }
-    const contentFetcher = resourceLoader.fetcherMap.get(source.href);
+    const contentFetcher = resourceLoader.fetcherMap.get(resourceUrl);
     if (contentFetcher) {
       const buffer = await contentFetcher;
       const contentType = contentFetcher.response?.headers["content-type"];
       if (!contentType || new MIMEType2(contentType).essence !== "text/html") {
-        throw new Error(`The content is not an HTML document: ${source.href}`);
+        throw new Error(`The content is not an HTML document: ${resourceUrl}`);
       }
       content = getJsdomFromString({ html: buffer.toString("utf8") });
       content = await processManuscriptHtml(content, {
@@ -4208,18 +4209,18 @@ async function transformManuscript(entry, {
   if (!source || source.type === "file" && !pathEquals(source.pathname, entry.target)) {
     writeFileIfChanged(entry.target, htmlBuffer);
   }
-  if (source?.type === "uri" && resourceLoader) {
-    const { response } = resourceLoader.fetcherMap.get(source.href);
+  if (source?.type === "uri" && resourceLoader && resourceUrl) {
+    const { response } = resourceLoader.fetcherMap.get(resourceUrl);
     const contentFetcher = Promise.resolve(
       htmlBuffer
     );
     contentFetcher.abort = () => {
     };
     contentFetcher.response = response;
-    resourceLoader.fetcherMap.set(source.href, contentFetcher);
+    resourceLoader.fetcherMap.set(resourceUrl, contentFetcher);
     await ResourceLoader.saveFetchedResources({
       fetcherMap: resourceLoader.fetcherMap,
-      rootUrl: source.href,
+      rootUrl: resourceUrl,
       outputDir: source.rootDir
     });
   }
@@ -4517,10 +4518,11 @@ function vsDevServerPlugin({
       server?.watcher.add(config.viewerInput.manifestPath);
     }
   }
-  async function transform(entry, config2) {
+  async function transform(entry, config2, host) {
+    const rootUrl = host ? `${server?.config.server.https ? "https" : "http"}://${host}` : config2.rootUrl;
     const promise = (async () => {
       try {
-        const html = await transformManuscript(entry, config2);
+        const html = await transformManuscript(entry, { ...config2, rootUrl });
         if (!html) {
           transformCache.delete(entry.target);
           return;
@@ -4587,15 +4589,16 @@ function vsDevServerPlugin({
         return res.end(cached.content);
       }
     }
+    const { host } = req.headers;
     if (entry.rel === "contents") {
       const _config2 = { ...config };
       await Promise.all(
         _config2.entries.flatMap(
-          (e) => isWebPubConfig(_config2) && e.rel !== "contents" && e.rel !== "cover" ? transform(e, _config2) : []
+          (e) => isWebPubConfig(_config2) && e.rel !== "contents" && e.rel !== "cover" ? transform(e, _config2, host) : []
         )
       );
     }
-    const result = await transform(entry, config);
+    const result = await transform(entry, config, host);
     if (!result) {
       return next();
     }

package/dist/{chunk-LGWCIQSL.js → chunk-QZWMJ4L2.js}

@@ -1,6 +1,6 @@
 import {
   resolveViteConfig
-} from "./chunk-NWDF2NRZ.js";
+} from "./chunk-4Y2QIRBA.js";
 import {
   Logger,
   createViteServer,
@@ -13,7 +13,7 @@ import {
   resolveTaskConfig,
   setupConfigFromFlags,
   warnDeprecatedConfig
-} from "./chunk-KJ2TDIM3.js";
+} from "./chunk-PY4J4NG6.js";
 import {
   cliVersion
 } from "./chunk-EX7EA34F.js";

package/dist/{chunk-YXEC5ZRK.js → chunk-XRR6RKA6.js}

@@ -3,7 +3,7 @@ import {
   Logger,
   cwd,
   runExitHandlers
-} from "./chunk-KJ2TDIM3.js";
+} from "./chunk-PY4J4NG6.js";
 
 // src/core/init.ts
 import fs from "node:fs";

package/dist/commands/build.js

@@ -1,13 +1,13 @@
 import {
   build
-} from "../chunk-NABNSSUR.js";
-import "../chunk-NWDF2NRZ.js";
+} from "../chunk-5AUWIYEK.js";
+import "../chunk-4Y2QIRBA.js";
 import {
   Logger,
   gracefulError,
   isInContainer,
   parseFlagsToInlineConfig
-} from "../chunk-KJ2TDIM3.js";
+} from "../chunk-PY4J4NG6.js";
 import "../chunk-EX7EA34F.js";
 import "../chunk-WX6JHPSL.js";
 import "../chunk-DMARNPN5.js";
@@ -135,7 +135,10 @@ It is useful that using own viewer that has staging features. (ex: https://vivli
       "--ignore-https-errors",
       `true to ignore HTTPS errors when Playwright browser opens a new page`
     )
-  ).option("--host <host>", "IP address the server should listen on").option("--port <port>", "port the server should listen on", parseInt).option("--no-enable-static-serve", "disable static file serving").addOption(new Option("--executable-chromium <path>").hideHelp()).addOption(new Option("--verbose").hideHelp()).addOption(new Option("--http").hideHelp()).action((_arg, option) => {
+  ).option("--host <host>", "IP address the server should listen on").option("--port <port>", "port the server should listen on", parseInt).option("--no-enable-static-serve", "disable static file serving").option("--vite-config-file <path>", "Vite config file path").option(
+    "--no-vite-config-file",
+    "ignore Vite config file even if it exists"
+  ).addOption(new Option("--executable-chromium <path>").hideHelp()).addOption(new Option("--verbose").hideHelp()).addOption(new Option("--http").hideHelp()).action((_arg, option) => {
     let invalid = targets.find((it) => !("path" in it));
     if (invalid) {
       throw new Error(

package/dist/commands/init.js

@@ -1,10 +1,10 @@
 import {
   init
-} from "../chunk-YXEC5ZRK.js";
+} from "../chunk-XRR6RKA6.js";
 import {
   gracefulError,
   parseFlagsToInlineConfig
-} from "../chunk-KJ2TDIM3.js";
+} from "../chunk-PY4J4NG6.js";
 import "../chunk-EX7EA34F.js";
 import "../chunk-WX6JHPSL.js";
 import "../chunk-DMARNPN5.js";

package/dist/commands/preview.js

@@ -1,11 +1,11 @@
 import {
   preview
-} from "../chunk-LGWCIQSL.js";
-import "../chunk-NWDF2NRZ.js";
+} from "../chunk-QZWMJ4L2.js";
+import "../chunk-4Y2QIRBA.js";
 import {
   gracefulError,
   parseFlagsToInlineConfig
-} from "../chunk-KJ2TDIM3.js";
+} from "../chunk-PY4J4NG6.js";
 import "../chunk-EX7EA34F.js";
 import "../chunk-WX6JHPSL.js";
 import "../chunk-DMARNPN5.js";
@@ -82,7 +82,10 @@ Currently, Firefox and Webkit support preview command only!`
       "--ignore-https-errors",
       `true to ignore HTTPS errors when Playwright browser opens a new page`
     )
-  ).option("--host <host>", "IP address the server should listen on").option("--port <port>", "port the server should listen on", parseInt).option("--no-open-viewer", "do not open viewer").option("--no-enable-static-serve", "disable static file serving").option("--no-enable-viewer-start-page", "disable viewer start page").addOption(new Option("--executable-chromium <path>").hideHelp()).addOption(new Option("--verbose").hideHelp()).addOption(new Option("--http").hideHelp());
+  ).option("--host <host>", "IP address the server should listen on").option("--port <port>", "port the server should listen on", parseInt).option("--no-open-viewer", "do not open viewer").option("--no-enable-static-serve", "disable static file serving").option("--no-enable-viewer-start-page", "disable viewer start page").option("--vite-config-file <path>", "Vite config file path").option(
+    "--no-vite-config-file",
+    "ignore Vite config file even if it exists"
+  ).addOption(new Option("--executable-chromium <path>").hideHelp()).addOption(new Option("--verbose").hideHelp()).addOption(new Option("--http").hideHelp());
   return program;
 }