diff --git a/packages/router-generator/src/filesystem/virtual/loadConfigFile.ts b/packages/router-generator/src/filesystem/virtual/loadConfigFile.ts index d7a9bbc697..0bf6a30692 100644 --- a/packages/router-generator/src/filesystem/virtual/loadConfigFile.ts +++ b/packages/router-generator/src/filesystem/virtual/loadConfigFile.ts @@ -1,5 +1,3 @@ -import { createJiti } from 'jiti' - /** * Evaluates a virtual route config module (`virtualRouteConfig` file, * `__virtual.ts`). Every call evaluates the file again: the generator only @@ -7,6 +5,8 @@ import { createJiti } from 'jiti' * (SPEC J1.10), so no module cache is kept between loads. */ export async function loadConfigFile(filePath: string) { + // only virtual route configs need jiti: keep it off the startup path + const { createJiti } = await import('jiti') const jiti = createJiti(filePath, { interopDefault: false, tsconfigPaths: true, diff --git a/packages/router-plugin/src/hosts/loader.ts b/packages/router-plugin/src/hosts/loader.ts index 2ed333af4d..f80369e7fd 100644 --- a/packages/router-plugin/src/hosts/loader.ts +++ b/packages/router-plugin/src/hosts/loader.ts @@ -5,11 +5,11 @@ * absolute path as the map source. The static loader file * (`loader/index.cjs`) finds this implementation on the compiler. */ -import remapping from '@jridgewell/remapping' import { SourceText, identify } from '@tanstack/router-utils/compiler' import { normalizePath } from './session' import type { RouterCompiler } from './session' import type { Diagnostic } from '@tanstack/router-utils/compiler' +import type remapping from '@jridgewell/remapping' /** What the loader uses of the webpack / Rspack loader context. */ export interface LoaderContextLike { @@ -102,6 +102,8 @@ export function createLoaderImpl( } let map: unknown = out.map ?? undefined if (out.map && inputMap) { + // only another loader's input map needs composing: load it on first use + const { default: remap } = await import('@jridgewell/remapping') const input = typeof inputMap === 'string' ? (JSON.parse(inputMap) as Parameters[0]) @@ -110,7 +112,7 @@ export function createLoaderImpl( ...out.map, sources: [ctx.resourcePath], } as unknown as Parameters[0] - const composed = remapping([ours, input] as never, () => null) + const composed = remap([ours, input] as never, () => null) map = JSON.parse(composed.toString()) } else if (out.map) { map = { ...out.map, sources: [ctx.resourcePath] } diff --git a/packages/start-plugin-core/src/rsbuild/compiler-session.ts b/packages/start-plugin-core/src/rsbuild/compiler-session.ts index 949341e0f3..8483c421a7 100644 --- a/packages/start-plugin-core/src/rsbuild/compiler-session.ts +++ b/packages/start-plugin-core/src/rsbuild/compiler-session.ts @@ -11,7 +11,6 @@ */ import fs from 'node:fs' import path from 'node:path' -import remapping from '@jridgewell/remapping' import { RawFactsCache, SourceText, @@ -52,6 +51,7 @@ import type { ImportProtectionOptions } from '../schema' import type { CompileStartFrameworkOptions, StartRscOptions } from '../types' import type { Config as RouterConfig } from '@tanstack/router-plugin' import type { RouterPlannerConfig } from '@tanstack/router-plugin/planners' +import type remapping from '@jridgewell/remapping' import type { CompileOutput, CompilerCaches, @@ -612,14 +612,17 @@ export class StartRsbuildCompilerSession { if (identity.derived === null && out.code === source) { return passthrough } - return { code: out.code, map: this.composeMap(ctx, out.map, inputMap) } + return { + code: out.code, + map: await this.composeMap(ctx, out.map, inputMap), + } } - private composeMap( + private async composeMap( ctx: LoaderContextLike, map: RawSourceMap | null, inputMap: unknown, - ): unknown { + ): Promise { if (!map) { return undefined } @@ -627,11 +630,13 @@ export class StartRsbuildCompilerSession { if (!inputMap) { return ours } + // only another loader's input map needs composing: load it on first use + const { default: remap } = await import('@jridgewell/remapping') const input = typeof inputMap === 'string' ? (JSON.parse(inputMap) as Parameters[0]) : (inputMap as Parameters[0]) - const composed = remapping( + const composed = remap( [ours as unknown as Parameters[0], input] as never, () => null, ) diff --git a/packages/start-plugin-core/src/start-manifest-plugin/inlineCss.ts b/packages/start-plugin-core/src/start-manifest-plugin/inlineCss.ts index bf87de9bfe..6851d0206d 100644 --- a/packages/start-plugin-core/src/start-manifest-plugin/inlineCss.ts +++ b/packages/start-plugin-core/src/start-manifest-plugin/inlineCss.ts @@ -1,4 +1,8 @@ -import { transform } from 'lightningcss' +import { createRequire } from 'node:module' +import type * as LightningCss from 'lightningcss' + +// loaded on first use: only inline CSS with rewritable urls needs it +let lightningcss: typeof LightningCss | undefined export interface InlineCssTemplate { strings: Array @@ -94,7 +98,10 @@ export function processInlineCssUrls(options: { const urls: Array = [] - const result = transform({ + lightningcss ??= createRequire(import.meta.url)( + 'lightningcss', + ) as typeof LightningCss + const result = lightningcss.transform({ filename: options.cssHref, code: Buffer.from(css), minify: true,