@vivliostyle/cli 4.12.4 → 5.1.0

package/README.md

@@ -70,36 +70,48 @@ vivliostyle build
 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 [Letter]
-                                   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
   --style <stylesheet>             additional stylesheet URL or path
   --user-style <user_stylesheet>   user stylesheet URL or path
   -d, --single-doc                 single HTML document input
-  -p, --press-ready                make generated PDF compatible with press ready PDF/X-1a [false]
+  -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
   --title <title>                  title
   --author <author>                author
   -l, --language <language>        language
-  --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.
+  --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.
                                    https://github.com/vibranthq/press-ready
   --verbose                        verbose log output
-  --no-sandbox                     launch chrome without sandbox. use this option when ECONNREFUSED error occurred.
-  --executable-chromium <path>     specify a path of executable Chrome (or Chromium) you installed
+  --no-sandbox                     launch chrome without sandbox. use this option when
+                                   ECONNREFUSED error occurred.
+  --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
+  --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 <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/)
   -h, --help                       display help for command
 ```
 
@@ -118,7 +130,8 @@ Options:
   -c, --config <config_file>      path to vivliostyle.config.js
   -T, --theme <theme>             theme path or package name
   -s, --size <size>               output pdf size [Letter]
-                                  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
   --style <stylesheet>            additional stylesheet URL or path
   --user-style <user_stylesheet>  user stylesheet URL or path
@@ -128,12 +141,20 @@ Options:
   --author <author>               author
   -l, --language <language>       language
   --verbose                       verbose log output
-  --no-sandbox                    launch chrome without sandbox (use this option to avoid ECONNREFUSED error)
-  --executable-chromium <path>    specify a path of executable Chrome(Chromium) you installed
-  --http                          launch an HTTP server hosting contents instead of file protocol
+  --no-sandbox                    launch chrome without sandbox (use this option to avoid
+                                  ECONNREFUSED error)
+  --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 <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/)
+  --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")
   -h, --help                      display help for command
 ```
 
@@ -141,15 +162,6 @@ Options:
 
 See [User Guide](https://docs.vivliostyle.org/#/vivliostyle-cli)
 
-## Q&A
-
-### Not working in Node v14.0.0
-
-`puppeteer` is not working in Node v14.0.0, ie `vivliostyle-cli` is not working same.
-See also: https://developers.google.com/web/tools/puppeteer/troubleshooting
-
-The error has been resolved by Node `>= v14.1.0` or `<= v12.0.0`.
-
 ## Contribute
 
 See [Contribution Guide](CONTRIBUTING.md).

package/dist/browser.d.ts

@@ -1,9 +1,16 @@
-import puppeteer from 'puppeteer-core';
-declare type PuppeteerLaunchOptions = Parameters<typeof puppeteer.launch>[0];
-declare type Browser = ReturnType<typeof puppeteer.launch>;
-export declare function launchBrowser(options?: PuppeteerLaunchOptions): Browser;
-export declare function getExecutableBrowserPath(): string;
+import * as playwright from 'playwright-core';
+import type { BrowserType } from './schema/vivliostyleConfig.schema';
+export declare function launchBrowser({ browserType, executablePath, headless, noSandbox, disableWebSecurity, disableDevShmUsage, }: {
+    browserType: BrowserType;
+    executablePath: string;
+    headless: boolean;
+    noSandbox?: boolean;
+    disableWebSecurity?: boolean;
+    disableDevShmUsage?: boolean;
+}): Promise<playwright.Browser>;
+export declare function getExecutableBrowserPath(browserType: BrowserType): string;
+export declare function getFullBrowserName(browserType: BrowserType): string;
 export declare function checkBrowserAvailability(path: string): boolean;
-export declare function downloadBrowser(): Promise<string>;
-export {};
+export declare function isPlaywrightExecutable(path: string): boolean;
+export declare function downloadBrowser(browserType: BrowserType): Promise<string>;
 //# sourceMappingURL=browser.d.ts.map

package/dist/browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"AAGA,OAAO,SAA4B,MAAM,gBAAgB,CAAC;AAW1D,aAAK,sBAAsB,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACrE,aAAK,OAAO,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;AACnD,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAa7E;AAED,wBAAgB,wBAAwB,IAAI,MAAM,CAQjD;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE9D;AAED,wBAAsB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAwCvD"}
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAE9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AASrE,wBAAsB,aAAa,CAAC,EAClC,WAAW,EACX,cAAc,EACd,QAAQ,EACR,SAAS,EACT,kBAAkB,EAClB,kBAAkB,GACnB,EAAE;IACD,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CA+B9B;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAEzE;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAMnE;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE9D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,wBAAsB,eAAe,CACnC,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,MAAM,CAAC,CAQjB"}

package/dist/browser.js

@@ -1,67 +1,92 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadBrowser = exports.checkBrowserAvailability = exports.getExecutableBrowserPath = exports.launchBrowser = void 0;
+exports.downloadBrowser = exports.isPlaywrightExecutable = exports.checkBrowserAvailability = exports.getFullBrowserName = exports.getExecutableBrowserPath = exports.launchBrowser = void 0;
 const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
