Merge branch 'master' into add_datadir

Author: developit

package.json

@@ -1,6 +1,6 @@
 {
   "name": "karmatic",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Zero-config automatic (headless) browser testing. Powered by Karma, Webpack & Jasmine.",
   "main": "dist/index.js",
   "module": "dist/index.m.js",
@@ -25,7 +25,7 @@
   "devDependencies": {
     "eslint": "^4.16.0",
     "eslint-config-developit": "^1.1.1",
-    "microbundle": "^0.4.0",
+    "microbundle": "^0.4.1",
     "workerize-loader": "^1.0.1"
   },
   "dependencies": {

src/configure.js

@@ -168,7 +168,11 @@ export default function configure(options) {
 				modules: webpackProp('resolveLoader.modules', [
 					'node_modules',
 					path.resolve(__dirname, '../node_modules')
-				])
+				]),
+				alias: webpackProp('resolveLoader.alias', {
+					[pkg.name]: res('.'),
+					src: res('src')
+				})
 			}),
 			plugins: (webpackConfig.plugins || []).filter( plugin => {
 				let name = plugin && plugin.constructor.name;