diff --git a/django/contrib/staticfiles/storage.py b/django/contrib/staticfiles/storage.py
index 445cf6b954..91c2dab87e 100644
--- a/django/contrib/staticfiles/storage.py
+++ b/django/contrib/staticfiles/storage.py
@@ -4,6 +4,8 @@ import posixpath
 import re
 from urllib.parse import unquote, urldefrag, urlsplit, urlunsplit
 
+import pyparsing
+
 from django.conf import STATICFILES_STORAGE_ALIAS, settings
 from django.contrib.staticfiles.utils import check_settings, matches_patterns
 from django.core.exceptions import ImproperlyConfigured
@@ -103,6 +105,7 @@ class HashedFilesMixin:
         super().__init__(*args, **kwargs)
         self._patterns = {}
         self.hashed_files = {}
+        self.comment_remover = pyparsing.cpp_style_comment.suppress()
         for extension, patterns in self.patterns:
             for pattern in patterns:
                 if isinstance(pattern, (tuple, list)):
@@ -363,7 +366,12 @@ class HashedFilesMixin:
                                 try:
                                     content = pattern.sub(converter, content)
                                 except ValueError as exc:
-                                    yield name, None, exc, False
+                                    # Try a second time with comments removed.
+                                    content = self.comment_remover.transform_string(content)
+                                    try:
+                                        content = pattern.sub(converter, content)
+                                    except ValueError as exc:
+                                        yield name, None, exc, False
                     if hashed_file_exists:
                         self.delete(hashed_name)
                     # then save the processed result
diff --git a/tests/staticfiles_tests/project/documents/cached/module.js b/tests/staticfiles_tests/project/documents/cached/module.js
index 7764e740d6..61def68e9b 100644
--- a/tests/staticfiles_tests/project/documents/cached/module.js
+++ b/tests/staticfiles_tests/project/documents/cached/module.js
@@ -20,3 +20,9 @@ export {
     firstVar as firstVarAlias,
     secondVar as secondVarAlias
 } from "./module_test.js";
+
+// Imports inside comments should be ignored.
+/**
+ * @param {HTMLElement} elt
+ * @returns {import("./htmx").HtmxTriggerSpecification[]}
+ */
diff --git a/tests/staticfiles_tests/test_storage.py b/tests/staticfiles_tests/test_storage.py
index 11b160945e..482ee3b5a3 100644
--- a/tests/staticfiles_tests/test_storage.py
+++ b/tests/staticfiles_tests/test_storage.py
@@ -179,7 +179,7 @@ class TestHashedFiles:
 
     def test_module_import(self):
         relpath = self.hashed_file_path("cached/module.js")
-        self.assertEqual(relpath, "cached/module.55fd6938fbc5.js")
+        self.assertEqual(relpath, "cached/module.7b546b090392.js")
         tests = [
             # Relative imports.
             b'import testConst from "./module_test.477bbebe77f0.js";',
@@ -207,7 +207,7 @@ class TestHashedFiles:
 
     def test_aggregating_modules(self):
         relpath = self.hashed_file_path("cached/module.js")
-        self.assertEqual(relpath, "cached/module.55fd6938fbc5.js")
+        self.assertEqual(relpath, "cached/module.7b546b090392.js")
         tests = [
             b'export * from "./module_test.477bbebe77f0.js";',
             b'export { testConst } from "./module_test.477bbebe77f0.js";',
