Yuki Takei 9 лет назад
Родитель
Сommit
75e21de553
2 измененных файлов с 9 добавлено и 9 удалено
  1. 3 7
      lib/views/layout/layout.html
  2. 6 2
      lib/views/page_presentation.html

+ 3 - 7
lib/views/layout/layout.html

@@ -24,18 +24,14 @@
 
   {% if env === 'development' %}
     <script src="/js/dll/vendor.dll.js"></script>
-  {% endif %}
-
-  <script src="{{ webpack_asset('commons').js }}"></script>
-
-  {% if env === 'development' %}
+    <script src="{{ webpack_asset('commons').js }}"></script>
     <script src="{{ webpack_asset('style').js }}"></script>
   {% else %}
-    <link rel="stylesheet" href="/css/style.css">
+    <script src="{{ webpack_asset('commons').js }}" async defer></script>
   {% endif %}
 
   {% if config.crowi['plugin:isEnabledPlugins'] %}
-    <script src="{{ webpack_asset('plugin').js }}" defer></script>
+    <script src="{{ webpack_asset('plugin').js }}" async defer></script>
   {% endif %}
   <script src="{{ webpack_asset('legacy').js }}" defer></script>
   <script src="{{ webpack_asset('app').js }}" defer></script>

+ 6 - 2
lib/views/page_presentation.html

@@ -12,8 +12,13 @@
 
     {% if env === 'development' %}
       <script src="/js/dll/vendor.dll.js"></script>
+      <script src="{{ webpack_asset('commons').js }}"></script>
+      <script src="{{ webpack_asset('style').js }}"></script>
+    {% else %}
+      <script src="{{ webpack_asset('commons').js }}" async defer></script>
     {% endif %}
-    <script src="{{ webpack_asset('commons').js }}"></script>
+
+    <script src="{{ webpack_asset('presentation').js }}" defer></script>
 
     <title>{{ path|path2name }} | {{ path }}</title>
   </head>
@@ -32,6 +37,5 @@
       </div>
     </div>
 
-    <script src="{{ webpack_asset('presentation').js }}"></script>
   </body>
 </html>