Fix .babelrc issues

lib/options.js

@@ -4,6 +4,8 @@ const fs = require('fs');
 const path = require('path').posix;
 const camelCase = require('camelcase');
 
+const pkgName = pkg => pkg.name ? pkg.name.split('/').slice(-1)[0] : '';
+
 function parseOpts(flags, pkg) {
 	// Use package.json config as default flags
 	if (pkg.lyo && typeof pkg.lyo === 'object') {
@@ -13,29 +15,40 @@ function parseOpts(flags, pkg) {
 	}
 
 	// Check if .babelrc exists
-	if (fs.existsSync('.babelrc')) {
-		flags.babelConfig = '.babelrc';
+	const babelrcPath = flags.inputDir ? path.join(flags.inputDir, '.babelrc') : path.resolve('.babelrc');
+	if (fs.existsSync(babelrcPath)) {
+		flags.babelConfig = babelrcPath;
 	}
 
 	// Set input
-	flags.input = flags.input || pkg.main || 'index.js';
-	if (flags.remote && flags.inputDir) {
-		flags.input = path.join(flags.inputDir, flags.input);
-	}
+	flags.input = input(flags, pkg);
 
 	// Set output
-	const pkgName = pkg.name ? pkg.name.split('/').slice(-1)[0] : '';
-	const defaultName = pkg.name ? (pkgName + '.min.js') : path.basename(flags.input).replace(/.js$/, '.min.js');
-	if (!flags.output) {
-		flags.output = flags.remote ? defaultName : path.join('dist', defaultName);
-	} else if (!path.extname(flags.output)) {
-		flags.output = path.join(flags.output, defaultName);
-	}
+	flags.output = output(flags, pkg);
 
 	// Set name
-	flags.name = flags.name || camelCase(pkgName || '') ||
+	flags.name = flags.name || camelCase(pkgName(pkg) || '') ||
         (pkg.main ? camelCase(pkg.main.replace(/.js$/, '')) : '') || 'module';
 	return flags;
 }
 
+function output(flags, pkg) {
+	const defaultName = pkg.name ? (pkgName(pkg) + '.min.js') : path.basename(flags.input).replace(/.js$/, '.min.js');
+	if (!flags.output) {
+		return flags.remote ? defaultName : path.join('dist', defaultName);
+	}
+	if (!path.extname(flags.output)) {
+		return path.join(flags.output, defaultName);
+	}
+	return flags.output;
+}
+
+function input(flags, pkg) {
+	const i = flags.input || pkg.main || 'index.js';
+	if (flags.remote && flags.inputDir) {
+		return path.join(flags.inputDir, i);
+	}
+	return i;
+}
+
 module.exports = parseOpts;

lib/task.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const path = require('path');
 const chalk = require('chalk');
 const getStream = require('get-stream');
 const ora = require('ora');
@@ -40,7 +41,7 @@ const runBrowserify = opts => runTask('Browserify', (resolve, reject) => {
 
 const runBabel = (code, opts) => runTask('Babel', (resolve, reject) => {
 	if (opts.babelConfig) {
-		opts = {configFile: opts.babelConfig, compact: false, babelrc: false};
+		opts = {babelrcRoots: path.dirname(opts.babelConfig), filename: opts.input, compact: false};
 	} else {
 		const configItem = babel.createConfigItem(babelEnvPreset);
 		opts = {presets: [configItem], compact: false};