fix(index): correct loader sourcemaps usage

appveyor.yml

@@ -19,6 +19,7 @@ matrix:
   fast_finish: true
 install:
   - ps: Install-Product node $env:nodejs_version x64
+  - cmd: npm i -g npm@latest
   - npm install
 before_test:
   - cmd: npm install webpack@%webpack_version%

package.json

@@ -8,6 +8,7 @@
     "dist"
   ],
   "dependencies": {
+    "convert-source-map": "^1.5.0",
     "istanbul-lib-instrument": "^1.7.3",
     "loader-utils": "^1.1.0"
   },
@@ -39,6 +40,7 @@
   "devDependencies": {
     "babel-cli": "^6.24.0",
     "babel-jest": "^20.0.3",
+    "babel-loader": "^7.1.1",
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
     "babel-polyfill": "^6.23.0",
     "babel-preset-env": "^1.6.0",

src/index.js

@@ -1,11 +1,21 @@
 import { createInstrumenter } from 'istanbul-lib-instrument';
 import loaderUtils from 'loader-utils';
+import convert from 'convert-source-map';
+
+export default function (source, sourceMap) {
+  let srcMap = sourceMap;
+  // use inline source map, if any
+  if (!srcMap) {
+    const inlineSourceMap = convert.fromSource(source);
+    if (inlineSourceMap) {
+      srcMap = inlineSourceMap.sourcemap;
+    }
+  }
 
-export default function (source) {
   const options = Object.assign({ produceSourceMap: true }, loaderUtils.getOptions(this));
   const instrumenter = createInstrumenter(options);
 
   instrumenter.instrument(source, this.resourcePath, (error, instrumentedSource) => {
     this.callback(error, instrumentedSource, instrumenter.lastSourceMap());
-  });
+  }, srcMap);
 }

test/fixtures/basic.js

@@ -4,8 +4,4 @@ module.exports = class Foo {
     return !!this;
   }
 
-  baz() {
-    return !this.bar();
-  }
-
 };

test/index.test.js

@@ -1,16 +1,15 @@
-import webpack from './webpack';
-import { stripLocalPaths } from './helpers';
+import webpack from './utils/webpack';
 
 test('instrument code', async () => {
   const stats = await webpack();
-  const instrumentedSource = stripLocalPaths(stats.compilation.assets['main.js'].source());
+  const instrumentedSource = stats.compilation.assets['main.js'].source();
   expect(instrumentedSource).toMatchSnapshot();
 });
 
 test('sourcemap files on by default', async () => {
   const stats = await webpack({
     extend: {
-      devtool: 'sourcemap',
+      devtool: 'source-map',
     },
   });
   const sourceMap = stats.compilation.assets['main.js.map'].source();
@@ -22,7 +21,7 @@ test('sourcemap files on by default', async () => {
 test('disabled sourcemaps', async () => {
   const stats = await webpack({
     extend: {
-      devtool: 'sourcemap',
+      devtool: 'source-map',
     },
     options: {
       produceSourceMap: false,

test/utils/loader.js

@@ -0,0 +1,18 @@
+import path from 'path';
+import loader from '../../src/cjs';
+
+const normalize = str => str.split(path.sep).join('/');
+
+module.exports = function (source, map, ...args) {
+  // hack the resourcePath to be consistent across systems so that tests always work
+  this.resourcePath = normalize(this.resourcePath.replace(path.resolve(__dirname, '..'), ''));
+
+  // do the same hack for sourcemaps so tests are consistent
+  const sourceMap = map;
+  if (sourceMap) {
+    sourceMap.sourceRoot = '';
+    sourceMap.sources = sourceMap.sources.map(normalize);
+  }
+
+  return loader.call(this, source, sourceMap, ...args);
+};

test/webpack.js → test/utils/webpack.js

@@ -2,23 +2,31 @@ import path from 'path';
 import webpack from 'webpack';
 import MemoryFileSystem from 'memory-fs';
 
-const loader = require.resolve('../src/cjs.js');
+const loader = require.resolve('./loader');
 
 export default function ({ fixture = 'basic.js', options, extend = {} } = {}) {
   const config = {
-    entry: path.join(__dirname, 'fixtures', fixture),
+    entry: path.join(__dirname, '..', 'fixtures', fixture),
     output: {
-      path: path.join(__dirname, 'fixtures', 'dist'),
+      path: path.join(__dirname, '..', 'fixtures', 'dist'),
     },
     module: {
       rules: [{
+        test: /\.js$/,
+        loader: 'babel-loader',
+      }, {
         test: /\.js$/,
         loader,
         enforce: 'post',
         options,
       }],
     },
     ...extend,
+    plugins: [
+      new webpack.optimize.CommonsChunkPlugin({
+        name: 'manifest',
+      }),
+    ],
   };
 
   return new Promise((resolve, reject) => {