From cdd006a971486bd6922277966492401b3f25af9f Mon Sep 17 00:00:00 2001
From: Sindre Sorhus <sindresorhus@gmail.com>
Date: Sat, 9 Feb 2019 10:56:11 +0700
Subject: [PATCH] Require Node.js 8 and upgrade `pageres`

---
 .gitattributes |  3 +-
 .travis.yml    |  3 +-
 cli.js         | 90 ++++++++++++++++++++++----------------------------
 package.json   | 25 +++++---------
 readme.md      | 68 ++++++++++++++++----------------------
 test/test.js   | 24 +++++++-------
 6 files changed, 91 insertions(+), 122 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 391f0a4..6313b56 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
-* text=auto
-*.js text eol=lf
+* text=auto eol=lf
diff --git a/.travis.yml b/.travis.yml
index 7d69d74..f3fa8cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 language: node_js
 node_js:
+  - '10'
   - '8'
-  - '6'
-  - '4'
diff --git a/cli.js b/cli.js
index dd48b89..503b4dc 100755
--- a/cli.js
+++ b/cli.js
@@ -34,21 +34,21 @@ const cli = meow(`
 	Screenshots are saved in the current directory.
 
 	Usage
-	  pageres <url> <resolution>
-	  pageres [ <url> <resolution> ] [ <url> <resolution> ]
+	  $ pageres <url> <resolution>
+	  $ pageres [ <url> <resolution> ] [ <url> <resolution> ]
 
-	Example
-	  pageres todomvc.com yeoman.io 1366x768 1600x900
-	  pageres todomvc.com yeoman.io 1366x768 1600x900 --overwrite
-	  pageres [ yeoman.io 1366x768 1600x900 --no-crop ] [ todomvc.com 1024x768 480x320 ] --crop
-	  pageres todomvc.com 1024x768 --filename='<%= date %> - <%= url %>'
-	  pageres yeoman.io 1366x768 --selector='.page-header'
-	  pageres unicorn.html 1366x768
+	Examples
+	  $ pageres https://sindresorhus.com https://example.com 1366x768 1600x900
+	  $ pageres https://sindresorhus.com https://example.com 1366x768 1600x900 --overwrite
+	  $ pageres [ https://example.com 1366x768 1600x900 --no-crop ] [ https://sindresorhus.com 1024x768 480x320 ] --crop
+	  $ pageres https://sindresorhus.com 1024x768 --filename='<%= date %> - <%= url %>'
+	  $ pageres https://example.com 1366x768 --selector='.page-header'
+	  $ pageres unicorn.html 1366x768
 
 	Options
-	  -v, --verbose            Verbose output
-	  -c, --crop               Crop to the set height
-	  -d, --delay=<seconds>    Delay screenshot capture
+	  --verbose, -v            Verbose output
+	  --crop, -c               Crop to the set height
+	  --delay=<seconds>, -d    Delay screenshot capture
 	  --filename=<template>    Custom filename
 	  --overwrite              Overwrite file if it exists
 	  --selector=<element>     Capture DOM element
@@ -61,67 +61,54 @@ const cli = meow(`
 	  --format=<string>        Image format
 	  --css=<string>           Apply custom CSS
 
-	<url> can also be a local file path.
+	<url> can also be a local file path
 `, options);
 
-function generate(args, options) {
-	const pageres = new Pageres({incrementalName: !options.overwrite})
-		.dest(process.cwd());
+async function generate(args, options) {
+	const pageres = new Pageres({
+		incrementalName: !options.overwrite
+	}).dest(process.cwd());
 
-	args.forEach(arg => {
-		pageres.src(arg.url, arg.sizes, arg.options);
-	});
-
-	if (options.verbose) {
-		pageres.on('warn', console.error.bind(console));
+	for (const argument of args) {
+		pageres.src(argument.url, argument.sizes, argument.options);
 	}
 
-	pageres.run()
-		.then(() => {
-			pageres.successMessage();
-		})
-		.catch(err => {
-			if (err.noStack) {
-				console.error(err.message);
-				process.exit(1);
-			} else {
-				throw err;
-			}
-		});
+	await pageres.run();
+	pageres.successMessage();
 }
 
 function get(args) {
 	const ret = [];
 
-	args.forEach(arg => {
-		if (arg.url.length === 0) {
+	for (const argument of args) {
+		if (argument.url.length === 0) {
 			console.error(logSymbols.warning, 'Specify a url');
 			process.exit(1);
 		}
 
-		if (arg.sizes.length === 0 && arg.keywords.length === 0) {
-			arg.sizes = ['1366x768'];
+		if (argument.sizes.length === 0 && argument.keywords.length === 0) {
+			argument.sizes = ['1366x768'];
 		}
 
-		if (arg.keywords.length > 0) {
-			arg.sizes = arg.sizes.concat(arg.keywords);
+		if (argument.keywords.length > 0) {
+			argument.sizes = argument.sizes.concat(argument.keywords);
 		}
 
-		arg.url.forEach(el => {
+		for (const url of argument.url) {
 			ret.push({
-				url: el,
-				sizes: arg.sizes,
-				options: arg.options
+				url,
+				sizes: argument.sizes,
+				options: argument.options
 			});
-		});
-	});
+		}
+	}
 
 	return ret;
 }
 
 function parse(args, globalOptions) {
 	return args.map(arg => {
-		const options = Object.assign({}, globalOptions, arg);
+		const options = {...globalOptions, ...arg};
 
 		arg = arg._;
 		delete options._;
@@ -159,7 +146,7 @@ function parse(args, globalOptions) {
 	});
 }
 
-function init(args, options) {
+async function init(args, options) {
 	if (args.length === 0) {
 		cli.showHelp(1);
 	}
@@ -176,10 +163,13 @@ function init(args, options) {
 	const parsedArgs = parse(args, options);
 	const items = get(parsedArgs);
 
-	generate(items, options);
+	await generate(items, options);
 }
 
 sudoBlock();
 updateNotifier({pkg: cli.pkg}).notify();
 
-init(subarg(cli.input, options)._, cli.flags);
+init(subarg(cli.input, options)._, cli.flags).catch(error => {
+	console.error(error);
+	process.exit(1);
+});
diff --git a/package.json b/package.json
index 84174dd..2b9fed5 100644
--- a/package.json
+++ b/package.json
@@ -9,18 +9,11 @@
 		"email": "sindresorhus@gmail.com",
 		"url": "sindresorhus.com"
 	},
-	"maintainers": [
-		{
-			"name": "Kevin Mårtensson",
-			"email": "kevinmartensson@gmail.com",
-			"url": "github.com/kevva"
-		}
-	],
 	"bin": {
 		"pageres": "cli.js"
 	},
 	"engines": {
-		"node": ">=4"
+		"node": ">=8"
 	},
 	"scripts": {
 		"test": "xo && ava"
@@ -46,8 +39,8 @@
 		"shot",
 		"responsive",
 		"gulpfriendly",
-		"phantom",
-		"phantomjs",
+		"puppeteer",
+		"chrome",
 		"image",
 		"svg",
 		"render",
@@ -61,20 +54,20 @@
 		"jpeg"
 	],
 	"dependencies": {
-		"array-differ": "^1.0.0",
-		"array-uniq": "^1.0.2",
+		"array-differ": "^2.0.3",
+		"array-uniq": "^2.0.0",
 		"arrify": "^1.0.0",
 		"log-symbols": "^2.1.0",
 		"meow": "^3.5.0",
-		"pageres": "^4.3.0",
+		"pageres": "^5.0.0",
 		"parse-headers": "^2.0.0",
 		"subarg": "^1.0.0",
 		"sudo-block": "^2.0.0",
 		"update-notifier": "^2.3.0"
 	},
 	"devDependencies": {
-		"ava": "*",
-		"execa": "^0.8.0",
-		"xo": "*"
+		"ava": "^1.2.0",
+		"execa": "^1.0.0",
+		"xo": "^0.24.0"
 	}
 }
diff --git a/readme.md b/readme.md
index c7fa6f4..daff540 100644
--- a/readme.md
+++ b/readme.md
@@ -15,12 +15,12 @@ Capture screenshots of websites in various resolutions. A good way to make sure
 $ npm install --global pageres-cli
 ```
 
+Note to Linux users: If you get a "No usable sandbox!" error, you need to enable [system sandboxing](https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md#setting-up-chrome-linux-sandbox).
+
 <a href="https://www.patreon.com/sindresorhus">
 	<img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" width="160">
 </a>
 
-*PhantomJS, which is used for generating the screenshots, is installed automagically, but in some [rare cases](https://github.com/Obvious/phantomjs/issues/102) it might fail to and you'll get an `Error: spawn EACCES` error. [Download](http://phantomjs.org/download.html) PhantomJS manually and reinstall pageres if that happens.*
-
 
 ## Usage
 
@@ -41,9 +41,9 @@ List multiple urls and resolutions for pageres to capture all combinations.
 ```sh
 pageres <url> <resolution> ...
 
-pageres todomvc.com 1024x768 1366x768 # 2 screenshots
-pageres todomvc.com yeoman.io 1024x768 # 2 screenshots
-pageres todomvc.com yeoman.io 1024x768 1366x768 # 4 screenshots
+pageres https://sindresorhus.com 1024x768 1366x768 # 2 screenshots
+pageres https://sindresorhus.com https://https://example.com 1024x768 # 2 screenshots
+pageres https://sindresorhus.com https://https://example.com 1024x768 1366x768 # 4 screenshots
 ```
 
 Group arguments with square brackets.
@@ -53,10 +53,10 @@ pageres [ <url> <resolution> ] [ <url> <resolution> ]
 pageres [ <url> <resolution> ... ]
 
 # Mix grouped and single arguments
-pageres [ yeoman.io 1024x768 1600x900 ] todomvc.com 1366x768
+pageres [ https://example.com 1024x768 1600x900 ] https://sindresorhus.com 1366x768
 
 # Options defined inside a group will override the outer ones.
-pageres [ yeoman.io 1024x768 --no-crop ] todomvc.com 1366x768 --crop
+pageres [ https://example.com 1024x768 --no-crop ] https://sindresorhus.com 1366x768 --crop
 ```
 
 Screenshots are saved in the current directory.
@@ -65,19 +65,19 @@ Screenshots are saved in the current directory.
 
 ```sh
 # Basic multi-url, multi-resolution usage
-pageres todomvc.com yeoman.io 1366x768 1600x900
+pageres https://sindresorhus.com https://example.com 1366x768 1600x900
 
 # Override outer option within group
-pageres [ yeoman.io 1366x768 1600x900 --no-crop ] [ todomvc.com 1024x768 480x320 ] --crop
+pageres [ https://example.com 1366x768 1600x900 --no-crop ] [ https://sindresorhus.com 1024x768 480x320 ] --crop
 
 # Provide a custom filename template
-pageres todomvc.com 1024x768 --filename='<%= date %> - <%= url %>'
+pageres https://sindresorhus.com 1024x768 --filename='<%= date %> - <%= url %>'
 
 # Capture a specific element
-pageres yeoman.io 1366x768 --selector='.page-header'
+pageres https://example.com 1366x768 --selector='.page-header'
 
 # Hide a specific element
-pageres yeoman.io 1366x768 --hide='.page-header'
+pageres https://example.com 1366x768 --hide='.page-header'
 
 # Capture a local file
 pageres unicorn.html 1366x768
@@ -85,24 +85,24 @@ pageres unicorn.html 1366x768
 
 ### Options
 
-##### `-v`, `--verbose`
+##### `--verbose`, `-v`
 
 Verbose output to see errors if you need to troubleshoot.
 
-##### `-c`, `--crop`
+##### `--crop`, `-c`
 
 Crop to the set height.
 
 ```
-$ pageres todomvc.com 1024x768 --crop
+$ pageres https://sindresorhus.com 1024x768 --crop
 ```
 
-##### `-d`, `--delay=<number>`
+##### `--delay=<number>`, `-d`
 
 Delay screenshot capture.
 
 ```
-$ pageres todomvc.com 1024x768 --delay=3
+$ pageres https://sindresorhus.com 1024x768 --delay=3
 ```
 
 ##### `--filename=<template>`
@@ -110,7 +110,7 @@ $ pageres todomvc.com 1024x768 --delay=3
 Custom filename.
 
 ```
-$ pageres todomvc.com 1024x768 --filename='<%= date %> - <%= url %>'
+$ pageres https://sindresorhus.com 1024x768 --filename='<%= date %> - <%= url %>'
 ```
 
 ##### `--overwrite`
@@ -118,7 +118,7 @@ $ pageres todomvc.com 1024x768 --filename='<%= date %> - <%= url %>'
 Overwrite destination file if it exists. Defaults to appending ` (n)` to the file name if `--overwrite` is not set.
 
 ```
-$ pageres todomvc.com 1366x768 --overwrite
+$ pageres https://sindresorhus.com 1366x768 --overwrite
 ```
 
 ##### `--selector=<element>`
@@ -126,7 +126,7 @@ $ pageres todomvc.com 1366x768 --overwrite
 Capture DOM element.
 
 ```
-$ pageres yeoman.io 1366x768 --selector='.page-header'
+$ pageres https://example.com 1366x768 --selector='.page-header'
 ```
 
 ##### `--hide=<element>`
@@ -134,7 +134,7 @@ $ pageres yeoman.io 1366x768 --selector='.page-header'
 Hide DOM element. Can be set multiple times.
 
 ```
-$ pageres yeoman.io 1366x768 --hide='.page-header'
+$ pageres https://example.com 1366x768 --hide='.page-header'
 ```
 
 ##### `--no-crop`
@@ -142,7 +142,7 @@ $ pageres yeoman.io 1366x768 --hide='.page-header'
 Override a global crop option within a group.
 
 ```
-$ pageres [ yeoman.io 1366x768 --no-crop ] todomvc.com 1024x768 --crop
+$ pageres [ https://example.com 1366x768 --no-crop ] https://sindresorhus.com 1024x768 --crop
 ```
 
 ##### `--css=<string>`
@@ -150,8 +150,8 @@ $ pageres [ yeoman.io 1366x768 --no-crop ] todomvc.com 1024x768 --crop
 Apply custom CSS to the webpage. Specify some CSS or the path to a CSS file.
 
 ```
-$ pageres todomvc.com --css='body { background: red; }'
-$ pageres todomvc.com --css='style.css'
+$ pageres https://sindresorhus.com --css='body { background: red; }'
+$ pageres https://sindresorhus.com --css='style.css'
 ```
 
 ##### `--cookie=<cookie>`
@@ -159,7 +159,7 @@ $ pageres todomvc.com --css='style.css'
 Browser cookie. Can be set multiple times.
 
 ```
-$ pageres yeoman.io --cookie='foo=bar'
+$ pageres https://example.com --cookie='foo=bar'
 ```
 
 ##### `--header=<header>`
@@ -167,7 +167,7 @@ $ pageres yeoman.io --cookie='foo=bar'
 Custom HTTP request header. Can be set multiple times.
 
 ```
-$ pageres yeoman.io --header='Cache-Control: no-cache'
+$ pageres https://example.com --header='Cache-Control: no-cache'
 ```
 
 ##### `--username=<username>`
@@ -201,23 +201,11 @@ You can persist your commands into a file and run it whenever with eg. `sh .page
 
 ```sh
 # .pageres
-pageres [ todomvc.com 1000x1000 --crop ] [ yeoman.io 500x500 ]
-pageres [ google.com 1000x1000 --crop ] [ github.com 500x500 ]
+pageres [ https://sindresorhus.com 1000x1000 --crop ] [ https://example.com 500x500 ]
+pageres [ https://google.com 1000x1000 --crop ] [ https://github.com 500x500 ]
 ```
 
 
-## Google Analytics screen resolutions
-
-You can use the most popular resolutions for your site with `pageres` by following these steps:
-
-- In Google Analytics go to the site for which you want screen resolutions
-- Select `Audience` => `Technology` => `Browser & OS`
-- Click the `Screen Resolution` link in the middle of the screen
-- Click the `Export` button at the top, then `Google Spreadsheets`, and select yes for importing
-- Select all the resolutions and copy them into a new file and save it
-- In your terminal run: `pageres website.com $(awk '{a = $1 " " a} END {print a}' file-from-above-step.txt)`
-
-
 ## License
 
 MIT © [Sindre Sorhus](https://sindresorhus.com)
diff --git a/test/test.js b/test/test.js
index 5267ce9..3869c0f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -7,19 +7,19 @@ import {version as pkgVersion} from '../package';
 process.chdir(__dirname);
 
 test('generate screenshot', async t => {
-	await execa('../cli.js', ['yeoman.io', '320x240']);
+	await execa('../cli.js', ['https://sindresorhus.com', '320x240']);
 
-	t.true(fs.existsSync('yeoman.io-320x240.png'));
-	fs.unlinkSync('yeoman.io-320x240.png');
+	t.true(fs.existsSync('sindresorhus.com-320x240.png'));
+	fs.unlinkSync('sindresorhus.com-320x240.png');
 });
 
 test.cb('remove temporary files on cancel', t => {
 	t.plan(1);
 
-	const cp = spawn('../cli.js', ['yeoman.io', '320x240']);
+	const cp = spawn('../cli.js', ['https://sindresorhus.com', '320x240']);
 
 	cp.on('exit', () => {
-		t.false(fs.existsSync('yeoman.io-320x240.png'));
+		t.false(fs.existsSync('sindresorhus.com-320x240.png'));
 		t.end();
 	});
 
@@ -29,21 +29,21 @@ test.cb('remove temporary files on cancel', t => {
 });
 
 test('show error if no url is specified', async t => {
-	await t.throws(execa('../cli.js', ['320x240']), /Specify a url/);
+	await t.throwsAsync(execa('../cli.js', ['320x240']), /Specify a url/);
 });
 
 test('use 1366x768 as default resolution', async t => {
-	await execa('../cli.js', ['yeoman.io']);
+	await execa('../cli.js', ['https://sindresorhus.com']);
 
-	t.true(fs.existsSync('yeoman.io-1366x768.png'));
-	fs.unlinkSync('yeoman.io-1366x768.png');
+	t.true(fs.existsSync('sindresorhus.com-1366x768.png'));
+	fs.unlinkSync('sindresorhus.com-1366x768.png');
 });
 
 test('generate screenshots using keywords', async t => {
-	await execa('../cli.js', ['yeoman.io', 'iphone5s']);
+	await execa('../cli.js', ['https://sindresorhus.com', 'iphone5s']);
 
-	t.true(fs.existsSync('yeoman.io-320x568.png'));
-	fs.unlinkSync('yeoman.io-320x568.png');
+	t.true(fs.existsSync('sindresorhus.com-320x568.png'));
+	fs.unlinkSync('sindresorhus.com-320x568.png');
 });
 
 test('show help screen', async t => {