diff --git a/package-lock.json b/package-lock.json
index 1cdd9f97b89..f714437c002 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.2",
         "pdfjs-dist": "5.4.149",
         "prettier": "^3.6.2",
         "puppeteer": "24.18.0",
@@ -7391,9 +7391,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.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 4ccc6c827a6..95b5a329cc2 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.2",
     "pdfjs-dist": "5.4.149",
     "prettier": "^3.6.2",
     "puppeteer": "24.18.0",
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) => {