diff --git a/back/config/serverEnv.ts b/back/config/serverEnv.ts index 95f67110..bbb9fc15 100644 --- a/back/config/serverEnv.ts +++ b/back/config/serverEnv.ts @@ -1,5 +1,5 @@ import { Request, Response } from 'express'; -import { pick } from 'lodash'; +import pick from 'lodash/pick'; let pickedEnv: Record; diff --git a/back/index.d.ts b/back/index.d.ts index 8fba99c8..4301a545 100644 --- a/back/index.d.ts +++ b/back/index.d.ts @@ -3,3 +3,5 @@ declare namespace Express { platform: 'desktop' | 'mobile'; } } + +declare module 'pstree.remy'; diff --git a/back/loaders/initTask.ts b/back/loaders/initTask.ts index 71ebc48e..fa84ddb0 100644 --- a/back/loaders/initTask.ts +++ b/back/loaders/initTask.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; import SystemService from '../services/system'; -import ScheduleService from '../services/schedule'; +import ScheduleService, { ScheduleTaskType } from '../services/schedule'; import SubscriptionService from '../services/subscription'; import config from '../config'; import { fileExist } from '../config/util'; @@ -22,7 +22,7 @@ export default async () => { id: NaN, name: '生成token', command: tokenCommand, - }; + } as ScheduleTaskType; await scheduleService.cancelIntervalTask(cron); scheduleService.createIntervalTask(cron, { days: 28, diff --git a/back/services/schedule.ts b/back/services/schedule.ts index a17195dc..0e6cf4a2 100644 --- a/back/services/schedule.ts +++ b/back/services/schedule.ts @@ -12,7 +12,7 @@ import dayjs from 'dayjs'; import taskLimit from '../shared/pLimit'; import { spawn } from 'cross-spawn'; -interface ScheduleTaskType { +export interface ScheduleTaskType { id: number; command: string; name?: string; diff --git a/back/services/system.ts b/back/services/system.ts index d24c36e6..88c61760 100644 --- a/back/services/system.ts +++ b/back/services/system.ts @@ -28,7 +28,7 @@ import taskLimit from '../shared/pLimit'; import tar from 'tar'; import path from 'path'; import fs from 'fs'; -import { sum } from 'lodash'; +import sum from 'lodash/sum'; @Service() export default class SystemService { @@ -84,7 +84,7 @@ export default class SystemService { }); if (info.logRemoveFrequency) { const cron = { - id: result.id, + id: result.id || NaN, name: '删除日志', command: `ql rmlog ${info.logRemoveFrequency}`, }; diff --git a/nodemon.json b/nodemon.json index 02fed196..23ebe045 100644 --- a/nodemon.json +++ b/nodemon.json @@ -1,6 +1,5 @@ { "watch": ["back", ".env"], "ext": "js,ts,json", - "ignore": ["src/**/*.spec.ts"], - "exec": "ts-node --transpile-only ./back/app.ts" + "exec": "ts-node -P tsconfig.back.json ./back/app.ts" } diff --git a/package.json b/package.json index 9afdc0d3..621e091f 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "start": "concurrently -n w: npm:start:*", "start:front": "max dev", "start:back": "nodemon", - "start:public": "ts-node --transpile-only ./back/public.ts", - "start:rpc": "ts-node --transpile-only ./back/schedule/index.ts", + "start:public": "ts-node -P tsconfig.back.json ./back/public.ts", + "start:rpc": "ts-node -P tsconfig.back.json ./back/schedule/index.ts", "build:front": "max build", "build:back": "tsc -p tsconfig.back.json", "panel": "npm run build:back && node static/build/app.js", @@ -69,11 +69,11 @@ "dotenv": "^16.0.0", "express": "^4.17.3", "express-jwt": "^6.1.1", - "express-rate-limit": "^6.7.0", + "express-rate-limit": "^7.0.0", "express-urlrewrite": "^1.4.0", "form-data": "^4.0.0", "got": "^11.8.2", - "hpagent": "^0.1.2", + "hpagent": "^1.2.0", "http-proxy-middleware": "^2.0.6", "iconv-lite": "^0.6.3", "js-yaml": "^4.1.0", @@ -162,7 +162,7 @@ "ts-proto": "^1.146.0", "tslib": "^2.4.0", "tsx": "^3.12.3", - "typescript": "4.8.4", + "typescript": "5.2.2", "vh-check": "^2.0.5", "virtualizedtableforantd4": "1.3.0", "webpack": "^5.70.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fb6b74c4..451c8c42 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,8 +44,8 @@ dependencies: specifier: ^6.1.1 version: 6.1.2 express-rate-limit: - specifier: ^6.7.0 - version: 6.7.0(express@4.18.2) + specifier: ^7.0.0 + version: 7.0.0(express@4.18.2) express-urlrewrite: specifier: ^1.4.0 version: 1.4.0 @@ -56,8 +56,8 @@ dependencies: specifier: ^11.8.2 version: 11.8.6 hpagent: - specifier: ^0.1.2 - version: 0.1.2 + specifier: ^1.2.0 + version: 1.2.0 http-proxy-middleware: specifier: ^2.0.6 version: 2.0.6(@types/express@4.17.17) @@ -224,7 +224,7 @@ devDependencies: version: 4.21.9(@babel/runtime@7.22.3)(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.9.0)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.2.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.16.0)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0) '@umijs/max': specifier: ^4.0.72 - version: 4.0.72(@types/node@17.0.45)(@types/react-dom@18.2.4)(@types/react@18.2.8)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sockjs-client@1.6.1)(typescript@4.8.4)(webpack@5.85.1) + version: 4.0.72(@types/node@17.0.45)(@types/react-dom@18.2.4)(@types/react@18.2.8)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sockjs-client@1.6.1)(typescript@5.2.2)(webpack@5.85.1) '@umijs/ssr-darkreader': specifier: ^4.9.45 version: 4.9.45 @@ -308,7 +308,7 @@ devDependencies: version: 1.6.1 ts-node: specifier: ^10.6.0 - version: 10.9.1(@types/node@17.0.45)(typescript@4.8.4) + version: 10.9.1(@types/node@17.0.45)(typescript@5.2.2) ts-proto: specifier: ^1.146.0 version: 1.148.2 @@ -319,8 +319,8 @@ devDependencies: specifier: ^3.12.3 version: 3.12.7 typescript: - specifier: 4.8.4 - version: 4.8.4 + specifier: 5.2.2 + version: 5.2.2 vh-check: specifier: ^2.0.5 version: 2.0.5 @@ -5117,7 +5117,7 @@ packages: '@types/yargs-parser': 21.0.0 dev: true - /@typescript-eslint/eslint-plugin@5.48.1(@typescript-eslint/parser@5.48.1)(eslint@8.35.0)(typescript@4.8.4): + /@typescript-eslint/eslint-plugin@5.48.1(@typescript-eslint/parser@5.48.1)(eslint@8.35.0)(typescript@5.2.2): resolution: {integrity: sha512-9nY5K1Rp2ppmpb9s9S2aBiF3xo5uExCehMDmYmmFqqyxgenbHJ3qbarcLt4ITgaD6r/2ypdlcFRdcuVPnks+fQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5130,23 +5130,23 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.48.1(eslint@8.35.0)(typescript@4.8.4) + '@typescript-eslint/parser': 5.48.1(eslint@8.35.0)(typescript@5.2.2) '@typescript-eslint/scope-manager': 5.48.1 - '@typescript-eslint/type-utils': 5.48.1(eslint@8.35.0)(typescript@4.8.4) - '@typescript-eslint/utils': 5.48.1(eslint@8.35.0)(typescript@4.8.4) + '@typescript-eslint/type-utils': 5.48.1(eslint@8.35.0)(typescript@5.2.2) + '@typescript-eslint/utils': 5.48.1(eslint@8.35.0)(typescript@5.2.2) debug: 4.3.4 eslint: 8.35.0 ignore: 5.2.4 natural-compare-lite: 1.4.0 regexpp: 3.2.0 semver: 7.5.1 - tsutils: 3.21.0(typescript@4.8.4) - typescript: 4.8.4 + tsutils: 3.21.0(typescript@5.2.2) + typescript: 5.2.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@5.48.1(eslint@8.35.0)(typescript@4.8.4): + /@typescript-eslint/parser@5.48.1(eslint@8.35.0)(typescript@5.2.2): resolution: {integrity: sha512-4yg+FJR/V1M9Xoq56SF9Iygqm+r5LMXvheo6DQ7/yUWynQ4YfCRnsKuRgqH4EQ5Ya76rVwlEpw4Xu+TgWQUcdA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5160,10 +5160,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.48.1 '@typescript-eslint/types': 5.48.1 - '@typescript-eslint/typescript-estree': 5.48.1(typescript@4.8.4) + '@typescript-eslint/typescript-estree': 5.48.1(typescript@5.2.2) debug: 4.3.4 eslint: 8.35.0 - typescript: 4.8.4 + typescript: 5.2.2 transitivePeerDependencies: - supports-color dev: true @@ -5184,7 +5184,7 @@ packages: '@typescript-eslint/visitor-keys': 5.59.9 dev: true - /@typescript-eslint/type-utils@5.48.1(eslint@8.35.0)(typescript@4.8.4): + /@typescript-eslint/type-utils@5.48.1(eslint@8.35.0)(typescript@5.2.2): resolution: {integrity: sha512-Hyr8HU8Alcuva1ppmqSYtM/Gp0q4JOp1F+/JH5D1IZm/bUBrV0edoewQZiEc1r6I8L4JL21broddxK8HAcZiqQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5196,12 +5196,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.48.1(typescript@4.8.4) - '@typescript-eslint/utils': 5.48.1(eslint@8.35.0)(typescript@4.8.4) + '@typescript-eslint/typescript-estree': 5.48.1(typescript@5.2.2) + '@typescript-eslint/utils': 5.48.1(eslint@8.35.0)(typescript@5.2.2) debug: 4.3.4 eslint: 8.35.0 - tsutils: 3.21.0(typescript@4.8.4) - typescript: 4.8.4 + tsutils: 3.21.0(typescript@5.2.2) + typescript: 5.2.2 transitivePeerDependencies: - supports-color dev: true @@ -5216,7 +5216,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree@5.48.1(typescript@4.8.4): + /@typescript-eslint/typescript-estree@5.48.1(typescript@5.2.2): resolution: {integrity: sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5231,13 +5231,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.1 - tsutils: 3.21.0(typescript@4.8.4) - typescript: 4.8.4 + tsutils: 3.21.0(typescript@5.2.2) + typescript: 5.2.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@5.59.9(typescript@4.8.4): + /@typescript-eslint/typescript-estree@5.59.9(typescript@5.2.2): resolution: {integrity: sha512-pmM0/VQ7kUhd1QyIxgS+aRvMgw+ZljB3eDb+jYyp6d2bC0mQWLzUDF+DLwCTkQ3tlNyVsvZRXjFyV0LkU/aXjA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5252,13 +5252,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.1 - tsutils: 3.21.0(typescript@4.8.4) - typescript: 4.8.4 + tsutils: 3.21.0(typescript@5.2.2) + typescript: 5.2.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.48.1(eslint@8.35.0)(typescript@4.8.4): + /@typescript-eslint/utils@5.48.1(eslint@8.35.0)(typescript@5.2.2): resolution: {integrity: sha512-SmQuSrCGUOdmGMwivW14Z0Lj8dxG1mOFZ7soeJ0TQZEJcs3n5Ndgkg0A4bcMFzBELqLJ6GTHnEU+iIoaD6hFGA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5271,7 +5271,7 @@ packages: '@types/semver': 7.5.0 '@typescript-eslint/scope-manager': 5.48.1 '@typescript-eslint/types': 5.48.1 - '@typescript-eslint/typescript-estree': 5.48.1(typescript@4.8.4) + '@typescript-eslint/typescript-estree': 5.48.1(typescript@5.2.2) eslint: 8.35.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0(eslint@8.35.0) @@ -5281,7 +5281,7 @@ packages: - typescript dev: true - /@typescript-eslint/utils@5.59.9(eslint@8.35.0)(typescript@4.8.4): + /@typescript-eslint/utils@5.59.9(eslint@8.35.0)(typescript@5.2.2): resolution: {integrity: sha512-1PuMYsju/38I5Ggblaeb98TOoUvjhRvLpLa1DoTOFaLWqaXl/1iQ1eGurTXgBY58NUdtfTXKP5xBq7q9NDaLKg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5295,7 +5295,7 @@ packages: '@types/semver': 7.5.0 '@typescript-eslint/scope-manager': 5.59.9 '@typescript-eslint/types': 5.59.9 - '@typescript-eslint/typescript-estree': 5.59.9(typescript@4.8.4) + '@typescript-eslint/typescript-estree': 5.59.9(typescript@5.2.2) eslint: 8.35.0 eslint-scope: 5.1.1 semver: 7.5.1 @@ -5486,7 +5486,7 @@ packages: - terser dev: true - /@umijs/bundler-webpack@4.0.72(sockjs-client@1.6.1)(typescript@4.8.4)(webpack@5.85.1): + /@umijs/bundler-webpack@4.0.72(sockjs-client@1.6.1)(typescript@5.2.2)(webpack@5.85.1): resolution: {integrity: sha512-0oTvna4AdMoSvRWeF0E8u8/aKASwll226DkLKvjYDs5FE9nhbxIHevsoSRX7TnlEDPNfV/a3kVRnRG1dR2oJnQ==} hasBin: true dependencies: @@ -5503,7 +5503,7 @@ packages: cors: 2.8.5 css-loader: 6.7.1(webpack@5.85.1) es5-imcompatible-versions: 0.1.83 - fork-ts-checker-webpack-plugin: 8.0.0(typescript@4.8.4)(webpack@5.85.1) + fork-ts-checker-webpack-plugin: 8.0.0(typescript@5.2.2)(webpack@5.85.1) jest-worker: 29.4.3 lightningcss: 1.19.0 node-libs-browser: 2.2.1 @@ -5648,16 +5648,16 @@ packages: query-string: 6.14.1 dev: true - /@umijs/lint@4.0.72(eslint@8.35.0)(stylelint@14.8.2)(typescript@4.8.4): + /@umijs/lint@4.0.72(eslint@8.35.0)(stylelint@14.8.2)(typescript@5.2.2): resolution: {integrity: sha512-kH3L81Rex+jj5WeyJjR2G6yI1/0KFpr91ZtXeMy9Iyd4G7mEUJl3Fl/9iUEwZ2sgUa7kEJ+28H43eER5W4A6bg==} dependencies: '@babel/core': 7.21.0 '@babel/eslint-parser': 7.19.1(@babel/core@7.21.0)(eslint@8.35.0) '@stylelint/postcss-css-in-js': 0.38.0(postcss-syntax@0.36.2)(postcss@8.4.24) - '@typescript-eslint/eslint-plugin': 5.48.1(@typescript-eslint/parser@5.48.1)(eslint@8.35.0)(typescript@4.8.4) - '@typescript-eslint/parser': 5.48.1(eslint@8.35.0)(typescript@4.8.4) + '@typescript-eslint/eslint-plugin': 5.48.1(@typescript-eslint/parser@5.48.1)(eslint@8.35.0)(typescript@5.2.2) + '@typescript-eslint/parser': 5.48.1(eslint@8.35.0)(typescript@5.2.2) '@umijs/babel-preset-umi': 4.0.72 - eslint-plugin-jest: 27.2.1(@typescript-eslint/eslint-plugin@5.48.1)(eslint@8.35.0)(typescript@4.8.4) + eslint-plugin-jest: 27.2.1(@typescript-eslint/eslint-plugin@5.48.1)(eslint@8.35.0)(typescript@5.2.2) eslint-plugin-react: 7.32.2(eslint@8.35.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.35.0) postcss: 8.4.24 @@ -5677,16 +5677,16 @@ packages: - typescript dev: true - /@umijs/max@4.0.72(@types/node@17.0.45)(@types/react-dom@18.2.4)(@types/react@18.2.8)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sockjs-client@1.6.1)(typescript@4.8.4)(webpack@5.85.1): + /@umijs/max@4.0.72(@types/node@17.0.45)(@types/react-dom@18.2.4)(@types/react@18.2.8)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sockjs-client@1.6.1)(typescript@5.2.2)(webpack@5.85.1): resolution: {integrity: sha512-5e5BwaSBCdGWlj0PZ2I73+WLLe/8AibgDt2OtXc86YujRkhSKGY740pYgqy2PAszV8MjDMg8Sqs+gZG13C5z8w==} hasBin: true dependencies: - '@umijs/lint': 4.0.72(eslint@8.35.0)(stylelint@14.8.2)(typescript@4.8.4) + '@umijs/lint': 4.0.72(eslint@8.35.0)(stylelint@14.8.2)(typescript@5.2.2) '@umijs/plugins': 4.0.72(@types/react-dom@18.2.4)(@types/react@18.2.8)(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) eslint: 8.35.0 stylelint: 14.8.2 - umi: 4.0.72(@types/node@17.0.45)(@types/react@18.2.8)(eslint@8.35.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sockjs-client@1.6.1)(stylelint@14.8.2)(typescript@4.8.4)(webpack@5.85.1) + umi: 4.0.72(@types/node@17.0.45)(@types/react@18.2.8)(eslint@8.35.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sockjs-client@1.6.1)(stylelint@14.8.2)(typescript@5.2.2)(webpack@5.85.1) transitivePeerDependencies: - '@babel/core' - '@reduxjs/toolkit' @@ -5794,7 +5794,7 @@ packages: - supports-color dev: true - /@umijs/preset-umi@4.0.72(@types/node@17.0.45)(@types/react@18.2.8)(sockjs-client@1.6.1)(typescript@4.8.4)(webpack@5.85.1): + /@umijs/preset-umi@4.0.72(@types/node@17.0.45)(@types/react@18.2.8)(sockjs-client@1.6.1)(typescript@5.2.2)(webpack@5.85.1): resolution: {integrity: sha512-DDRzPCyP2K667YrOHrexAPcEacTdA9/TBn73erwreZpi+c4qhFZ2eYQo27SAGAhfZlYDYthL8JAfbgfhYmLo1A==} dependencies: '@iconify/utils': 2.1.1 @@ -5804,7 +5804,7 @@ packages: '@umijs/bundler-esbuild': 4.0.72 '@umijs/bundler-utils': 4.0.72 '@umijs/bundler-vite': 4.0.72(@types/node@17.0.45) - '@umijs/bundler-webpack': 4.0.72(sockjs-client@1.6.1)(typescript@4.8.4)(webpack@5.85.1) + '@umijs/bundler-webpack': 4.0.72(sockjs-client@1.6.1)(typescript@5.2.2)(webpack@5.85.1) '@umijs/core': 4.0.72 '@umijs/did-you-know': 1.0.3 '@umijs/es-module-parser': 0.0.7 @@ -8437,7 +8437,7 @@ packages: source-map: 0.6.1 dev: true - /eslint-plugin-jest@27.2.1(@typescript-eslint/eslint-plugin@5.48.1)(eslint@8.35.0)(typescript@4.8.4): + /eslint-plugin-jest@27.2.1(@typescript-eslint/eslint-plugin@5.48.1)(eslint@8.35.0)(typescript@5.2.2): resolution: {integrity: sha512-l067Uxx7ZT8cO9NJuf+eJHvt6bqJyz2Z29wykyEdz/OtmcELQl2MQGQLX8J94O1cSJWAwUSEvCjwjA7KEK3Hmg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -8452,8 +8452,8 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 5.48.1(@typescript-eslint/parser@5.48.1)(eslint@8.35.0)(typescript@4.8.4) - '@typescript-eslint/utils': 5.59.9(eslint@8.35.0)(typescript@4.8.4) + '@typescript-eslint/eslint-plugin': 5.48.1(@typescript-eslint/parser@5.48.1)(eslint@8.35.0)(typescript@5.2.2) + '@typescript-eslint/utils': 5.59.9(eslint@8.35.0)(typescript@5.2.2) eslint: 8.35.0 transitivePeerDependencies: - supports-color @@ -8724,9 +8724,9 @@ packages: lodash: 4.17.21 dev: false - /express-rate-limit@6.7.0(express@4.18.2): - resolution: {integrity: sha512-vhwIdRoqcYB/72TK3tRZI+0ttS8Ytrk24GfmsxDXK9o9IhHNO5bXRiXQSExPQ4GbaE5tvIS7j1SGrxsuWs+sGA==} - engines: {node: '>= 12.9.0'} + /express-rate-limit@7.0.0(express@4.18.2): + resolution: {integrity: sha512-zKMQ9meikj7j3ILeVvHIaBejAYljgDBtGuCfbzNS2d0VCW4s68ONdtEhBJnOGW/Ty1wGeNXgC4m/C1bBUIX0LA==} + engines: {node: '>= 16'} peerDependencies: express: ^4 || ^5 dependencies: @@ -8986,7 +8986,7 @@ packages: is-callable: 1.2.7 dev: true - /fork-ts-checker-webpack-plugin@8.0.0(typescript@4.8.4)(webpack@5.85.1): + /fork-ts-checker-webpack-plugin@8.0.0(typescript@5.2.2)(webpack@5.85.1): resolution: {integrity: sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==} engines: {node: '>=12.13.0', yarn: '>=1.0.0'} peerDependencies: @@ -9008,7 +9008,7 @@ packages: schema-utils: 3.1.2 semver: 7.5.1 tapable: 2.2.1 - typescript: 4.8.4 + typescript: 5.2.2 webpack: 5.85.1 dev: true @@ -9468,8 +9468,9 @@ packages: wbuf: 1.7.3 dev: true - /hpagent@0.1.2: - resolution: {integrity: sha512-ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ==} + /hpagent@1.2.0: + resolution: {integrity: sha512-A91dYTeIB6NoXG+PxTQpCCDDnfHsW9kc06Lvpu1TEe9gnd6ZFeiBoRO9JvzEv6xK7EX97/dUE8g/vBMTqTS3CA==} + engines: {node: '>=14'} dev: false /htm@3.1.1: @@ -12412,7 +12413,7 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier-plugin-organize-imports@3.2.2(prettier@2.8.8)(typescript@4.8.4): + /prettier-plugin-organize-imports@3.2.2(prettier@2.8.8)(typescript@5.2.2): resolution: {integrity: sha512-e97lE6odGSiHonHJMTYC0q0iLXQyw0u5z/PJpvP/3vRy6/Zi9kLBwFAbEGjDzIowpjQv8b+J04PDamoUSQbzGA==} peerDependencies: '@volar/vue-language-plugin-pug': ^1.0.4 @@ -12426,7 +12427,7 @@ packages: optional: true dependencies: prettier: 2.8.8 - typescript: 4.8.4 + typescript: 5.2.2 dev: true /prettier-plugin-packagejson@2.4.3(prettier@2.8.8): @@ -15338,7 +15339,7 @@ packages: resolution: {integrity: sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==} dev: false - /ts-node@10.9.1(@types/node@17.0.45)(typescript@4.8.4): + /ts-node@10.9.1(@types/node@17.0.45)(typescript@5.2.2): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -15364,7 +15365,7 @@ packages: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 4.8.4 + typescript: 5.2.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true @@ -15406,14 +15407,14 @@ packages: resolution: {integrity: sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==} dev: true - /tsutils@3.21.0(typescript@4.8.4): + /tsutils@3.21.0(typescript@5.2.2): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 4.8.4 + typescript: 5.2.2 dev: true /tsx@3.12.7: @@ -15523,28 +15524,28 @@ packages: resolution: {integrity: sha512-v3UJF8xm68BBj6AF4oQML3ikrfK2c9EmZUyLOfShpJuItAqVBHWP/KtpGinkSsIiP6EZyyb6Z3NXyW9dgS9X1w==} dev: false - /typescript@4.8.4: - resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==} - engines: {node: '>=4.2.0'} + /typescript@5.2.2: + resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} + engines: {node: '>=14.17'} hasBin: true dev: true - /umi@4.0.72(@types/node@17.0.45)(@types/react@18.2.8)(eslint@8.35.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sockjs-client@1.6.1)(stylelint@14.8.2)(typescript@4.8.4)(webpack@5.85.1): + /umi@4.0.72(@types/node@17.0.45)(@types/react@18.2.8)(eslint@8.35.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sockjs-client@1.6.1)(stylelint@14.8.2)(typescript@5.2.2)(webpack@5.85.1): resolution: {integrity: sha512-VXXwhHtZAApRR02c2F+uDv84m/Bf5g56pMKrArtIUFsrWM8hqS3f7whzgpdjzh0H8EFjpXwan0kJrkXFr6dAPg==} engines: {node: '>=14'} hasBin: true dependencies: '@babel/runtime': 7.21.0 '@umijs/bundler-utils': 4.0.72 - '@umijs/bundler-webpack': 4.0.72(sockjs-client@1.6.1)(typescript@4.8.4)(webpack@5.85.1) + '@umijs/bundler-webpack': 4.0.72(sockjs-client@1.6.1)(typescript@5.2.2)(webpack@5.85.1) '@umijs/core': 4.0.72 - '@umijs/lint': 4.0.72(eslint@8.35.0)(stylelint@14.8.2)(typescript@4.8.4) - '@umijs/preset-umi': 4.0.72(@types/node@17.0.45)(@types/react@18.2.8)(sockjs-client@1.6.1)(typescript@4.8.4)(webpack@5.85.1) + '@umijs/lint': 4.0.72(eslint@8.35.0)(stylelint@14.8.2)(typescript@5.2.2) + '@umijs/preset-umi': 4.0.72(@types/node@17.0.45)(@types/react@18.2.8)(sockjs-client@1.6.1)(typescript@5.2.2)(webpack@5.85.1) '@umijs/renderer-react': 4.0.72(react-dom@18.2.0)(react@18.2.0) '@umijs/server': 4.0.72 '@umijs/test': 4.0.72 '@umijs/utils': 4.0.72 - prettier-plugin-organize-imports: 3.2.2(prettier@2.8.8)(typescript@4.8.4) + prettier-plugin-organize-imports: 3.2.2(prettier@2.8.8)(typescript@5.2.2) prettier-plugin-packagejson: 2.4.3(prettier@2.8.8) transitivePeerDependencies: - '@babel/core' diff --git a/src/pages/crontab/viewCreateModal.tsx b/src/pages/crontab/viewCreateModal.tsx index e12f427d..ef261091 100644 --- a/src/pages/crontab/viewCreateModal.tsx +++ b/src/pages/crontab/viewCreateModal.tsx @@ -115,7 +115,7 @@ const ViewCreateModal = ({ const OperationElement = ({ name }: { name: number }) => { const property = form.getFieldValue(['filters', name, 'property']); return ( - {OPERATIONS.filter((x) => STATUS_MAP[property as 'status' | 'sub_id'] ? x.type === 'select' : x, ).map((x) => ( @@ -140,7 +140,7 @@ const ViewCreateModal = ({ }; const typeElement = ( - {SORTTYPES.map((x) => ( {x.name} @@ -261,7 +261,9 @@ const ViewCreateModal = ({ diff --git a/src/pages/setting/about.tsx b/src/pages/setting/about.tsx index 6c7369d6..c9584bad 100644 --- a/src/pages/setting/about.tsx +++ b/src/pages/setting/about.tsx @@ -10,10 +10,12 @@ const { Link } = Typography; enum TVersion { 'develop' = '开发版', 'master' = '正式版', - 'debian' = '正式版' + 'debian' = '正式版', } const About = ({ systemInfo }: { systemInfo: SharedContext['systemInfo'] }) => { + const version = TVersion[systemInfo.branch] || '正式版'; + return (
{ - {intl.get(TVersion[systemInfo.branch])} v{systemInfo.version} + {intl.get(version)} v{systemInfo.version} {dayjs(systemInfo.publishTime * 1000).format('YYYY-MM-DD HH:mm')} diff --git a/tsconfig.back.json b/tsconfig.back.json index 6feca191..007d4a85 100644 --- a/tsconfig.back.json +++ b/tsconfig.back.json @@ -1,19 +1,17 @@ { "compilerOptions": { "target": "es2017", - "lib": ["es2021", "esnext.asynciterable", "DOM"], - "typeRoots": [ - "./node_modules/@types", - "./src/types", - "./node_modules/celebrate/lib/index.d.ts" - ], + "lib": ["ESNext"], + "typeRoots": ["./node_modules/celebrate/lib", "./node_modules/@types"], "paths": { - "@/*": ["./back/*"], + "@/*": ["./back/*"] }, "allowSyntheticDefaultImports": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, "forceConsistentCasingInFileNames": true, + "strict": true, + "skipLibCheck": true, "moduleResolution": "node", "module": "commonjs", "pretty": true, @@ -24,5 +22,6 @@ "esModuleInterop": true }, "include": ["./back/**/*"], - "exclude": ["node_modules", "tests"] + "exclude": ["node_modules"], + "files": ["./back/index.d.ts"] } diff --git a/tsconfig.json b/tsconfig.json index c3266d56..5b0609a9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,8 +1,8 @@ { "compilerOptions": { - "target": "es2017", - "module": "commonjs", - "moduleResolution": "node", + "target": "ESNext", + "module": "ES2015", + "moduleResolution": "Bundler", "importHelpers": true, "jsx": "react-jsx", "esModuleInterop": true, @@ -14,11 +14,6 @@ "@@/*": ["src/.umi/*"] }, "lib": ["dom", "es2021", "esnext.asynciterable"], - "typeRoots": [ - "./node_modules/@types", - "./back/types", - "./node_modules/celebrate/lib/index.d.ts" - ], "allowSyntheticDefaultImports": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, diff --git a/typings.d.ts b/typings.d.ts index 6c2b37ae..bdc76dfd 100644 --- a/typings.d.ts +++ b/typings.d.ts @@ -9,8 +9,6 @@ declare module '*.svg' { export default url; } -declare module 'pstree.remy'; - interface Window { __ENV__QlBaseUrl: string; __ENV__DeployEnv: string;