Merge branch 'devel' into inherit_buff

hwe/ts/battle_simulator.ts

@@ -1,3 +1,4 @@
+import { exportWindow } from './util/exportWindow';
 import $ from 'jquery';
 import Popper from 'popper.js';
 exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가?
@@ -10,7 +11,6 @@ import { numberWithCommas } from "./util/numberWithCommas";
 import { unwrap_any } from './util/unwrap_any';
 import { BasicGeneralListResponse, InvalidResponse } from './defs';
 import { formatTime } from './util/formatTime';
-import { exportWindow } from './util/exportWindow';
 
 type CityAttackerInfo = {
     level: number,

hwe/ts/bossInfo.ts

@@ -1,10 +1,10 @@
+import { exportWindow } from './util/exportWindow';
 import $ from 'jquery';
 import axios from 'axios';
 import { convertFormData } from './util/convertFormData';
 import { InvalidResponse } from './defs';
 import { unwrap_any } from './util/unwrap_any';
 import { setAxiosXMLHttpRequest } from './util/setAxiosXMLHttpRequest';
-import { exportWindow } from './util/exportWindow';
 import Popper from 'popper.js';
 exportWindow(Popper, 'Popper');
 import 'bootstrap';

hwe/ts/build_exports.json

@@ -1,7 +1,6 @@
 {
     "ingame": {
         "chiefCenter": "chiefCenter.ts",
-        "common": "common_deprecated.ts",
         "troop": "troop.ts",
         "map": "map.ts",
         "install_db": "install_db.ts",
@@ -22,7 +21,8 @@
         "history": "history.ts",
         "join": "join.ts",
         "select_general_from_pool": "select_general_from_pool.ts",
-        "extKingdoms": "extKingdoms.ts"
+        "extKingdoms": "extKingdoms.ts",
+        "common": "common_deprecated.ts"
     },
     "ingame_vue": {
         "v_inheritPoint": "v_inheritPoint.ts",

hwe/ts/common_deprecated.ts

@@ -1,10 +1,10 @@
+import { exportWindow } from "./util/exportWindow";
 import { activateFlip, isBrightColor, getIconPath, errUnknown, errUnknownToast, quickReject, initTooltip } from "./common_legacy";
 import { mb_strwidth } from "./util/mb_strwidth";
 import { TemplateEngine } from "./util/TemplateEngine";
 import { escapeHtml } from "./legacy/escapeHtml";
 import { nl2br } from "./util/nl2br";
 import jQuery from "jquery";
-import { exportWindow } from "./util/exportWindow";
 import Popper from 'popper.js';
 exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가?
 import 'bootstrap';

hwe/ts/gateway/admin_member.ts

@@ -1,5 +1,7 @@
 import axios from 'axios';
 import $ from 'jquery';
+import Popper from 'popper.js';
+exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가?
 import { isNumber } from 'lodash';
 import { TemplateEngine } from '../util/TemplateEngine';
 import { InvalidResponse } from '../defs';

hwe/ts/gateway/admin_server.ts

@@ -1,5 +1,4 @@
-
+import { exportWindow } from '../util/exportWindow';
-import $ from 'jquery';
 import axios from 'axios';
 import { setAxiosXMLHttpRequest } from '../util/setAxiosXMLHttpRequest';
 import { InvalidResponse } from '../defs';
@@ -65,10 +64,6 @@ const serverAdminTemplate = '\
 
 declare global {
     interface Window {
-        modifyServerStatus: (caller: HTMLElement, action: string) => void;
-        Entrance_AdminClosedLogin: (caller: HTMLElement) => void;
-        Entrance_AdminOpen119: (caller: HTMLElement) => void;
-        serverUpdate: (caller: HTMLElement) => void;
         adminGrade: number;
         aclList: Record<string, string[]>;
     }
@@ -218,11 +213,6 @@ export async function loadPlugin(): Promise<void> {
 
     Entrance_AdminInit();
 
-    window.modifyServerStatus = modifyServerStatus;
-    window.Entrance_AdminClosedLogin = Entrance_AdminClosedLogin;
-    window.Entrance_AdminOpen119 = Entrance_AdminOpen119;
-    window.serverUpdate = serverUpdate;
-
     const response = await axios({
         url: 'j_server_get_admin_status.php',
         method: 'post',
@@ -330,3 +320,8 @@ function Entrance_AdminOpen119(caller: HTMLElement) {
     const serverDir = $caller.parents('tr').data('server_name');
     location.href = `../${serverDir}/_119.php`;
 }
+
+exportWindow(modifyServerStatus, 'modifyServerStatus');
+exportWindow(Entrance_AdminClosedLogin, 'Entrance_AdminClosedLogin');
+exportWindow(Entrance_AdminOpen119, 'Entrance_AdminOpen119');
+exportWindow(serverUpdate, 'serverUpdate');

hwe/ts/gateway/common_deprecated.ts

@@ -1 +0,0 @@
-export * from '../common_deprecated';

hwe/ts/gateway/entrance.ts

@@ -1,5 +1,10 @@
-import axios from 'axios';
+import { exportWindow } from '../util/exportWindow';
 import $ from 'jquery';
+exportWindow($, '$');
+import Popper from 'popper.js';
+exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가?
+import axios from 'axios';
+import 'bootstrap';
 import { initTooltip } from '../common_legacy';
 import { TemplateEngine } from "../util/TemplateEngine";
 import { InvalidResponse } from '../defs';
@@ -7,6 +12,7 @@ import { getDateTimeNow } from '../util/getDateTimeNow';
 import { setAxiosXMLHttpRequest } from '../util/setAxiosXMLHttpRequest';
 import { loadPlugin as loadAdminPlugin } from './admin_server';
 
+
 declare const isAdmin: boolean;
 
 const serverListTemplate = "\
@@ -236,6 +242,14 @@ async function Entrance_drawServerList(serverInfos: ServerResponseItem[]) {
             continue;
         }
 
+        if(response.reserved){
+            $serverHtml.find('.server_down').detach();
+            $serverHtml.append(
+                TemplateEngine(serverReservedTemplate, response.reserved)
+            );
+            initTooltip($serverHtml);
+        }
+
         if(!response.game){
             continue;
         }

hwe/ts/myPage.ts

@@ -9,7 +9,7 @@ import { unwrap_any } from './util/unwrap_any';
 
 type LogResponse = {
     result: true;
-    log: Record<number, string>;
+    log: Record<string, string>;
 };
 
 $(function ($) {
@@ -92,10 +92,11 @@ $(function ($) {
         }
 
         const html: string[] = [];
-        for (const [key, item] of Object.entries(result.log)) {
+        for (const key of Object.values(keys)) {
             if ($(`#log_${logType}_${key}`).length) {
                 return true;
             }
+            const item = result.log[key];
             html.push(`<div class='log_${logType}' id='log_${logType}_${key}' data-seq='${key}'>${item}</div>`);
         }
         $(`#${logType}Plate`).append(html.join(''));

i_entrance/entrance.php

@@ -34,9 +34,9 @@ $acl = $session->acl;
         <script>
             var isAdmin = <?=($userGrade >= 5 || $acl)?'true':'false'?>;
         </script>
-        <?=WebUtil::printJS('../d_shared/common_path.js') ?>
+        <?=WebUtil::printJS('../d_shared/common_path.js', true) ?>
-        <?=WebUtil::printJS('../dist_js/vendors.js') ?>
+        <?=WebUtil::printJS('../dist_js/vendors.js', true) ?>
-        <?=WebUtil::printJS('../dist_js/entrance.js')?>
+        <?=WebUtil::printJS('../dist_js/entrance.js', true)?>
 
     </head>
     <body>

package.json

@@ -84,8 +84,10 @@
     "lint"
   ],
   "browserslist": [
+    "last 3 versions",
     "> 0.4%",
-    "not ie <= 11",
+    "not dead",
-    "not op_mini all"
+    "not op_mini all",
+    "not ie <= 11"
   ]
-}
+}

webpack.config.cjs

@@ -247,7 +247,6 @@ module.exports = (env, argv) => {
         },
         mode,
         entry: {
-            common: `${tsDir}/gateway/common_deprecated.ts`,
             entrance: `${tsDir}/gateway/entrance.ts`,
             user_info: `${tsDir}/gateway/user_info.ts`,
             admin_member: `${tsDir}/gateway/admin_member.ts`,