Merge pull request #11 from mjmasn/master

Update phantomjs & npm dependencies
justengland · Dec 18, 2016 · 327333e · 327333e
2 parents f491dea + d925654
commit 327333e
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 .env
+context.json
+*.env
diff --git a/build-phantomjs.sh b/build-phantomjs.sh
diff --git a/index.js b/index.js
@@ -6,15 +6,14 @@ exports.handler = function( event, context ) {
       fs = require('fs'),
       os = require('os'),
       http = require('http'),
-      phantomDownloadPath = "https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64-symbols.tar.bz2",
       childProcess = require('child_process');
 
   // Get the path to the phantomjs application
   function getPhantomFileName(callback) {
-    var nodeModulesPath = path.join(__dirname, 'node_modules');
+    var nodeModulesPath = path.join(__dirname, 'node_modules', 'phantomjs-prebuilt');
     fs.exists(nodeModulesPath, function(exists) {
       if (exists) {
-        callback(path.join(__dirname, 'node_modules','phantomjs', 'bin', 'phantomjs'));
+        callback(path.join(__dirname, 'node_modules','phantomjs-prebuilt', 'bin', 'phantomjs'));
       }
       else {
         callback(path.join(__dirname, 'phantomjs'));
@@ -25,11 +24,11 @@ exports.handler = function( event, context ) {
   // Call the phantomjs script
   function callPhantom(callback) {
     getPhantomFileName(function(phantomJsPath) {
-      
+
       var childArgs = [
         path.join(__dirname, 'phantomjs-script.js')
       ];
-      
+
       // replace default phantomjs script with something the invoker sent
       if (event && event.code) {
         childArgs[0] = generateTmpScript()
@@ -48,20 +47,20 @@ exports.handler = function( event, context ) {
 
       console.log('Calling phantom: ', phantomJsPath, childArgs);
       var ls = childProcess.execFile(phantomJsPath, childArgs);
-  
+
       ls.stdout.on('data', function (data) {    // register one or more handlers
         console.log(data);
       });
-  
+
       ls.stderr.on('data', function (data) {
         console.log('phantom error  ---:> ' + data);
       });
-  
+
       ls.on('exit', function (code) {
         console.log('child process exited with code ' + code);
         callback();
       });
-      
+
     });
   }
 

diff --git a/libicudata.so.50 b/libicudata.so.50
diff --git a/libicui18n.so.50 b/libicui18n.so.50
diff --git a/libicuio.so.50 b/libicuio.so.50
diff --git a/libicule.so.50 b/libicule.so.50
diff --git a/libiculx.so.50 b/libiculx.so.50
diff --git a/libicutest.so.50 b/libicutest.so.50
diff --git a/libicutu.so.50 b/libicutu.so.50
diff --git a/libicuuc.so.50 b/libicuuc.so.50
diff --git a/package.json b/package.json
@@ -15,10 +15,10 @@
   "homepage": "https://github.com/rebelmail/node-lambda-template",
   "dependencies": {},
   "devDependencies": {
-    "aws-sdk": "^2.1.39",
-    "mocha": "^2.3.2",
-    "node-lambda": "^0.8.5",
-    "phantomjs": "^1.9.17"
+    "aws-sdk": "^2.7.8",
+    "mocha": "^3.2.0",
+    "node-lambda": "^0.8.11",
+    "phantomjs-prebuilt": "^2.1.13"
   },
   "scripts": {
     "setup": "node-lambda setup",

diff --git a/phantomjs b/phantomjs