-const perf_hooks_1 = require("perf_hooks");
-const puppeteer_core_1 = __importDefault(require("puppeteer-core"));
+const playwright = __importStar(require("playwright-core"));
+const server_1 = require("playwright-core/lib/server");
 const util_1 = require("./util");
-async function launchBrowser(options) {
-    // process listener of puppeteer won't handle signal
-    // because it doesn't support subprocess which is spawned by CLI
-    const browser = await puppeteer_core_1.default.launch({
-        handleSIGINT: false,
-        handleSIGTERM: false,
-        handleSIGHUP: false,
-        ...options,
-    });
+async function launchBrowser({ browserType, executablePath, headless, noSandbox, disableWebSecurity, disableDevShmUsage, }) {
+    const options = browserType === 'chromium'
+        ? {
+            executablePath,
+            chromiumSandbox: !noSandbox,
+            // We don't use Playwright's preset for headless Chrome to set `headless: 'chrome'` option
+            // https://github.com/vivliostyle/vivliostyle-cli/pull/280
+            headless: false,
+            args: [
+                // Preset of Playwright: https://github.com/microsoft/playwright/blob/e69c3f12e6f07ee9e737446ba22f20cb669d7211/packages/playwright-core/src/server/chromium/chromium.ts#L287-L294
+                ...(headless
+                    ? [
+                        '--headless=chrome',
+                        '--hide-scrollbars',
+                        '--mute-audio',
+                        '--blink-settings=primaryHoverType=2,availableHoverTypes=2,primaryPointerType=4,availablePointerTypes=4',
+                    ]
+                    : []),
+                '--allow-file-access-from-files',
+                disableWebSecurity ? '--disable-web-security' : '',
+                disableDevShmUsage ? '--disable-dev-shm-usage' : '',
+            ],
+        }
+        : // TODO: Investigate appropriate settings on Firefox & Webkit
+            { executablePath, headless };
+    const browser = await playwright[browserType].launch(options);
     util_1.beforeExitHandlers.push(() => {
         browser.close();
     });
     return browser;
 }
 exports.launchBrowser = launchBrowser;
-function getExecutableBrowserPath() {
-    const isInContainer = util_1.checkContainerEnvironment();
-    if (isInContainer && os_1.default.arch() === 'arm64') {
-        // Use the Debian packages until puppeteer supports
-        // https://github.com/puppeteer/puppeteer/blob/159d2835450697dabea6f9adf6e67d158b5b8ae3/src/node/BrowserFetcher.ts#L298-L303
-        return '/usr/bin/chromium';
-    }
-    return puppeteer_core_1.default.executablePath();
+function getExecutableBrowserPath(browserType) {
+    return playwright[browserType].executablePath();
 }
 exports.getExecutableBrowserPath = getExecutableBrowserPath;
+function getFullBrowserName(browserType) {
+    return {
+        chromium: 'Chromium',
+        firefox: 'Firefox',
+        webkit: 'Webkit',
+    }[browserType];
+}
+exports.getFullBrowserName = getFullBrowserName;
 function checkBrowserAvailability(path) {
     return fs_1.default.existsSync(path);
 }
 exports.checkBrowserAvailability = checkBrowserAvailability;
-async function downloadBrowser() {
-    const browserFetcher = puppeteer_core_1.default.createBrowserFetcher({});
-    const revision = puppeteer_core_1.default._preferredRevision;
-    const revisionInfo = browserFetcher.revisionInfo(revision);
-    util_1.debug('trying download browser, revision info', revisionInfo);
-    const toMegabytes = (bytes) => `${(bytes / 1024 / 1024).toFixed(1)} Mb`;
-    let time = perf_hooks_1.performance.now();
-    const onProgress = (downloadedBytes, totalBytes) => {
-        const now = perf_hooks_1.performance.now();
-        if (now - time < 500) {
-            return;
-        }
-        time = now;
-        const progressLen = 16;
-        const completeLen = Math.round((downloadedBytes / totalBytes) * progressLen);
-        const progressBar = `[${Array(completeLen + 1).join('=')}${Array(progressLen - completeLen + 1).join(' ')}]`;
-        util_1.logUpdate(`Downloading Browser: ${progressBar} ${toMegabytes(downloadedBytes)} / ${toMegabytes(totalBytes)}`);
-    };
-    util_1.logInfo('Rendering browser (Chromium) is not installed yet. Downloading now...');
-    util_1.startLogging('Downloading Browser');
-    await browserFetcher.download(revision, onProgress);
+function isPlaywrightExecutable(path) {
+    return server_1.registry.executables().some((exe) => exe.executablePath() === path);
+}
+exports.isPlaywrightExecutable = isPlaywrightExecutable;
+async function downloadBrowser(browserType) {
+    const executable = server_1.registry.findExecutable(browserType);
+    util_1.logInfo('Rendering browser is not installed yet. Downloading now...');
+    util_1.stopLogging();
+    await server_1.registry.install([executable], false);
     util_1.logSuccess(`Successfully downloaded browser`);
     util_1.startLogging();
-    return revisionInfo.executablePath;
+    return executable.executablePath();
 }
 exports.downloadBrowser = downloadBrowser;
 //# sourceMappingURL=browser.js.map

package/dist/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,4CAAoB;AACpB,2CAAyC;AACzC,oEAA0D;AAC1D,iCAQgB;AAIT,KAAK,UAAU,aAAa,CAAC,OAAgC;IAClE,oDAAoD;IACpD,gEAAgE;IAChE,MAAM,OAAO,GAAG,MAAM,wBAAS,CAAC,MAAM,CAAC;QACrC,YAAY,EAAE,KAAK;QACnB,aAAa,EAAE,KAAK;QACpB,YAAY,EAAE,KAAK;QACnB,GAAG,OAAO;KACX,CAAC,CAAC;IACH,yBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE;QAC3B,OAAO,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC;AAbD,sCAaC;AAED,SAAgB,wBAAwB;IACtC,MAAM,aAAa,GAAG,gCAAyB,EAAE,CAAC;IAClD,IAAI,aAAa,IAAI,YAAE,CAAC,IAAI,EAAE,KAAK,OAAO,EAAE;QAC1C,mDAAmD;QACnD,4HAA4H;QAC5H,OAAO,mBAAmB,CAAC;KAC5B;IACD,OAAQ,wBAAsC,CAAC,cAAc,EAAE,CAAC;AAClE,CAAC;AARD,4DAQC;AAED,SAAgB,wBAAwB,CAAC,IAAY;IACnD,OAAO,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC;AAFD,4DAEC;AAEM,KAAK,UAAU,eAAe;IACnC,MAAM,cAAc,GAClB,wBACD,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;IAC3B,MAAM,QAAQ,GAAI,wBAAsC,CAAC,kBAAkB,CAAC;IAC5E,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC3D,YAAK,CAAC,wCAAwC,EAAE,YAAY,CAAC,CAAC;IAE9D,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,EAAE,CACpC,GAAG,CAAC,KAAK,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3C,IAAI,IAAI,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,UAAU,GAAG,CAAC,eAAuB,EAAE,UAAkB,EAAE,EAAE;QACjE,MAAM,GAAG,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;QAC9B,IAAI,GAAG,GAAG,IAAI,GAAG,GAAG,EAAE;YACpB,OAAO;SACR;QACD,IAAI,GAAG,GAAG,CAAC;QACX,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,CAAC,eAAe,GAAG,UAAU,CAAC,GAAG,WAAW,CAC7C,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAC9D,WAAW,GAAG,WAAW,GAAG,CAAC,CAC9B,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QACf,gBAAS,CACP,wBAAwB,WAAW,IAAI,WAAW,CAChD,eAAe,CAChB,MAAM,WAAW,CAAC,UAAU,CAAC,EAAE,CACjC,CAAC;IACJ,CAAC,CAAC;IAEF,cAAO,CACL,uEAAuE,CACxE,CAAC;IACF,mBAAY,CAAC,qBAAqB,CAAC,CAAC;IACpC,MAAM,cAAc,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACpD,iBAAU,CAAC,iCAAiC,CAAC,CAAC;IAC9C,mBAAY,EAAE,CAAC;IAEf,OAAO,YAAY,CAAC,cAAc,CAAC;AACrC,CAAC;AAxCD,0CAwCC"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAoB;AACpB,4DAA8C;AAC9C,uDAAsD;AAEtD,iCAMgB;AAET,KAAK,UAAU,aAAa,CAAC,EAClC,WAAW,EACX,cAAc,EACd,QAAQ,EACR,SAAS,EACT,kBAAkB,EAClB,kBAAkB,GAQnB;IACC,MAAM,OAAO,GACX,WAAW,KAAK,UAAU;QACxB,CAAC,CAAC;YACE,cAAc;YACd,eAAe,EAAE,CAAC,SAAS;YAC3B,0FAA0F;YAC1F,0DAA0D;YAC1D,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE;gBACJ,iLAAiL;gBACjL,GAAG,CAAC,QAAQ;oBACV,CAAC,CAAC;wBACE,mBAAmB;wBACnB,mBAAmB;wBACnB,cAAc;wBACd,wGAAwG;qBACzG;oBACH,CAAC,CAAC,EAAE,CAAC;gBACP,gCAAgC;gBAChC,kBAAkB,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE;gBAClD,kBAAkB,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE;aACpD;SACF;QACH,CAAC,CAAC,6DAA6D;YAC7D,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC;IACnC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9D,yBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE;QAC3B,OAAO,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC;AA7CD,sCA6CC;AAED,SAAgB,wBAAwB,CAAC,WAAwB;IAC/D,OAAO,UAAU,CAAC,WAAW,CAAC,CAAC,cAAc,EAAE,CAAC;AAClD,CAAC;AAFD,4DAEC;AAED,SAAgB,kBAAkB,CAAC,WAAwB;IACzD,OAAO;QACL,QAAQ,EAAE,UAAU;QACpB,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,QAAQ;KACjB,CAAC,WAAW,CAAC,CAAC;AACjB,CAAC;AAND,gDAMC;AAED,SAAgB,wBAAwB,CAAC,IAAY;IACnD,OAAO,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC;AAFD,4DAEC;AAED,SAAgB,sBAAsB,CAAC,IAAY;IACjD,OAAO,iBAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,IAAI,CAAC,CAAC;AAC7E,CAAC;AAFD,wDAEC;AAEM,KAAK,UAAU,eAAe,CACnC,WAAwB;IAExB,MAAM,UAAU,GAAG,iBAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACxD,cAAO,CAAC,4DAA4D,CAAC,CAAC;IACtE,kBAAW,EAAE,CAAC;IACd,MAAM,iBAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5C,iBAAU,CAAC,iCAAiC,CAAC,CAAC;IAC9C,mBAAY,EAAE,CAAC;IACf,OAAO,UAAU,CAAC,cAAc,EAAG,CAAC;AACtC,CAAC;AAVD,0CAUC"}

package/dist/build.d.ts

@@ -1,4 +1,4 @@
-import { CliFlags } from './config';
+import { CliFlags, MergedConfig } from './config';
 export interface BuildCliFlags extends CliFlags {
     output?: {
         output?: string;
@@ -6,5 +6,6 @@ export interface BuildCliFlags extends CliFlags {
     }[];
     bypassedPdfBuilderOption?: string;
 }
+export declare function getFullConfig(cliFlags: BuildCliFlags): Promise<MergedConfig[]>;
 export declare function build(cliFlags: BuildCliFlags): Promise<void>;
 //# sourceMappingURL=build.d.ts.map

package/dist/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAIT,MAAM,UAAU,CAAC;AAalB,MAAM,WAAW,aAAc,SAAQ,QAAQ;IAC7C,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAED,wBAAsB,KAAK,CAAC,QAAQ,EAAE,aAAa,iBAuFlD"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAGR,YAAY,EACb,MAAM,UAAU,CAAC;AAalB,MAAM,WAAW,aAAc,SAAQ,QAAQ;IAC7C,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAED,wBAAsB,aAAa,CACjC,QAAQ,EAAE,aAAa,GACtB,OAAO,CAAC,YAAY,EAAE,CAAC,CAmBzB;AAED,wBAAsB,KAAK,CAAC,QAAQ,EAAE,aAAa,iBAwElD"}

package/dist/build.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.build = void 0;
+exports.build = exports.getFullConfig = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const terminal_link_1 = __importDefault(require("terminal-link"));
 const upath_1 = __importDefault(require("upath"));
@@ -14,28 +14,14 @@ const pdf_1 = require("./pdf");
 const server_1 = require("./server");
 const util_1 = require("./util");
 const webbook_1 = require("./webbook");
-async function build(cliFlags) {
-    var _a, _b, _c, _d;
-    if (cliFlags.bypassedPdfBuilderOption) {
-        const option = JSON.parse(cliFlags.bypassedPdfBuilderOption);
-        // Host doesn't know inside path of chromium path
-        option.executableChromium = browser_1.getExecutableBrowserPath();
-        util_1.debug('bypassedPdfBuilderOption', option);
-        util_1.startLogging();
-        await pdf_1.buildPDF(option);
-        // Stop remaining stream output and kill process
-        util_1.stopLogging();
-        return;
-    }
-    const isInContainer = util_1.checkContainerEnvironment();
-    util_1.startLogging('Collecting build config');
+async function getFullConfig(cliFlags) {
     const loadedConf = config_1.collectVivliostyleConfig(cliFlags);
     const { vivliostyleConfig, vivliostyleConfigPath } = loadedConf;
-    cliFlags = loadedConf.cliFlags;
+    const loadedCliFlags = loadedConf.cliFlags;
     const context = vivliostyleConfig ? upath_1.default.dirname(vivliostyleConfigPath) : util_1.cwd;
     const configEntries = [];
     for (const entry of vivliostyleConfig !== null && vivliostyleConfig !== void 0 ? vivliostyleConfig : [vivliostyleConfig]) {
-        const config = await config_1.mergeConfig(cliFlags, entry, context);
+        const config = await config_1.mergeConfig(loadedCliFlags, entry, context);
         checkUnsupportedOutputs(config);
         // check output path not to overwrite source files
         for (const target of config.outputs) {
@@ -43,6 +29,25 @@ async function build(cliFlags) {
         }
         configEntries.push(config);
     }
+    return configEntries;
+}
+exports.getFullConfig = getFullConfig;
+async function build(cliFlags) {
+    var _a, _b, _c, _d, _e;
+    if (cliFlags.bypassedPdfBuilderOption) {
+        const option = JSON.parse(cliFlags.bypassedPdfBuilderOption);
+        // Host doesn't know browser path inside of container
+        option.executableBrowser = browser_1.getExecutableBrowserPath((_a = option.browserType) !== null && _a !== void 0 ? _a : 'chromium');
+        util_1.debug('bypassedPdfBuilderOption', option);
+        util_1.startLogging();
+        await pdf_1.buildPDF(option);
+        // Stop remaining stream output and kill process
+        util_1.stopLogging();
+        return;
+    }
+    const isInContainer = util_1.checkContainerEnvironment();
+    util_1.startLogging('Collecting build config');
+    const configEntries = await getFullConfig(cliFlags);
     for (const config of configEntries) {
         // build artifacts
         if (config.manifestPath) {
@@ -56,14 +61,14 @@ async function build(cliFlags) {
                 if (!isInContainer && target.renderMode === 'docker') {
                     output = await pdf_1.buildPDFWithContainer({
                         ...config,
-                        input: ((_b = (_a = config.manifestPath) !== null && _a !== void 0 ? _a : config.webbookEntryPath) !== null && _b !== void 0 ? _b : config.epubOpfPath),
+                        input: ((_c = (_b = config.manifestPath) !== null && _b !== void 0 ? _b : config.webbookEntryPath) !== null && _c !== void 0 ? _c : config.epubOpfPath),
                         target,
                     });
                 }
                 else {
                     output = await pdf_1.buildPDF({
                         ...config,
-                        input: ((_d = (_c = config.manifestPath) !== null && _c !== void 0 ? _c : config.webbookEntryPath) !== null && _d !== void 0 ? _d : config.epubOpfPath),
+                        input: ((_e = (_d = config.manifestPath) !== null && _d !== void 0 ? _d : config.webbookEntryPath) !== null && _e !== void 0 ? _e : config.epubOpfPath),
                         target,
                     });
                 }

package/dist/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,kEAAyC;AACzC,kDAAyB;AACzB,uCAAqD;AACrD,uCAAyE;AACzE,qCAKkB;AAClB,+BAAwD;AACxD,qCAA0C;AAC1C,iCAOgB;AAChB,uCAAiD;AAU1C,KAAK,UAAU,aAAa,CACjC,QAAuB;IAEvB,MAAM,UAAU,GAAG,iCAAwB,CAAC,QAAQ,CAAC,CAAC;IACtD,MAAM,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,GAAG,UAAU,CAAC;IAChE,MAAM,cAAc,GAAG,UAAU,CAAC,QAAQ,CAAC;IAE3C,MAAM,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,eAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,UAAG,CAAC;IAE9E,MAAM,aAAa,GAAmB,EAAE,CAAC;IACzC,KAAK,MAAM,KAAK,IAAI,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,CAAC,iBAAiB,CAAC,EAAE;QAC5D,MAAM,MAAM,GAAG,MAAM,oBAAW,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACjE,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAEhC,kDAAkD;QAClD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACnC,iCAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;SAC7D;QACD,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAC5B;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AArBD,sCAqBC;AAEM,KAAK,UAAU,KAAK,CAAC,QAAuB;;IACjD,IAAI,QAAQ,CAAC,wBAAwB,EAAE;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;QAC7D,qDAAqD;QACrD,MAAM,CAAC,iBAAiB,GAAG,kCAAwB,CACjD,MAAA,MAAM,CAAC,WAAW,mCAAI,UAAU,CACjC,CAAC;QACF,YAAK,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAC;QAE1C,mBAAY,EAAE,CAAC;QACf,MAAM,cAAQ,CAAC,MAAM,CAAC,CAAC;QACvB,gDAAgD;QAChD,kBAAW,EAAE,CAAC;QACd,OAAO;KACR;IAED,MAAM,aAAa,GAAG,gCAAyB,EAAE,CAAC;IAClD,mBAAY,CAAC,yBAAyB,CAAC,CAAC;IACxC,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,CAAC;IAEpD,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE;QAClC,kBAAkB;QAClB,IAAI,MAAM,CAAC,YAAY,EAAE;YACvB,MAAM,iBAAO,CAAC,MAAM,CAAC,CAAC;YACtB,MAAM,oBAAU,CAAC,MAAM,CAAC,CAAC;SAC1B;QAED,iBAAiB;QACjB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACnC,IAAI,MAAM,GAAkB,IAAI,CAAC;YACjC,IAAI,MAAM,CAAC,MAAM,KAAK,KAAK,EAAE;gBAC3B,IAAI,CAAC,aAAa,IAAI,MAAM,CAAC,UAAU,KAAK,QAAQ,EAAE;oBACpD,MAAM,GAAG,MAAM,2BAAqB,CAAC;wBACnC,GAAG,MAAM;wBACT,KAAK,EAAE,CAAC,MAAA,MAAA,MAAM,CAAC,YAAY,mCACzB,MAAM,CAAC,gBAAgB,mCACvB,MAAM,CAAC,WAAW,CAAW;wBAC/B,MAAM;qBACP,CAAC,CAAC;iBACJ;qBAAM;oBACL,MAAM,GAAG,MAAM,cAAQ,CAAC;wBACtB,GAAG,MAAM;wBACT,KAAK,EAAE,CAAC,MAAA,MAAA,MAAM,CAAC,YAAY,mCACzB,MAAM,CAAC,gBAAgB,mCACvB,MAAM,CAAC,WAAW,CAAW;wBAC/B,MAAM;qBACP,CAAC,CAAC;iBACJ;aACF;iBAAM,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE;gBACrC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;oBACxB,SAAS;iBACV;gBACD,MAAM,GAAG,MAAM,8BAAoB,CAAC;oBAClC,GAAG,MAAM;oBACT,KAAK,EAAE,MAAM,CAAC,YAAY;oBAC1B,MAAM,EAAE,MAAM,CAAC,IAAI;iBACpB,CAAC,CAAC;aACJ;YACD,IAAI,MAAM,EAAE;gBACV,MAAM,eAAe,GAAG,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,eAAI,CAAC,QAAQ,CAAC,UAAG,EAAE,MAAM,CAAC,CAAC,CAAC;gBACrE,UAAG,CACD,KAAK,uBAAY,CAAC,eAAe,EAAE,SAAS,GAAG,MAAM,EAAE;oBACrD,QAAQ,EAAE,GAAG,EAAE,CAAC,eAAe;iBAChC,CAAC,oBAAoB,CACvB,CAAC;aACH;SACF;QAED,uBAAc,EAAE,CAAC;KAClB;IAED,kBAAW,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;AAC3C,CAAC;AAxED,sBAwEC;AAED,SAAS,uBAAuB,CAAC,EAC/B,gBAAgB,EAChB,WAAW,EACX,OAAO,GACM;IACb,IAAI,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,EAAE;QAClE,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;KACH;SAAM,IAAI,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,EAAE;QACpE,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAC;KACH;AACH,CAAC"}

package/dist/commands/build.js

@@ -31,11 +31,13 @@ try {
         verbose: options.verbose,
         timeout: options.timeout,
         sandbox: options.sandbox,
-        executableChromium: options.executableChromium,
+        executableBrowser: options.executableBrowser,
         image: options.image,
         http: options.http,
         viewer: options.viewer,
+        // browser: options.browser,
         bypassedPdfBuilderOption: options.bypassedPdfBuilderOption,
+        executableChromium: options.executableChromium, // TODO: Remove it in the next major version up
     }).catch(util_1.gracefulError);
 }
 catch (err) {

package/dist/commands/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAC9B,oCAAiC;AACjC,kCAAwC;AACxC,iDAAyD;AAEzD,IAAI;IACF,MAAM,OAAO,GAAG,sCAAuB,EAAE,CAAC;IAC1C,OAAO,CAAC,KAAK,CAAC,iBAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC/B,aAAK,CAAC;QACJ,KAAK,EAAE,MAAA,OAAO,CAAC,IAAI,0CAAG,CAAC,CAAC;QACxB,UAAU,EAAE,OAAO,CAAC,MAAM;QAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,OAAO;QACzC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,wBAAwB,EAAE,OAAO,CAAC,wBAAwB;KAC3D,CAAC,CAAC,KAAK,CAAC,oBAAa,CAAC,CAAC;CACzB;AAAC,OAAO,GAAG,EAAE;IACZ,IAAI,GAAG,YAAY,KAAK,EAAE;QACxB,oBAAa,CAAC,GAAG,CAAC,CAAC;KACpB;CACF"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAC9B,oCAAiC;AACjC,kCAAwC;AACxC,iDAAyD;AAEzD,IAAI;IACF,MAAM,OAAO,GAAG,sCAAuB,EAAE,CAAC;IAC1C,OAAO,CAAC,KAAK,CAAC,iBAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC/B,aAAK,CAAC;QACJ,KAAK,EAAE,MAAA,OAAO,CAAC,IAAI,0CAAG,CAAC,CAAC;QACxB,UAAU,EAAE,OAAO,CAAC,MAAM;QAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,OAAO;QACzC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,4BAA4B;QAC5B,wBAAwB,EAAE,OAAO,CAAC,wBAAwB;QAC1D,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,EAAE,+CAA+C;KAChG,CAAC,CAAC,KAAK,CAAC,oBAAa,CAAC,CAAC;CACzB;AAAC,OAAO,GAAG,EAAE;IACZ,IAAI,GAAG,YAAY,KAAK,EAAE;QACxB,oBAAa,CAAC,GAAG,CAAC,CAAC;KACpB;CACF"}

package/dist/commands/build.parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.parser.d.ts","sourceRoot":"","sources":["../../src/commands/build.parser.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAyC,YAAY,EAAE,MAAM,WAAW,CAAC;AAEhF,wBAAgB,uBAAuB,IAAI,SAAS,CAAC,OAAO,CA4H3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE;IACN,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,EAAE,GACF,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,CAczC"}
+{"version":3,"file":"build.parser.d.ts","sourceRoot":"","sources":["../../src/commands/build.parser.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAyC,YAAY,EAAE,MAAM,WAAW,CAAC;AAEhF,wBAAgB,uBAAuB,IAAI,SAAS,CAAC,OAAO,CAsI3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE;IACN,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,EAAE,GACF,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,CAczC"}

package/dist/commands/build.parser.js

@@ -63,13 +63,23 @@ Please refer the document of press-ready for further information.
 https://github.com/vibranthq/press-ready`)
         .option('--verbose', 'verbose log output')
         .option('--no-sandbox', `launch chrome without sandbox. use this option when ECONNREFUSED error occurred.`)
-        .option('--executable-chromium <path>', 'specify a path of executable Chrome (or Chromium) you installed')
+        .option('--executable-browser <path>', 'specify a path of executable browser you installed')
         .option('--image <image>', 'specify a docker image to render')
         .option('--http', `launch an HTTP server hosting contents instead of file protocol
 It is useful that requires CORS such as external web fonts.`)
         .option('--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/)`)
+        // Hide --browser option for now. There's no choice other than Chromium.
+        //     .addOption(
+        //       new commander.Option(
+        //         '--browser <browser>',
+        //         `Specify a browser type to launch Vivliostyle viewer [chromium]
+        // Currently, Firefox and Webkit support preview command only!`,
+        //       ).choices(['chromium', 'firefox', 'webkit']),
+        //     )
         .addOption(new commander_1.default.Option('--bypassed-pdf-builder-option <json>').hideHelp())
+        // TODO: Remove it in the next major version up
+        .addOption(new commander_1.default.Option('--executable-chromium <path>').hideHelp())
         .action((_arg, option) => {
         option.targets = inferenceTargetsOption(targets);
     });

package/dist/commands/build.parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.parser.js","sourceRoot":"","sources":["../../src/commands/build.parser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build.parser.js","sourceRoot":"","sources":["../../src/commands/build.parser.ts"],"names":[],"mappings":"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"}

package/dist/commands/preview.js

@@ -23,9 +23,11 @@ try {
         verbose: options.verbose,
         timeout: options.timeout,
         sandbox: options.sandbox,
-        executableChromium: options.executableChromium,
+        executableBrowser: options.executableBrowser,
         http: options.http,
         viewer: options.viewer,
+        browser: options.browser,
+        executableChromium: options.executableChromium, // TODO: Remove it in the next major version up
     }).catch(util_1.gracefulError);
 }
 catch (err) {

package/dist/commands/preview.js.map

@@ -1 +1 @@
-{"version":3,"file":"preview.js","sourceRoot":"","sources":["../../src/commands/preview.ts"],"names":[],"mappings":";;;AAAA,wCAAqC;AACrC,kCAAwC;AACxC,qDAA6D;AAE7D,IAAI;IACF,MAAM,OAAO,GAAG,0CAAyB,EAAE,CAAC;IAC5C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC/B,iBAAO,CAAC;QACN,KAAK,EAAE,MAAA,OAAO,CAAC,IAAI,0CAAG,CAAC,CAAC;QACxB,UAAU,EAAE,OAAO,CAAC,MAAM;QAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC,KAAK,CAAC,oBAAa,CAAC,CAAC;CACzB;AAAC,OAAO,GAAG,EAAE;IACZ,IAAI,GAAG,YAAY,KAAK,EAAE;QACxB,oBAAa,CAAC,GAAG,CAAC,CAAC;KACpB;CACF"}
+{"version":3,"file":"preview.js","sourceRoot":"","sources":["../../src/commands/preview.ts"],"names":[],"mappings":";;;AAAA,wCAAqC;AACrC,kCAAwC;AACxC,qDAA6D;AAE7D,IAAI;IACF,MAAM,OAAO,GAAG,0CAAyB,EAAE,CAAC;IAC5C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC/B,iBAAO,CAAC;QACN,KAAK,EAAE,MAAA,OAAO,CAAC,IAAI,0CAAG,CAAC,CAAC;QACxB,UAAU,EAAE,OAAO,CAAC,MAAM;QAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,EAAE,+CAA+C;KAChG,CAAC,CAAC,KAAK,CAAC,oBAAa,CAAC,CAAC;CACzB;AAAC,OAAO,GAAG,EAAE;IACZ,IAAI,GAAG,YAAY,KAAK,EAAE;QACxB,oBAAa,CAAC,GAAG,CAAC,CAAC;KACpB;CACF"}

package/dist/commands/preview.parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preview.parser.d.ts","sourceRoot":"","sources":["../../src/commands/preview.parser.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,wBAAgB,yBAAyB,IAAI,SAAS,CAAC,OAAO,CAyC7D"}
+{"version":3,"file":"preview.parser.d.ts","sourceRoot":"","sources":["../../src/commands/preview.parser.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,wBAAgB,yBAAyB,IAAI,SAAS,CAAC,OAAO,CAkD7D"}

package/dist/commands/preview.parser.js

@@ -25,11 +25,15 @@ custom(comma separated): 182mm,257mm or 8.5in,11in`)
         .option('-l, --language <language>', 'language')
         .option('--verbose', 'verbose log output')
         .option('--no-sandbox', `launch chrome without sandbox (use this option to avoid ECONNREFUSED error)`)
-        .option('--executable-chromium <path>', 'specify a path of executable Chrome(Chromium) you installed')
+        .option('--executable-browser <path>', 'specify a path of executable browser you installed')
         .option('--http', `launch an HTTP server hosting contents instead of file protocol
 It is useful that requires CORS such as external web fonts.`)
         .option('--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/)`);
+It is useful that using own viewer that has staging features. (ex: https://vivliostyle.vercel.app/)`)
+        .addOption(new commander_1.default.Option('--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']))
+        // TODO: Remove it in the next major version up
+        .addOption(new commander_1.default.Option('--executable-chromium <path>').hideHelp());
     return program;
 }
 exports.setupPreviewParserProgram = setupPreviewParserProgram;

package/dist/commands/preview.parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"preview.parser.js","sourceRoot":"","sources":["../../src/commands/preview.parser.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAElC,SAAgB,yBAAyB;IACvC,MAAM,OAAO,GAAG,IAAI,mBAAS,CAAC,OAAO,EAAE,CAAC;IACxC,OAAO;SACJ,IAAI,CAAC,qBAAqB,CAAC;SAC3B,WAAW,CAAC,uBAAuB,CAAC;SACpC,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,4BAA4B,EAAE,+BAA+B,CAAC;SACrE,MAAM,CAAC,qBAAqB,EAAE,4BAA4B,CAAC;SAC3D,MAAM,CACL,mBAAmB,EACnB;;mDAE6C,CAC9C;SACA,MAAM,CAAC,sBAAsB,EAAE,mCAAmC,CAAC;SACnE,MAAM,CAAC,gCAAgC,EAAE,6BAA6B,CAAC;SACvE,MAAM,CAAC,kBAAkB,EAAE,4BAA4B,CAAC;SACxD,MAAM,CAAC,aAAa,EAAE,qCAAqC,CAAC;SAC5D,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC;SAClC,MAAM,CAAC,mBAAmB,EAAE,QAAQ,CAAC;SACrC,MAAM,CAAC,2BAA2B,EAAE,UAAU,CAAC;SAC/C,MAAM,CAAC,WAAW,EAAE,oBAAoB,CAAC;SACzC,MAAM,CACL,cAAc,EACd,6EAA6E,CAC9E;SACA,MAAM,CACL,8BAA8B,EAC9B,6DAA6D,CAC9D;SACA,MAAM,CACL,QAAQ,EACR;4DACsD,CACvD;SACA,MAAM,CACL,gBAAgB,EAChB;oGAC8F,CAC/F,CAAC;IACJ,OAAO,OAAO,CAAC;AACjB,CAAC;AAzCD,8DAyCC"}
+{"version":3,"file":"preview.parser.js","sourceRoot":"","sources":["../../src/commands/preview.parser.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAElC,SAAgB,yBAAyB;IACvC,MAAM,OAAO,GAAG,IAAI,mBAAS,CAAC,OAAO,EAAE,CAAC;IACxC,OAAO;SACJ,IAAI,CAAC,qBAAqB,CAAC;SAC3B,WAAW,CAAC,uBAAuB,CAAC;SACpC,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,4BAA4B,EAAE,+BAA+B,CAAC;SACrE,MAAM,CAAC,qBAAqB,EAAE,4BAA4B,CAAC;SAC3D,MAAM,CACL,mBAAmB,EACnB;;mDAE6C,CAC9C;SACA,MAAM,CAAC,sBAAsB,EAAE,mCAAmC,CAAC;SACnE,MAAM,CAAC,gCAAgC,EAAE,6BAA6B,CAAC;SACvE,MAAM,CAAC,kBAAkB,EAAE,4BAA4B,CAAC;SACxD,MAAM,CAAC,aAAa,EAAE,qCAAqC,CAAC;SAC5D,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC;SAClC,MAAM,CAAC,mBAAmB,EAAE,QAAQ,CAAC;SACrC,MAAM,CAAC,2BAA2B,EAAE,UAAU,CAAC;SAC/C,MAAM,CAAC,WAAW,EAAE,oBAAoB,CAAC;SACzC,MAAM,CACL,cAAc,EACd,6EAA6E,CAC9E;SACA,MAAM,CACL,6BAA6B,EAC7B,oDAAoD,CACrD;SACA,MAAM,CACL,QAAQ,EACR;4DACsD,CACvD;SACA,MAAM,CACL,gBAAgB,EAChB;oGAC8F,CAC/F;SACA,SAAS,CACR,IAAI,mBAAS,CAAC,MAAM,CAClB,qBAAqB,EACrB;4DACoD,CACrD,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAC7C;QACD,+CAA+C;SAC9C,SAAS,CAAC,IAAI,mBAAS,CAAC,MAAM,CAAC,8BAA8B,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9E,OAAO,OAAO,CAAC;AACjB,CAAC;AAlDD,8DAkDC"}

package/dist/config.d.ts

@@ -1,6 +1,6 @@
 import { InputFormat, ManuscriptMediaType } from './input';
 import { OutputFormat } from './output';
-import type { VivliostyleConfigEntry } from './schema/vivliostyleConfig.schema';
+import type { BrowserType, VivliostyleConfigEntry } from './schema/vivliostyleConfig.schema';
 import { PageSize } from './server';
 export declare type ParsedTheme = UriTheme | FileTheme | PackageTheme;
 export interface UriTheme {
@@ -56,10 +56,12 @@ export interface CliFlags {
     preflight?: 'press-ready' | 'press-ready-local';
     preflightOption?: string[];
     sandbox?: boolean;
-    executableChromium?: string;
+    executableBrowser?: string;
     image?: string;
     http?: boolean;
     viewer?: string;
+    browser?: 'chromium' | 'firefox' | 'webkit';
+    /** @deprecated */ executableChromium?: string;
 }
 export interface WebPublicationManifestConfig {
     manifestPath: string;
@@ -106,7 +108,8 @@ export declare type MergedConfig = {
     verbose: boolean;
     timeout: number;
     sandbox: boolean;
-    executableChromium: string;
+    executableBrowser: string;
+    browserType: BrowserType;
     image: string;
     httpServer: boolean;
     viewer: string | undefined;

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}