Add failing test: @bugsnag/js

package.json

@@ -18,6 +18,7 @@
   },
   "devDependencies": {
     "@azure/cosmos": "^2.0.5",
+    "@bugsnag/js": "^5.0.1",
     "@google-cloud/bigquery": "^2.0.1",
     "@google-cloud/firestore": "^0.19.0",
     "@sentry/node": "^4.3.0",

src/loaders/relocate-loader.js

@@ -50,20 +50,42 @@ function isExpressionReference(node, parent) {
 	return true;
 }
 
-// Wrapper detections for require extraction
-// detects:
+// Wrapper detections for require extraction handles:
 // 
 // When.js-style AMD wrapper:
 //   (function (define) { 'use strict' define(function (require) { ... }) })
 //   (typeof define === 'function' && define.amd ? define : function (factory) { module.exports = factory(require); })
-// // ...
-function unwrapIfAMD (ast, scope, magicString, len) {
+// ->
+//   (function (define) { 'use strict' define(function () { ... }) })
+//   (typeof define === 'function' && define.amd ? define : function (factory) { module.exports = factory(require); })
+//
+// Browserify-style wrapper
+//   (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.bugsnag = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({
+//   1:[function(require,module,exports){
+//     ...code...
+//   },{"external":undefined}], 2: ...
+//   },{},[24])(24)
+//   });
+// ->
+//   (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.bugsnag = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({
+//   1:[function(require,module,exports){
+//     ...code...
+//   },{"external":undefined}], 2: ...
+//   },{
+//     "external": { exports: require('external') }
+//   },[24])(24)
+//   });
+//
+
+function handleWrappers (ast, scope, magicString, len) {
   let transformed = false;
   if (ast.body.length === 1 &&
       ast.body[0].type === 'ExpressionStatement' &&
       ast.body[0].expression.type === 'CallExpression' &&
       ast.body[0].expression.callee.type === 'FunctionExpression' &&
       ast.body[0].expression.arguments.length === 1) {
+
+    // When.js wrapper
     const arg = ast.body[0].expression.arguments[0];
     if (arg.type === 'ConditionalExpression' && 
         arg.test.type === 'LogicalExpression' &&
@@ -99,7 +121,6 @@ function unwrapIfAMD (ast, scope, magicString, len) {
         arg.alternate.body.body[0].expression.right.arguments[0].type === 'Identifier' &&
         arg.alternate.body.body[0].expression.right.arguments[0].name === 'require') {
       let iifeBody = ast.body[0].expression.callee.body.body;
-
       if (iifeBody[0].type === 'ExpressionStatement' &&
           iifeBody[0].expression.type === 'Literal' &&
           iifeBody[0].expression.value === 'use strict') {
@@ -120,6 +141,66 @@ function unwrapIfAMD (ast, scope, magicString, len) {
         transformed = true;
       }
     }
+    // browserify wrapper
+    else if (arg.type === 'FunctionExpression' &&
+        arg.params.length === 0 &&
+        arg.body.body.length === 2 &&
+        arg.body.body[0].type === 'VariableDeclaration' &&
+        arg.body.body[0].declarations.length === 3 &&
+        arg.body.body[0].declarations.every(decl => decl.init === null && decl.id.type === 'Identifier') &&
+        arg.body.body[1].type === 'ReturnStatement' &&
+        arg.body.body[1].argument.type === 'CallExpression' &&
+        arg.body.body[1].argument.callee.type === 'CallExpression' &&
+        arg.body.body[1].argument.arguments.length &&
+        arg.body.body[1].argument.arguments.every(arg => arg.type === 'Literal' && typeof arg.value === 'number') &&
+        arg.body.body[1].argument.callee.callee.type === 'CallExpression' &&
+        arg.body.body[1].argument.callee.callee.callee.type === 'FunctionExpression' &&
+        arg.body.body[1].argument.callee.callee.arguments.length === 0 &&
+        // (dont go deeper into browserify loader internals than this)
+        arg.body.body[1].argument.callee.arguments.length === 3 &&
+        arg.body.body[1].argument.callee.arguments[0].type === 'ObjectExpression' &&
+        arg.body.body[1].argument.callee.arguments[1].type === 'ObjectExpression' &&
+        arg.body.body[1].argument.callee.arguments[2].type === 'ArrayExpression') {
+      const modules = arg.body.body[1].argument.callee.arguments[0].properties;
+
+      // verify modules is the expected data structure
+      // in the process, extract external requires
+      const externals = {};
+      if (modules.every(m => {
+        if (m.type !== 'Property' ||
+            m.computed !== false ||
+            m.key.type !== 'Literal' ||
+            typeof m.key.value !== 'number' ||
+            m.value.type !== 'ArrayExpression' ||
+            m.value.elements.length !== 2 ||
+            m.value.elements[0].type !== 'FunctionExpression' ||
+            m.value.elements[1].type !== 'ObjectExpression')
+          return false;
+
+        // detect externals from undefined moduleMap values
+        const moduleMap = m.value.elements[1].properties;
+        for (const prop of moduleMap) {
+          if (prop.type !== 'Property' ||
+              (prop.value.type !== 'Identifier' && prop.value.type !== 'Literal') ||
+              prop.key.type !== 'Literal' ||
+              typeof prop.key.value !== 'string' ||
+              prop.computed)
+            return false;
+          if (prop.value.type === 'Identifier' && prop.value.name === 'undefined')
+            externals[prop.key.value] = true;
+        }
+        return true;
+      })) {
+        // if we have externals, inline them into the browserify cache for webpack to pick up
+        const externalIds = Object.keys(externals);
+        if (externalIds.length) {
+          const cache = arg.body.body[1].argument.callee.arguments[1];
+          const renderedExternals = externalIds.map(ext => `"${ext}": { exports: require("${ext}") }`).join(',\n  ');
+          magicString.appendRight(cache.end - 1, renderedExternals);
+          transformed = true;
+        }
+      }
+    }
   }
   return { ast, scope, transformed };
 }
@@ -320,7 +401,7 @@ module.exports = function (code) {
         node.arguments[0].type === 'Literal';
   }
 
-  ({ ast, scope, transformed } = unwrapIfAMD(ast, scope, magicString, code.length));
+  ({ ast, scope, transformed } = handleWrappers(ast, scope, magicString, code.length));
 
   walk(ast, {
     enter (node, parent) {

test/integration/bugsnag-js.js

@@ -0,0 +1,3 @@
+require("@bugsnag/js");
+
+module.exports = () => {};

test/unit/browserify/dep1.js

@@ -0,0 +1 @@
+module.exports = 'dep1';

test/unit/browserify/dep2.js

@@ -0,0 +1 @@
+module.exports = 'dep2';

test/unit/browserify/output.js

@@ -0,0 +1,111 @@
+module.exports =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var require;var require;(function(f){if(true){module.exports=f()}else { var g; }})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return require(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+  module.exports = [require("./dep1"), require("./dep2")];
+},{"./dep1": undefined, "./dep2": undefined}]},{"./dep1": { exports: __webpack_require__(1) },
+  "./dep2": { exports: __webpack_require__(2) }},[1])(1)
+});
+
+/***/ }),
+/* 1 */
+/***/ (function(module, exports) {
+
+module.exports = 'dep1';
+
+/***/ }),
+/* 2 */
+/***/ (function(module, exports) {
+
+module.exports = 'dep2';
+
+/***/ })
+/******/ ]);

