From d4ff406b857eeede4dbe131ea1532d9d73ff2570 Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Sat, 8 May 2021 16:57:21 +0700 Subject: [PATCH] Require Node.js 12.20 --- .github/funding.yml | 4 ---- .github/workflows/main.yml | 4 ++-- cli.js | 16 ++++++++++------ package.json | 19 ++++++++++--------- test.js.md | 12 +++--------- test.js.snap | Bin 1112 -> 1076 bytes 6 files changed, 25 insertions(+), 30 deletions(-) delete mode 100644 .github/funding.yml diff --git a/.github/funding.yml b/.github/funding.yml deleted file mode 100644 index 15edf6e..0000000 --- a/.github/funding.yml +++ /dev/null @@ -1,4 +0,0 @@ -github: sindresorhus -open_collective: sindresorhus -patreon: sindresorhus -custom: https://sindresorhus.com/donate diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d4d275..268f715 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,12 +10,12 @@ jobs: fail-fast: false matrix: node-version: + - 16 - 14 - 12 - - 10 steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2 with: node-version: ${{ matrix.node-version }} - run: npm install diff --git a/cli.js b/cli.js index 933e7e2..c3ee0dd 100755 --- a/cli.js +++ b/cli.js @@ -1,10 +1,9 @@ #!/usr/bin/env node -'use strict'; -const meow = require('meow'); -const captureWebsite = require('capture-website'); -const arrify = require('arrify'); -const splitOnFirst = require('split-on-first'); -const getStdin = require('get-stdin'); +import meow from 'meow'; +import captureWebsite from 'capture-website'; +import arrify from 'arrify'; +import splitOnFirst from 'split-on-first'; +import getStdin from 'get-stdin'; const cli = meow(` Usage @@ -81,6 +80,7 @@ const cli = meow(` --inset=10,15,-10,15 --inset=30 `, { + importMeta: import.meta, flags: { output: { type: 'string' @@ -196,6 +196,10 @@ options.modules = options.module; options.scripts = options.script; options.styles = options.style; options.cookies = options.cookie; +delete options.module; +delete options.script; +delete options.style; +delete options.cookie; if (options.launchOptions) { options.launchOptions = JSON.parse(options.launchOptions); diff --git a/package.json b/package.json index 974a069..4335846 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,12 @@ "email": "sindresorhus@gmail.com", "url": "https://sindresorhus.com" }, + "type": "module", "bin": { - "capture-website": "cli.js" + "capture-website": "./cli.js" }, "engines": { - "node": ">=10" + "node": ">=12.20" }, "scripts": { "test": "xo && ava" @@ -40,17 +41,17 @@ "jpg" ], "dependencies": { - "arrify": "^2.0.1", - "capture-website": "^1.4.0", - "get-stdin": "^8.0.0", - "meow": "^7.0.1", - "split-on-first": "^2.0.1" + "arrify": "^3.0.0", + "capture-website": "^2.0.0", + "get-stdin": "^9.0.0", + "meow": "^10.0.0", + "split-on-first": "^3.0.0" }, "devDependencies": { - "ava": "^2.4.0", + "ava": "^3.15.0", "create-test-server": "^3.0.1", "execa": "^5.0.0", "file-type": "^12.4.0", - "xo": "^0.38.1" + "xo": "^0.39.1" } } diff --git a/test.js.md b/test.js.md index 0a26e11..6f4bd0d 100644 --- a/test.js.md +++ b/test.js.md @@ -2,7 +2,7 @@ The actual snapshot is saved in `test.js.snap`. -Generated by [AVA](https://ava.li). +Generated by [AVA](https://avajs.dev). ## check flags @@ -14,9 +14,6 @@ Generated by [AVA](https://ava.li). username: 'username', }, clickElement: 'button', - cookie: [ - 'id=unicorn; Expires=Wed, 21 Oct 2018 07:28:00 GMT;', - ], cookies: [ 'id=unicorn; Expires=Wed, 21 Oct 2018 07:28:00 GMT;', ], @@ -49,11 +46,6 @@ Generated by [AVA](https://ava.li). headless: false, }, listDevices: false, - module: [ - 'https://sindresorhus.com/remote-file.js', - 'local-file.js', - 'document.body.style.backgroundColor = \'red\'', - ], modules: [ 'https://sindresorhus.com/remote-file.js', 'local-file.js', @@ -66,7 +58,9 @@ Generated by [AVA](https://ava.li). 'img.ad', ], scaleFactor: 3, + scripts: [], scrollToElement: '#map', + styles: [], timeout: 80, type: 'jpeg.', userAgent: 'I love unicorns', diff --git a/test.js.snap b/test.js.snap index 8d01165b8a1b2d4863e8f7a875452e9c201593dc..f65cd158f218d59dc110a3742bd04b9b084a1639 100644 GIT binary patch literal 1076 zcmV-41k3wDRzV^njM-A0GF0=(y(goqrS-~x9jNT)kQ6rv!C+1>H(+|BMRGqdNo zOehedqooK1q6!osB7{J+G*mQ5P$3EwAq5J0-md@FV+Tv0ygTokZ{Od%aS%cn-TUgJ zd!K)EeB+H9&;EdZzgWX4|Gm>h$U=7Uj2rlw2k`$L;5UE`6bJAU;BCNrfKLEF0{#VT zRS>!gxC{6g@GamMz$3s@7T5qj;4a`(!1sWMfR!pj9l#MF1$+Sb8t@a~FF>mX-vq>f z3%I_C>&Ma8j#2KT?&}alio*jvR77LZOVXg(#%fgXu!?0}zv`;dw zuM+<(lp;%llSm}gxoM`LpK*RdLb}}jdPGS;<>d9^?M^BNRMMd14SSAHQk_ZK8Bk9# zO*>GMBK5zPQ$JELQxC!{j7AYvD>o~}zDj+zZ!Ka09hX-X*6otD#u7!%$e&=4519~t zBH`(flkhS5yuj4!1@4pt>{tXDUue#{$aI=bYu*AcC{0u(w3{ZOL2in3DhCpZusja?-HdRi$Bk%X ztLwf{IPyiwk(Q(}=**HnAByq`r-#JXLXP{{DkOd`$1=*5xwj3=g7fRbIIq>Mn52cs zqmoEn>EU8NY|UaS#tEt76T@89!*ts1wbPV_u9>4uQMn(MKHt9Pa0uAR66OoJP`uWF zFnuVb;k3OqYH9PN4_Kh1aYO%Uk$I=-I~ntIW^82Cn!(VG~+yUrI8>*5s+( zZWpBcK={(ssxD|f1j^rrR?X0=H5&-E0Uf|KK)+$=))#c|0Ofs?W}CF?XF$0R_yb@y z=iO+SA-xQQLxa?uC(YSb{>QdDXM;vo;jj;>!R9K`0WRvxg^ zakX^LE_0*dDwvuck%f5GoG6}v+c6#=pnuE*#A$zWxSlq9Th4~{!bVGrbaufl396Bw z7dX(f2?#vP^nE+hI#s=$9mSFW(kEn;Dc2YAPCk|(>OSMtJyqj<7|#ZrJoiR|FT**>kob=iAG(T4!<|{JQE54 literal 1112 zcmV-e1gHB!RzV!4Y3jMu%oXU90!<#vh9a00000000Bc zmd|e+MHI(p?6r53#&$xvz=f?+H4@YtHxeRp2vQ0O;zyN0tF~0)Fy5VbC!XEe&dkQO z_;KLK1&L!h6d@rYAx;&jhf17~kl<8tLL91c0U@OF7nJAqul3lyalq0?UcdRy+xO

