Skip to content

Commit 8995ac5

Browse files
authored
chore(builder): flat directory structure (#7834)
1 parent bc49b53 commit 8995ac5

25 files changed

+35
-41
lines changed

packages/cli/builder/src/rspack/index.ts renamed to packages/cli/builder/src/createBuilder.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import type {
55
RsbuildPlugin,
66
} from '@rsbuild/core';
77
import type { PluginBabelOptions } from '@rsbuild/plugin-babel';
8-
import { parseCommonConfig } from '../shared/parseCommonConfig';
9-
import { rsbuildRscPlugin } from '../shared/rsc/plugins/rsbuild-rsc-plugin';
10-
import { castArray } from '../shared/utils';
8+
import { rsbuildRscPlugin } from './rsc/plugins/rsbuild-rsc-plugin';
9+
import { parseCommonConfig } from './shared/parseCommonConfig';
10+
import { castArray } from './shared/utils';
1111
import type {
1212
BuilderConfig,
1313
CreateBuilderCommonOptions,
1414
CreateBuilderOptions,
15-
} from '../types';
15+
} from './types';
1616

1717
export async function parseConfig(
1818
builderConfig: BuilderConfig,
@@ -48,7 +48,7 @@ export async function parseConfig(
4848
}
4949

5050
if (Boolean(rsbuildConfig.tools!.lightningcssLoader) === false) {
51-
const { pluginPostcss } = await import('../shared/plugins/postcss');
51+
const { pluginPostcss } = await import('./plugins/postcss');
5252
rsbuildPlugins.push(
5353
pluginPostcss({ autoprefixer: builderConfig.tools?.autoprefixer }),
5454
);

packages/cli/builder/src/index.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type BuilderInstance, createRspackBuilder } from './rspack';
1+
import { type BuilderInstance, createRspackBuilder } from './createBuilder';
22
import type { CreateBuilderOptions } from './types';
33

44
export type { CreateBuilderOptions, BuilderInstance };
@@ -14,9 +14,7 @@ export type {
1414
CacheGroup,
1515
} from './types';
1616

17-
export async function createBuilder(options: CreateBuilderOptions) {
18-
return createRspackBuilder(options);
19-
}
17+
export { createRspackBuilder as createBuilder };
2018

2119
export {
2220
logger,
@@ -38,4 +36,4 @@ export {
3836
castArray,
3937
} from './shared/utils';
4038

41-
export { parseConfig as parseRspackConfig } from './rspack';
39+
export { parseConfig as parseRspackConfig } from './createBuilder';

packages/cli/builder/src/shared/plugins/environmentDefaults.ts renamed to packages/cli/builder/src/plugins/environmentDefaults.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { join } from 'node:path';
22
import type { RsbuildConfig, RsbuildPlugin } from '@rsbuild/core';
3-
import type { DistPath } from '../../types';
43
import {
54
SERVICE_WORKER_ENVIRONMENT_NAME,
65
getBrowserslistWithDefault,
7-
} from '../utils';
6+
} from '../shared/utils';
7+
import type { DistPath } from '../types';
88

99
export const pluginEnvironmentDefaults = (
1010
distPath: DistPath = {},

packages/cli/builder/src/shared/plugins/globalVars.ts renamed to packages/cli/builder/src/plugins/globalVars.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { applyOptionsChain } from '@modern-js/utils';
22
import type { RsbuildPlugin } from '@rsbuild/core';
3-
import type { ChainedGlobalVars } from '../../types';
3+
import type { ChainedGlobalVars } from '../types';
44

55
export const pluginGlobalVars = (
66
options?: ChainedGlobalVars,

packages/cli/builder/src/shared/plugins/mainFields.ts renamed to packages/cli/builder/src/plugins/mainFields.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { RsbuildPlugin, RsbuildTarget } from '@rsbuild/core';
2-
import type { MainFields } from '../../types';
2+
import type { MainFields } from '../types';
33

44
export const pluginMainFields = (
55
resolveMainFields: MainFields | Partial<Record<RsbuildTarget, MainFields>>,

0 commit comments

Comments
 (0)