Merge pull request #3 from Timer/master

Fix babel source map parsing

Author: sokra

lib/fromStringWithSourceMap.js

@@ -62,8 +62,9 @@ module.exports = function fromStringWithSourceMap(code, map) {
 			var linePosition = currentLine;
 		}
 
-		if(mapping.rest && mapping.rest[0] === ",") {
-			mapping.rest = mapping.rest.substr(1);
+		if(mapping.rest) {
+			var next = mapping.rest.indexOf(",");
+			mapping.rest = next === -1 ? "" : mapping.rest.substr(next);
 		}
 
 		if(!ignore) {

test/fixtures/from-to-tests/babel2-source.js

@@ -0,0 +1,6 @@
+class Test {
+  foo() {
+    console.log('bar')
+    throw new Error('bar')
+  }
+}

test/fixtures/from-to-tests/babel2.expected.map

@@ -0,0 +1,13 @@
+{
+  "version": 3,
+  "file": "babel2.generated.js",
+  "sources": [
+    "webpack:///webpack/bootstrap b1bcc793378011ad1abd",
+    "webpack:///./packages/react-scripts/template/src/index.js"
+  ],
+  "sourcesContent": [
+    " \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId])\n \t\t\treturn installedModules[moduleId].exports;\n\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\texports: {},\n \t\t\tid: moduleId,\n \t\t\tloaded: false\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.loaded = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"/\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(0);\n\n\n\n/** WEBPACK FOOTER **\n ** webpack/bootstrap b1bcc793378011ad1abd\n **/",
+    "class Test {\n  foo() {\n    console.log('bar')\n    throw new Error('bar')\n  }\n}\n\n\n\n/** WEBPACK FOOTER **\n ** ./packages/react-scripts/template/src/index.js\n **/"
+  ],
+  "mappings": ";AAAA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;;;;;;;;;;;;;;;;;;;;;;;;;ACtCA;;;;;;;AACA;AACA;AACA;AACA;;;;;;;;;"
+}