babel-loader 6.2.6 → 6.2.10

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # Changelog
 
+## v6.2.9
+
+### 😢 Regression
+
+Source maps on windows did not work correctly with v6.2.8.
+Thanks @josephst
+
+### 🏠 Internal
+
+- Add AppVeyor to run tests on windows @danez
+- Fix tests on windows (#343) @danez
+
+## v6.2.8
+
+### 🐛 Bug Fix
+
+- gzipped files should have `.gz` as the extension, not `.gzip` (#326) @bjornstar
+- fix options.sourceFileName gennerate bug (#260) @creeperyang
+
+### 📝 Documentation
+
+- Update README docs for cacheDirectory's actual behaviour (#245) @sohkai
+- updates docs re: transform-runtime (#197) @gbrassey
+
+### 🏠 Internal
+
+- Use eslint and nyc (#321) @danez
+- Adjust travis config (#320) @danez
+- Use babel to compile babel-loader (#319) @danez
+
+## v6.2.7
+
+### 😢 Regression
+
+Fallback to `os.tmpdir()` if no cachedir found (#318) (fixes #317) @danez
+
+Fixes an issue with v6.2.6 when using `babel-loader` as a global package.
+
+## v6.2.6
+
+### 🐛 Bug Fix
+
+- Use standard cache dir as default `cacheDirectory` (#301) @fson
+
+Use the common cache directory, `./node_modules/.cache/babel-loader`, as the default cache directory (when the cacheDirectory setting is enabled).
+
+```js
+query: {
+  cacheDirectory: true
+}
+```
+
 ## v6.2.5
 
 - Don't show the call stack for a Babel error (such as when you have a syntax error)

package/README.md

@@ -1,4 +1,8 @@
-# babel-loader [![NPM Status](https://img.shields.io/npm/v/babel-loader.svg?style=flat)](https://www.npmjs.com/package/babel-loader) [![Build Status](https://travis-ci.org/babel/babel-loader.svg?branch=master)](https://travis-ci.org/babel/babel-loader) [![codecov](https://codecov.io/gh/babel/babel-loader/branch/master/graph/badge.svg)](https://codecov.io/gh/babel/babel-loader)
+# babel-loader 
+[![NPM Status](https://img.shields.io/npm/v/babel-loader.svg?style=flat)](https://www.npmjs.com/package/babel-loader) 
+[![Build Status](https://travis-ci.org/babel/babel-loader.svg?branch=master)](https://travis-ci.org/babel/babel-loader) 
+[![Build Status](https://ci.appveyor.com/api/projects/status/vgtpr2i5bykgyuqo/branch/master?svg=true)](https://ci.appveyor.com/project/danez/babel-loader/branch/master)
+[![codecov](https://codecov.io/gh/babel/babel-loader/branch/master/graph/badge.svg)](https://codecov.io/gh/babel/babel-loader)
   > Babel is a compiler for writing next generation JavaScript.
 
   This package allows transpiling JavaScript files using [Babel](https://github.com/babel/babel) and [webpack](https://github.com/webpack/webpack).
@@ -8,7 +12,13 @@
 ## Installation
 
 ```bash
-npm install babel-loader babel-core babel-preset-es2015 --save-dev
+npm install babel-loader babel-core babel-preset-es2015 webpack --save-dev
+```
+
+or
+
+```bash
+yarn add babel-loader babel-core babel-preset-es2015 webpack --dev
 ```
 
 __Note:__ [npm](https://npmjs.com) deprecated [auto-installing of peerDependencies](https://github.com/npm/npm/issues/6565) since npm@3, so required peer dependencies like babel-core and webpack must be listed explicitly in your `package.json`.
@@ -27,7 +37,7 @@ module: {
     {
       test: /\.js$/,
       exclude: /(node_modules|bower_components)/,
-      loader: 'babel', // 'babel-loader' is also a valid name to reference
+      loader: 'babel-loader',
       query: {
         presets: ['es2015']
       }
@@ -48,13 +58,13 @@ module: {
     {
       test: /\.js$/,
       exclude: /(node_modules|bower_components)/,
-      loader: 'babel?presets[]=es2015'
+      loader: 'babel-loader?presets[]=es2015'
     }
   ]
 }
   ```
 
-  or by using the query property:
+  or by using the [query property](https://webpack.github.io/docs/using-loaders.html#query-parameters):
 
   ```javascript
 module: {
@@ -62,7 +72,7 @@ module: {
     {
       test: /\.js$/,
       exclude: /(node_modules|bower_components)/,
-      loader: 'babel',
+      loader: 'babel-loader',
       query: {
         presets: ['es2015']
       }
@@ -73,10 +83,11 @@ module: {
 
   This loader also supports the following loader-specific option:
 
-  * `cacheDirectory`: Default `false`. When set, the given directory will be used to cache the results of the loader. Future webpack builds will attempt to read from the cache to avoid needing to run the potentially expensive Babel recompilation process on each run. If the value is blank (`loader: 'babel-loader?cacheDirectory'`) the loader will use the default cache directory in `node_modules/.cache/babel-loader`.
+  * `cacheDirectory`: Default `false`. When set, the given directory will be used to cache the results of the loader. Future webpack builds will attempt to read from the cache to avoid needing to run the potentially expensive Babel recompilation process on each run. If the value is blank (`loader: 'babel-loader?cacheDirectory'`) or `true` (`loader: babel-loader?cacheDirectory=true`) the loader will use the default cache directory in `node_modules/.cache/babel-loader` or fallback to the default OS temporary file directory if no `node_modules` folder could be found in any root directory.
 
   * `cacheIdentifier`: Default is a string composed by the babel-core's version, the babel-loader's version, the contents of .babelrc file if it exists and the value of the environment variable `BABEL_ENV` with a fallback to the `NODE_ENV` environment variable. This can be set to a custom value to force cache busting if the identifier changes.
 
+  * `babelrc`: Default `true`.  When `false`, will ignore `.babelrc` files (except those referenced by the `extends` option).
 
   __Note:__ The `sourceMap` option is ignored, instead sourceMaps are automatically enabled when webpack is configured to use them (via the `devtool` config option).
 
@@ -114,7 +125,7 @@ loaders: [
   {
     test: /\.js$/,
     exclude: /(node_modules|bower_components)/,
-    loader: 'babel',
+    loader: 'babel-loader',
     query: {
       presets: ['es2015'],
       plugins: ['transform-runtime']
@@ -123,84 +134,9 @@ loaders: [
 ]
 ```
 
-### The node API for `babel` has been moved to `babel-core`.
-
-If you receive this message it means that you have the npm package `babel` installed and use the short notation of the loader in the webpack config:
-```js
-  {
-    test: /\.js$/,
-    loader: 'babel',
-  }
-```
-
-Webpack then tries to load the `babel` package instead of the `babel-loader`.
-
-To fix this you should uninstall the npm package `babel` as it is deprecated in babel v6. (instead install `babel-cli` or `babel-core`)
-In the case one of your dependencies is installing `babel` and you cannot uninstall it yourself, use the complete name of the loader in the webpack config:
-```js
-  {
-    test: /\.js$/,
-    loader: 'babel-loader',
-  }
-```
-
-
-### using `cacheDirectory` fails with ENOENT Error
-
-If using cacheDirectory results in an error similar to the following:
-
-```bash
-ERROR in ./frontend/src/main.js
-Module build failed: Error: ENOENT, open 'true/350c59cae6b7bce3bb58c8240147581bfdc9cccc.json.gzip'
- @ multi app
-```
-(notice the `true/` in the filepath)
-
-That means that most likely, you're not setting the options correctly, and you're doing something similar to:
-
-```javascript
-loaders: [
-  {
-    test: /\.js$/,
-    exclude: /(node_modules|bower_components)/,
-    loader: 'babel?cacheDirectory=true'
-  }
-]
-```
+#### **NOTE:** transform-runtime & custom polyfills (e.g. Promise library)
 
-That's not the correct way of setting boolean values. You should do instead:
-
-```javascript
-loaders: [
-  {
-    test: /\.js$/,
-    exclude: /(node_modules|bower_components)/,
-    loader: 'babel?cacheDirectory'
-  }
-]
-```
-
-or use the [query](https://webpack.github.io/docs/using-loaders.html#query-parameters) property:
-
-```javascript
-loaders: [
-  // the optional 'runtime' transformer tells babel to require the runtime
-  // instead of inlining it.
-  {
-    test: /\.js$/,
-    exclude: /(node_modules|bower_components)/,
-    loader: 'babel',
-    query: {
-      cacheDirectory: true
-    }
-  }
-]
-```
-
-
-### custom polyfills (e.g. Promise library)
-
-Since Babel includes a polyfill that includes a custom [regenerator runtime](https://github.com/facebook/regenerator/blob/master/runtime.js) and [core.js](https://github.com/zloirock/core-js), the following usual shimming method using `webpack.ProvidePlugin` will not work:
+Since [babel-plugin-transform-runtime](https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-runtime) includes a polyfill that includes a custom [regenerator runtime](https://github.com/facebook/regenerator/blob/master/packages/regenerator-runtime/runtime.js) and [core.js](https://github.com/zloirock/core-js), the following usual shimming method using `webpack.ProvidePlugin` will not work:
 
 ```javascript
 // ...
@@ -244,4 +180,25 @@ require('babel-runtime/core-js/promise').default = require('bluebird');
 require('./app');
 ```
 
+### The node API for `babel` has been moved to `babel-core`.
+
+If you receive this message it means that you have the npm package `babel` installed and use the short notation of the loader in the webpack config (which is not valid anymore as of webpack 2.x):
+```js
+  {
+    test: /\.js$/,
+    loader: 'babel',
+  }
+```
+
+Webpack then tries to load the `babel` package instead of the `babel-loader`.
+
+To fix this you should uninstall the npm package `babel` as it is deprecated in babel v6. (instead install `babel-cli` or `babel-core`)
+In the case one of your dependencies is installing `babel` and you cannot uninstall it yourself, use the complete name of the loader in the webpack config:
+```js
+  {
+    test: /\.js$/,
+    loader: 'babel-loader',
+  }
+```
+
 ## [License](http://couto.mit-license.org/)

package/lib/fs-cache.js

@@ -1,37 +1,25 @@
-'use strict';
-
-/**
- * Filesystem cache
- *
- * Given a file and a transform function, cache the result into files
- * or retrieve the previously cached files if the given file is already known.
- *
- * @see https://github.com/babel/babel-loader/issues/34
- * @see https://github.com/babel/babel-loader/pull/41
- */
-var crypto = require('crypto');
-var mkdirp = require('mkdirp');
-var findCacheDir = require('find-cache-dir');
-var fs = require('fs');
-var os = require('os');
-var path = require('path');
-var zlib = require('zlib');
-
-/**
- * Read the contents from the compressed file.
- *
- * @async
- * @params {String} filename
- * @params {Function} callback
- */
-var read = function(filename, callback) {
-  return fs.readFile(filename, function(err, data) {
-    if (err) { return callback(err); }
-
-    return zlib.gunzip(data, function(err, content) {
+"use strict";
+
+var crypto = require("crypto");
+var mkdirp = require("mkdirp");
+var findCacheDir = require("find-cache-dir");
+var fs = require("fs");
+var os = require("os");
+var path = require("path");
+var zlib = require("zlib");
+
+var read = function read(filename, callback) {
+  return fs.readFile(filename, function (err, data) {
+    if (err) {
+      return callback(err);
+    }
+
+    return zlib.gunzip(data, function (err, content) {
       var result = {};
 
-      if (err) { return callback(err); }
+      if (err) {
+        return callback(err);
+      }
 
       try {
         result = JSON.parse(content);
@@ -44,113 +32,71 @@ var read = function(filename, callback) {
   });
 };
 
-
-/**
- * Write contents into a compressed file.
- *
- * @async
- * @params {String} filename
- * @params {String} result
- * @params {Function} callback
- */
-var write = function(filename, result, callback) {
+var write = function write(filename, result, callback) {
   var content = JSON.stringify(result);
 
-  return zlib.gzip(content, function(err, data) {
-    if (err) { return callback(err); }
+  return zlib.gzip(content, function (err, data) {
+    if (err) {
+      return callback(err);
+    }
 
     return fs.writeFile(filename, data, callback);
   });
 };
 
-
-/**
- * Build the filename for the cached file
- *
- * @params {String} source  File source code
- * @params {Object} options Options used
- *
- * @return {String}
- */
-var filename = function(source, identifier, options) {
-  var hash = crypto.createHash('SHA1');
+var filename = function filename(source, identifier, options) {
+  var hash = crypto.createHash("SHA1");
   var contents = JSON.stringify({
     source: source,
     options: options,
-    identifier: identifier,
+    identifier: identifier
   });
 
   hash.end(contents);
 
-  return hash.read().toString('hex') + '.json.gzip';
+  return hash.read().toString("hex") + ".json.gz";
 };
 
-/**
- * Retrieve file from cache, or create a new one for future reads
- *
- * @async
- * @param  {Object}   params
- * @param  {String}   params.directory  Directory to store cached files
- * @param  {String}   params.identifier Unique identifier to bust cache
- * @param  {String}   params.source   Original contents of the file to be cached
- * @param  {Object}   params.options  Options to be given to the transform fn
- * @param  {Function} params.transform  Function that will transform the
- *                                      original file and whose result will be
- *                                      cached
- *
- * @param  {Function<err, result>} callback
- *
- * @example
- *
- *   cache({
- *     directory: '.tmp/cache',
- *     identifier: 'babel-loader-cachefile',
- *     source: *source code from file*,
- *     options: {
- *       experimental: true,
- *       runtime: true
- *     },
- *     transform: function(source, options) {
- *       var content = *do what you need with the source*
- *       return content;
- *     }
- *   }, function(err, result) {
- *
- *   });
- */
-var cache = module.exports = function(params, callback) {
-  // Spread params into named variables
-  // Forgive user whenever possible
+var handleCache = function handleCache(directory, params, callback) {
   var source = params.source;
   var options = params.options || {};
   var transform = params.transform;
   var identifier = params.identifier;
-  var directory = (typeof params.directory === 'string') ?
-        params.directory :
-        findCacheDir({ name: 'babel-loader' });
-  var file = path.join(directory, filename(source, identifier, options));
+  var shouldFallback = typeof params.directory !== "string" && directory !== os.tmpdir();
 
-  // Make sure the directory exists.
-  return mkdirp(directory, function(err) {
-    if (err) { return callback(err); }
+  mkdirp(directory, function (err) {
+    if (err) return shouldFallback ? handleCache(os.tmpdir(), params, callback) : callback(err);
 
-    return read(file, function(err, content) {
+    var file = path.join(directory, filename(source, identifier, options));
+
+    return read(file, function (err, content) {
       var result = {};
-      // No errors mean that the file was previously cached
-      // we just need to return it
-      if (!err) { return callback(null, content); }
 
-      // Otherwise just transform the file
-      // return it to the user asap and write it in cache
+      if (!err) return callback(null, content);
+
       try {
         result = transform(source, options);
       } catch (error) {
         return callback(error);
       }
 
-      return write(file, result, function(err) {
-        return callback(err, result);
+      return write(file, result, function (err) {
+        if (err) return shouldFallback ? handleCache(os.tmpdir(), params, callback) : callback(err);
+
+        callback(null, result);
       });
     });
   });
 };
+
+module.exports = function (params, callback) {
+  var directory = void 0;
+
+  if (typeof params.directory === "string") {
+    directory = params.directory;
+  } else {
+    directory = findCacheDir({ name: "babel-loader" }) || os.tmpdir();
+  }
+
+  handleCache(directory, params, callback);
+};

package/lib/index.js

@@ -0,0 +1,135 @@
+"use strict";
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+var assign = require("object-assign");
+var babel = require("babel-core");
+var loaderUtils = require("loader-utils");
+var path = require("path");
+var cache = require("./fs-cache.js");
+var exists = require("./utils/exists")();
+var relative = require("./utils/relative");
+var read = require("./utils/read")();
+var resolveRc = require("./resolve-rc.js");
+var pkg = require("./../package.json");
+
+function BabelLoaderError(name, message, codeFrame, hideStack, error) {
+  Error.call(this);
+  Error.captureStackTrace(this, BabelLoaderError);
+
+  this.name = "BabelLoaderError";
+  this.message = formatMessage(name, message, codeFrame);
+  this.hideStack = hideStack;
+  this.error = error;
+}
+
+BabelLoaderError.prototype = Object.create(Error.prototype);
+BabelLoaderError.prototype.constructor = BabelLoaderError;
+
+var STRIP_FILENAME_RE = /^[^:]+: /;
+
+var formatMessage = function formatMessage(name, message, codeFrame) {
+  return (name ? name + ": " : "") + message + "\n\n" + codeFrame + "\n";
+};
+
+var transpile = function transpile(source, options) {
+  var result = void 0;
+  try {
+    result = babel.transform(source, options);
+  } catch (error) {
+    if (error.message && error.codeFrame) {
+      var message = error.message;
+      var name = void 0;
+      var hideStack = void 0;
+      if (error instanceof SyntaxError) {
+        message = message.replace(STRIP_FILENAME_RE, "");
+        name = "SyntaxError";
+        hideStack = true;
+      } else if (error instanceof TypeError) {
+        message = message.replace(STRIP_FILENAME_RE, "");
+        hideStack = true;
+      }
+      throw new BabelLoaderError(name, message, error.codeFrame, hideStack, error);
+    } else {
+      throw error;
+    }
+  }
+  var code = result.code;
+  var map = result.map;
+
+  if (map && (!map.sourcesContent || !map.sourcesContent.length)) {
+    map.sourcesContent = [source];
+  }
+
+  return {
+    code: code,
+    map: map
+  };
+};
+
+module.exports = function (source, inputSourceMap) {
+  var _this = this;
+
+  var result = {};
+
+  var webpackRemainingChain = loaderUtils.getRemainingRequest(this).split("!");
+  var filename = webpackRemainingChain[webpackRemainingChain.length - 1];
+
+  var globalOptions = this.options.babel || {};
+  var loaderOptions = loaderUtils.parseQuery(this.query);
+  var userOptions = assign({}, globalOptions, loaderOptions);
+  var defaultOptions = {
+    inputSourceMap: inputSourceMap,
+    sourceRoot: process.cwd(),
+    filename: filename,
+    cacheIdentifier: JSON.stringify({
+      "babel-loader": pkg.version,
+      "babel-core": babel.version,
+      babelrc: exists(userOptions.babelrc) ? read(userOptions.babelrc) : resolveRc(path.dirname(filename)),
+      env: process.env.BABEL_ENV || process.env.NODE_ENV
+    })
+  };
+
+  var options = assign({}, defaultOptions, userOptions);
+
+  if (userOptions.sourceMap === undefined) {
+    options.sourceMap = this.sourceMap;
+  }
+
+  if (options.sourceFileName === undefined) {
+    options.sourceFileName = relative(options.sourceRoot, options.filename);
+  }
+
+  var cacheDirectory = options.cacheDirectory;
+  var cacheIdentifier = options.cacheIdentifier;
+
+  delete options.cacheDirectory;
+  delete options.cacheIdentifier;
+
+  this.cacheable();
+
+  if (cacheDirectory) {
+    var _ret = function () {
+      var callback = _this.async();
+      return {
+        v: cache({
+          directory: cacheDirectory,
+          identifier: cacheIdentifier,
+          source: source,
+          options: options,
+          transform: transpile
+        }, function (err, result) {
+          if (err) {
+            return callback(err);
+          }
+          return callback(null, result.code, result.map);
+        })
+      };
+    }();
+
+    if ((typeof _ret === "undefined" ? "undefined" : _typeof(_ret)) === "object") return _ret.v;
+  }
+
+  result = transpile(source, options);
+  this.callback(null, result.code, result.map);
+};

package/lib/resolve-rc.js

@@ -1,37 +1,24 @@
-'use strict';
+"use strict";
 
-/**
- * The purpose of this module, is to find the project's .babelrc and
- * use its contents to bust the babel-loader's internal cache whenever an option
- * changes.
- *
- * @see https://github.com/babel/babel-loader/issues/62
- * @see http://git.io/vLEvu
- */
-var fs = require('fs');
-var path = require('path');
-var assign = require('object-assign');
-var exists = require('./helpers/exists')({});
-var read = require('./helpers/read')({});
+var path = require("path");
+var exists = require("./utils/exists")({});
+var read = require("./utils/read")({});
 
 var find = function find(start, rel) {
   var file = path.join(start, rel);
-  var opts = {};
-  var up = '';
 
   if (exists(file)) {
     return read(file);
   }
 
-  up = path.dirname(start);
+  var up = path.dirname(start);
   if (up !== start) {
-    // Reached root
     return find(up, rel);
   }
-
 };
 
-module.exports = function(loc, rel) {
-  rel = rel || '.babelrc';
+module.exports = function (loc, rel) {
+  rel = rel || ".babelrc";
+
   return find(loc, rel);
-};
+};

package/lib/utils/exists.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var fs = require("fs");
+
+module.exports = function (cache) {
+  cache = cache || {};
+
+  return function (filename) {
+
+    if (!filename) {
+      return false;
+    }
+
+    cache[filename] = cache[filename] || fs.existsSync(filename);
+
+    return cache[filename];
+  };
+};

package/lib/utils/read.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var fs = require("fs");
+
+module.exports = function (cache) {
+  cache = cache || {};
+
+  return function (filename) {
+
+    if (!filename) {
+      throw new Error("filename must be a string");
+    }
+
+    cache[filename] = cache[filename] || fs.readFileSync(filename, "utf8");
+
+    return cache[filename];
+  };
+};

package/lib/utils/relative.js

@@ -0,0 +1,14 @@
+"use strict";
+
+var path = require("path");
+
+module.exports = function relative(sourceRoot, filename) {
+  var rootPath = sourceRoot.replace(/\\/g, "/").split("/")[1];
+  var fileRootPath = filename.replace(/\\/g, "/").split("/")[1];
+
+  if (rootPath && rootPath !== fileRootPath) {
+    return filename;
+  }
+
+  return path.relative(sourceRoot, filename);
+};

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "babel-loader",
-  "version": "6.2.6",
+  "version": "6.2.10",
   "description": "babel module loader for webpack",
   "files": [
-    "index.js",
     "lib"
   ],
+  "main": "lib/index.js",
   "dependencies": {
     "find-cache-dir": "^0.1.1",
     "loader-utils": "^0.2.11",
@@ -14,25 +14,37 @@
   },
   "peerDependencies": {
     "babel-core": "^6.0.0",
-    "webpack": "1 || ^2.1.0-beta"
+    "webpack": "1 || 2 || ^2.1.0-beta || ^2.2.0-rc"
   },
   "devDependencies": {
+    "ava": "^0.17.0",
+    "babel-cli": "^6.18.0",
     "babel-core": "^6.0.0",
+    "babel-eslint": "^7.1.0",
+    "babel-plugin-istanbul": "^3.0.0",
     "babel-preset-es2015": "^6.0.0",
-    "expect.js": "^0.3.1",
-    "istanbul": "^0.4.0",
-    "jscs": "^3.0.7",
-    "jshint": "^2.8.0",
-    "mocha": "^3.0.2",
-    "rimraf": "^2.4.3"
+    "babel-preset-latest": "^6.16.0",
+    "babel-register": "^6.18.0",
+    "codecov": "^1.0.1",
+    "cross-env": "^2.0.0",
+    "eslint": "^3.8.1",
+    "eslint-config-babel": "^3.0.0",
+    "eslint-plugin-babel": "^4.0.0",
+    "eslint-plugin-flowtype": "^2.25.0",
+    "nyc": "^10.0.0",
+    "rimraf": "^2.4.3",
+    "webpack": "^2.2.0-rc"
   },
   "scripts": {
-    "test": "npm run hint && npm run cs && npm run cover",
-    "travis": "npm run cover -- --report lcovonly",
-    "cover": "istanbul cover ./node_modules/.bin/_mocha -- test/*.test.js",
-    "postcover": "npm run hint && npm run cs",
-    "hint": "jshint --config .jshintrc index.js lib/* test/*",
-    "cs": "jscs --config .jscsrc index.js lib/* test/*"
+    "clean": "rimraf lib/",
+    "build": "babel src/ --out-dir lib/",
+    "coverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json",
+    "lint": "eslint src test",
+    "preversion": "npm test",
+    "prepublish": "npm run clean && npm run build",
+    "test": "npm run lint && cross-env BABEL_ENV=test npm run build && npm run test-only",
+    "test-ci": "cross-env BABEL_ENV=test npm run build && npm run test-only",
+    "test-only": "nyc ava"
   },
   "repository": {
     "type": "git",
@@ -41,7 +53,6 @@
   "keywords": [
     "webpack",
     "loader",
-    "6to5",
     "babel",
     "es6",
     "transpiler",
@@ -52,5 +63,27 @@
   "bugs": {
     "url": "https://github.com/babel/babel-loader/issues"
   },
-  "homepage": "https://github.com/babel/babel-loader"
+  "homepage": "https://github.com/babel/babel-loader",
+  "nyc": {
+    "all": true,
+    "include": [
+      "src/**/*.js"
+    ],
+    "require": [
+      "babel-register"
+    ],
+    "sourceMap": false,
+    "instrument": false
+  },
+  "ava": {
+    "files": [
+      "test/**/*.test.js",
+      "!test/fixtures/**/*",
+      "!test/helpers/**/*"
+    ],
+    "source": [
+      "src/**/*.js"
+    ],
+    "babel": "inherit"
+  }
 }

package/index.js

@@ -1,133 +0,0 @@
-'use strict';
-
-var assign = require('object-assign');
-var babel = require('babel-core');
-var loaderUtils = require('loader-utils');
-var cache = require('./lib/fs-cache.js');
-var exists = require('./lib/helpers/exists')();
-var read = require('./lib/helpers/read')();
-var resolveRc = require('./lib/resolve-rc.js');
-var pkg = require('./package.json');
-var path = require('path');
-
-/**
- * Error thrown by Babel formatted to conform to Webpack reporting.
- */
-function BabelLoaderError(name, message, codeFrame, hideStack, error) {
-  Error.call(this);
-  Error.captureStackTrace(this, BabelLoaderError);
-
-  this.name = 'BabelLoaderError';
-  this.message = formatMessage(name, message, codeFrame);
-  this.hideStack = hideStack;
-  this.error = error;
-}
-
-BabelLoaderError.prototype = Object.create(Error.prototype);
-BabelLoaderError.prototype.constructor = BabelLoaderError;
-
-var STRIP_FILENAME_RE = /^[^:]+: /;
-
-var formatMessage = function(name, message, codeFrame) {
-  return (name ? name + ': ' : '') + message + '\n\n' + codeFrame + '\n';
-};
-
-var transpile = function(source, options) {
-  var result;
-  try {
-    result = babel.transform(source, options);
-  } catch (error) {
-    if (error.message && error.codeFrame) {
-      var message = error.message;
-      var name;
-      var hideStack;
-      if (error instanceof SyntaxError) {
-        message = message.replace(STRIP_FILENAME_RE, '');
-        name = 'SyntaxError';
-        hideStack = true;
-      } else if (error instanceof TypeError) {
-        message = message.replace(STRIP_FILENAME_RE, '');
-        hideStack = true;
-      }
-      throw new BabelLoaderError(
-        name, message, error.codeFrame, hideStack, error);
-    } else {
-      throw error;
-    }
-  }
-  var code = result.code;
-  var map = result.map;
-
-  if (map && (!map.sourcesContent || !map.sourcesContent.length)) {
-    map.sourcesContent = [source];
-  }
-
-  return {
-    code: code,
-    map: map,
-  };
-};
-
-module.exports = function(source, inputSourceMap) {
-  var result = {};
-
-  // Handle filenames (#106)
-  var webpackRemainingChain = loaderUtils.getRemainingRequest(this).split('!');
-  var filename = webpackRemainingChain[webpackRemainingChain.length - 1];
-
-  // Handle options
-  var globalOptions = this.options.babel || {};
-  var loaderOptions = loaderUtils.parseQuery(this.query);
-  var userOptions = assign({}, globalOptions, loaderOptions);
-  var defaultOptions = {
-    inputSourceMap: inputSourceMap,
-    sourceRoot: process.cwd(),
-    filename: filename,
-    cacheIdentifier: JSON.stringify({
-      'babel-loader': pkg.version,
-      'babel-core': babel.version,
-      babelrc: exists(userOptions.babelrc) ?
-          read(userOptions.babelrc) :
-          resolveRc(path.dirname(filename)),
-      env: process.env.BABEL_ENV || process.env.NODE_ENV,
-    }),
-  };
-
-  var options = assign({}, defaultOptions, userOptions);
-
-  if (userOptions.sourceMap === undefined) {
-    options.sourceMap = this.sourceMap;
-  }
-
-  if (options.sourceFileName === undefined) {
-    options.sourceFileName = path.relative(
-        options.sourceRoot,
-        options.filename
-    );
-  }
-
-  var cacheDirectory = options.cacheDirectory;
-  var cacheIdentifier = options.cacheIdentifier;
-
-  delete options.cacheDirectory;
-  delete options.cacheIdentifier;
-
-  this.cacheable();
-
-  if (cacheDirectory) {
-    var callback = this.async();
-    return cache({
-      directory: cacheDirectory,
-      identifier: cacheIdentifier,
-      source: source,
-      options: options,
-      transform: transpile,
-    }, function(err, result) {
-      if (err) { return callback(err); }
-      return callback(null, result.code, result.map);
-    });
-  }
-
-  result = transpile(source, options);
-  this.callback(null, result.code, result.map);
-};

package/lib/helpers/exists.js

@@ -1,23 +0,0 @@
-'use strict';
-
-var fs = require('fs');
-/**
- * Check if file exists and cache the result
- * return the result in cache
- *
- * @example
- * var exists = require('./helpers/fsExists')({});
- * exists('.babelrc'); // false
- */
-module.exports = function(cache) {
-  cache = cache || {};
-
-  return function(filename) {
-
-    if (!filename) { return false; }
-
-    cache[filename] = cache[filename] || fs.existsSync(filename);
-
-    return cache[filename];
-  };
-};

package/lib/helpers/read.js

@@ -1,25 +0,0 @@
-'use strict';
-
-var fs = require('fs');
-/**
- * Read the file and cache the result
- * return the result in cache
- *
- * @example
- * var read = require('./helpers/fsExists')({});
- * read('.babelrc'); // file contents...
- */
-module.exports = function(cache) {
-  cache = cache || {};
-
-  return function(filename) {
-
-    if (!filename) {
-      throw new Error('filename must be a string');
-    }
-
-    cache[filename] = cache[filename] || fs.readFileSync(filename, 'utf8');
-
-    return cache[filename];
-  };
-};