Skip to content
This repository was archived by the owner on Jul 24, 2019. It is now read-only.

Commit 322abfd

Browse files
committed
Update PhantomJS to 2.1.1, remove 2.0 warning in readme
Fixes #437
1 parent 3ad7dad commit 322abfd

File tree

5 files changed

+9
-27
lines changed

5 files changed

+9
-27
lines changed

.jshintrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
asi: false
2+
"asi": true,
3+
"node": true
34
}

README.md

-19
Original file line numberDiff line numberDiff line change
@@ -209,25 +209,6 @@ conflict. This is a non-portable change, and we do not try to support this. The
209209
recommends that you run `apt-get install nodejs-legacy` to symlink `node` to `nodejs`
210210
on those platforms, or many NodeJS programs won't work properly.
211211

212-
##### The latest version of this package installs PhantomJS 1.9.8. When is PhantomJS 2.0 coming?
213-
214-
In January 2015, the PhantomJS project released PhantomJS 2.0 with statically
215-
compiled Windows binaries.
216-
217-
They were not able to create statically-compiled binaries for Linux or OSX 9+.
218-
219-
This put us in a difficult position. The whole reason this NPM installer exists
220-
is to provide a portable, cross-platform installation process for
221-
PhantomJS. Without static binaries, we can't support PhantomJS 2.0.
222-
223-
If you work on a project that does not need cross-platform installation
224-
(for example, if your users can compile and install phantomjs themselves on PATH),
225-
then there is no good reason to depend on this package. You should call phantomjs
226-
directly with `child_process.spawn`.
227-
228-
The core PhantomJS team is hard at work trying to producing static binaries,
229-
but there's currently no timeline.
230-
231212
Contributing
232213
------------
233214

install.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -382,16 +382,16 @@ function getDownloadSpec() {
382382
var arch = getTargetArch()
383383
if (platform === 'linux' && arch === 'x64') {
384384
downloadUrl += 'linux-x86_64.tar.bz2'
385-
checksum = '4ea7aa79e45fbc487a63ef4788a18ef7'
385+
checksum = '1c947d57fce2f21ce0b43fe2ed7cd361'
386386
} else if (platform === 'linux' && arch == 'ia32') {
387387
downloadUrl += 'linux-i686.tar.bz2'
388-
checksum = '814a438ca515c6f7b1b2259d0d5bc804'
388+
checksum = '0396e8249e082f72c1e39d33fc9d8de6'
389389
} else if (platform === 'darwin' || platform === 'openbsd' || platform === 'freebsd') {
390390
downloadUrl += 'macosx.zip'
391-
checksum = 'fb850d56c033dd6e1142953904f62614'
391+
checksum = 'b0c038bd139b9ecaad8fd321070c1651'
392392
} else if (platform === 'win32') {
393393
downloadUrl += 'windows.zip'
394-
checksum = 'c5eed3aeb356ee597a457ab5b1bea870'
394+
checksum = '4104470d43ddf2a195e8869deef0aa69'
395395
} else {
396396
return null
397397
}

lib/phantomjs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ try {
2626
* The version of phantomjs installed by this package.
2727
* @type {number}
2828
*/
29-
exports.version = '1.9.8'
29+
exports.version = '2.1.1'
3030

3131

3232
/**

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "phantomjs",
3-
"version": "1.9.19",
3+
"version": "2.1.0",
44
"keywords": [
55
"phantomjs",
66
"headless",
@@ -42,7 +42,7 @@
4242
"adm-zip": "0.4.4",
4343
"fs-extra": "~0.23.1",
4444
"kew": "0.4.0",
45-
"md5": "~2.0.0",
45+
"md5": "~2.0.0",
4646
"npmconf": "2.1.1",
4747
"progress": "1.1.8",
4848
"request": "2.42.0",

0 commit comments

Comments
 (0)