Merge pull request #476 from marp-team/improve-chrome-not-resolvable-…

…error-message

Don't suggest to install Chromium in error message if the current platform cannot resolve Chromium by `chrome-launcher` module

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Don't suggest to install Chromium in error message if the current platform cannot resolve Chromium by `chrome-launcher` module ([#475](https://github.com/marp-team/marp-cli/issues/475), [#476](https://github.com/marp-team/marp-cli/pull/476))
+
 ### Changed
 
 - Upgrade Node.js and dependencies ([#473](https://github.com/marp-team/marp-cli/pull/473))

README.md

@@ -43,7 +43,7 @@ npx @marp-team/marp-cli@latest -w slide-deck.md
 npx @marp-team/marp-cli@latest -s ./slides
 ```
 
-> :information_source: You have to install [Google Chrome], [Chromium], or [Microsoft Edge] to convert slide deck into PDF, PPTX, and image(s).
+> :information_source: You have to install [Google Chrome]<!--, [Chromium], --> or [Microsoft Edge] to convert slide deck into PDF, PPTX, and image(s).
 
 [google chrome]: https://www.google.com/chrome/
 [chromium]: https://www.chromium.org/
@@ -121,19 +121,19 @@ When you want to output the converted result to another directory with keeping t
 
 ### Convert to PDF (`--pdf`)
 
-If you passed `--pdf` option or the output filename specified by `--output` (`-o`) option ends with `.pdf`, Marp CLI will try to convert into PDF file by using [Google Chrome], [Chromium], [Microsoft Edge], or a Chromium based browser.
+If you passed `--pdf` option or the output filename specified by `--output` (`-o`) option ends with `.pdf`, Marp CLI will try to convert Markdown into PDF file through the browser.
 
 ```bash
 marp --pdf slide-deck.md
 marp slide-deck.md -o converted.pdf
 ```
 
-> :information_source: All kind of conversions except HTML require [Google Chrome], [Chromium], [Microsoft Edge], or a Chromium based browser. When an unexpected problem has occurred while converting, please update your browser to the latest version or try installing [Google Chrome Canary].
->
-> If you want to use a browser other than Google Chrome, Chromium, or Microsoft Edge, specify the path to a Chromium based browser using the `CHROME_PATH` environment variable. For example: `CHROME_PATH=$(which brave) marp --pdf slide-deck.md`
+All kind of conversions except HTML _require to install [Google Chrome]<!--, [Chromium]-->, [Microsoft Edge], or [Chromium] (flavored) browser._ When an unexpected problem has occurred while converting, please update your browser to the latest version or try installing [Google Chrome Canary].
 
 [google chrome canary]: https://www.google.com/chrome/canary/
 
+> :information_source: If you want to use Chromium or flavored browsers to convert, you have to specify the path to the browser binary through `CHROME_PATH` environment variable. For example: `CHROME_PATH=$(which brave) marp --pdf slide-deck.md`
+
 If your slide deck had included [Marpit presenter notes] as HTML comment, you can add note annotations to the lower left by using `--pdf-notes` option together with `--pdf`.
 
 [marpit presenter notes]: https://marpit.marp.app/usage?id=presenter-notes

src/utils/puppeteer.ts

@@ -105,8 +105,14 @@ export const generatePuppeteerLaunchArgs = async () => {
       if (!executablePath) {
         if (findChromeError) warn(findChromeError.message)
 
+        // https://github.com/marp-team/marp-cli/issues/475
+        // https://github.com/GoogleChrome/chrome-launcher/issues/278
+        const chromiumResolvable = process.platform === 'linux'
+
         error(
-          'You have to install Google Chrome, Chromium, or Microsoft Edge to convert slide deck with current options.',
+          `You have to install Google Chrome${
+            chromiumResolvable ? ', Chromium,' : ''
+          } or Microsoft Edge to convert slide deck with current options.`,
           CLIErrorCode.NOT_FOUND_CHROMIUM
         )
       }

test/utils/puppeteer.ts

@@ -133,10 +133,7 @@ describe('#generatePuppeteerLaunchArgs', () => {
     jest.spyOn(edgeFinder(), 'findEdgeInstallation').mockImplementation()
 
     await expect(puppeteerUtils().generatePuppeteerLaunchArgs).rejects.toThrow(
-      new (CLIError())(
-        'You have to install Google Chrome, Chromium, or Microsoft Edge to convert slide deck with current options.',
-        CLIErrorCode.NOT_FOUND_CHROMIUM
-      )
+      'You have to install Google Chrome'
     )
     expect(warn).toHaveBeenCalledWith(
       expect.stringContaining('Error in chrome finder')