Merge pull request Enigmatic-Smile#47 from FidelLimited/fix-46

goncaloneves · web-flow · commit 5b6f6867e113 · 2017-08-03T19:37:54.000+01:00
Fix Enigmatic-Smile#46
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-plugin-optimize",
-  "version": "3.0.2-rc.1",
+  "version": "3.0.3-rc.1",
   "description": "Bundle with Browserify, transpile with Babel and minify with Babili automatically to your NodeJS runtime compatible JavaScript.",
   "main": "src/index.js",
   "scripts": {
diff --git a/src/index.js b/src/index.js
@@ -164,7 +164,8 @@ class Optimize {
         exclude: ['**'],
         include: [this.optimize.options.prefix + '/**']
       }
-      this.serverless.service.package = this.optimize.package
+      this.serverless.service.package = this.serverless.service.package || {}
+      Object.assign(this.serverless.service.package, this.optimize.package)
     }
 
     /** Clean prefix folder */

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "serverless-plugin-optimize",`
`3`		`- "version": "3.0.2-rc.1",`
	`3`	`+ "version": "3.0.3-rc.1",`
`4`	`4`	`"description": "Bundle with Browserify, transpile with Babel and minify with Babili automatically to your NodeJS runtime compatible JavaScript.",`
`5`	`5`	`"main": "src/index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,8 @@ class Optimize {`
`164`	`164`	`exclude: ['**'],`
`165`	`165`	`include: [this.optimize.options.prefix + '/**']`
`166`	`166`	`}`
`167`		`- this.serverless.service.package = this.optimize.package`
	`167`	`+ this.serverless.service.package = this.serverless.service.package \|\| {}`
	`168`	`+ Object.assign(this.serverless.service.package, this.optimize.package)`
`168`	`169`	`}`
`169`	`170`
`170`	`171`	`/** Clean prefix folder */`