Skip to content

Commit c8e63bc

Browse files
committed
LPD-52709 Use hashed URLs instead of legacy ones
Note that for some bundles we also hashify the file names to achieve infinite caching.
1 parent f11915e commit c8e63bc

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

modules/apps/frontend-js/frontend-js-loader-modules-extender/src/main/java/com/liferay/frontend/js/loader/modules/extender/internal/servlet/taglib/JSLoaderTopHeadDynamicInclude.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ public void include(
103103
httpServletRequest);
104104

105105
printWriter.write(
106-
absolutePortalURLBuilder.forBundleScript(
107-
_bundle, "/loader.js"
106+
absolutePortalURLBuilder.forWebContextScript(
107+
"frontend-js-loader-modules-extender", "/loader.js"
108108
).build());
109109

110110
printWriter.write("\" type=\"");

modules/apps/frontend-js/frontend-js-lodash-web/src/main/java/com/liferay/frontend/js/lodash/web/internal/servlet/taglib/LodashTopHeadDynamicInclude.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public void include(
6161
printWriter.print(" data-senna-track=\"permanent\" src=\"");
6262

6363
printWriter.print(
64-
absolutePortalURLBuilder.forBundleScript(
65-
_bundleContext.getBundle(), fileName
64+
absolutePortalURLBuilder.forWebContextScript(
65+
"frontend-js-lodash-web", fileName
6666
).build());
6767

6868
printWriter.println("\" type=\"text/javascript\"></script>");

modules/apps/frontend-js/frontend-js-svg4everybody-web/node-scripts.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
customBuild: {
1010
esbuild: {
1111
bundle: true,
12-
entryNames: 'index',
12+
entryNames: 'index.([hash])',
1313
entryPoints: [
1414
path.resolve(
1515
'src',

modules/apps/frontend-js/frontend-js-svg4everybody-web/src/main/java/com/liferay/frontend/js/svg4everybody/web/internal/servlet/taglib/SVG4EverybodyTopHeadDynamicInclude.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.liferay.portal.kernel.util.WebKeys;
2525
import com.liferay.portal.url.builder.AbsolutePortalURLBuilder;
2626
import com.liferay.portal.url.builder.AbsolutePortalURLBuilderFactory;
27-
import com.liferay.portal.url.builder.BundleScriptAbsolutePortalURLBuilder;
27+
import com.liferay.portal.url.builder.WebContextScriptAbsolutePortalURLBuilder;
2828

2929
import jakarta.servlet.http.HttpServletRequest;
3030
import jakarta.servlet.http.HttpServletResponse;
@@ -109,16 +109,16 @@ public void include(
109109
httpServletRequest));
110110
printWriter.print(" data-senna-track=\"permanent\" src=\"");
111111

112-
BundleScriptAbsolutePortalURLBuilder
113-
bundleScriptAbsolutePortalURLBuilder =
114-
absolutePortalURLBuilder.forBundleScript(
115-
_bundleContext.getBundle(), jsFileName);
112+
WebContextScriptAbsolutePortalURLBuilder
113+
webContextScriptAbsolutePortalURLBuilder =
114+
absolutePortalURLBuilder.forWebContextScript(
115+
"frontend-js-svg4everybody-web", jsFileName);
116116

117117
if (!cdnDynamicResourcesEnabled) {
118-
bundleScriptAbsolutePortalURLBuilder.ignoreCDNHost();
118+
webContextScriptAbsolutePortalURLBuilder.ignoreCDNHost();
119119
}
120120

121-
printWriter.print(bundleScriptAbsolutePortalURLBuilder.build());
121+
printWriter.print(webContextScriptAbsolutePortalURLBuilder.build());
122122

123123
printWriter.println("\" type=\"text/javascript\"></script>");
124124
}

modules/apps/frontend-js/frontend-js-web/node-scripts.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
customBuild: {
1010
esbuild: {
1111
bundle: true,
12-
entryNames: 'Liferay',
12+
entryNames: 'Liferay.([hash])',
1313
entryPoints: [
1414
path.resolve(
1515
'src',

modules/apps/frontend-js/frontend-js-web/src/main/java/com/liferay/frontend/js/web/internal/servlet/taglib/LiferayGlobalObjectPostAUIDynamicInclude.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.liferay.portal.kernel.util.Validator;
1515
import com.liferay.portal.url.builder.AbsolutePortalURLBuilder;
1616
import com.liferay.portal.url.builder.AbsolutePortalURLBuilderFactory;
17-
import com.liferay.portal.url.builder.BundleScriptAbsolutePortalURLBuilder;
17+
import com.liferay.portal.url.builder.WebContextScriptAbsolutePortalURLBuilder;
1818

1919
import jakarta.servlet.http.HttpServletRequest;
2020
import jakarta.servlet.http.HttpServletResponse;
@@ -57,14 +57,14 @@ public void include(
5757
_absolutePortalURLBuilderFactory.getAbsolutePortalURLBuilder(
5858
httpServletRequest);
5959

60-
BundleScriptAbsolutePortalURLBuilder
61-
bundleScriptAbsolutePortalURLBuilder =
62-
absolutePortalURLBuilder.forBundleScript(
63-
_bundle, "/Liferay.js");
60+
WebContextScriptAbsolutePortalURLBuilder
61+
webContextScriptAbsolutePortalURLBuilder =
62+
absolutePortalURLBuilder.forWebContextScript(
63+
"frontend-js-web", "/Liferay.js");
6464

6565
_renderScript(
6666
httpServletRequest, httpServletResponse.getWriter(),
67-
bundleScriptAbsolutePortalURLBuilder.build(),
67+
webContextScriptAbsolutePortalURLBuilder.build(),
6868
"text/javascript");
6969
}
7070
catch (Exception exception) {

0 commit comments

Comments
 (0)