Merge pull request #38 from mrTimofey/master

Code for Node 6+, webpack and buble dependency version

Author: Jaeho Lee

.gitignore

@@ -1,4 +1,6 @@
 node_modules/
 test/temp
 *.log
-
+.idea
+package-lock.json
+yarn.lock

.npmignore

@@ -1,4 +1,6 @@
 *.log
 node_modules
 test/
-
+.idea
+package-lock.json
+yarn.lock

README.md

@@ -2,23 +2,21 @@
 
 This package allows you to transpile ES2015 source using [buble](https://github.com/Rich-Harris/buble). See [Buble project website](https://buble.surge.sh/guide/) to check out supported features.
 
-note: This is almost-working prototype. Everything is immature. If you want something to be fixed, freely send PR or post issues!
-
 ## Installation
 ```bash
-npm install --save-dev buble-loader buble
+npm i -S buble-loader buble
 ```
 ## Usage
 
-Add this to your `webpack.config.js`
+Add something like this to your `webpack.config.js`
 ```js
 module: {
-  loaders: [
+  rules: [
     {
       test: /\.js$/,
-      loaders: 'buble-loader',
+      loader: 'buble-loader',
       include: path.join(__dirname, 'src'),
-      query: {
+      options: {
         objectAssign: 'Object.assign'
       }
     }

index.js

@@ -1,49 +1,35 @@
-'use strict';
-
-var buble = require('buble');
-var path = require('path');
-var loaderUtils = require('loader-utils');
-
-function BubleError (err) {
-  Error.call(this);
-  Error.captureStackTrace(this, BubleError);
-
-  this.name = 'BubleLoaderError';
-  this.message = ['', err.snippet, err.message].join('\n');
-  this.hideStack = true;
-  this.error = err;
+/* eslint-disable no-invalid-this */
+const buble = require('buble'),
+	path = require('path'),
+	loaderUtils = require('loader-utils');
+
+class BubleError extends Error {
+	constructor(err) {
+		super();
+		Error.captureStackTrace(this, this.constructor);
+		this.name = 'BubleLoaderError';
+		this.message = ['', err.snippet, err.message].join('\n');
+		this.error = err;
+	}
 }
 
-BubleError.prototype = Object.create(Error.prototype);
-BubleError.prototype.constructor = BubleError;
-
-function handleError (err) {
-    if (err.name === 'CompileError' || err.name === 'SyntaxError') {
-        throw new BubleError(err);
-    } else {
-        throw err;
-    }
-}
-
-module.exports = function BubleLoader(source, inputSourceMap) {
-	var loaderOptions = loaderUtils.getOptions(this);
-    var transformed;
-    try {
-        transformed = buble.transform(source, Object.assign({
-            transforms: {
-                modules: false
-            }
-        }, loaderOptions));
-    } catch (err) {
-        handleError(err);
-    }
-
-    var resourcePath = this.resourcePath;
-
-    transformed.map.file = resourcePath;
-    transformed.map.sources[0] = path.relative(process.cwd(), resourcePath);
-    transformed.map.sourceRoot = process.cwd();
-
-    this.cacheable && this.cacheable();
-    this.callback(null, transformed.code, transformed.map);
+module.exports = function(source) {
+	const config = loaderUtils.getOptions(this);
+	config.transforms = Object.assign({}, config.transforms || {}, { modules: false });
+	let output;
+	try {
+		output = buble.transform(source, config);
+	}
+	catch (err) {
+		throw err.name === 'CompileError' || err.name === 'SyntaxError' ? new BubleError(err) : err;
+	}
+
+	const resourcePath = this.resourcePath;
+
+	output.map.file = resourcePath;
+	output.map.sources[0] = path.relative(process.cwd(), resourcePath);
+	output.map.sourceRoot = process.cwd();
+
+	if (this.cacheable) this.cacheable();
+	this.callback(null, output.code, output.map);
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "buble-loader",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "lightweight ES2015 source loader for Webpack using Buble",
   "main": "index.js",
   "scripts": {
@@ -16,19 +16,21 @@
     "webpack",
     "buble",
     "ES2015",
-    "ES6"
+    "ES6",
+    "loader"
   ],
   "bugs": {
     "url": "https://github.com/sairion/buble-loader/issues"
   },
+  "dependencies": {
+    "loader-utils": "^1.1.0"
+  },
   "devDependencies": {
-    "object-assign": "^4.0.1"
+    "buble": "*",
+    "webpack": "*"
   },
   "peerDependencies": {
-    "buble": "^0.15.0",
+    "buble": "*",
     "webpack": "*"
-  },
-  "dependencies": {
-    "loader-utils": "^1.1.0"
   }
 }

test/fixtures/SyntaxCheck.js

@@ -14,7 +14,7 @@ module.exports = {
         {
             let a = 2;
         }
-        console.assert(a === 1);
+		console.assert(a === 1);
 
         const b = 10;
         // b = 100; // throws error

test/fixtures/index.js

@@ -1,4 +1,4 @@
-var SyntaxCheck = require('./SyntaxCheck');
+const SyntaxCheck = require('./SyntaxCheck');
 
 console.log(SyntaxCheck.objectDestructuring());
 console.log(SyntaxCheck.blockScopingBindings());

test/loader-test.js

@@ -1,49 +1,46 @@
-'use strict';
+const path = require('path'),
+	webpack = require('webpack'),
+	assert = require('assert');
 
-var path = require('path');
-var webpack = require('webpack');
-var assert = require('assert')
-
-var tempDir = path.resolve(__dirname, './temp/');
-var loader = path.resolve(__dirname, '../');
-
-var baseConfig = {
-  entry: './test/fixtures/index.js',
-  output: {
-    path: tempDir,
-    filename: '[id].js',
-  },
-  devtool: 'source-map',
-  module: {
-    loaders: [
-      {
-        test: /\.js$/,
-        loader: loader,
-        query: {
-          objectAssign: 'Object.assign'
-        },
-        exclude: /node_modules/,
-      },
-    ],
-  },
+const baseConfig = {
+	output: {
+		path: path.resolve(__dirname, './temp/'),
+		filename: '[id].js'
+	},
+	devtool: 'source-map',
+	module: {
+		rules: [
+			{
+				test: /\.js$/,
+				loader: path.resolve(__dirname, '../'),
+				options: {
+					objectAssign: 'Object.assign'
+				},
+				exclude: /node_modules/
+			}
+		]
+	}
 };
 
-webpack(baseConfig, function(err, stats) {
-  if (stats.compilation.errors.length > 0) {
-    console.error(stats.compilation.errors[0].message);
-    process.exit(1);
-  }
+for (let mode of ['development', 'production']) {
+	baseConfig.mode = mode;
+	baseConfig.entry = './test/fixtures/index.js';
+	webpack(baseConfig, function (err, stats) {
+		if (stats.compilation.errors.length > 0) {
+			console.error(stats.compilation.errors[0].message);
+			process.exit(1);
+		}
 
-  baseConfig.entry = './test/fixtures/errors.js';
-  webpack(baseConfig, function(err, stats) {
-    var niceErrorMessage = [
-      'ERROR in ./test/fixtures/errors.js',
-      'Module build failed: ',
-      '1 : // double arrow?',
-      '2 : const add = (a, b) ==> 1',
-      '                         ^',
-      'Unexpected token (2:21)'
-    ].join('\n');
-    assert.ok(stats.toString().includes(niceErrorMessage), 'output contains a nice error msg');
-  });
-});
+		baseConfig.entry = './test/fixtures/errors.js';
+		webpack(baseConfig, function (err, stats) {
+			assert.ok(stats.toString().includes([
+				'ERROR in ./test/fixtures/errors.js',
+				'Module build failed: BubleLoaderError: ',
+				'1 : // double arrow?',
+				'2 : const add = (a, b) ==> 1',
+				'                         ^',
+				'Unexpected token (2:21)'
+			].join('\n')), 'output contains a nice error msg');
+		});
+	});
+}