diff --git a/packages/core/prebundle.config.ts b/packages/core/prebundle.config.ts index 139352c1db..2d49450562 100644 --- a/packages/core/prebundle.config.ts +++ b/packages/core/prebundle.config.ts @@ -44,13 +44,7 @@ export default { }, { name: 'rslog', - afterBundle(task) { - // use the cjs bundle of rslog - fs.copyFileSync( - join(task.depPath, 'dist/index.cjs'), - join(task.distPath, 'index.js'), - ); - }, + dtsOnly: true, }, { name: 'launch-editor-middleware', diff --git a/packages/core/rslib.config.ts b/packages/core/rslib.config.ts index f64a761516..79ad201817 100644 --- a/packages/core/rslib.config.ts +++ b/packages/core/rslib.config.ts @@ -93,7 +93,8 @@ export default defineConfig({ // Only use tsgo in local dev for faster build, disable it in CI until it's more stable tsgo: !process.env.CI, alias: { - // alias to pre-bundled types as it's public API + // alias to pre-bundled types as they are public API + rslog: './compiled/rslog', 'rspack-chain': './compiled/rspack-chain/types', }, }, diff --git a/packages/core/src/helpers/vendors.ts b/packages/core/src/helpers/vendors.ts index 2335ab9af0..74162e0c33 100644 --- a/packages/core/src/helpers/vendors.ts +++ b/packages/core/src/helpers/vendors.ts @@ -7,7 +7,6 @@ type CompiledPackages = { ws: typeof import('../../compiled/ws').default; cors: typeof import('../../compiled/cors').default; sirv: typeof import('../../compiled/sirv'); - rslog: typeof import('../../compiled/rslog'); memfs: typeof import('../../compiled/memfs'); mrmime: typeof import('../../compiled/mrmime'); connect: typeof import('../../compiled/connect').default; diff --git a/packages/core/src/logger.ts b/packages/core/src/logger.ts index 6e006558da..1b7e9f96b4 100644 --- a/packages/core/src/logger.ts +++ b/packages/core/src/logger.ts @@ -12,10 +12,8 @@ * This convention helps distinguish between normal operations * and important alerts that require attention. */ -import type { Logger } from '../compiled/rslog/index.js'; -import { color, requireCompiledPackage } from './helpers/vendors'; - -const logger: Logger = requireCompiledPackage('rslog').logger; +import { type Logger, logger } from 'rslog'; +import { color } from './helpers/vendors'; export const isDebug = (): boolean => { if (!process.env.DEBUG) {