chore: remove dev.port & source.disableEntryDirs (#7798)

Author: yimingjfe

packages/cli/builder/src/shared/devServer.ts

@@ -24,15 +24,9 @@ export const transformToRsbuildServerOptions = (
   rsbuildDev: DevConfig;
   rsbuildServer: ServerConfig;
 } => {
-  const {
-    port = 8080,
-    host,
-    https,
-    startUrl,
-    beforeStartUrl,
-    ...devConfig
-  } = dev;
+  const { host, https, startUrl, beforeStartUrl, ...devConfig } = dev;
 
+  const port = process.env.PORT ? Number(process.env.PORT) : 8080;
   const rsbuildDev: DevConfig = merge(defaultDevConfig, devConfig);
   // setupMiddlewares apply by @modern-js/server
   delete rsbuildDev.setupMiddlewares;
@@ -53,8 +47,8 @@ export const transformToRsbuildServerOptions = (
         headers: serverCofig.headers,
         historyApiFallback: serverCofig.historyApiFallback,
         proxy: serverCofig.proxy,
-        port,
         host,
+        port,
         https: https ? (https as ServerConfig['https']) : undefined,
         middlewareMode: true,
       };

packages/cli/builder/src/types.ts

@@ -144,10 +144,6 @@ export type BuilderExtraConfig = {
      * After configuring this option, you can enable HTTPS Dev Server, and disabling the HTTP Dev Server.
      */
     https?: DevServerHttpsOptions;
-    /**
-     * Specify a port number for Dev Server to listen.
-     */
-    port?: number;
   };
   source?: {
     transformImport?: SourceConfig['transformImport'] | false;

packages/cli/builder/tests/__snapshots__/parseConfig.test.ts.snap

@@ -48,7 +48,7 @@ exports[`parseCommonConfig > dev.xxx 1`] = `
       "key": "xxxx",
     },
     "middlewareMode": true,
-    "port": 8081,
+    "port": 8080,
     "printUrls": false,
     "publicDir": false,
   },

packages/cli/builder/tests/parseConfig.test.ts

@@ -78,7 +78,6 @@ describe('parseCommonConfig', () => {
               key: 'xxxx',
               cert: 'xxx',
             },
-            port: 8081,
             host: 'xxx.xxx',
             client: {
               path: '/aaaa',
@@ -107,7 +106,6 @@ describe('parseCommonConfig', () => {
               key: 'xxxx',
               cert: 'xxx',
             },
-            port: 8081,
             host: 'xxx.xxx',
           },
           tools: {

packages/document/main-doc/docs/en/configure/app/source/disable-entry-dirs.mdx

@@ -8,9 +8,6 @@ export function createDefaultConfig(
   appContext: AppToolsContext,
 ): AppUserConfig {
   const dev: AppUserConfig['dev'] = {
-    // `dev.port` should not have a default value
-    // because we will use `server.port` by default
-    port: undefined,
     cliShortcuts: {
       help: false,
       // does not support restart server and print urls yet

packages/document/main-doc/docs/zh/configure/app/source/disable-entry-dirs.mdx

@@ -97,15 +97,9 @@ export const getFileSystemEntry = async (
   const { appDirectory } = appContext;
 
   const {
-    source: { entriesDir, disableEntryDirs },
+    source: { entriesDir },
   } = config;
 
-  let disabledDirs: string[] = [];
-  if (disableEntryDirs && Array.isArray(disableEntryDirs)) {
-    disabledDirs = disableEntryDirs?.map(dir =>
-      ensureAbsolutePath(appDirectory, dir),
-    );
-  }
   const src = ensureAbsolutePath(appDirectory, entriesDir || '');
 
   if (fs.existsSync(src)) {
@@ -119,8 +113,7 @@ export const getFileSystemEntry = async (
           const file = path.join(src, filename);
           if (
             fs.statSync(file).isDirectory() &&
-            (await isBundleEntry(hooks, file)) &&
-            !disabledDirs.includes(file)
+            (await isBundleEntry(hooks, file))
           ) {
             dirs.push(file);
           }

packages/solutions/app-tools/src/config/default.ts

@@ -91,7 +91,7 @@ async function getServerPort(config: AppToolsNormalizedConfig) {
   const prodPort = Number(process.env.PORT) || config.server.port || 8080;
 
   if (isDev() && isDevCommand()) {
-    return getPort(Number(process.env.PORT) || config.dev.port || prodPort);
+    return getPort(Number(process.env.PORT) || prodPort);
   }
 
   return prodPort;

packages/solutions/app-tools/src/plugins/analyze/getFileSystemEntry.ts

@@ -45,11 +45,6 @@ export interface SourceUserConfig extends NonNullable<BuilderConfig['source']> {
    * You can customize the directory used for identifying page entries with this option.
    */
   entriesDir?: string;
-  /**
-   * By default, framework identifies the application entry point based on the `src` directory.
-   * You can use this option to prevent some directories from being recognized as application entry points.
-   */
-  disableEntryDirs?: string[];
   /**
    * Customize the directory of the framework configuration files.
    */