yarn.lock

@@ -68,6 +68,31 @@
     core-js "^2.5.7"
     regenerator-runtime "^0.12.0"
 
+"@bugsnag/browser@^5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@bugsnag/browser/-/browser-5.0.1.tgz#ce8535cef3ecf9c8c760bec1c4afefa0a14059a0"
+  integrity sha512-BxAerpEdFe5IdvEDt2eL2d+FDcLmm9IC2Sc+s3uZLHQFenYlrnskM/GGghY26LmBeCiVThREcX5wqzjOLV6Mhg==
+
+"@bugsnag/js@^5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@bugsnag/js/-/js-5.0.1.tgz#dcc4308f6984070f6b206b7bdb7876c9c8f6d994"
+  integrity sha512-8gQGLZal88zGdGmf6AH7gYSAsC2moXy+RJD9h2SquKt9HiAd1LzpeKgUtiJI4Oo/CGEQM06hvGTz8qnJgG6GpQ==
+  dependencies:
+    "@bugsnag/browser" "^5.0.1"
+    "@bugsnag/node" "^5.0.1"
+
+"@bugsnag/node@^5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@bugsnag/node/-/node-5.0.1.tgz#3f6362dae1030911fb9ad370940fb1309c31186e"
+  integrity sha512-8sApByaiUlCsdZa9k4CQUVrM0/RuLX+K1OMHjM6i1EwhikSolvcmhd4+XbD62AdiO66vwHN6FgtNsykSQHgQMg==
+  dependencies:
+    byline "^5.0.0"
+    error-stack-parser "^2.0.2"
+    iserror "^0.0.2"
+    pump "^3.0.0"
+    request "^2.87.0"
+    stack-generator "^2.0.3"
+
 "@firebase/[email protected]":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.3.2.tgz#a92dc544290e2893bd8c02a81e684dae3d8e7c85"
@@ -3291,6 +3316,13 @@ error-inject@^1.0.0:
   resolved "https://registry.yarnpkg.com/error-inject/-/error-inject-1.0.0.tgz#e2b3d91b54aed672f309d950d154850fa11d4f37"
   integrity sha1-4rPZG1Su1nLzCdlQ0VSFD6EdTzc=
 
+error-stack-parser@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.2.tgz#4ae8dbaa2bf90a8b450707b9149dcabca135520d"
+  integrity sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==
+  dependencies:
+    stackframe "^1.0.4"
+
 es-abstract@^1.5.1:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
@@ -5135,6 +5167,11 @@ [email protected], isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
+iserror@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/iserror/-/iserror-0.0.2.tgz#bd53451fe2f668b9f2402c1966787aaa2c7c0bf5"
+  integrity sha1-vVNFH+L2aLnyQCwZZnh6qix8C/U=
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -9381,6 +9418,13 @@ stable@^0.1.6:
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
+stack-generator@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.3.tgz#bb74385c67ffc4ccf3c4dee5831832d4e509c8a0"
+  integrity sha512-kdzGoqrnqsMxOEuXsXyQTmvWXZmG0f3Ql2GDx5NtmZs59sT2Bt9Vdyq0XdtxUi58q/+nxtbF9KOQ9HkV1QznGg==
+  dependencies:
+    stackframe "^1.0.4"
+
 [email protected]:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
@@ -9391,6 +9435,11 @@ stack-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
   integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
 
+stackframe@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b"
+  integrity sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==
+
 standard-as-callback@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-1.0.1.tgz#2e9e1e9d278d7d77580253faaec42269015e3c1d"