Merge branch 'master' into pr-966

.gitignore

@@ -8,13 +8,9 @@ bower_components/
 node_modules/
 npm-debug.log
 src/bld
+demo/react
 
 ### docusaurus
-./*.html
-*.html
-demo/
-demo/react/
-docs/
-img/
-privacy.html
-website/
+.docusaurus
+/build
+/docs

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2020 Brent Ely
+Copyright (c) 2015-2022 Brent Ely
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -45,7 +45,7 @@ This library creates Open Office XML (OOXML) Presentations which are compatible
 **Works Everywhere**
 
 - Every modern desktop and mobile browser is supported
-- Integrates with Node, Angular, React and Electron
+- Integrates with Node, Angular, React, and Electron
 - Compatible with PowerPoint, Keynote, and more
 
 **Full Featured**
@@ -58,7 +58,7 @@ This library creates Open Office XML (OOXML) Presentations which are compatible
 
 - The absolute easiest PowerPoint library to use
 - Learn as you code will full typescript definitions included
-- Tons of demo code comes included (over 70 slides of features)
+- Tons of demo code comes included (over 75 slides of features)
 
 **Export Your Way**
 
@@ -74,7 +74,7 @@ This library creates Open Office XML (OOXML) Presentations which are compatible
 
 Visit the demos page to create a simple presentation to see how easy it is to use pptxgenjs, or check out the complete demo which showcases every available feature.
 
-- [PptxGenJS Demos](https://gitbrent.github.io/PptxGenJS/demo)
+- [PptxGenJS Demos](https://gitbrent.github.io/PptxGenJS/demos/)
 
 # Installation
 
@@ -85,14 +85,14 @@ Visit the demos page to create a simple presentation to see how easy it is to us
 Bundle: Modern Browsers and IE11
 
 ```html
-<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@3.6.0/dist/pptxgen.bundle.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@3.10.0/dist/pptxgen.bundle.js"></script>
 ```
 
 Min files: Modern Browsers
 
 ```html
-<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@3.6.0/libs/jszip.min.js"></script>
-<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@3.6.0/dist/pptxgen.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@3.10.0/libs/jszip.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@3.10.0/dist/pptxgen.min.js"></script>
 ```
 
 ## Download
@@ -187,21 +187,21 @@ That's really all there is to it!
 
 Full documentation and code examples are available
 
-- [Creating a Presentation](https://gitbrent.github.io/PptxGenJS/docs/usage-pres-create)
-- [Presentation Options](https://gitbrent.github.io/PptxGenJS/docs/usage-pres-options)
-- [Adding a Slide](https://gitbrent.github.io/PptxGenJS/docs/usage-add-slide)
-- [Slide Options](https://gitbrent.github.io/PptxGenJS/docs/usage-slide-options)
-- [Saving a Presentation](https://gitbrent.github.io/PptxGenJS/docs/usage-saving)
-- [Master Slides](https://gitbrent.github.io/PptxGenJS/docs/masters)
-- [Adding Charts](https://gitbrent.github.io/PptxGenJS/docs/api-charts)
-- [Adding Images](https://gitbrent.github.io/PptxGenJS/docs/api-images)
-- [Adding Media](https://gitbrent.github.io/PptxGenJS/docs/api-media)
-- [Adding Shapes](https://gitbrent.github.io/PptxGenJS/docs/api-shapes)
-- [Adding Tables](https://gitbrent.github.io/PptxGenJS/docs/api-tables)
-- [Adding Text](https://gitbrent.github.io/PptxGenJS/docs/api-text)
-- [Speaker Notes](https://gitbrent.github.io/PptxGenJS/docs/speaker-notes)
-- [Using Scheme Colors](https://gitbrent.github.io/PptxGenJS/docs/shapes-and-schemes)
-- [Integration with Other Libraries](https://gitbrent.github.io/PptxGenJS/docs/integration)
+- [Creating a Presentation](https://gitbrent.github.io/PptxGenJS/docs/usage-pres-create/)
+- [Presentation Options](https://gitbrent.github.io/PptxGenJS/docs/usage-pres-options/)
+- [Adding a Slide](https://gitbrent.github.io/PptxGenJS/docs/usage-add-slide/)
+- [Slide Options](https://gitbrent.github.io/PptxGenJS/docs/usage-slide-options/)
+- [Saving a Presentation](https://gitbrent.github.io/PptxGenJS/docs/usage-saving/)
+- [Master Slides](https://gitbrent.github.io/PptxGenJS/docs/masters/)
+- [Adding Charts](https://gitbrent.github.io/PptxGenJS/docs/api-charts/)
+- [Adding Images](https://gitbrent.github.io/PptxGenJS/docs/api-images/)
+- [Adding Media](https://gitbrent.github.io/PptxGenJS/docs/api-media/)
+- [Adding Shapes](https://gitbrent.github.io/PptxGenJS/docs/api-shapes/)
+- [Adding Tables](https://gitbrent.github.io/PptxGenJS/docs/api-tables/)
+- [Adding Text](https://gitbrent.github.io/PptxGenJS/docs/api-text/)
+- [Speaker Notes](https://gitbrent.github.io/PptxGenJS/docs/speaker-notes/)
+- [Using Scheme Colors](https://gitbrent.github.io/PptxGenJS/docs/shapes-and-schemes/)
+- [Integration with Other Libraries](https://gitbrent.github.io/PptxGenJS/docs/integration/)
 
 ---
 
@@ -217,8 +217,7 @@ pptx.writeFile({ fileName: "html2pptx-demo.pptx" });
 
 Learn more:
 
-- [HTML-to-PowerPoint Documentation](https://gitbrent.github.io/PptxGenJS/docs/html-to-powerpoint)
-- [Online HTML-to-PowerPoint Demo](https://gitbrent.github.io/PptxGenJS/demo/#html2pptx)
+- [HTML-to-PowerPoint Docs/Demo](https://gitbrent.github.io/PptxGenJS/html2pptx/)
 
 ---
 
@@ -269,7 +268,7 @@ PowerPoint shape definitions and some XML code via [Officegen Project](https://g
 
 # Sponsor Us
 
-If you find this library useful, please consider sponsoring us through a [donation](https://gitbrent.github.io/PptxGenJS/sponsor)
+If you find this library useful, please consider sponsoring us through a [donation](https://gitbrent.github.io/PptxGenJS/sponsor/)
 
 ---
 

bower.json

@@ -5,7 +5,7 @@
     "dist/pptxgen.js"
   ],
   "dependencies": {
-    "jszip": "^3.4.0"
+    "jszip": "^3.7.1"
   },
   "authors": [
     "Brent Ely <https://github.com/gitbrent>"
@@ -37,6 +37,8 @@
     "**/.*",
     "node_modules",
     "bower_components",
+	"demo",
+	"docs",
     "test",
     "tests"
   ]