Merge pull request #5 from FidelLimited/add-function-minify

Add global properties to function and aws-sdk optional

Author: goncaloneves

README.md

@@ -1,6 +1,9 @@
 Serverless Optimize Plugin
 =============================
-[![serverless](http://public.serverless.com/badges/v3.svg)](http://www.serverless.com)
+[![serverless](http://public.serverless.com/badges/v3.svg)](http://www.serverless.com) 
+[![npm version](https://badge.fury.io/js/serverless-plugin-optimize.svg)](https://badge.fury.io/js/serverless-plugin-optimize)
+[![dependencies](https://img.shields.io/david/FidelLimited/serverless-plugin-optimize.svg)](https://www.npmjs.com/package/serverless-plugin-optimize)
+[![license](https://img.shields.io/npm/l/serverless-plugin-optimize.svg)](https://raw.githubusercontent.com/FidelLimited/serverless-plugin-optimize/master/LICENSE)
 
 Bundle with Browserify, transpile with Babel to ES5 and minify with Uglify your Serverless functions.
 
@@ -53,7 +56,7 @@ custom:
   	exclude: ['ajv']
 ```
 
-* **minify** (default `true`) - When mininify is set to `false` your functions won't be minified.
+* **minify** (default `true`) - When minify is set to `false` your functions won't be minified.
 
 ```yml
 custom:
@@ -79,15 +82,15 @@ custom:
 
 #### Function
 
-* **optimize** (default `true`) - When optimize is set to `false` the specific function won't be optimized.
+* **optimize** (default `true`) - When optimize is set to `false` the function won't be optimized.
 
 ```yml
 functions:
   hello:
     optimize: false
 ```
 
-* **exclude** - Array of modules that will be excluded from the specific function.
+* **exclude** - Array of modules that will be excluded from the function.
 
 ```yml
 functions:
@@ -96,6 +99,24 @@ functions:
       exclude: ['ajv']
 ```
 
+* **minify** - When minify is set to `false` the function won't be minified.
+
+```yml
+functions:
+  hello:
+    optimize:
+      minify: false
+```
+
+* **presets** - Array of Babel presets for the function.
+
+```yml
+functions:
+  hello:
+    optimize:
+      presets: ['es2016']
+```
+
 ## Contribute
 
 Help us making this plugin better and future proof.

src/index.js

@@ -68,12 +68,12 @@ class Optimize {
 
       /** Babel presets */
       if (Array.isArray(this.custom.optimize.presets)) {
-        this.optimize.options.presets = this.optimize.options.presets.concat(this.custom.optimize.presets)
+        this.optimize.options.presets = this.custom.optimize.presets
       }
 
-      /** Global unique excludes */
+      /** Global excludes */
       if (Array.isArray(this.custom.optimize.exclude)) {
-        this.optimize.options.exclude = this.optimize.options.exclude.concat(this.custom.optimize.exclude)
+        this.optimize.options.exclude = this.custom.optimize.exclude
       }
     }
 
@@ -204,6 +204,9 @@ class Optimize {
       return BbPromise.resolve('optimization skipped')
     }
 
+    /** Log function to optimize */
+    this.serverless.cli.log('Optimize: ' + functionObject.name)
+
     /** Optimize object */
     let optimize = {
       bundle: functionBundle,
@@ -214,11 +217,25 @@ class Optimize {
       }
     }
 
-    /** Setup function unique excludes */
-    let functionExclude = [].concat(this.optimize.options.exclude)
-    if (functionObject.optimize && Array.isArray(functionObject.optimize.exclude)) {
-      optimize.exclude = functionObject.optimize.exclude
-      functionExclude = functionExclude.concat(functionObject.optimize.exclude)
+    /** Function optimize options */
+    let functionExclude = this.optimize.options.exclude
+    let functionMinify = this.optimize.options.minify
+    let functionPresets = this.optimize.options.presets
+    if (typeof functionObject.optimize === 'object') {
+      /** Excludes */
+      if (Array.isArray(functionObject.optimize.exclude)) {
+        functionExclude = optimize.exclude = functionObject.optimize.exclude
+      }
+
+      /** Minify flag */
+      if (typeof functionObject.optimize.minify === 'boolean') {
+        functionMinify = optimize.minify = functionObject.optimize.minify
+      }
+
+      /** Babel presets */
+      if (Array.isArray(functionObject.optimize.presets)) {
+        functionPresets = optimize.presets = functionObject.optimize.presets
+      }
     }
 
     /** Browserify */
@@ -245,11 +262,11 @@ class Optimize {
 
     /** Browserify babelify transform */
     bundler.transform(babelify, {
-      presets: this.optimize.options.presets
+      presets: functionPresets
     })
 
     /** Browserify minify transform */
-    if (this.optimize.options.minify) {
+    if (functionMinify) {
       bundler.transform({
         global: true
       }, uglify)
@@ -275,9 +292,6 @@ class Optimize {
 
       /** Update package */
       functionObject.package = optimize.package
-
-      /** Log optimized function */
-      this.serverless.cli.log('Optimize: ' + functionObject.name)
     })
   }
 }