Skip to content

Commit d07db5b

Browse files
tomholubioanmo226
andauthored
[Snyk] Upgrade filesize from 10.1.2 to 10.1.6 (#5920)
* feat: updated filesize * fix: type error * fix * fix: test * fix: pr reviews --------- Co-authored-by: Ioan Moldovan <[email protected]>
1 parent 3c0d0a5 commit d07db5b

File tree

7 files changed

+11
-13
lines changed

7 files changed

+11
-13
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,3 @@ updates:
3232
update-types: ["version-update:semver-major"]
3333
- dependency-name: "chai-as-promised"
3434
update-types: ["version-update:semver-major"]
35-
- dependency-name: "filesize"
36-
versions: [ ">= 10.1.3" ]

extension/chrome/elements/pgp_block.htm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<script src="/lib/sweetalert2.js"></script>
4242
<script src="/lib/linkify.min.js"></script>
4343
<script src="/lib/linkify-html.min.js"></script>
44-
<script src="/lib/filesize.js"></script>
4544
<script src="pgp_block.js" type="module"></script>
4645
</body>
4746
</html>

extension/chrome/elements/pgp_block_modules/pgp-block-attachments-module.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import { XssSafeFactory } from '../../../js/common/xss-safe-factory.js';
1414
import { Str } from '../../../js/common/core/common.js';
1515
import { AttachmentWarnings } from '../shared/attachment_warnings.js';
1616
import { MsgUtil } from '../../../js/common/core/crypto/pgp/msg-util.js';
17-
18-
declare const filesize: { filesize: (size: number) => number };
17+
import { filesize } from 'filesize';
1918

2019
export class PgpBlockViewAttachmentsModule {
2120
public includedAttachments: Attachment[] = [];
@@ -28,7 +27,9 @@ export class PgpBlockViewAttachmentsModule {
2827
for (const i of attachments.keys()) {
2928
const name = attachments[i].name ? Str.stripPgpOrGpgExtensionIfPresent(attachments[i].name) : 'noname';
3029
const nameVisible = name.length > 100 ? name.slice(0, 100) + '…' : name;
31-
const size = filesize.filesize(attachments[i].length);
30+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
31+
const size = filesize(attachments[i].length);
32+
3233
const htmlContent = `<b>${Xss.escape(nameVisible)}</b>&nbsp;&nbsp;&nbsp;${size}<span class="progress"><span class="percent"></span></span>`;
3334
const attachment = $(`<a href="#" index="${Number(i)}">`);
3435
attachment.attr('title', name);

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"bootstrap": "4.6.2",
4949
"clipboard": "2.0.11",
5050
"dompurify": "3.2.5",
51-
"filesize": "10.1.2",
51+
"filesize": "10.1.6",
5252
"fs-extra": "^11.3.0",
5353
"globby": "^14.1.0",
5454
"iso-8859-2": "1.0.0",

scripts/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const copyDependencies = async () => {
6262
['squire-rte/dist/squire.js', 'lib/squire.js'],
6363
['clipboard/dist/clipboard.js', 'lib/clipboard.js'],
6464
['@flowcrypt/fine-uploader/fine-uploader/fine-uploader.js', 'lib/fine-uploader.js'],
65-
['filesize/dist/filesize.js', 'lib/filesize.js'],
65+
['filesize/dist/filesize.esm.js', 'lib/filesize.js'],
6666
// Using legacy build due to Puppeteer compatibility issue (Promise.withResolvers error)
6767
// Reference: https://github.com/mozilla/pdf.js/issues/18006#issuecomment-2078739672
6868
['pdfjs-dist/legacy/build/pdf.min.mjs', 'lib/pdf.min.mjs'],

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"dompurify": ["../node_modules/dompurify/dist/purify.cjs.d.ts", "lib/purify.js", "COMMENT"],
2828
"fine-uploader": ["lib/fine-uploader.js", "COMMENT"],
2929
"clipboard": ["lib/clipboard.js", "COMMENT"],
30-
"filesize": ["lib/filesize.js", "COMMENT"],
30+
"filesize": ["lib/filesize.js", "../node_modules/filesize/types/filesize.d.ts"],
3131
"iso-8859-2": ["lib/iso-8859-2.js", "COMMENT"],
3232
"zxcvbn": ["lib/zxcvbn.js", "COMMENT"],
3333
"emailjs-mime-parser": ["lib/emailjs/emailjs-mime-parser.js", "COMMENT"],

0 commit comments

Comments
 (0)