Skip to content

Commit 480ae0f

Browse files
committed
Merge branch 'master' into modernization
# Conflicts: # dist/jspdf.debug.js # package-lock.json # package.json # src/jspdf.js # src/node.js # test/reference/bar_graph_with_text_and_lines.pdf
2 parents f06ab37 + 91cecee commit 480ae0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+263
-215
lines changed

.gitpod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tasks:
2-
- init: npm run build
2+
- init: npm install && npm run build
33
command: npm start
44
ports:
55
- port: 8000

HOTFIX_README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Hotfixes
1+
# Hotfixes
22

33
We sometimes bake-in solutions (A.K.A. hotfixes) to solve issues for specific use cases.
44

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
[![GitHub license](https://img.shields.io/github/license/MrRio/jsPDF.svg)](https://github.com/MrRio/jsPDF/blob/master/LICENSE)
88
[![Total alerts](https://img.shields.io/lgtm/alerts/g/MrRio/jsPDF.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/MrRio/jsPDF/alerts/)
99
[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/MrRio/jsPDF.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/MrRio/jsPDF/context:javascript)
10+
[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/from-referrer/)
1011

1112

1213

package-lock.json

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"optionalDependencies": {
3333
"canvg": "^3.0.6",
3434
"core-js": "^3.6.0",
35+
"dompurify": "^2.0.12",
3536
"html2canvas": "^1.0.0-rc.5"
3637
},
3738
"devDependencies": {

0 commit comments

Comments
 (0)