From 71965e6b692860cd3cf7b02c179868ac4532f486 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Mon, 2 Jun 2025 18:43:36 +0800 Subject: [PATCH] Fix: Update TypeScript configuration and refactor imports (#5869) --- package.json | 2 +- src/util.js | 44 +++++++++++-------------------------------- src/util.ts | 2 +- tsconfig-backend.json | 9 +++++++++ tsconfig.json | 2 +- 5 files changed, 23 insertions(+), 36 deletions(-) create mode 100644 tsconfig-backend.json diff --git a/package.json b/package.json index 4a5aefd0d..49daa4127 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "test-e2e-ui": "playwright test --config ./config/playwright.config.js --ui --ui-port=51063", "playwright-codegen": "playwright codegen localhost:3000 --save-storage=./private/e2e-auth.json", "playwright-show-report": "playwright show-report ./private/playwright-report", - "tsc": "tsc", + "tsc": "tsc --project ./tsconfig-backend.json", "vite-preview-dist": "vite preview --host --config ./config/vite.config.js", "build-docker-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base2 --target base2 . --push", "build-docker-base-slim": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base2-slim --target base2-slim . --push", diff --git a/src/util.js b/src/util.js index f094cdd63..38c4a22ea 100644 --- a/src/util.js +++ b/src/util.js @@ -8,34 +8,12 @@ // Backend uses the compiled file util.js // Frontend uses util.ts */ -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); - __setModuleDefault(result, mod); - return result; -}; -var __importDefault = (this && this.__importDefault) || function (mod) { - return (mod && mod.__esModule) ? mod : { "default": mod }; -}; var _a; Object.defineProperty(exports, "__esModule", { value: true }); exports.CONSOLE_STYLE_FgPink = exports.CONSOLE_STYLE_FgBrown = exports.CONSOLE_STYLE_FgViolet = exports.CONSOLE_STYLE_FgLightBlue = exports.CONSOLE_STYLE_FgLightGreen = exports.CONSOLE_STYLE_FgOrange = exports.CONSOLE_STYLE_FgGray = exports.CONSOLE_STYLE_FgWhite = exports.CONSOLE_STYLE_FgCyan = exports.CONSOLE_STYLE_FgMagenta = exports.CONSOLE_STYLE_FgBlue = exports.CONSOLE_STYLE_FgYellow = exports.CONSOLE_STYLE_FgGreen = exports.CONSOLE_STYLE_FgRed = exports.CONSOLE_STYLE_FgBlack = exports.CONSOLE_STYLE_Hidden = exports.CONSOLE_STYLE_Reverse = exports.CONSOLE_STYLE_Blink = exports.CONSOLE_STYLE_Underscore = exports.CONSOLE_STYLE_Dim = exports.CONSOLE_STYLE_Bright = exports.CONSOLE_STYLE_Reset = exports.PING_PER_REQUEST_TIMEOUT_DEFAULT = exports.PING_PER_REQUEST_TIMEOUT_MAX = exports.PING_PER_REQUEST_TIMEOUT_MIN = exports.PING_COUNT_DEFAULT = exports.PING_COUNT_MAX = exports.PING_COUNT_MIN = exports.PING_GLOBAL_TIMEOUT_DEFAULT = exports.PING_GLOBAL_TIMEOUT_MAX = exports.PING_GLOBAL_TIMEOUT_MIN = exports.PING_PACKET_SIZE_DEFAULT = exports.PING_PACKET_SIZE_MAX = exports.PING_PACKET_SIZE_MIN = exports.MIN_INTERVAL_SECOND = exports.MAX_INTERVAL_SECOND = exports.SQL_DATETIME_FORMAT_WITHOUT_SECOND = exports.SQL_DATETIME_FORMAT = exports.SQL_DATE_FORMAT = exports.STATUS_PAGE_MAINTENANCE = exports.STATUS_PAGE_PARTIAL_DOWN = exports.STATUS_PAGE_ALL_UP = exports.STATUS_PAGE_ALL_DOWN = exports.MAINTENANCE = exports.PENDING = exports.UP = exports.DOWN = exports.appName = exports.isNode = exports.isDev = void 0; exports.evaluateJsonQuery = exports.intHash = exports.localToUTC = exports.utcToLocal = exports.utcToISODateTime = exports.isoToUTCDateTime = exports.parseTimeFromTimeObject = exports.parseTimeObject = exports.getMaintenanceRelativeURL = exports.getMonitorRelativeURL = exports.genSecret = exports.getCryptoRandomInt = exports.getRandomInt = exports.getRandomArbitrary = exports.TimeLogger = exports.polyfill = exports.log = exports.debug = exports.ucfirst = exports.sleep = exports.flipStatus = exports.badgeConstants = exports.CONSOLE_STYLE_BgGray = exports.CONSOLE_STYLE_BgWhite = exports.CONSOLE_STYLE_BgCyan = exports.CONSOLE_STYLE_BgMagenta = exports.CONSOLE_STYLE_BgBlue = exports.CONSOLE_STYLE_BgYellow = exports.CONSOLE_STYLE_BgGreen = exports.CONSOLE_STYLE_BgRed = exports.CONSOLE_STYLE_BgBlack = void 0; -const dayjs_1 = __importDefault(require("dayjs")); -const jsonata = __importStar(require("jsonata")); +const dayjs = require("dayjs"); +const jsonata = require("jsonata"); exports.isDev = process.env.NODE_ENV === "development"; exports.isNode = typeof process !== "undefined" && ((_a = process === null || process === void 0 ? void 0 : process.versions) === null || _a === void 0 ? void 0 : _a.node); exports.appName = "Uptime Kuma"; @@ -187,11 +165,11 @@ class Logger { module = module.toUpperCase(); level = level.toUpperCase(); let now; - if (dayjs_1.default.tz) { - now = dayjs_1.default.tz(new Date()).format(); + if (dayjs.tz) { + now = dayjs.tz(new Date()).format(); } else { - now = (0, dayjs_1.default)().format(); + now = dayjs().format(); } const levelColor = consoleLevelColors[level]; const moduleColor = consoleModuleColors[intHash(module, consoleModuleColors.length)]; @@ -292,11 +270,11 @@ function polyfill() { exports.polyfill = polyfill; class TimeLogger { constructor() { - this.startTime = (0, dayjs_1.default)().valueOf(); + this.startTime = dayjs().valueOf(); } print(name) { if (exports.isDev && process.env.TIMELOGGER === "1") { - console.log(name + ": " + ((0, dayjs_1.default)().valueOf() - this.startTime) + "ms"); + console.log(name + ": " + (dayjs().valueOf() - this.startTime) + "ms"); } } } @@ -408,19 +386,19 @@ function parseTimeFromTimeObject(obj) { } exports.parseTimeFromTimeObject = parseTimeFromTimeObject; function isoToUTCDateTime(input) { - return (0, dayjs_1.default)(input).utc().format(exports.SQL_DATETIME_FORMAT); + return dayjs(input).utc().format(exports.SQL_DATETIME_FORMAT); } exports.isoToUTCDateTime = isoToUTCDateTime; function utcToISODateTime(input) { - return dayjs_1.default.utc(input).toISOString(); + return dayjs.utc(input).toISOString(); } exports.utcToISODateTime = utcToISODateTime; function utcToLocal(input, format = exports.SQL_DATETIME_FORMAT) { - return dayjs_1.default.utc(input).local().format(format); + return dayjs.utc(input).local().format(format); } exports.utcToLocal = utcToLocal; function localToUTC(input, format = exports.SQL_DATETIME_FORMAT) { - return (0, dayjs_1.default)(input).utc().format(format); + return dayjs(input).utc().format(format); } exports.localToUTC = localToUTC; function intHash(str, length = 10) { diff --git a/src/util.ts b/src/util.ts index 277d860f4..22a40e204 100644 --- a/src/util.ts +++ b/src/util.ts @@ -9,7 +9,7 @@ // Frontend uses util.ts */ -import dayjs from "dayjs"; +import * as dayjs from "dayjs"; // For loading dayjs plugins, don't remove event though it is not used in this file // eslint-disable-next-line @typescript-eslint/no-unused-vars diff --git a/tsconfig-backend.json b/tsconfig-backend.json new file mode 100644 index 000000000..08be7e5bb --- /dev/null +++ b/tsconfig-backend.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "esModuleInterop": false + }, + "files": [ + "./src/util.ts" + ] +} diff --git a/tsconfig.json b/tsconfig.json index 782537e30..a3df45004 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,6 +16,6 @@ "esModuleInterop": true }, "files": [ - "./src/util.ts" + ] }