From 7498ab2dc05e6da8fcf6ab1000554751307aa970 Mon Sep 17 00:00:00 2001 From: PeachScript Date: Thu, 1 Jun 2023 13:38:50 +0800 Subject: [PATCH] fix(preset-built-in): avoid phantom dependency --- packages/preset-built-in/src/plugins/features/analyze.ts | 3 +-- .../preset-built-in/src/plugins/features/fastRefresh.ts | 9 ++++----- .../src/plugins/features/forkTSChecker.ts | 4 ++-- .../src/plugins/features/mfsu/mfsu.test.ts | 2 +- .../preset-built-in/src/plugins/features/mfsu/mfsu.ts | 3 +-- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/preset-built-in/src/plugins/features/analyze.ts b/packages/preset-built-in/src/plugins/features/analyze.ts index 649ae1d4f24c..4fecce011782 100644 --- a/packages/preset-built-in/src/plugins/features/analyze.ts +++ b/packages/preset-built-in/src/plugins/features/analyze.ts @@ -1,5 +1,4 @@ -import { BundlerConfigType } from '@umijs/types'; -import { IApi } from 'umi'; +import { BundlerConfigType, IApi } from '@umijs/types'; export default (api: IApi) => { api.describe({ diff --git a/packages/preset-built-in/src/plugins/features/fastRefresh.ts b/packages/preset-built-in/src/plugins/features/fastRefresh.ts index fd8fda9394b1..87d8655e2cf8 100644 --- a/packages/preset-built-in/src/plugins/features/fastRefresh.ts +++ b/packages/preset-built-in/src/plugins/features/fastRefresh.ts @@ -1,10 +1,9 @@ -import { BundlerConfigType, IApi, utils } from 'umi'; - -const { createDebug } = utils; - -const debug = createDebug('umi:preset-build-in:fastRefresh'); +import { BundlerConfigType, IApi } from '@umijs/types'; export default (api: IApi) => { + const { createDebug } = api.utils; + const debug = createDebug('umi:preset-build-in:fastRefresh'); + /** * enable by default, back up using view rerender * ssr can't work with fastRefresh diff --git a/packages/preset-built-in/src/plugins/features/forkTSChecker.ts b/packages/preset-built-in/src/plugins/features/forkTSChecker.ts index cac8bc6bba9a..ed091f2e5df6 100644 --- a/packages/preset-built-in/src/plugins/features/forkTSChecker.ts +++ b/packages/preset-built-in/src/plugins/features/forkTSChecker.ts @@ -1,7 +1,7 @@ -import { IApi, utils } from 'umi'; +import { IApi } from '@umijs/types'; export default (api: IApi) => { - const { deepmerge } = utils; + const { deepmerge } = api.utils; api.describe({ key: 'forkTSChecker', config: { diff --git a/packages/preset-built-in/src/plugins/features/mfsu/mfsu.test.ts b/packages/preset-built-in/src/plugins/features/mfsu/mfsu.test.ts index cc5e4d870dde..83ad462df72b 100644 --- a/packages/preset-built-in/src/plugins/features/mfsu/mfsu.test.ts +++ b/packages/preset-built-in/src/plugins/features/mfsu/mfsu.test.ts @@ -1,6 +1,6 @@ import { winPath } from '@umijs/utils'; import { resolve } from 'path'; -import { IApi } from 'umi'; +import { IApi } from '@umijs/types'; import { getMfsuPath, normalizeReqPath } from './mfsu'; test('functions: get mfsu path', () => { diff --git a/packages/preset-built-in/src/plugins/features/mfsu/mfsu.ts b/packages/preset-built-in/src/plugins/features/mfsu/mfsu.ts index 40641b670929..78e4e13dd1ad 100644 --- a/packages/preset-built-in/src/plugins/features/mfsu/mfsu.ts +++ b/packages/preset-built-in/src/plugins/features/mfsu/mfsu.ts @@ -1,10 +1,9 @@ -import { BundlerConfigType } from '@umijs/types'; +import { BundlerConfigType, IApi } from '@umijs/types'; import { chalk, createDebug, mkdirp } from '@umijs/utils'; import assert from 'assert'; import { existsSync, readFileSync } from 'fs'; import mime from 'mime'; import { dirname, join, parse } from 'path'; -import { IApi } from 'umi'; import webpack from 'webpack'; import BabelImportRedirectPlugin from './babel-import-redirect-plugin'; import BabelPluginAutoExport from './babel-plugin-auto-export';