Skip to content

Commit bb1a643

Browse files
skerdudouskerdudou
committed
[Ui] Move scripts inclusion to html <head>
/!\ vu:page parameters moved to vu:head : - vuiDevMode - vuejsDevMode - quasarVersion - vertigoUiVersion and removing libraries_slot (not really usefull, prefer using event listening from vertigo-ui-mpa.js events)
1 parent 0b0b38b commit bb1a643

File tree

2 files changed

+56
-34
lines changed

2 files changed

+56
-34
lines changed

‎vertigo-ui/src/main/resources/io/vertigo/ui/components/layout/head.html

Lines changed: 51 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,58 @@
1-
<th:block th:fragment="head(title, quasarVersion, vueJsVersion, vertigoUiVersion)" >
1+
<th:block th:fragment="head(title, vueJsVersion, vuejsDevMode, vuiDevMode, vuiSsr, vertigoUiVersion, useQuasar, quasarVersion)" >
22
<meta charset="utf8">
3-
<vu:head-meta quasarVersion="${quasarVersion}" vueVersion="${vueJsVersion}" vertigoUiVersion="${vertigoUiVersion}"/>
3+
<vu:head-meta
4+
vueJsVersion="${vueJsVersion}"
5+
vuejsDevMode="${vuejsDevMode}"
6+
vuiDevMode="${vuiDevMode}"
7+
vuiSsr="${vuiSsr}"
8+
vertigoUiVersion="${vertigoUiVersion}"
9+
useQuasar="${useQuasar}"
10+
quasarVersion="${quasarVersion}"/>
411
<vu:content/>
5-
<title vu:text="${title}"></title>
12+
<title vu:text="${title}"></title>
613
</head>
714
</th:block>
815

9-
<th:block th:fragment="head-meta(vuejsDevMode, quasarVersion, vueVersion, vertigoUiVersion)"
10-
th:with="isVuejsDevMode=${vuejsDevMode != null ? vuejsDevMode : false},
11-
myQuasarVersion=${quasarVersion?:'2.16.5'}, myVueJsVersion=${vueVersion?:'3.4.31'}, myVertigoUiVersion=${vertigoUiVersion?:'4.2.0'}">
12-
<link th:href="@{/vertigo-ui/static/3rdParty/roboto/v20/css/roboto.css}" rel="stylesheet" type="text/css"/>
13-
<link th:href="@{/vertigo-ui/static/3rdParty/materialIcons/v142/css/materialIconsOutlined.css}" rel="stylesheet" type="text/css"/>
14-
<link th:href="@{/vertigo-ui/static/3rdParty/materialIcons/v142/css/materialIcons.css}" rel="stylesheet" type="text/css"/>
15-
<link th:href="@{/vertigo-ui/static/3rdParty/use.fontawesome.com/releases/v6.5.2/css/all.min.css}" rel="stylesheet" type="text/css"/>
16-
<link th:href="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/ionicons@4.6.4-1/dist/css/ionicons.min.css}" rel="stylesheet" type="text/css"/>
17-
<link th:href="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/@mdi/font@7.4.47/css/materialdesignicons.min.css}" rel="stylesheet" type="text/css"/>
18-
<link th:href="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/animate.css@4.1.1/animate.min.css}" rel="stylesheet" type="text/css"/>
16+
<th:block th:fragment="head-meta(vueJsVersion, vuejsDevMode, vuiDevMode, vuiSsr, vertigoUiVersion, useQuasar, quasarVersion)"
17+
th:with="isVuiDevMode=${vuiDevMode != null ? vuiDevMode : false},
18+
isVuejsDevMode=${vuejsDevMode != null ? vuejsDevMode : false},
19+
isVuiSsr=${vuiSsr != null ? vuiSsr : false},
20+
myVueJsVersion=${vueJsVersion?:'3.4.31'}, myVertigoUiVersion=${vertigoUiVersion?:'4.2.0'},
21+
myUseQuasar=${useQuasar ?: true}, myQuasarVersion=${quasarVersion?:'2.16.5'}">
22+
23+
<link th:href="@{/vertigo-ui/static/3rdParty/roboto/v20/css/roboto.css}" rel="stylesheet" type="text/css"/>
24+
<link th:href="@{/vertigo-ui/static/3rdParty/materialIcons/v142/css/materialIconsOutlined.css}" rel="stylesheet" type="text/css"/>
25+
<link th:href="@{/vertigo-ui/static/3rdParty/materialIcons/v142/css/materialIcons.css}" rel="stylesheet" type="text/css"/>
26+
<link th:href="@{/vertigo-ui/static/3rdParty/use.fontawesome.com/releases/v6.5.2/css/all.min.css}" rel="stylesheet" type="text/css"/>
27+
<link th:href="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/ionicons@4.6.4-1/dist/css/ionicons.min.css}" rel="stylesheet" type="text/css"/>
28+
<link th:href="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/@mdi/font@7.4.47/css/materialdesignicons.min.css}" rel="stylesheet" type="text/css"/>
29+
<link th:href="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/animate.css@4.1.1/animate.min.css}" rel="stylesheet" type="text/css"/>
30+
31+
32+
<!--/* VueJS */-->
33+
<script th:if="${!isVuejsDevMode}" th:src="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/vue@__${myVueJsVersion}__/dist/vue.global.prod.js}"></script>
34+
<script th:if="${isVuejsDevMode}" th:src="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/vue@__${myVueJsVersion}__/dist/vue.global.js}"></script>
35+
<script th:src="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/axios@1.7.2/dist/axios.min.js}" ></script>
36+
37+
<!--/* Defered scripts */-->
38+
39+
<!--/* Quasar */-->
40+
<th:block th:if="${myUseQuasar}">
1941
<link th:href="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/quasar@__${myQuasarVersion}__/dist/quasar.css}" rel="stylesheet" type="text/css"/>
20-
<link th:href="@{/vertigo-ui/static/css/vertigo-ui.css?v=__${myVertigoUiVersion}__}" rel="stylesheet" type="text/css"/>
21-
22-
<script th:if="${!isVuejsDevMode}" th:src="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/vue@__${myVueJsVersion}__/dist/vue.global.prod.js}"></script>
23-
<script th:if="${isVuejsDevMode}" th:src="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/vue@__${myVueJsVersion}__/dist/vue.global.js}"></script>
24-
<script th:src="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/axios@1.7.2/dist/axios.min.js}" ></script>
42+
<script th:if="${!isVuejsDevMode}" defer th:src="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/quasar@__${myQuasarVersion}__/dist/quasar.umd.prod.js}"></script>
43+
<script th:if="${isVuejsDevMode}" defer th:src="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/quasar@__${myQuasarVersion}__/dist/quasar.umd.js}"></script>
44+
<script defer th:src="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/quasar@__${myQuasarVersion}__/dist/lang/__${model.util.getCurrentLocalePrefixForQuasar()}__.umd.prod.js}"></script>
45+
</th:block>
46+
47+
<!--/* Vertigo UI UMD */-->
48+
<link th:href="@{/vertigo-ui/static/css/vertigo-ui.css?v=__${myVertigoUiVersion}__}" rel="stylesheet" type="text/css"/>
49+
<script th:if="${!isVuiDevMode && !isVuejsDevMode}" defer th:src="@{/vertigo-ui/static/js/vertigo-ui.umd.js?v=__${myVertigoUiVersion}__}"></script>
50+
<script th:if="${!isVuiDevMode && isVuejsDevMode}" defer th:src="@{/vertigo-ui/static/js/vertigo-ui.umd.js?v=__${myVertigoUiVersion}__}"></script>
51+
52+
<script th:if="${isVuiDevMode}" defer type="module" src="http://localhost:3000/@vite/client"></script>
53+
<script th:if="${isVuiDevMode}" defer type="module" src="http://localhost:3000/src/main.js"></script>
54+
55+
<!--/* Vertigo UI MPA */-->
56+
<script th:if="${isVuiSsr}" defer th:src="@{/vertigo-ui/static/js/vertigo-ui-mpa-ssr.js?v=__${myVertigoUiVersion}__}"></script>
57+
<script th:if="${!isVuiSsr}" defer th:src="@{/vertigo-ui/static/js/vertigo-ui-mpa.js?v=__${myVertigoUiVersion}__}" blocking="render"></script>
2558
</th:block>

