update es3ify/selenium/browserify/derequire

bin/dev-server.js

@@ -5,14 +5,19 @@
 var HTTP_PORT = 8001;
 
 var Promise = require('bluebird');
-var request = require('request');
 var http_server = require("http-server");
 var fs = require('fs');
 var indexfile = "./test/test.js";
 var dotfile = "./test/.test-bundle.js";
 var outfile = "./test/test-bundle.js";
 var watchify = require("watchify");
-var w = watchify(indexfile);
+var browserify = require('browserify');
+var w = watchify(browserify(indexfile, {
+  cache: {},
+  packageCache: {},
+  fullPaths: true,
+  debug: true
+}));
 
 w.on('update', bundle);
 bundle();

bin/es3ify.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+'use strict';
+var es3ify = require('es3ify');
+return process.stdin.pipe(es3ify()).pipe(process.stdout);

bin/test-browser.js

@@ -6,14 +6,12 @@ var spawn = require('child_process').spawn;
 
 var wd = require('wd');
 var sauceConnectLauncher = require('sauce-connect-launcher');
+var selenium = require('selenium-standalone');
 var querystring = require("querystring");
 var request = require('request').defaults({json: true});
 
 var devserver = require('./dev-server.js');
 
-var SELENIUM_PATH = '../vendor/selenium-server-standalone-2.38.0.jar';
-var SELENIUM_HUB = 'http://localhost:4444/wd/hub/status';
-
 var testTimeout = 30 * 60 * 1000;
 
 var username = process.env.SAUCE_USERNAME;
@@ -42,12 +40,6 @@ if (client.runner === 'saucelabs') {
 if (process.env.GREP) {
   qs.grep = process.env.GREP;
 }
-if (process.env.ADAPTERS) {
-  qs.adapters = process.env.ADAPTERS;
-}
-if (process.env.ES5_SHIM || process.env.ES5_SHIMS) {
-  qs.es5shim = true;
-}
 testUrl += '?';
 testUrl += querystring.stringify(qs);
 
@@ -86,31 +78,18 @@ function testComplete(result) {
 }
 
 function startSelenium(callback) {
-
   // Start selenium
-  spawn('java', ['-jar', path.resolve(__dirname, SELENIUM_PATH)], {});
-
-  var retries = 0;
-  var started = function () {
-
-    if (++retries > 30) {
-      console.error('Unable to connect to selenium');
+  var opts = {version: '2.45.0'};
+  selenium.install(opts, function(err) {
+    if (err) {
+      console.error('Failed to install selenium');
       process.exit(1);
-      return;
     }
-
-    request(SELENIUM_HUB, function (err, resp) {
-      if (resp && resp.statusCode === 200) {
-        sauceClient = wd.promiseChainRemote();
-        callback();
-      } else {
-        setTimeout(started, 1000);
-      }
+    selenium.start(opts, function(err, server) {
+      sauceClient = wd.promiseChainRemote();
+      callback();
     });
-  };
-
-  started();
-
+  });
 }
 
 function startSauceConnect(callback) {

package.json

@@ -24,7 +24,8 @@
     "test-browser": "./bin/test-browser.js",
     "jshint": "jshint -c .jshintrc lib/*.js test/test.js",
     "test": "npm run jshint && ./bin/run-test.sh",
-    "build": "mkdir -p dist && browserify lib/index.js -s blobUtil -o dist/blob-util.js && npm run min",
+    "build": "mkdirp dist && npm run browserify && npm run min",
+    "browserify": "browserify lib/index.js -s blobUtil | ./bin/es3ify.js | derequire > dist/blob-util.js",
     "min": "uglifyjs dist/blob-util.js -mc > dist/blob-util.min.js",
     "dev": "browserify test/test.js > test/test-bundle.js && npm run dev-server",
     "dev-server": "./bin/dev-server.js",
@@ -34,30 +35,28 @@
   },
   "dependencies": {
     "blob": "0.0.4",
-    "es3ify": "^0.1.3",
     "lie": "^2.6.0"
   },
   "devDependencies": {
     "bluebird": "^1.0.7",
-    "browserify": "~2.36.0",
+    "browserify": "^9.0.3",
     "chai": "~1.8.1",
     "chai-as-promised": "~4.1.0",
+    "derequire": "^2.0.0",
+    "es3ify": "^0.1.3",
     "http-server": "~0.5.5",
     "istanbul": "^0.2.7",
     "jsdoc": "^3.3.0-alpha10",
     "jsdoc-to-markdown": "^0.5.9",
     "jshint": "~2.3.0",
+    "mkdirp": "^0.5.0",
     "mocha": "~1.18",
     "phantomjs": "^1.9.7-5",
     "request": "^2.36.0",
     "sauce-connect-launcher": "^0.4.2",
     "uglify-js": "^2.4.13",
-    "watchify": "~0.4.1",
+    "selenium-standalone": "3.0.2",
+    "watchify": "^2.4.0",
     "wd": "^0.2.21"
-  },
-  "browserify": {
-    "transform": [
-      "es3ify"
-    ]
   }
 }