Skip to content

Commit d830728

Browse files
DonaldcwlDonaldcwl
authored
Merge branch 'dev' into dev
2 parents 2b300bd + 30e2b1c commit d830728

27 files changed

+409
-322
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,6 @@ Temporary Items
8989
.idea/
9090
dist/
9191
/example/*/yarn.lock
92+
93+
.next/
94+
build/

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## v1.0.12 (4 June 2020)
2+
* fixed: issue with SSR [#58](https://github.com/Donaldcwl/browser-image-compression/issues/58)
3+
14
## v1.0.11 (8 May 2020)
25
* fixed: issue with IE support [#38](https://github.com/Donaldcwl/browser-image-compression/issues/38) [#23](https://github.com/Donaldcwl/browser-image-compression/issues/23)
36

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ yarn add browser-image-compression
1818
```
1919
or use a CDN like [delivrjs]:
2020
```
21-
https://cdn.jsdelivr.net/npm/browser-image-compression@1.0.11/dist/browser-image-compression.js
21+
https://cdn.jsdelivr.net/npm/browser-image-compression@1.0.12/dist/browser-image-compression.js
2222
or
2323
https://cdn.jsdelivr.net/npm/browser-image-compression@latest/dist/browser-image-compression.js
2424
```
@@ -51,7 +51,8 @@ const options = {
5151
maxIteration: number, // optional, max number of iteration to compress the image (default: 10)
5252
exifOrientation: number, // optional, see https://stackoverflow.com/a/32490603/10395024
5353
onProgress: Function, // optional, a function takes one progress argument (percentage from 0 to 100)
54-
fileType: string // optional, fileType override
54+
fileType: string, // optional, fileType override
55+
initialQuality: number // optional, initial quality value during compression
5556
}
5657

5758
imageCompression(file: File, options): Promise<File | Blob>

‎coverage/coverage-final.json

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎coverage/coverage-summary.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{"total": {"lines":{"total":213,"covered":167,"skipped":0,"pct":78.4},"statements":{"total":220,"covered":169,"skipped":0,"pct":76.82},"functions":{"total":28,"covered":24,"skipped":0,"pct":85.71},"branches":{"total":103,"covered":58,"skipped":0,"pct":56.31}}
2-
,"/home/user/WebstormProjects/browser-image-compression/lib/image-compression.js": {"lines":{"total":47,"covered":47,"skipped":0,"pct":100},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":47,"covered":47,"skipped":0,"pct":100},"branches":{"total":24,"covered":20,"skipped":0,"pct":83.33}}
3-
,"/home/user/WebstormProjects/browser-image-compression/lib/index.js": {"lines":{"total":30,"covered":27,"skipped":0,"pct":90},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":30,"covered":27,"skipped":0,"pct":90},"branches":{"total":19,"covered":13,"skipped":0,"pct":68.42}}
4-
,"/home/user/WebstormProjects/browser-image-compression/lib/utils.js": {"lines":{"total":136,"covered":93,"skipped":0,"pct":68.38},"functions":{"total":23,"covered":19,"skipped":0,"pct":82.61},"statements":{"total":143,"covered":95,"skipped":0,"pct":66.43},"branches":{"total":60,"covered":25,"skipped":0,"pct":41.67}}
1+
{"total": {"lines":{"total":206,"covered":167,"skipped":0,"pct":81.07},"statements":{"total":220,"covered":169,"skipped":0,"pct":76.82},"functions":{"total":28,"covered":24,"skipped":0,"pct":85.71},"branches":{"total":105,"covered":60,"skipped":0,"pct":57.14}}
2+
,"D:\\Projects\\browser-image-compression\\lib\\image-compression.js": {"lines":{"total":47,"covered":47,"skipped":0,"pct":100},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":47,"covered":47,"skipped":0,"pct":100},"branches":{"total":24,"covered":20,"skipped":0,"pct":83.33}}
3+
,"D:\\Projects\\browser-image-compression\\lib\\index.js": {"lines":{"total":30,"covered":27,"skipped":0,"pct":90},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":30,"covered":27,"skipped":0,"pct":90},"branches":{"total":19,"covered":13,"skipped":0,"pct":68.42}}
4+
,"D:\\Projects\\browser-image-compression\\lib\\utils.js": {"lines":{"total":129,"covered":93,"skipped":0,"pct":72.09},"functions":{"total":23,"covered":19,"skipped":0,"pct":82.61},"statements":{"total":143,"covered":95,"skipped":0,"pct":66.43},"branches":{"total":62,"covered":27,"skipped":0,"pct":43.55}}
55
}

‎coverage/image-compression.js.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,9 @@ <h1><a href="index.html">All files</a> image-compression.js</h1>
337337
incProgress()
338338
&nbsp;
339339
// exifOrientation
340-
const exifOrientation = options.exifOrientation || <span class="branch-1 cbranch-no" title="branch not covered" >await getExifOrientation(file)</span>
340+
options.exifOrientation = options.exifOrientation || <span class="branch-1 cbranch-no" title="branch not covered" >await getExifOrientation(file)</span>
341341
incProgress()
342-
const orientationFixedCanvas = (await isAutoOrientationInBrowser) ? <span class="branch-0 cbranch-no" title="branch not covered" >maxWidthOrHeightFixedCanvas </span>: followExifOrientation(maxWidthOrHeightFixedCanvas, exifOrientation)
342+
const orientationFixedCanvas = (await isAutoOrientationInBrowser) ? <span class="branch-0 cbranch-no" title="branch not covered" >maxWidthOrHeightFixedCanvas </span>: followExifOrientation(maxWidthOrHeightFixedCanvas, options.exifOrientation)
343343
incProgress()
344344
&nbsp;
345345
let quality = 1
@@ -403,7 +403,7 @@ <h1><a href="index.html">All files</a> image-compression.js</h1>
403403
<div class='footer quiet pad2 space-top1 center small'>
404404
Code coverage generated by
405405
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
406-
at Tue Jun 16 2020 19:18:40 GMT+0300 (Moscow Standard Time)
406+
at Thu Jun 04 2020 13:37:49 GMT+0800 (香港標準時間)
407407
</div>
408408
</div>
409409
<script src="prettify.js"></script>

‎coverage/index.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ <h1>All files</h1>
3030

3131

3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">56.31% </span>
33+
<span class="strong">57.14% </span>
3434
<span class="quiet">Branches</span>
35-
<span class='fraction'>58/103</span>
35+
<span class='fraction'>60/105</span>
3636
</div>
3737

3838

@@ -44,9 +44,9 @@ <h1>All files</h1>
4444

4545

4646
<div class='fl pad1y space-right2'>
47-
<span class="strong">78.4% </span>
47+
<span class="strong">81.07% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>167/213</span>
49+
<span class='fraction'>167/206</span>
5050
</div>
5151

5252

@@ -109,12 +109,12 @@ <h1>All files</h1>
109109
</td>
110110
<td data-value="66.43" class="pct medium">66.43%</td>
111111
<td data-value="143" class="abs medium">95/143</td>
112-
<td data-value="41.67" class="pct low">41.67%</td>
113-
<td data-value="60" class="abs low">25/60</td>
112+
<td data-value="43.55" class="pct low">43.55%</td>
113+
<td data-value="62" class="abs low">27/62</td>
114114
<td data-value="82.61" class="pct high">82.61%</td>
115115
<td data-value="23" class="abs high">19/23</td>
116-
<td data-value="68.38" class="pct medium">68.38%</td>
117-
<td data-value="136" class="abs medium">93/136</td>
116+
<td data-value="72.09" class="pct medium">72.09%</td>
117+
<td data-value="129" class="abs medium">93/129</td>
118118
</tr>
119119

120120
</tbody>
@@ -125,7 +125,7 @@ <h1>All files</h1>
125125
<div class='footer quiet pad2 space-top1 center small'>
126126
Code coverage generated by
127127
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
128-
at Tue Jun 16 2020 19:18:40 GMT+0300 (Moscow Standard Time)
128+
at Thu Jun 04 2020 13:37:49 GMT+0800 (香港標準時間)
129129
</div>
130130
</div>
131131
<script src="prettify.js"></script>

‎coverage/index.js.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ <h1><a href="index.html">All files</a> index.js</h1>
333333
imageCompression.handleMaxWidthOrHeight = handleMaxWidthOrHeight
334334
imageCompression.followExifOrientation = followExifOrientation
335335
imageCompression.cleanupMemory = cleanupCanvasMemory
336-
imageCompression.version = '1.0.11'
336+
imageCompression.version = '1.0.12'
337337
&nbsp;
338338
export default imageCompression
339339
&nbsp;</pre></td></tr></table></pre>
@@ -343,7 +343,7 @@ <h1><a href="index.html">All files</a> index.js</h1>
343343
<div class='footer quiet pad2 space-top1 center small'>
344344
Code coverage generated by
345345
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
346-
at Tue Jun 16 2020 19:18:40 GMT+0300 (Moscow Standard Time)
346+
at Thu Jun 04 2020 13:37:49 GMT+0800 (香港標準時間)
347347
</div>
348348
</div>
349349
<script src="prettify.js"></script>

‎coverage/lcov-report/image-compression.js.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,9 @@ <h1><a href="index.html">All files</a> image-compression.js</h1>
337337
incProgress()
338338
&nbsp;
339339
// exifOrientation
340-
const exifOrientation = options.exifOrientation || <span class="branch-1 cbranch-no" title="branch not covered" >await getExifOrientation(file)</span>
340+
options.exifOrientation = options.exifOrientation || <span class="branch-1 cbranch-no" title="branch not covered" >await getExifOrientation(file)</span>
341341
incProgress()
342-
const orientationFixedCanvas = (await isAutoOrientationInBrowser) ? <span class="branch-0 cbranch-no" title="branch not covered" >maxWidthOrHeightFixedCanvas </span>: followExifOrientation(maxWidthOrHeightFixedCanvas, exifOrientation)
342+
const orientationFixedCanvas = (await isAutoOrientationInBrowser) ? <span class="branch-0 cbranch-no" title="branch not covered" >maxWidthOrHeightFixedCanvas </span>: followExifOrientation(maxWidthOrHeightFixedCanvas, options.exifOrientation)
343343
incProgress()
344344
&nbsp;
345345
let quality = 1
@@ -403,7 +403,7 @@ <h1><a href="index.html">All files</a> image-compression.js</h1>
403403
<div class='footer quiet pad2 space-top1 center small'>
404404
Code coverage generated by
405405
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
406-
at Tue Jun 16 2020 19:18:40 GMT+0300 (Moscow Standard Time)
406+
at Thu Jun 04 2020 13:37:49 GMT+0800 (香港標準時間)
407407
</div>
408408
</div>
409409
<script src="prettify.js"></script>

‎coverage/lcov-report/index.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ <h1>All files</h1>
3030

3131

3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">56.31% </span>
33+
<span class="strong">57.14% </span>
3434
<span class="quiet">Branches</span>
35-
<span class='fraction'>58/103</span>
35+
<span class='fraction'>60/105</span>
3636
</div>
3737

3838

@@ -44,9 +44,9 @@ <h1>All files</h1>
4444

4545

4646
<div class='fl pad1y space-right2'>
47-
<span class="strong">78.4% </span>
47+
<span class="strong">81.07% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>167/213</span>
49+
<span class='fraction'>167/206</span>
5050
</div>
5151

5252

@@ -109,12 +109,12 @@ <h1>All files</h1>
109109
</td>
110110
<td data-value="66.43" class="pct medium">66.43%</td>
111111
<td data-value="143" class="abs medium">95/143</td>
112-
<td data-value="41.67" class="pct low">41.67%</td>
113-
<td data-value="60" class="abs low">25/60</td>
112+
<td data-value="43.55" class="pct low">43.55%</td>
113+
<td data-value="62" class="abs low">27/62</td>
114114
<td data-value="82.61" class="pct high">82.61%</td>
115115
<td data-value="23" class="abs high">19/23</td>
116-
<td data-value="68.38" class="pct medium">68.38%</td>
117-
<td data-value="136" class="abs medium">93/136</td>
116+
<td data-value="72.09" class="pct medium">72.09%</td>
117+
<td data-value="129" class="abs medium">93/129</td>
118118
</tr>
119119

120120
</tbody>
@@ -125,7 +125,7 @@ <h1>All files</h1>
125125
<div class='footer quiet pad2 space-top1 center small'>
126126
Code coverage generated by
127127
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
128-
at Tue Jun 16 2020 19:18:40 GMT+0300 (Moscow Standard Time)
128+
at Thu Jun 04 2020 13:37:49 GMT+0800 (香港標準時間)
129129
</div>
130130
</div>
131131
<script src="prettify.js"></script>

0 commit comments

Comments
 (0)