fix: non-forked packages breaking web build (#225)

package.json

@@ -94,9 +94,9 @@
     "watchify": "^3.11.0"
   },
   "dependencies": {
-    "browser-request": "^0.3.3",
+    "browser-request": "postlight/browser-request#feat-add-headers-to-response",
     "cheerio": "^0.22.0",
-    "difflib": "^0.2.4",
+    "difflib": "postlight/difflib.js",
     "ellipsize": "0.1.0",
     "iconv-lite": "0.4.24",
     "jquery": "^3.3.1",

scripts/check-build.test.js

@@ -16,7 +16,15 @@ let urls = [
 ];
 
 // don't run this on CI b/c we want to avoid network requests
-if (process.env.CI) {
+if (
+  process.env.CI ||
+  (typeof __karma__ !== 'undefined' && __karma__.config.args[0] === '--CI')
+) {
+  if (cheerio.browser) {
+    require('../dist/mercury.web');
+  }
+  // eslint-disable-next-line no-unused-expressions
+  typeof Mercury === 'undefined' && require('../dist/mercury');
   describe('Tests', () => {
     it('do not run because this is CI and we do not want network requests', () => {
       assert.equal(true, true);

scripts/karma.conf.js

@@ -64,5 +64,9 @@ module.exports = function(config) {
     // Concurrency level
     // how many browser should be started simultaneous
     concurrency: Infinity,
+
+    client: {
+      args: config.CI ? ['--CI'] : [],
+    },
   });
 };

scripts/proxy-browser-test.js

@@ -31,11 +31,10 @@ const stop = () => {
   server && server.close();
 };
 
-if (!process.env.CI) {
+start();
-  start();
+require('child_process').execSync(
-  require('child_process').execSync(
+  'node ./node_modules/karma/bin/karma start ./scripts/karma.conf.js' +
-    'node ./node_modules/karma/bin/karma start ./scripts/karma.conf.js',
+    (process.env.CI ? ' --CI' : ''),
-    { stdio: [0, 1, 2] }
+  { stdio: [0, 1, 2] }
-  );
+);
-  stop();
+stop();
-}

src/resource/utils/fetch-resource.js

@@ -102,8 +102,12 @@ export default async function fetchResource(url, parsedUrl) {
     gzip: true,
     // Follow any non-GET redirects
     followAllRedirects: true,
-    // Follow GET redirects
+    ...(typeof window !== 'undefined'
-    followRedirect: true,
+      ? {}
+      : {
+          // Follow GET redirects; this option is for Node only
+          followRedirect: true,
+        }),
   };
 
   const { response, body } = await get(options);