Merge branch 'master' into #81-emoji-confetti

README.md

@@ -30,7 +30,7 @@ You can then `require('canvas-confetti');` to use it in your project build. _Not
 You can also include this library in your HTML page directly from a CDN:
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/canvas-confetti@1.7.0/dist/confetti.browser.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/canvas-confetti@1.8.0/dist/confetti.browser.min.js"></script>
 ```
 
 _Note: you should use the latest version at the time that you include your project. You can see all versions [on the releases page](https://github.com/catdad/canvas-confetti/releases)._

index.html

@@ -678,9 +678,11 @@ <h2><a href="#custom-canvas" id="custom-canvas" class="anchor">Custom Canvas</a>
         };
 
         function fire(particleRatio, opts) {
-          confetti(Object.assign({}, defaults, opts, {
+          confetti({
+            ...defaults,
+            ...opts,
             particleCount: Math.floor(count * particleRatio)
-          }));
+          });
         }
 
         fire(0.25, {
@@ -724,8 +726,8 @@ <h2><a href="#custom-canvas" id="custom-canvas" class="anchor">Custom Canvas</a>
 
           var particleCount = 50 * (timeLeft / duration);
           // since particles fall down, start a bit higher than random
-          confetti(Object.assign({}, defaults, { particleCount, origin: { x: randomInRange(0.1, 0.3), y: Math.random() - 0.2 } }));
-          confetti(Object.assign({}, defaults, { particleCount, origin: { x: randomInRange(0.7, 0.9), y: Math.random() - 0.2 } }));
+          confetti({ ...defaults, particleCount, origin: { x: randomInRange(0.1, 0.3), y: Math.random() - 0.2 } });
+          confetti({ ...defaults, particleCount, origin: { x: randomInRange(0.7, 0.9), y: Math.random() - 0.2 } });
         }, 250);
       },
       snow: function snow() {
@@ -770,7 +772,6 @@ <h2><a href="#custom-canvas" id="custom-canvas" class="anchor">Custom Canvas</a>
           gravity: 0,
           decay: 0.94,
           startVelocity: 30,
-          shapes: ['star'],
           colors: ['FFE400', 'FFBD00', 'E89400', 'FFCA6C', 'FDFFB8']
         };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "canvas-confetti",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "performant confetti animation in the browser",
   "main": "src/confetti.js",
   "module": "dist/confetti.module.mjs",