Przeglądaj źródła

refactor bootstrap.jsx -> base.jsx

Yuki Takei 5 lat temu
rodzic
commit
3974bf3091

+ 2 - 1
config/logger/config.dev.js

@@ -30,7 +30,8 @@ module.exports = {
   /*
    * configure level for client
    */
-  'growi:app': 'debug',
+  'growi:cli:bootstrap': 'debug',
+  'growi:cli:app': 'debug',
   'growi:services:*': 'debug',
   // 'growi:StaffCredit': 'debug',
   // 'growi:TableOfContents': 'debug',

+ 1 - 1
src/client/js/admin.jsx

@@ -41,7 +41,7 @@ import AdminGitHubSecurityContainer from './services/AdminGitHubSecurityContaine
 import AdminTwitterSecurityContainer from './services/AdminTwitterSecurityContainer';
 import AdminNotificationContainer from './services/AdminNotificationContainer';
 
-import { appContainer, componentMappings } from './bootstrap';
+import { appContainer, componentMappings } from './base';
 
 const logger = loggerFactory('growi:admin');
 

+ 2 - 2
src/client/js/app.jsx

@@ -40,9 +40,9 @@ import GrowiSubNavigation from './components/Navbar/GrowiSubNavigation';
 import GrowiSubNavigationForUserPage from './components/Navbar/GrowiSubNavigationForUserPage';
 import PersonalContainer from './services/PersonalContainer';
 
-import { appContainer, componentMappings } from './bootstrap';
+import { appContainer, componentMappings } from './base';
 
-const logger = loggerFactory('growi:app');
+const logger = loggerFactory('growi:cli:app');
 
 const { i18n } = appContainer;
 const websocketContainer = appContainer.getContainer('WebsocketContainer');

+ 3 - 11
src/client/js/bootstrap.jsx → src/client/js/base.jsx

@@ -14,26 +14,18 @@ import WebsocketContainer from './services/WebsocketContainer';
 import PageCreateButton from './components/Navbar/PageCreateButton';
 import PageCreateModal from './components/PageCreateModal';
 
-const logger = loggerFactory('growi:app');
-
-if (!window) {
-  window = {};
-}
-
-// setup xss library
-const xss = new Xss();
-window.xss = xss;
+const logger = loggerFactory('growi:cli:app');
 
 // create unstated container instance
 const appContainer = new AppContainer();
 // eslint-disable-next-line no-unused-vars
 const websocketContainer = new WebsocketContainer(appContainer);
 
-logger.info('unstated containers have been initialized');
-
 appContainer.init();
 appContainer.injectToWindow();
 
+logger.info('AppContainer has been initialized');
+
 /**
  * define components
  *  key: id of element