fix for multiple imports

ShMcK · ShMcK · commit 5548e10b3e8b · 2016-08-14T20:47:36.000-07:00
diff --git a/lib/addImportsAsVars.js b/lib/addImportsAsVars.js
@@ -1,4 +1,4 @@
-const importRegex = /\bimport\s+(?:\s?(.+)\}?\s+from\s+)?[\'"]([^"\']+)["\']/;
+const importRegex = /^import\s+(?:\s?(.+)\}?\s+from\s+)?[\'"]([^"\']+)["\']/;
 const namedRegex = /^{.+}$/;
 
 let imports = {};
@@ -30,7 +30,7 @@ function detectImports(src) {
     }
   });
 
-  let output = '';
+  let output = '\n';
 
   for (let key in imports) { /* jshint forin: false */
 
@@ -39,9 +39,9 @@ function detectImports(src) {
         const { path, importType } = imports[key];
         // eval(`var ${key};`);
         if (importType === 'named') {
-          output += `global.${key} = require('${path}').${key};`;
+          output += `global.${key} = require('${path}').${key};\n`;
         } else {
-          output += `global.${key} = require('${path}')`;
+          output += `global.${key} = require('${path}');\n`;
         }
 
       } catch(e) {}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rewire-coderoad",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "CodeRoad implementation to override 'require' in order to monkey-patch test globals",
   "keywords": [
     "dependency",
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "expect.js": "^0.3.1",
-    "mocha": "^2.1.0"
+    "mocha": "^3.0.2"
   },
   "license": "MIT",
   "scripts": {
