This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/master by this push:
new 5db995d90 TAP5-2803: trying to figure out the suffix.mjs test failure
5db995d90 is described below
commit 5db995d901da6c39c9fb2c9e85cc4221133f1b7b
Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br>
AuthorDate: Wed May 7 11:29:04 2025 -0300
TAP5-2803: trying to figure out the suffix.mjs test failure
---
.../internal/services/javascript/EsModuleManagerImpl.java | 9 +++------
.../org/apache/tapestry5/integration/app1/EsModuleTests.java | 12 +++++++++++-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/EsModuleManagerImpl.java
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/EsModuleManagerImpl.java
index c383608a6..f65cc7a49 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/EsModuleManagerImpl.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/EsModuleManagerImpl.java
@@ -176,12 +176,9 @@ public class EsModuleManagerImpl implements EsModuleManager
executeCallbacks(newImportMap, moduleConfigurationCallbacks);
executeCallbacks(newImportMap, globalPerRequestCallbacks);
- if (!newImportMap.in(IMPORTS_ATTRIBUTE).isEmpty())
- {
- head.element("script")
- .attribute("type", "importmap")
- .text(newImportMap.toString(compactJSON));
- }
+ head.element("script")
+ .attribute("type", "importmap")
+ .text(newImportMap.toString(compactJSON));
}
@Override
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/EsModuleTests.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/EsModuleTests.java
index 671550275..c7577e640 100644
---
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/EsModuleTests.java
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/EsModuleTests.java
@@ -55,6 +55,7 @@ public class EsModuleTests extends App1TestCase
JSONObject importMap = getImportMap();
assertModuleUrlSuffix("foo/bar", "/es-modules/foo/bar.js", importMap);
assertModuleUrlSuffix("root-folder", "/es-modules/root-folder.js",
importMap);
+ assertModuleUrlSuffix("suffix", "/es-modules/suffix.mjs", importMap);
}
/**
@@ -129,7 +130,6 @@ public class EsModuleTests extends App1TestCase
assertEquals(getText("body-top-message"), "ES module imported
correctly (<body> top)!");
assertEquals(getText("body-bottom-message"), "ES module imported
correctly (<body> bottom)!");
assertEquals(getText("outside-metainf-message"), "ES module correctly
imported from outside /META-INF/assets/es-modules!");
- assertEquals(getText("suffix-message"), "ES module imported correctly
from .mjs file!");
}
@@ -142,7 +142,10 @@ public class EsModuleTests extends App1TestCase
public void at_import_esModule() throws InterruptedException
{
openLinks(PAGE_NAME);
+ assertScriptElement("root-folder");
+ assertScriptElement("suffix");
assertEquals(getText("root-folder-message"), "ES module imported
correctly from the root folder!");
+ assertEquals(getText("suffix-message"), "ES module imported correctly
from .mjs file!");
}
/**
@@ -222,6 +225,13 @@ public class EsModuleTests extends App1TestCase
assertEquals(url, urlSuffix, String.format("Unexpected URL %s for
module %s (expected %s suffix)", url, id, urlSuffix));
}
+ private void assertScriptElement(String moduleId)
+ {
+ assertTrue(
+
isElementPresent(String.format("//script[@data-module-id='%s']", moduleId)),
+ "<script> element for ES module found: " + moduleId);
+ }
+
private JSONObject getImportMap()
{
return new JSONObject(getText("import-map-listing"));
