Yuki Takei 5 роки тому
батько
коміт
054bcebb5f

+ 5 - 2
config/webpack.common.js

@@ -166,7 +166,10 @@ module.exports = (options) => {
           },
           commons: {
             test: /(src|resource)[\\/].*\.(js|jsx|json)$/,
-            chunks: 'initial',
+            chunks: (chunk) => {
+              // ignore patterns
+              return chunk.name != null && !chunk.name.match(/boot/);
+            },
             name: 'js/commons',
             minChunks: 2,
             minSize: 1,
@@ -176,7 +179,7 @@ module.exports = (options) => {
             test: /node_modules[\\/].*\.(js|jsx|json)$/,
             chunks: (chunk) => {
               // ignore patterns
-              return chunk.name != null && !chunk.name.match(/legacy-presentation|ie11-polyfill|hackmd-/);
+              return chunk.name != null && !chunk.name.match(/boot|legacy-presentation|ie11-polyfill|hackmd-/);
             },
             name: 'js/vendors',
             minSize: 1,

+ 9 - 0
src/client/js/base.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 
 import loggerFactory from '@alias/logger';
+import Xss from '@commons/service/xss';
 
 import SearchTop from './components/Navbar/SearchTop';
 import NavbarToggler from './components/Navbar/NavbarToggler';
@@ -15,6 +16,14 @@ import PageCreateModal from './components/PageCreateModal';
 
 const logger = loggerFactory('growi:cli:app');
 
+if (!window) {
+  window = {};
+}
+
+// setup xss library
+const xss = new Xss();
+window.xss = xss;
+
 // create unstated container instance
 const appContainer = new AppContainer();
 // eslint-disable-next-line no-unused-vars

+ 0 - 16
src/client/js/boot.js

@@ -1,21 +1,5 @@
-import loggerFactory from '@alias/logger';
-import Xss from '@commons/service/xss';
-
 import {
-  mediaQueryListForDarkMode,
   applyColorScheme,
 } from './util/color-scheme';
 
-const logger = loggerFactory('growi:cli:bootstrap');
-
-if (!window) {
-  window = {};
-}
-
-// setup xss library
-const xss = new Xss();
-window.xss = xss;
-
-logger.debug('Dark Mode:', mediaQueryListForDarkMode.matches);
-
 applyColorScheme();

+ 3 - 2
src/server/views/layout/layout.html

@@ -25,11 +25,12 @@
 
   {% include '../widget/headers/scripts-for-dev.html' %}
 
+  <script src="{{ webpack_asset('js/boot.js') }}"></script>
+
   <script src="{{ webpack_asset('js/vendors.js') }}"></script>
   <script src="{{ webpack_asset('js/commons.js') }}"></script>
-  <script src="{{ webpack_asset('js/boot.js') }}"></script>
   {% if getConfig('crowi', 'plugin:isEnabledPlugins') %}
-  <script src="{{ webpack_asset('js/plugin.js') }}"></script>
+  <script src="{{ webpack_asset('js/plugin.js') }}" defer></script>
   {% endif %}
   {% block html_head_loading_legacy %}
     <script src="{{ webpack_asset('js/legacy.js') }}" defer></script>