F?nCF7O**gX9@t6Sx8> z;4|P3a381?5ZVH+0XKo$z&+q0U>6Z;0M~%`fSbTw;1}R;;Asn?Ch#us0q{BSGw>Hs zDIxR{z=4yvyn@U7tt0AdjK`15%gYE?5MD*Nit)!Fd=eKCF0J4yNp(nL&3vMnh!L)V zkHTnl$>+@P>~b1`WMnM2Qmy+^aP@7@RoNG!!)RvzHD|X6c4hc>0wOyXL_jk`p=J!1 z0@_O3gRx~}Y$c$FB<1=%@jGoP(m0r}10S69vR@WnoN>YwX>qy}vnb15%@4$;)9F{d zh_JZsi&%rz5LalFa-!)g^qBc{oGLpAMNHkR<`NvHoF9-jogaQVq$Hqn^z+n>dLp`1 z(xBezHC>-1I+e8Er7guYtwX7@rGJ!P`hf>?>A^8;hl7l)!qq}H?@W0zZz*H}9hO~X zqi^I!ODtB@%=`%k>mg&p4%kn+K%y_d7w1N+R%iBu=)crR2TI!a>| z3hgCv+Ym2^V=B86iZeey`+7<^)58sF<6^^meo(?(AXP~t@G~jKbc)I+obC}{3pw29 zMMF}97zO8-gmH|m)rcf!M4ClZ4D++_fiZ09UNYX)rK5zlJu~H0QMuF3y{7h>%OQR@ zjhQdxOpU5t!t|byMsW7(VCR|#y2}C`4)^UJ#eNGeo`!DxEO5~_+FxP1{W-YsK1e);49!h@W>D^n)$y7_u%=(Y0-%(5!^Nf zv)v^`sjiU0jKLK4cTr3tI%7cnHjWWq>dVJxWP=6U!~M18?%qh4q-y&L4bHk7=iGf? zyBm#jn{MNU=Ei2T(QseAaB1s5bX3V4P2ZdORy}Tfb369DFdR=o|7{VOIk(In)Dm$2 zM#D4uk9kHpJsh3ir_AFcCvAUbVo{4^a#hYr%IP0TXo-_v3c8{h`&y`VqMGaLip2pe zpO9gyJYPiX{YC~^A2Lq8BQ>0d@uZat=w;^c`0dXH!cY4x!fT13=PBI-U2FUY;AO#u ebhq6#So5|2d1N#7F0-iZk>Fn!;2jEi3IG6QmL!(|