chore: use type PackageJson from type-fest

web-infra-dev · Aug 21, 2024 · 67b22ac · 67b22ac
1 parent e9d2133
commit 67b22ac
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 14 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -51,6 +51,7 @@
     "prebundle": "1.1.0",
     "rslib": "npm:@rslib/[email protected]",
     "rslog": "^1.2.2",
+    "type-fest": "^4.25.0",
     "typescript": "^5.5.4"
   },
   "peerDependencies": {

diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -9,12 +9,12 @@ import {
   mergeRsbuildConfig,
 } from '@rsbuild/core';
 import glob from 'fast-glob';
+import type { PackageJson } from 'type-fest';
 import { DEFAULT_CONFIG_NAME, DEFAULT_EXTENSIONS } from './constant';
 import type {
   AutoExternal,
   Format,
   LibConfig,
-  PkgJson,
   RslibConfig,
   RslibConfigAsyncFn,
   RslibConfigExport,
@@ -89,7 +89,7 @@ export async function loadConfig({
 
 export const composeAutoExternalConfig = (options: {
   autoExternal: AutoExternal;
-  pkgJson?: PkgJson;
+  pkgJson?: PackageJson;
   userExternals?: NonNullable<RsbuildConfig['output']>['externals'];
 }): RsbuildConfig => {
   const { autoExternal, pkgJson, userExternals } = options;
@@ -242,7 +242,7 @@ const composeFormatConfig = (format: Format): RsbuildConfig => {
 const composeAutoExtensionConfig = (
   config: LibConfig,
   autoExtension: boolean,
-  pkgJson?: PkgJson,
+  pkgJson?: PackageJson,
 ): {
   config: RsbuildConfig;
   jsExtension: string;

diff --git a/packages/core/src/types/index.ts b/packages/core/src/types/index.ts
@@ -1,2 +1 @@
 export type * from './config';
-export type * from './utils';
diff --git a/packages/core/src/types/utils.ts b/packages/core/src/types/utils.ts
diff --git a/packages/core/src/utils/extension.ts b/packages/core/src/utils/extension.ts
@@ -1,9 +1,10 @@
-import type { Format, PkgJson } from '../types';
+import type { PackageJson } from 'type-fest';
+import type { Format } from '../types';
 import { logger } from './logger';
 
 export const getDefaultExtension = (options: {
   format: Format;
-  pkgJson?: PkgJson;
+  pkgJson?: PackageJson;
   autoExtension: boolean;
 }): {
   jsExtension: string;

diff --git a/packages/core/src/utils/helper.ts b/packages/core/src/utils/helper.ts
@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import fsP from 'node:fs/promises';
 import path from 'node:path';
 import color from 'picocolors';
-import type { PkgJson } from '../types';
+import type { PackageJson } from 'type-fest';
 import { logger } from './logger';
 
 /**
@@ -107,7 +107,7 @@ export async function calcLongestCommonPath(
   return lca;
 }
 
-export const readPackageJson = (rootPath: string): undefined | PkgJson => {
+export const readPackageJson = (rootPath: string): undefined | PackageJson => {
   const pkgJsonPath = path.join(rootPath, './package.json');
 
   if (!fs.existsSync(pkgJsonPath)) {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export type * from './config';
		export type * from './utils';