stacktracejs · btd · Sep 21, 2015 · Oct 15, 2015 · Oct 15, 2015 · Oct 15, 2015
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 *.pid
 *.gz
 
+bower_components
 node_modules
 build
 coverage

diff --git a/.jshintrc b/.jshintrc
@@ -14,6 +14,7 @@
     "es3": true,
     "camelcase": true,
     "nonbsp": true,
+    "maxlen": 130,
     "predef": {
         "afterEach": false,
         "beforeEach": false,

diff --git a/.nvmrc b/.nvmrc
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,15 @@
 language: node_js
-node_js:
-- '0.12'
-script: gulp ci
-install:
-- npm install
-- npm install bower -g
 sudo: false
+node_js: stable
 addons:
   sauce_connect: true
-env:
-  global:
-  - secure: hNvLoSVYWY+O2Oz5usb5+IFUMgWdM21xxZuCR4+qh1yJhlQYTaFANBDYJ5vhC74DbzLHRmy8ZUYa1G/4R4w8KXX9cCt6PFD2ETPpmZPJROHzoAoaYKahOAqdcMSVHn0BVKZCeAvPeLoBhvIfMJx4DOcRTTkKPzTJzg4ewzR/v3g=
-  - secure: hnc8EGbHzAlz6lAfVoGSf47pecv7G/LxbDHCIN2jn23SgU9SdScY9LT9K0X69smFsdBmOSCWDRRqPgX859sS/tz3lGHW6lCRn3mqclCNVhFNM6Vd+dB4hwAEvJQXhtMAaxM5Bqop+8C8OQ4NdoHgSYcdEvMT0CaWU1ZFrpjiBs4=
+  firefox: latest
+  apt:
+    sources:
+    - google-chrome
+    packages:
+    - google-chrome-stable
+before_script:
+- npm install
+script:
+- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then gulp ci; else gulp pr; fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
-## v1.1.2
+## v1.3.2
+* Handle Safari stack entries with no location information
+
+## v1.3.0
+* Significantly improved handling of eval()
+* Add many browsers to CI
+
+## v1.2.2
 * Handle native functions in V8 stack traces
 
 ## v1.2.0

diff --git a/README.md b/README.md
@@ -9,7 +9,10 @@ an Array of [StackFrame](http://git.io/stackframe)s.
 Once you have parsed out StackFrames, you can do much more interesting things. See [stacktrace-gps](http://git.io/stacktrace-gps).
 
 Note that in IE9 and earlier, `Error` objects don't have enough information to extract much of anything. In IE 10, `Error`s
-are given a `stack` once they're `throw`n. 
+are given a `stack` once they're `throw`n.
+
+## Browser Support
+[![Sauce Test Status](https://saucelabs.com/browser-matrix/stacktracejs.svg)](https://saucelabs.com/u/stacktracejs)
 
 ## Usage
 ```js
@@ -29,15 +32,6 @@ bower install error-stack-parser
 https://raw.githubusercontent.com/stacktracejs/error-stack-parser/master/dist/error-stack-parser.min.js
 ```
 
-## Browser Support
-* Chrome 1+
-* Firefox 3.6+
-* Safari 7+
-* Opera 9+
-* IE 10+
-* iOS 7+
-* Android 4.2+
-
 ## Contributing
 Want to be listed as a *Contributor*? Start with the [Contributing Guide](CONTRIBUTING.md)!
 

diff --git a/bower.json b/bower.json
@@ -1,14 +1,14 @@
 {
     "name": "error-stack-parser",
-    "main": "./error-stack-parser.js",
+    "main": "./dist/error-stack-parser.js",
     "homepage": "https://github.com/stacktracejs/error-stack-parser",
     "authors": [
         "Eric Wendelin <[email protected]> (http://www.eriwen.com)",
         "Victor Homyakov <[email protected]> (https://github.com/victor-homyakov)"
     ],
     "description": "Extract meaning from JS Errors",
     "dependencies": {
-        "stackframe": "~0"
+        "stackframe": "~0.3.1"
     },
     "moduleType": [
         "amd",

diff --git a/component.json b/component.json
@@ -2,7 +2,7 @@
     "name": "error-stack-parser",
     "repository": "stacktracejs/error-stack-parser",
     "description": "Extract meaning from JS Errors",
-    "version": "1.2.2",
+    "version": "1.3.3",
     "keywords": [
         "stacktrace",
         "error",

diff --git a/dist/error-stack-parser-with-polyfills.min.js b/dist/error-stack-parser-with-polyfills.min.js
diff --git a/dist/error-stack-parser-with-polyfills.min.js.map b/dist/error-stack-parser-with-polyfills.min.js.map
diff --git a/dist/error-stack-parser.js b/dist/error-stack-parser.js
@@ -14,7 +14,34 @@
     'use strict';
 
     var FIREFOX_SAFARI_STACK_REGEXP = /(^|@)\S+\:\d+/;
-    var CHROME_IE_STACK_REGEXP = /\s+at .*(\S+\:\d+|\(native\))/;
+    var CHROME_IE_STACK_REGEXP = /^\s*at .*(\S+\:\d+|\(native\))/m;
+    var SAFARI_NATIVE_CODE_REGEXP = /^(eval@)?(\[native code\])?$/;
+
+    function _map(array, fn, thisArg) {
+        if (typeof Array.prototype.map === 'function') {
+            return array.map(fn, thisArg);
+        } else {
+            var output = new Array(array.length);
+            for (var i = 0; i < array.length; i++) {
+                output[i] = fn.call(thisArg, array[i]);
+            }
+            return output;
+        }
+    }
+
+    function _filter(array, fn, thisArg) {
+        if (typeof Array.prototype.filter === 'function') {
+            return array.filter(fn, thisArg);
+        } else {
+            var output = [];
+            for (var i = 0; i < array.length; i++) {
+                if (fn.call(thisArg, array[i])) {
+                    output.push(array[i]);
+                }
+            }
+            return output;
+        }
+    }
 
     return {
         /**
@@ -27,7 +54,7 @@
                 return this.parseOpera(error);
             } else if (error.stack && error.stack.match(CHROME_IE_STACK_REGEXP)) {
                 return this.parseV8OrIE(error);
-            } else if (error.stack && error.stack.match(FIREFOX_SAFARI_STACK_REGEXP)) {
+            } else if (error.stack) {
                 return this.parseFFOrSafari(error);
             } else {
                 throw new Error('Cannot parse given Error object');
@@ -57,24 +84,44 @@
         },
 
         parseV8OrIE: function ErrorStackParser$$parseV8OrIE(error) {
-            return error.stack.split('\n').filter(function (line) {
+            var filtered = _filter(error.stack.split('\n'), function (line) {
                 return !!line.match(CHROME_IE_STACK_REGEXP);
-            }, this).map(function (line) {
-                var tokens = line.replace(/^\s+/, '').split(/\s+/).slice(1);
+            }, this);
+
+            return _map(filtered, function (line) {
+                if (line.indexOf('(eval ') > -1) {
+                    // Throw away eval information until we implement stacktrace.js/stackframe#8
+                    line = line.replace(/eval code/g, 'eval').replace(/(\(eval at [^\()]*)|(\)\,.*$)/g, '');
+                }
+                var tokens = line.replace(/^\s+/, '').replace(/\(eval code/g, '(').split(/\s+/).slice(1);
                 var locationParts = this.extractLocation(tokens.pop());
-                var functionName = (!tokens[0] || tokens[0] === 'Anonymous') ? undefined : tokens[0];
-                return new StackFrame(functionName, undefined, locationParts[0], locationParts[1], locationParts[2], line);
+                var functionName = tokens.join(' ') || undefined;
+                var fileName = locationParts[0] === 'eval' ? undefined : locationParts[0];
+
+                return new StackFrame(functionName, undefined, fileName, locationParts[1], locationParts[2], line);
             }, this);
         },
 
         parseFFOrSafari: function ErrorStackParser$$parseFFOrSafari(error) {
-            return error.stack.split('\n').filter(function (line) {
-                return !!line.match(FIREFOX_SAFARI_STACK_REGEXP);
-            }, this).map(function (line) {
-                var tokens = line.split('@');
-                var locationParts = this.extractLocation(tokens.pop());
-                var functionName = tokens.shift() || undefined;
-                return new StackFrame(functionName, undefined, locationParts[0], locationParts[1], locationParts[2], line);
+            var filtered = _filter(error.stack.split('\n'), function (line) {
+                return !line.match(SAFARI_NATIVE_CODE_REGEXP);
+            }, this);
+
+            return _map(filtered, function (line) {
+                // Throw away eval information until we implement stacktrace.js/stackframe#8
+                if (line.indexOf(' > eval') > -1) {
+                    line = line.replace(/ line (\d+)(?: > eval line \d+)* > eval\:\d+\:\d+/g, ':$1');
+                }
+
+                if (line.indexOf('@') === -1 && line.indexOf(':') === -1) {
+                    // Safari eval frames only have function names and nothing else
+                    return new StackFrame(line);
+                } else {
+                    var tokens = line.split('@');
+                    var locationParts = this.extractLocation(tokens.pop());
+                    var functionName = tokens.shift() || undefined;
+                    return new StackFrame(functionName, undefined, locationParts[0], locationParts[1], locationParts[2], line);
+                }
             }, this);
         },
 
@@ -121,10 +168,12 @@
 
         // Opera 10.65+ Error.stack very similar to FF/Safari
         parseOpera11: function ErrorStackParser$$parseOpera11(error) {
-            return error.stack.split('\n').filter(function (line) {
+            var filtered = _filter(error.stack.split('\n'), function (line) {
                 return !!line.match(FIREFOX_SAFARI_STACK_REGEXP) &&
                     !line.match(/^Error created at/);
-            }, this).map(function (line) {
+            }, this);
+
+            return _map(filtered, function (line) {
                 var tokens = line.split('@');
                 var locationParts = this.extractLocation(tokens.pop());
                 var functionCall = (tokens.shift() || '');
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
     *.pid
     *.gz
+    bower_components
     node_modules
     build
     coverage
@@ Expand Down @@