Separate babili opts from gulp-plugin opts

babel · Dec 4, 2016 · ba931a8 · ba931a8
1 parent dca0fa8
commit ba931a8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 27 deletions.
diff --git a/packages/gulp-babili/__tests__/gulp-babili-test.js b/packages/gulp-babili/__tests__/gulp-babili-test.js
@@ -81,7 +81,7 @@ describe("gulp-babili", () => {
         return babiliPreset(...args);
       };
 
-      const stream = gulpBabili({
+      const stream = gulpBabili({}, {
         babel,
         babili,
       });
@@ -136,7 +136,7 @@ describe("gulp-babili", () => {
 
     it("should remove all comments when false", () => {
       return new Promise((resolve, reject) => {
-        const stream = gulpBabili({
+        const stream = gulpBabili({}, {
           comments: false
         });
         stream.on("data", () => {
@@ -150,7 +150,7 @@ describe("gulp-babili", () => {
 
     it("should take a custom function", () => {
       return new Promise((resolve, reject) => {
-        const stream = gulpBabili({
+        const stream = gulpBabili({}, {
           comments(contents) {
             return contents.indexOf("YAC") !== -1;
           }

diff --git a/packages/gulp-babili/src/index.js b/packages/gulp-babili/src/index.js
@@ -10,9 +10,11 @@ const NAME = "gulp-babili";
 
 module.exports = gulpBabili;
 
-function gulpBabili(_opts = {}) {
-  const opts = Object.assign({}, _opts);
-
+function gulpBabili(babiliOpts = {}, {
+  babel = babelCore,
+  babili = babiliPreset,
+  comments = /@preserve|@license/
+} = {}) {
   return through2.obj(function (file, enc, callback) {
     if (file.isNull()) {
       return callback(null, file);
@@ -22,22 +24,6 @@ function gulpBabili(_opts = {}) {
       return callback(new PluginError(NAME, "Streaming not supported"));
     }
 
-    let babel = babelCore;
-    let babili = babiliPreset;
-
-    if (opts.babel) {
-      babel = opts.babel;
-      delete opts.babel;
-    }
-    if (opts.babili) {
-      babili = opts.babili;
-      delete opts.babili;
-    }
-
-    const commentsRegex = typeof opts.comments === "undefined"
-      ? /@preserve|@license/
-      : opts.comments;
-
     let inputSourceMap;
     if (file.sourceMap && file.sourceMap.mappings) {
       inputSourceMap = file.sourceMap;
@@ -49,15 +35,15 @@ function gulpBabili(_opts = {}) {
       ast: false,
 
       /* preset */
-      presets: [[babili, opts]],
+      presets: [[babili, babiliOpts]],
 
       /* sourcemaps */
-      sourceMaps: true,
+      sourceMaps: !!file.sourceMap,
       inputSourceMap,
 
       /* remove comments */
       shouldPrintComment(contents) {
-        return shouldPrintComment(contents, commentsRegex);
+        return shouldPrintComment(contents, comments);
       },
 
       /* file */
@@ -73,7 +59,9 @@ function gulpBabili(_opts = {}) {
 
     if (success) {
       file.contents = new Buffer(result.code);
-      applySourceMap(file, result.map);
+      if (file.sourceMap) {
+        applySourceMap(file, result.map);
+      }
       return callback(null, file);
     }
 
@@ -102,4 +90,3 @@ function shouldPrintComment(contents, predicate) {
   default: return !!predicate;
   }
 }
-