Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Deflater with pako #2944

Merged
merged 16 commits into from
Dec 7, 2020
Merged

Replace Deflater with pako #2944

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1dd82b2
Replace Deflater with pako
Oct 5, 2020
5ff33eb
Merge branch 'master' into master
markotaht Oct 5, 2020
d753763
Substitute deflater with pako
Oct 8, 2020
69b26cf
Merge branch 'master' of https://github.com/markotaht/jsPDF
Oct 8, 2020
b2e9feb
Merge branch 'master' into master
markotaht Oct 8, 2020
bdeeb9f
Merge branch 'master' into master
MrRio Nov 7, 2020
0bd9418
remove obsolete Deflater.js file & make all tests work again
HackbrettXXX Dec 4, 2020
979f319
Merge branch 'master' into master
HackbrettXXX Dec 4, 2020
ba33372
Merge branch 'master' into master
HackbrettXXX Dec 4, 2020
651d4cc
fix linting issues
HackbrettXXX Dec 4, 2020
cd99568
run prettier
HackbrettXXX Dec 4, 2020
144ee18
Merge branch 'master' of https://github.com/markotaht/jsPDF into pr/2944
HackbrettXXX Dec 4, 2020
ecd16ad
ignore some more linting issues
HackbrettXXX Dec 4, 2020
d6e76f1
revert some changed files
HackbrettXXX Dec 4, 2020
803468b
prettier ignore some files
HackbrettXXX Dec 4, 2020
2713051
resolve more linting issues
HackbrettXXX Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
],
"moduleType": ["amd", "globals", "node", "es6"],
"keywords": ["pdf"],
"dependencies": {},
"dependencies": {
"pako": "^1.0.11"
},
"optionalDependencies": {
"canvg": "^3.0.6",
"core-js": "^3.6.0",
Expand Down
13 changes: 0 additions & 13 deletions modules.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,6 @@ var configuration = {
deps: []
},

png_support: {
name: "PNG Support",
folder: "modules",
description: "",
deps: ["jspdf", "jpeg_support", "Deflater", "png", "zlib"]
},

png: {
name: "PNG Encoder",
folder: "libs",
Expand All @@ -109,12 +102,6 @@ var configuration = {
description: "",
deps: []
},
Deflater: {
name: "Deflater",
folder: "libs",
description: "",
deps: []
},
gif_support: {
name: "Gif Support",
folder: "modules",
Expand Down
29 changes: 27 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
},
"dependencies": {
"atob": "^2.1.2",
"btoa": "^1.2.1"
"btoa": "^1.2.1",
"pako": "^1.0.11"
},
"optionalDependencies": {
"canvg": "^3.0.6",
Expand All @@ -37,10 +38,11 @@
"@babel/plugin-external-helpers": "^7.10.4",
"@babel/preset-env": "^7.10.4",
"@rollup/plugin-replace": "^2.3.3",
"@rollup/plugin-typescript": "^8.0.0",
"@types/jasmine": "^3.5.11",
"@types/node": "^14.0.18",
"@typescript-eslint/parser": "^3.6.0",
"@typescript-eslint/eslint-plugin": "^3.6.0",
"@typescript-eslint/parser": "^3.6.0",
"babel-plugin-rewire-exports": "^2.2.0",
"chalk": "^4.1.0",
"codeclimate-test-reporter": "^0.5.1",
Expand All @@ -65,6 +67,7 @@
"karma-jasmine": "3.3.1",
"karma-jasmine-matchers": "4.0.2",
"karma-mocha-reporter": "2.2.5",
"karma-rollup-preprocessor": "^7.0.5",
"karma-sauce-launcher": "4.1.5",
"karma-typescript": "^5.0.3",
"karma-verbose-reporter": "0.0.6",
Expand Down
6 changes: 6 additions & 0 deletions rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ const umd = {
],
external: umdExternals,
plugins: [
resolve(),
commonjs(),
RollupPluginPreprocess({ context: { MODULE_FORMAT: "umd" } }),
replaceVersion(),
licenseBanner()
Expand All @@ -89,6 +91,8 @@ const es = {
],
external: externals,
plugins: [
resolve(),
commonjs(),
RollupPluginPreprocess({ context: { MODULE_FORMAT: "es" } }),
replaceVersion(),
licenseBanner()
Expand Down Expand Up @@ -116,6 +120,8 @@ const node = {
],
external: externals,
plugins: [
resolve(),
commonjs(),
RollupPluginPreprocess({ context: { MODULE_FORMAT: "cjs" } }),
replaceVersion(),
licenseBanner()
Expand Down
Loading