From 0dadd25c98e2cac9200ca0d8fb1b87898f357f33 Mon Sep 17 00:00:00 2001 From: Ioan Moldovan Date: Wed, 3 Sep 2025 05:11:11 -0300 Subject: [PATCH 1/2] feat: upgraded openpgp to 6.21 --- package-lock.json | 8 ++++---- package.json | 2 +- tooling/resolve-modules.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 70ec89a71a1..d74612ff71c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,7 +55,7 @@ "lint-staged": "^16.1.5", "mailparser": "3.7.4", "mkdirp": "3.0.1", - "openpgp": "6.2.0", + "openpgp": "6.2.1", "pdfjs-dist": "5.4.54", "prettier": "^3.6.2", "puppeteer": "24.17.1", @@ -7414,9 +7414,9 @@ } }, "node_modules/openpgp": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/openpgp/-/openpgp-6.2.0.tgz", - "integrity": "sha512-zKbgazxMeGrTqUEWicKufbdcjv2E0om3YVxw+I3hRykp8ODp+yQOJIDqIr1UXJjP8vR2fky3bNQwYoQXyFkYMA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/openpgp/-/openpgp-6.2.1.tgz", + "integrity": "sha512-5vkqxQWgyrfY0shygqJTaCoa4SbPdjrpmtfREyXBBDrXjoRT25edEMQbdKH5/WxDXlLVn9TxPsVrKP72Jjuz2A==", "dev": true, "license": "LGPL-3.0+", "engines": { diff --git a/package.json b/package.json index 54843c962e0..a33a851693c 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lint-staged": "^16.1.5", "mailparser": "3.7.4", "mkdirp": "3.0.1", - "openpgp": "6.2.0", + "openpgp": "6.2.1", "pdfjs-dist": "5.4.54", "prettier": "^3.6.2", "puppeteer": "24.17.1", diff --git a/tooling/resolve-modules.ts b/tooling/resolve-modules.ts index 69ebd153d25..765ac1141ad 100644 --- a/tooling/resolve-modules.ts +++ b/tooling/resolve-modules.ts @@ -36,7 +36,7 @@ for (const moduleName of Object.keys(compilerOptions.paths)) { const namedImportLineRegEx = /^(import (?:.+ from )?['"])([^.][^'"]+)(['"];)\r{0,1}$$/g; const requireLineRegEx = /^(.+require\(['"])([^.][^'"]+)(['"]\)+;)\r{0,1}$$/g; const importLineNotEndingWithJs = /import (?:.+ from )?['"]\.[^'"]+[^.][^j][^s]['"];/g; -const importLineEndingWithJsNotStartingWithDot = /import (?:.+ from )?['"][^.][^'"]+\.js['"];/g; +const importLineEndingWithJsNotStartingWithDot = /^(?!\s*\/\/)(?!\s*\/\*)(?:\s*import (?:.+ from )?['"][^.][^'"]+\.js['"];)/gm; const resolveLineImports = (regex: RegExp, line: string, path: string) => line.replace(regex, (found, prefix, libname: string, suffix) => { From 4b8a4a01791e9df764d14ff8e41dc2b64b9da62b Mon Sep 17 00:00:00 2001 From: Roma Sosnovsky Date: Thu, 4 Sep 2025 11:29:08 +0300 Subject: [PATCH 2/2] openpgp 6.2.2 --- package-lock.json | 10 +++++----- package.json | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3f04da6180..f714437c002 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,8 +55,8 @@ "lint-staged": "^16.1.5", "mailparser": "3.7.4", "mkdirp": "3.0.1", - "openpgp": "6.2.1", - "pdfjs-dist": "5.4.54", + "openpgp": "6.2.2", + "pdfjs-dist": "5.4.149", "prettier": "^3.6.2", "puppeteer": "24.18.0", "stylelint": "16.23.1", @@ -7391,9 +7391,9 @@ } }, "node_modules/openpgp": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/openpgp/-/openpgp-6.2.1.tgz", - "integrity": "sha512-5vkqxQWgyrfY0shygqJTaCoa4SbPdjrpmtfREyXBBDrXjoRT25edEMQbdKH5/WxDXlLVn9TxPsVrKP72Jjuz2A==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/openpgp/-/openpgp-6.2.2.tgz", + "integrity": "sha512-P/dyEqQ3gfwOCo+xsqffzXjmUhGn4AZTOJ1LCcN21S23vAk+EAvMJOQTsb/C8krL6GjOSBxqGYckhik7+hneNw==", "dev": true, "license": "LGPL-3.0+", "engines": { diff --git a/package.json b/package.json index 83a583d69af..95b5a329cc2 100644 --- a/package.json +++ b/package.json @@ -30,8 +30,8 @@ "lint-staged": "^16.1.5", "mailparser": "3.7.4", "mkdirp": "3.0.1", - "openpgp": "6.2.1", - "pdfjs-dist": "5.4.54", + "openpgp": "6.2.2", + "pdfjs-dist": "5.4.149", "prettier": "^3.6.2", "puppeteer": "24.18.0", "stylelint": "16.23.1",