From 03c56d810e1a3a735e816f66731035d4c37a4796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B6=E5=AE=B6=E8=A1=8C?= Date: Tue, 26 Mar 2024 14:25:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=90=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E4=BB=A3=E7=A0=81=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/config.md | 14 +- .../fork-ts-checker/child_process_fork.js | 17 +++ .../{plugins => }/fork-ts-checker/index.js | 11 +- .../fork-ts-checker/ts-checker.js | 0 packages/bundler-okam/index.js | 6 +- packages/bundler-okam/package.json | 5 +- pnpm-lock.yaml | 120 +++++++++--------- 7 files changed, 91 insertions(+), 82 deletions(-) create mode 100644 packages/bundler-okam/fork-ts-checker/child_process_fork.js rename packages/bundler-okam/{plugins => }/fork-ts-checker/index.js (60%) rename packages/bundler-okam/{plugins => }/fork-ts-checker/ts-checker.js (100%) diff --git a/docs/config.md b/docs/config.md index bcf3de515..0a767bbd8 100644 --- a/docs/config.md +++ b/docs/config.md @@ -173,6 +173,13 @@ import("./a.js") 是否修复 flexbugs。 +## forkTsChecker + +- 类型：`boolean` +- 默认值：`false` + +是否开启构建时 ts 校验。 + ## hash - 类型：`boolean` @@ -429,13 +436,6 @@ function App() { } ``` -## forkTsChecker - -- 类型：`boolean` -- 默认值：`false` - -是否开启构建时 ts 校验。 - ## umd - 类型：`false | string` diff --git a/packages/bundler-okam/fork-ts-checker/child_process_fork.js b/packages/bundler-okam/fork-ts-checker/child_process_fork.js new file mode 100644 index 000000000..83e31a272 --- /dev/null +++ b/packages/bundler-okam/fork-ts-checker/child_process_fork.js @@ -0,0 +1,17 @@ +const { TypeChecker } = require('./ts-checker'); + +const projectRoot = process.argv[2]; + +async function runTypeCheck() { + const typeChecker = new TypeChecker(projectRoot); + return await typeChecker.check(); +} + +runTypeCheck() + .then(() => { + process.exit(1); + }) + .catch((error) => { + console.error(error); + process.exit(0); + }); diff --git a/packages/bundler-okam/plugins/fork-ts-checker/index.js b/packages/bundler-okam/fork-ts-checker/index.js similarity index 60% rename from packages/bundler-okam/plugins/fork-ts-checker/index.js rename to packages/bundler-okam/fork-ts-checker/index.js index 39c14135c..9d0f7354f 100644 --- a/packages/bundler-okam/plugins/fork-ts-checker/index.js +++ b/packages/bundler-okam/fork-ts-checker/index.js @@ -1,25 +1,20 @@ const { fork } = require('child_process'); const path = require('path'); -const { TypeChecker } = require('./ts-checker'); class ForkTsChecker { constructor(projectRoot) { this.projectRoot = projectRoot; } - async runTypeCheck() { - const typeChecker = new TypeChecker(projectRoot); - await typeChecker.check(); - } runTypeCheckInChildProcess() { const workerScript = path.join(__dirname, 'child_process_fork.js'); - const child = fork(workerScript, [projectRoot], { + const child = fork(workerScript, [this.projectRoot], { stdio: 'inherit', }); child.on('exit', (code) => { - if (code === 0) { - console.log('Type checking completed successfully.'); + if (code === 1) { + console.log('Type checking completed.'); } else { console.error('Type checking failed.'); } diff --git a/packages/bundler-okam/plugins/fork-ts-checker/ts-checker.js b/packages/bundler-okam/fork-ts-checker/ts-checker.js similarity index 100% rename from packages/bundler-okam/plugins/fork-ts-checker/ts-checker.js rename to packages/bundler-okam/fork-ts-checker/ts-checker.js diff --git a/packages/bundler-okam/index.js b/packages/bundler-okam/index.js index f1aabe430..a8749c601 100644 --- a/packages/bundler-okam/index.js +++ b/packages/bundler-okam/index.js @@ -5,7 +5,7 @@ const assert = require('assert'); const { createProxy, createHttpsServer } = require('@umijs/bundler-utils'); const lodash = require('lodash'); const chalk = require('chalk'); -const { ForkTsChecker } = require('./plugins/fork-ts-checker/index'); +const { ForkTsChecker } = require('./fork-ts-checker/index'); const { createProxyMiddleware, } = require('@umijs/bundler-utils/compiled/http-proxy-middleware'); @@ -101,9 +101,9 @@ exports.build = async function (opts) { } // 后置 ts 校验，不影响打包速度 - if (!!okamConfig.forkTsChecker) { + if (okamConfig.forkTsChecker) { const forkTypeChecker = new ForkTsChecker(cwd); - forkTypeChecker.runTypeCheck(); + forkTypeChecker.runTypeCheckInChildProcess(); } const statsJsonPath = path.join(cwd, 'dist', 'stats.json'); diff --git a/packages/bundler-okam/package.json b/packages/bundler-okam/package.json index 5f1b2e6d7..2db2dba13 100644 --- a/packages/bundler-okam/package.json +++ b/packages/bundler-okam/package.json @@ -25,5 +25,8 @@ "publishConfig": { "registry": "https://registry.antgroup-inc.cn" }, - "repository": "git@github.com:umijs/mako.git" + "repository": "git@github.com:umijs/mako.git", + "devDependencies": { + "typescript": "^5.4.3" + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a4566285..58544f4a2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -231,7 +231,7 @@ importers: version: 5.0.0-alpha.21(react-dom@18.2.0)(react@18.2.0) '@umijs/bundler-webpack': specifier: ^4.0.80 - version: 4.0.80(styled-components@5.3.10)(typescript@5.0.4)(webpack@5.84.1) + version: 4.0.80(styled-components@5.3.10)(typescript@5.4.3)(webpack@5.84.1) antd: specifier: ^5.12.2 version: 5.12.2(react-dom@18.2.0)(react@18.2.0) @@ -337,7 +337,7 @@ importers: version: 18.2.0(react@18.2.0) umi: specifier: ^4.0.70 - version: 4.0.70(@babel/core@7.22.1)(@types/node@20.4.2)(@types/react@18.2.7)(eslint@8.41.0)(postcss@8.4.24)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(styled-components@5.3.10)(stylelint@14.16.1)(typescript@5.0.4)(webpack@5.84.1) + version: 4.0.70(@babel/core@7.22.1)(@types/node@20.4.2)(@types/react@18.2.7)(eslint@8.41.0)(postcss@8.4.24)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(styled-components@5.3.10)(stylelint@14.16.1)(typescript@5.4.3)(webpack@5.84.1) packages/bundler-okam: dependencies: @@ -383,12 +383,13 @@ importers: rimraf: specifier: 5.0.1 version: 5.0.1 - typescript: - specifier: ^5.4.2 - version: 5.4.2 webpack-5-chain: specifier: 8.0.1 version: 8.0.1 + devDependencies: + typescript: + specifier: ^5.4.3 + version: 5.4.3 packages: @@ -4296,7 +4297,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.41.0)(typescript@5.0.4): + /@typescript-eslint/eslint-plugin@5.48.1(@typescript-eslint/parser@5.48.1)(eslint@8.41.0)(typescript@5.4.3): resolution: {integrity: sha512-9nY5K1Rp2ppmpb9s9S2aBiF3xo5uExCehMDmYmmFqqyxgenbHJ3qbarcLt4ITgaD6r/2ypdlcFRdcuVPnks+fQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4307,23 +4308,23 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.48.1(eslint@8.41.0)(typescript@5.0.4) + '@typescript-eslint/parser': 5.48.1(eslint@8.41.0)(typescript@5.4.3) '@typescript-eslint/scope-manager': 5.48.1 - '@typescript-eslint/type-utils': 5.48.1(eslint@8.41.0)(typescript@5.0.4) - '@typescript-eslint/utils': 5.48.1(eslint@8.41.0)(typescript@5.0.4) + '@typescript-eslint/type-utils': 5.48.1(eslint@8.41.0)(typescript@5.4.3) + '@typescript-eslint/utils': 5.48.1(eslint@8.41.0)(typescript@5.4.3) debug: 4.3.4(supports-color@5.5.0) eslint: 8.41.0 ignore: 5.2.4 natural-compare-lite: 1.4.0 regexpp: 3.2.0 semver: 7.5.4 - tsutils: 3.21.0(typescript@5.0.4) - typescript: 5.0.4 + tsutils: 3.21.0(typescript@5.4.3) + typescript: 5.4.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@5.48.1(eslint@8.41.0)(typescript@5.0.4): + /@typescript-eslint/parser@5.48.1(eslint@8.41.0)(typescript@5.4.3): resolution: {integrity: sha512-4yg+FJR/V1M9Xoq56SF9Iygqm+r5LMXvheo6DQ7/yUWynQ4YfCRnsKuRgqH4EQ5Ya76rVwlEpw4Xu+TgWQUcdA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4335,10 +4336,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.48.1 '@typescript-eslint/types': 5.48.1 - '@typescript-eslint/typescript-estree': 5.48.1(typescript@5.0.4) + '@typescript-eslint/typescript-estree': 5.48.1(typescript@5.4.3) debug: 4.3.4(supports-color@5.5.0) eslint: 8.41.0 - typescript: 5.0.4 + typescript: 5.4.3 transitivePeerDependencies: - supports-color dev: true @@ -4359,7 +4360,7 @@ packages: '@typescript-eslint/visitor-keys': 5.59.8 dev: true - /@typescript-eslint/type-utils@5.48.1(eslint@8.41.0)(typescript@5.0.4): + /@typescript-eslint/type-utils@5.48.1(eslint@8.41.0)(typescript@5.4.3): resolution: {integrity: sha512-Hyr8HU8Alcuva1ppmqSYtM/Gp0q4JOp1F+/JH5D1IZm/bUBrV0edoewQZiEc1r6I8L4JL21broddxK8HAcZiqQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4369,12 +4370,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.48.1(typescript@5.0.4) - '@typescript-eslint/utils': 5.48.1(eslint@8.41.0)(typescript@5.0.4) + '@typescript-eslint/typescript-estree': 5.48.1(typescript@5.4.3) + '@typescript-eslint/utils': 5.48.1(eslint@8.41.0)(typescript@5.4.3) debug: 4.3.4(supports-color@5.5.0) eslint: 8.41.0 - tsutils: 3.21.0(typescript@5.0.4) - typescript: 5.0.4 + tsutils: 3.21.0(typescript@5.4.3) + typescript: 5.4.3 transitivePeerDependencies: - supports-color dev: true @@ -4389,7 +4390,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree@5.48.1(typescript@5.0.4): + /@typescript-eslint/typescript-estree@5.48.1(typescript@5.4.3): resolution: {integrity: sha512-Hut+Osk5FYr+sgFh8J/FHjqX6HFcDzTlWLrFqGoK5kVUN3VBHF/QzZmAsIXCQ8T/W9nQNBTqalxi1P3LSqWnRA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4404,13 +4405,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 - tsutils: 3.21.0(typescript@5.0.4) - typescript: 5.0.4 + tsutils: 3.21.0(typescript@5.4.3) + typescript: 5.4.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/typescript-estree@5.59.8(typescript@5.0.4): + /@typescript-eslint/typescript-estree@5.59.8(typescript@5.4.3): resolution: {integrity: sha512-Jy/lPSDJGNow14vYu6IrW790p7HIf/SOV1Bb6lZ7NUkLc2iB2Z9elESmsaUtLw8kVqogSbtLH9tut5GCX1RLDg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4425,13 +4426,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 - tsutils: 3.21.0(typescript@5.0.4) - typescript: 5.0.4 + tsutils: 3.21.0(typescript@5.4.3) + typescript: 5.4.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.48.1(eslint@8.41.0)(typescript@5.0.4): + /@typescript-eslint/utils@5.48.1(eslint@8.41.0)(typescript@5.4.3): resolution: {integrity: sha512-SmQuSrCGUOdmGMwivW14Z0Lj8dxG1mOFZ7soeJ0TQZEJcs3n5Ndgkg0A4bcMFzBELqLJ6GTHnEU+iIoaD6hFGA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4441,7 +4442,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@5.0.4) + '@typescript-eslint/typescript-estree': 5.48.1(typescript@5.4.3) eslint: 8.41.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0(eslint@8.41.0) @@ -4451,7 +4452,7 @@ packages: - typescript dev: true - /@typescript-eslint/utils@5.59.8(eslint@8.41.0)(typescript@5.0.4): + /@typescript-eslint/utils@5.59.8(eslint@8.41.0)(typescript@5.4.3): resolution: {integrity: sha512-Tr65630KysnNn9f9G7ROF3w1b5/7f6QVCJ+WK9nhIocWmx9F+TmCAcglF26Vm7z8KCTwoKcNEBZrhlklla3CKg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4462,7 +4463,7 @@ packages: '@types/semver': 7.5.0 '@typescript-eslint/scope-manager': 5.59.8 '@typescript-eslint/types': 5.59.8 - '@typescript-eslint/typescript-estree': 5.59.8(typescript@5.0.4) + '@typescript-eslint/typescript-estree': 5.59.8(typescript@5.4.3) eslint: 8.41.0 eslint-scope: 5.1.1 semver: 7.5.4 @@ -4610,7 +4611,7 @@ packages: - terser dev: true - /@umijs/bundler-webpack@4.0.70(styled-components@5.3.10)(typescript@5.0.4)(webpack@5.84.1): + /@umijs/bundler-webpack@4.0.70(styled-components@5.3.10)(typescript@5.4.3)(webpack@5.84.1): resolution: {integrity: sha512-QHaIEFesPzFSHnIMhHui9Ru54VYwNdnO683CzSoIoBjYAIcpDsGM7Tl3hIesujbfhrZl2eCJQVc//ZJ0SEFiTw==} hasBin: true dependencies: @@ -4627,7 +4628,7 @@ packages: cors: 2.8.5 css-loader: 6.7.1(webpack@5.84.1) es5-imcompatible-versions: 0.1.82 - fork-ts-checker-webpack-plugin: 8.0.0(typescript@5.0.4)(webpack@5.84.1) + fork-ts-checker-webpack-plugin: 8.0.0(typescript@5.4.3)(webpack@5.84.1) jest-worker: 29.4.3 lightningcss: 1.19.0 node-libs-browser: 2.2.1 @@ -4648,7 +4649,7 @@ packages: - webpack-plugin-serve dev: true - /@umijs/bundler-webpack@4.0.80(styled-components@5.3.10)(typescript@5.0.4)(webpack@5.84.1): + /@umijs/bundler-webpack@4.0.80(styled-components@5.3.10)(typescript@5.4.3)(webpack@5.84.1): resolution: {integrity: sha512-EdkEQpVx/fSrI0jmD6RbvPuSXiXW/1HXSA0OB9MJoKOBbndVTvjKL82CNgoUo8Ahytr2bZ0zjbgoV/lHadFLkA==} hasBin: true dependencies: @@ -4665,7 +4666,7 @@ packages: cors: 2.8.5 css-loader: 6.7.1(webpack@5.84.1) es5-imcompatible-versions: 0.1.82 - fork-ts-checker-webpack-plugin: 8.0.0(typescript@5.0.4)(webpack@5.84.1) + fork-ts-checker-webpack-plugin: 8.0.0(typescript@5.4.3)(webpack@5.84.1) jest-worker: 29.4.3 lightningcss: 1.19.0 node-libs-browser: 2.2.1 @@ -4810,16 +4811,16 @@ packages: query-string: 6.14.1 dev: true - /@umijs/lint@4.0.70(eslint@8.41.0)(styled-components@5.3.10)(stylelint@14.16.1)(typescript@5.0.4): + /@umijs/lint@4.0.70(eslint@8.41.0)(styled-components@5.3.10)(stylelint@14.16.1)(typescript@5.4.3): resolution: {integrity: sha512-89+1BC/taDfEcubrWGXI6Yzk6hVb3br21jx+7eYYOwJjOXDMULy3+8GCFqZN+TxIz9WXOG3NFHehcFehx9YPwg==} dependencies: '@babel/core': 7.21.0 '@babel/eslint-parser': 7.19.1(@babel/core@7.21.0)(eslint@8.41.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.41.0)(typescript@5.0.4) - '@typescript-eslint/parser': 5.48.1(eslint@8.41.0)(typescript@5.0.4) + '@typescript-eslint/eslint-plugin': 5.48.1(@typescript-eslint/parser@5.48.1)(eslint@8.41.0)(typescript@5.4.3) + '@typescript-eslint/parser': 5.48.1(eslint@8.41.0)(typescript@5.4.3) '@umijs/babel-preset-umi': 4.0.70(styled-components@5.3.10) - eslint-plugin-jest: 27.2.1(@typescript-eslint/eslint-plugin@5.48.1)(eslint@8.41.0)(typescript@5.0.4) + eslint-plugin-jest: 27.2.1(@typescript-eslint/eslint-plugin@5.48.1)(eslint@8.41.0)(typescript@5.4.3) eslint-plugin-react: 7.32.2(eslint@8.41.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.41.0) postcss: 8.4.24 @@ -4918,7 +4919,7 @@ packages: - supports-color dev: true - /@umijs/preset-umi@4.0.70(@types/node@20.4.2)(@types/react@18.2.7)(postcss@8.4.24)(styled-components@5.3.10)(typescript@5.0.4)(webpack@5.84.1): + /@umijs/preset-umi@4.0.70(@types/node@20.4.2)(@types/react@18.2.7)(postcss@8.4.24)(styled-components@5.3.10)(typescript@5.4.3)(webpack@5.84.1): resolution: {integrity: sha512-N9TQbuaZNz+3HTtXm1QG+LpALJx/XLEJk1CYfff8Ey3hgQVRtvR/hTo6EhsUtovoqdcfBClxidHAfy9dvJ9Ebw==} dependencies: '@iconify/utils': 2.1.1 @@ -4928,7 +4929,7 @@ packages: '@umijs/bundler-esbuild': 4.0.70 '@umijs/bundler-utils': 4.0.70 '@umijs/bundler-vite': 4.0.70(@types/node@20.4.2)(postcss@8.4.24) - '@umijs/bundler-webpack': 4.0.70(styled-components@5.3.10)(typescript@5.0.4)(webpack@5.84.1) + '@umijs/bundler-webpack': 4.0.70(styled-components@5.3.10)(typescript@5.4.3)(webpack@5.84.1) '@umijs/core': 4.0.70 '@umijs/did-you-know': 1.0.3 '@umijs/es-module-parser': 0.0.7 @@ -7257,7 +7258,7 @@ packages: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} - /eslint-plugin-jest@27.2.1(@typescript-eslint/eslint-plugin@5.48.1)(eslint@8.41.0)(typescript@5.0.4): + /eslint-plugin-jest@27.2.1(@typescript-eslint/eslint-plugin@5.48.1)(eslint@8.41.0)(typescript@5.4.3): resolution: {integrity: sha512-l067Uxx7ZT8cO9NJuf+eJHvt6bqJyz2Z29wykyEdz/OtmcELQl2MQGQLX8J94O1cSJWAwUSEvCjwjA7KEK3Hmg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -7270,8 +7271,8 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 5.48.1(@typescript-eslint/parser@5.48.1)(eslint@8.41.0)(typescript@5.0.4) - '@typescript-eslint/utils': 5.59.8(eslint@8.41.0)(typescript@5.0.4) + '@typescript-eslint/eslint-plugin': 5.48.1(@typescript-eslint/parser@5.48.1)(eslint@8.41.0)(typescript@5.4.3) + '@typescript-eslint/utils': 5.59.8(eslint@8.41.0)(typescript@5.4.3) eslint: 8.41.0 transitivePeerDependencies: - supports-color @@ -7748,7 +7749,7 @@ packages: signal-exit: 4.0.2 dev: false - /fork-ts-checker-webpack-plugin@8.0.0(typescript@5.0.4)(webpack@5.84.1): + /fork-ts-checker-webpack-plugin@8.0.0(typescript@5.4.3)(webpack@5.84.1): resolution: {integrity: sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==} engines: {node: '>=12.13.0', yarn: '>=1.0.0'} peerDependencies: @@ -7767,7 +7768,7 @@ packages: schema-utils: 3.1.2 semver: 7.5.4 tapable: 2.2.1 - typescript: 5.0.4 + typescript: 5.4.3 webpack: 5.84.1(webpack-cli@4.7.2) dev: true @@ -10708,7 +10709,7 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier-plugin-organize-imports@3.2.2(prettier@2.8.8)(typescript@5.0.4): + /prettier-plugin-organize-imports@3.2.2(prettier@2.8.8)(typescript@5.4.3): resolution: {integrity: sha512-e97lE6odGSiHonHJMTYC0q0iLXQyw0u5z/PJpvP/3vRy6/Zi9kLBwFAbEGjDzIowpjQv8b+J04PDamoUSQbzGA==} peerDependencies: '@volar/vue-language-plugin-pug': ^1.0.4 @@ -10722,7 +10723,7 @@ packages: optional: true dependencies: prettier: 2.8.8 - typescript: 5.0.4 + typescript: 5.4.3 dev: true /prettier-plugin-packagejson@2.4.3(prettier@2.8.8): @@ -12304,7 +12305,6 @@ packages: object-assign: 4.1.1 prop-types: 15.8.1 dev: false - bundledDependencies: false /react@18.1.0: resolution: {integrity: sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==} @@ -13507,14 +13507,14 @@ packages: /tslib@2.5.2: resolution: {integrity: sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==} - /tsutils@3.21.0(typescript@5.0.4): + /tsutils@3.21.0(typescript@5.4.3): 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: 5.0.4 + typescript: 5.4.3 dev: true /tsx@3.12.7: @@ -13592,34 +13592,28 @@ packages: is-typed-array: 1.1.10 dev: true - /typescript@5.0.4: - resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==} - engines: {node: '>=12.20'} - hasBin: true - dev: true - - /typescript@5.4.2: - resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==} + /typescript@5.4.3: + resolution: {integrity: sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==} engines: {node: '>=14.17'} hasBin: true - dev: false + dev: true - /umi@4.0.70(@babel/core@7.22.1)(@types/node@20.4.2)(@types/react@18.2.7)(eslint@8.41.0)(postcss@8.4.24)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(styled-components@5.3.10)(stylelint@14.16.1)(typescript@5.0.4)(webpack@5.84.1): + /umi@4.0.70(@babel/core@7.22.1)(@types/node@20.4.2)(@types/react@18.2.7)(eslint@8.41.0)(postcss@8.4.24)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(styled-components@5.3.10)(stylelint@14.16.1)(typescript@5.4.3)(webpack@5.84.1): resolution: {integrity: sha512-e6GwzZXC1U+XPJhLaOMIr6IBWpi8mGap6ExRkApidfbYZ8HxilvrVHnaLUYSykp206RhZBnJWI7r99mYu3e5eQ==} engines: {node: '>=14'} hasBin: true dependencies: '@babel/runtime': 7.21.0 '@umijs/bundler-utils': 4.0.70 - '@umijs/bundler-webpack': 4.0.70(styled-components@5.3.10)(typescript@5.0.4)(webpack@5.84.1) + '@umijs/bundler-webpack': 4.0.70(styled-components@5.3.10)(typescript@5.4.3)(webpack@5.84.1) '@umijs/core': 4.0.70 - '@umijs/lint': 4.0.70(eslint@8.41.0)(styled-components@5.3.10)(stylelint@14.16.1)(typescript@5.0.4) - '@umijs/preset-umi': 4.0.70(@types/node@20.4.2)(@types/react@18.2.7)(postcss@8.4.24)(styled-components@5.3.10)(typescript@5.0.4)(webpack@5.84.1) + '@umijs/lint': 4.0.70(eslint@8.41.0)(styled-components@5.3.10)(stylelint@14.16.1)(typescript@5.4.3) + '@umijs/preset-umi': 4.0.70(@types/node@20.4.2)(@types/react@18.2.7)(postcss@8.4.24)(styled-components@5.3.10)(typescript@5.4.3)(webpack@5.84.1) '@umijs/renderer-react': 4.0.70(react-dom@18.2.0)(react@18.2.0) '@umijs/server': 4.0.70 '@umijs/test': 4.0.70(@babel/core@7.22.1) '@umijs/utils': 4.0.70 - prettier-plugin-organize-imports: 3.2.2(prettier@2.8.8)(typescript@5.0.4) + prettier-plugin-organize-imports: 3.2.2(prettier@2.8.8)(typescript@5.4.3) prettier-plugin-packagejson: 2.4.3(prettier@2.8.8) transitivePeerDependencies: - '@babel/core'