chore: improve directory structure of providers (#2137)

chenjiahan · web-flow · commit 3a255d0f40e0 · 2024-04-18T21:28:28.000+08:00
diff --git a/packages/compat/webpack/src/build.ts b/packages/compat/webpack/src/build.ts
diff --git a/packages/compat/webpack/src/createCompiler.ts b/packages/compat/webpack/src/createCompiler.ts
@@ -13,7 +13,7 @@ import {
   getDevMiddleware,
   type InternalContext,
 } from '@rsbuild/core/internal';
-import type { WebpackConfig } from '../types';
+import type { WebpackConfig } from './types';
 import { initConfigs, type InitConfigsOptions } from './initConfigs';
 // @ts-expect-error
 import WebpackMultiStats from 'webpack/lib/MultiStats';
diff --git a/packages/compat/webpack/src/initConfigs.ts b/packages/compat/webpack/src/initConfigs.ts
@@ -10,7 +10,7 @@ import {
 } from '@rsbuild/core/internal';
 import { inspectConfig } from './inspectConfig';
 import { generateWebpackConfig } from './webpackConfig';
-import type { WebpackConfig } from '../types';
+import type { WebpackConfig } from './types';
 
 export type InitConfigsOptions = {
   context: InternalContext;
diff --git a/packages/compat/webpack/src/inspectConfig.ts b/packages/compat/webpack/src/inspectConfig.ts
@@ -9,7 +9,7 @@ import {
   type InspectConfigResult,
   type InspectConfigOptions,
 } from '@rsbuild/shared';
-import type { WebpackConfig } from '../types';
+import type { WebpackConfig } from './types';
 
 export async function inspectConfig({
   context,
diff --git a/packages/compat/webpack/src/provider.ts b/packages/compat/webpack/src/provider.ts
@@ -11,7 +11,7 @@ import {
   initRsbuildConfig,
   createPublicContext,
 } from '@rsbuild/core/internal';
-import { initConfigs } from './core/initConfigs';
+import { initConfigs } from './initConfigs';
 
 export const webpackProvider: RsbuildProvider<'webpack'> = async ({
   pluginManager,
@@ -24,7 +24,7 @@ export const webpackProvider: RsbuildProvider<'webpack'> = async ({
   context.pluginAPI = pluginAPI;
 
   const createCompiler = (async () => {
-    const { createCompiler } = await import('./core/createCompiler');
+    const { createCompiler } = await import('./createCompiler');
     const { webpackConfigs } = await initConfigs({
       context,
       pluginManager,
@@ -92,7 +92,7 @@ export const webpackProvider: RsbuildProvider<'webpack'> = async ({
 
     async createDevServer(options) {
       const { createDevServer } = await import('@rsbuild/core/internal');
-      const { createDevMiddleware } = await import('./core/createCompiler');
+      const { createDevMiddleware } = await import('./createCompiler');
       await initRsbuildConfig({ context, pluginManager });
       return createDevServer(
         { context, pluginManager, rsbuildOptions },
@@ -103,7 +103,7 @@ export const webpackProvider: RsbuildProvider<'webpack'> = async ({
 
     async startDevServer(options) {
       const { createDevServer } = await import('@rsbuild/core/internal');
-      const { createDevMiddleware } = await import('./core/createCompiler');
+      const { createDevMiddleware } = await import('./createCompiler');
       await initRsbuildConfig({
         context,
         pluginManager,
@@ -131,12 +131,12 @@ export const webpackProvider: RsbuildProvider<'webpack'> = async ({
     },
 
     async build(options) {
-      const { build } = await import('./core/build');
+      const { build } = await import('./build');
       return build({ context, pluginManager, rsbuildOptions }, options);
     },
 
     async inspectConfig(inspectOptions) {
-      const { inspectConfig } = await import('./core/inspectConfig');
+      const { inspectConfig } = await import('./inspectConfig');
       return await inspectConfig({
         context,
         pluginManager,
diff --git a/packages/compat/webpack/src/webpackConfig.ts b/packages/compat/webpack/src/webpackConfig.ts
@@ -14,9 +14,9 @@ import {
   getChainUtils as getBaseChainUtils,
   type InternalContext,
 } from '@rsbuild/core/internal';
-import { getCompiledPath } from '../shared';
+import { getCompiledPath } from './shared';
 import type { RuleSetRule, WebpackPluginInstance } from 'webpack';
-import type { WebpackConfig } from '../types';
+import type { WebpackConfig } from './types';
 
 async function modifyWebpackChain(
   context: InternalContext,
diff --git a/packages/core/src/createContext.ts b/packages/core/src/createContext.ts
@@ -9,10 +9,10 @@ import {
   type NormalizedConfig,
   type CreateRsbuildOptions,
 } from '@rsbuild/shared';
-import type { InternalContext } from '../types';
-import { initHooks } from '../initHooks';
-import { withDefaultConfig } from '../config';
-import { getEntryObject } from '../plugins/entry';
+import type { InternalContext } from './types';
+import { initHooks } from './initHooks';
+import { withDefaultConfig } from './config';
+import { getEntryObject } from './plugins/entry';
 
 function getAbsolutePath(root: string, filepath: string) {
   return isAbsolute(filepath) ? filepath : join(root, filepath);
diff --git a/packages/core/src/initPlugins.ts b/packages/core/src/initPlugins.ts
@@ -10,7 +10,7 @@ import {
   type TransformHandler,
 } from '@rsbuild/shared';
 import { createPublicContext } from './createContext';
-import type { InternalContext, NormalizedConfig } from '../types';
+import type { InternalContext, NormalizedConfig } from './types';
 import type { Compiler } from '@rspack/core';
 
 export function getHTMLPathByEntry(
@@ -124,7 +124,7 @@ export function getPluginAPI({
 
       rule
         .use(id)
-        .loader(join(__dirname, '../rspack/transformLoader'))
+        .loader(join(__dirname, './rspack/transformLoader'))
         .options({ id });
 
       applyTransformPlugin(chain, transformer);
diff --git a/packages/core/src/internal.ts b/packages/core/src/internal.ts
@@ -5,17 +5,17 @@
  */
 
 export { rspackProvider } from './provider/provider';
-export { createContext, createPublicContext } from './provider/createContext';
+export { createContext, createPublicContext } from './createContext';
 export { initPlugins, createPluginManager } from './pluginManager';
 export { initHooks, type Hooks } from './initHooks';
 export { initRsbuildConfig } from './provider/initConfigs';
-export { getPluginAPI } from './provider/initPlugins';
+export { getPluginAPI } from './initPlugins';
 export { applyBaseCSSRule, applyCSSModuleRule } from './provider/plugins/css';
 export type { InternalContext } from './types';
 export { setHTMLPlugin, getHTMLPlugin } from './htmlUtils';
 export { formatStats, getStatsOptions } from './provider/shared';
 export { getChainUtils } from './provider/rspackConfig';
 export { applySwcDecoratorConfig } from './provider/plugins/swc';
-export { getDevMiddleware } from './provider/devMiddleware';
+export { getDevMiddleware } from './server/devMiddleware';
 export { createDevServer, startProdServer } from './server';
 export { plugins } from './plugins';
diff --git a/packages/core/src/provider/createCompiler.ts b/packages/core/src/provider/createCompiler.ts
@@ -149,7 +149,7 @@ export async function createDevMiddleware(
     });
   }
 
-  const { getDevMiddleware } = await import('./devMiddleware');
+  const { getDevMiddleware } = await import('../server/devMiddleware');
   return {
     devMiddleware: getDevMiddleware(compiler),
     compiler,
diff --git a/packages/core/src/provider/initConfigs.ts b/packages/core/src/provider/initConfigs.ts
@@ -7,7 +7,7 @@ import {
   type CreateRsbuildOptions,
 } from '@rsbuild/shared';
 import { mergeRsbuildConfig } from '../mergeConfig';
-import { updateContextByNormalizedConfig } from './createContext';
+import { updateContextByNormalizedConfig } from '../createContext';
 import { inspectConfig } from './inspectConfig';
 import { generateRspackConfig } from './rspackConfig';
 import { normalizeConfig } from '../config';
diff --git a/packages/core/src/provider/provider.ts b/packages/core/src/provider/provider.ts
@@ -4,9 +4,9 @@ import {
   type RsbuildProvider,
   type PreviewServerOptions,
 } from '@rsbuild/shared';
-import { createContext, createPublicContext } from './createContext';
+import { createContext, createPublicContext } from '../createContext';
 import { initConfigs, initRsbuildConfig } from './initConfigs';
-import { getPluginAPI } from './initPlugins';
+import { getPluginAPI } from '../initPlugins';
 import { plugins } from '../plugins';
 
 export const rspackProvider: RsbuildProvider = async ({
diff --git a/packages/core/src/server/devMiddleware.ts b/packages/core/src/server/devMiddleware.ts
diff --git a/packages/core/tests/createCompiler.test.ts b/packages/core/tests/createCompiler.test.ts
@@ -1,5 +1,5 @@
 import { createCompiler } from '../src/provider/createCompiler';
-import { createContext } from '../src/provider/createContext';
+import { createContext } from '../src/createContext';
 
 describe('createCompiler', () => {
   const createDefaultContext = () =>
diff --git a/packages/core/tests/htmlHelper.test.ts b/packages/core/tests/htmlHelper.test.ts
@@ -1,5 +1,5 @@
 import { hasTitle } from '../src/rspack/HtmlBasicPlugin';
-import { getHTMLPathByEntry } from '../src/provider/initPlugins';
+import { getHTMLPathByEntry } from '../src/initPlugins';
 import type { NormalizedConfig } from '@rsbuild/shared';
 
 test('should detect HTML title via "hasTitle" correctly', () => {

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ export async function createDevMiddleware(`
`149`	`149`	`});`
`150`	`150`	`}`
`151`	`151`
`152`		`- const { getDevMiddleware } = await import('./devMiddleware');`
	`152`	`+ const { getDevMiddleware } = await import('../server/devMiddleware');`
`153`	`153`	`return {`
`154`	`154`	`devMiddleware: getDevMiddleware(compiler),`
`155`	`155`	`compiler,`