‎vertigo-ui/src/main/resources/io/vertigo/ui/components/layout/page.html

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
1-
<th:block th:fragment="page(content, vuiDevMode, vuejsDevMode, vuiSsr, libraries_slot, quasarVersion, vertigoUiVersion)"
2-
th:with="isVuiDevMode=${vuiDevMode != null ? vuiDevMode : false},
3-
isVuejsDevMode=${vuejsDevMode != null ? vuejsDevMode : false},
4-
isVuiSsr=${vuiSsr != null ? vuiSsr : false},
5-
pendingAction=${model.vContext['componentStates'].addComponentState('pendingAction').addList('actionNames')},
6-
myQuasarVersion=${quasarVersion?:'2.16.5'},myVertigoUiVersion=${vertigoUiVersion?:'4.2.0'}">
1+
<th:block th:fragment="page(content, vuiSsr)"
2+
th:with="isVuiSsr=${vuiSsr != null ? vuiSsr : false},
3+
pendingAction=${model.vContext['componentStates'].addComponentState('pendingAction').addList('actionNames')}">
74
<div th:if="${!isVuiSsr}" id="page">
85
<vu:content/>
96
</div>
107
<div th:if="${isVuiSsr}" id="page"></div>
118
<vertigo-ssr th:if="${isVuiSsr}">
129
<vu:content/>
1310
</vertigo-ssr>
14-
<script th:if="${!isVuejsDevMode}" th:src="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/quasar@__${myQuasarVersion}__/dist/quasar.umd.prod.js}"></script>
15-
<script th:if="${isVuejsDevMode}" th:src="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/quasar@__${myQuasarVersion}__/dist/quasar.umd.js}"></script>
16-
<script th:src="@{/vertigo-ui/static/3rdParty/cdn.jsdelivr.net/npm/quasar@__${myQuasarVersion}__/dist/lang/__${model.util.getCurrentLocalePrefixForQuasar()}__.umd.prod.js}"></script>
17-
<script th:if="${!isVuiDevMode && !isVuejsDevMode}" th:src="@{/vertigo-ui/static/js/vertigo-ui.umd.js?v=__${myVertigoUiVersion}__}"></script>
18-
<script th:if="${!isVuiDevMode && isVuejsDevMode}" th:src="@{/vertigo-ui/static/js/vertigo-ui.umd.js?v=__${myVertigoUiVersion}__}"></script>
19-
<script th:if="${isVuiDevMode}" type="module" src="http://localhost:3000/@vite/client"></script>
20-
<script th:if="${isVuiDevMode}" type="module" src="http://localhost:3000/src/main.js"></script>
21-
<div vu:slot="libraries_slot" ></div>
11+
2212
<vu:vue-data/>
23-
<script th:if="${isVuiSsr}" defer th:src="@{/vertigo-ui/static/js/vertigo-ui-mpa-ssr.js?v=__${myVertigoUiVersion}__}"></script>
24-
<script th:if="${!isVuiSsr}" defer th:src="@{/vertigo-ui/static/js/vertigo-ui-mpa.js?v=__${myVertigoUiVersion}__}"></script>
13+
2514
</th:block>

0 commit comments

Comments
 (0)