@modern-js/uni-builder 2.56.1 → 2.57.0

package/dist/index.d.ts

@@ -4,8 +4,7 @@ import type { CreateUniBuilderOptions } from './types';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 export { HtmlWebpackPlugin };
 export type { CreateUniBuilderOptions, UniBuilderInstance, UniBuilderWebpackInstance, };
-export type { UniBuilderConfig, UniBuilderPlugin, BundlerType, MetaOptions, Stats, MultiStats, RspackConfig, } from './types';
-export type { StartDevServerOptions } from './shared/devServer';
+export type { UniBuilderConfig, UniBuilderPlugin, LooseRsbuildPlugin, BundlerType, MetaOptions, Stats, MultiStats, RspackConfig, } from './types';
 export declare function createUniBuilder(options: CreateUniBuilderOptions): Promise<UniBuilderInstance>;
 export { logger, type ConfigChain, type RsbuildPlugin, type ChainIdentifier, type RspackChain, type Rspack, type RsbuildContext, type RsbuildConfig, type RsbuildTarget, type NormalizedConfig, type CacheGroup, } from '@rsbuild/core';
 export type { webpack, WebpackConfig } from '@rsbuild/webpack';

package/dist/rspack/index.js

@@ -84,10 +84,6 @@ async function createRspackBuilder(options) {
         });
       });
       rsbuild.addPlugins(warpedPlugins, options2);
-    },
-    startDevServer: async (options2 = {}) => {
-      const { startDevServer } = await Promise.resolve().then(() => __toESM(require("../shared/devServer")));
-      return startDevServer(rsbuild, options2, config);
     }
   };
 }

package/dist/shared/devServer.d.ts

@@ -1,26 +1,6 @@
-/// <reference types="node" />
-import { type RsbuildInstance, type DevConfig, type ServerConfig, type Rspack } from '@rsbuild/core';
-import type { ModernDevServerOptions } from '@modern-js/server';
-import type { Server } from 'node:http';
-import { type ApplyPlugins } from '@modern-js/prod-server';
+import { type DevConfig, type ServerConfig } from '@rsbuild/core';
 import type { UniBuilderConfig, ToolsDevServerConfig } from '../types';
-type ServerOptions = Partial<Omit<ModernDevServerOptions, 'config'>> & {
-    config?: Partial<ModernDevServerOptions['config']>;
-};
 export declare const transformToRsbuildServerOptions: (dev: NonNullable<UniBuilderConfig['dev']>, devServer: ToolsDevServerConfig) => {
     dev: DevConfig;
     server: ServerConfig;
 };
-export type StartDevServerOptions = {
-    compiler?: Rspack.Compiler | Rspack.MultiCompiler;
-    getPortSilently?: boolean;
-    apiOnly?: boolean;
-    serverOptions?: ServerOptions;
-    applyPlugins?: ApplyPlugins;
-};
-export type UniBuilderStartServerResult = {
-    server: Server;
-    port: number;
-};
-export declare function startDevServer(rsbuild: RsbuildInstance, options: StartDevServerOptions | undefined, builderConfig: UniBuilderConfig): Promise<UniBuilderStartServerResult>;
-export {};

package/dist/shared/devServer.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,49 +15,30 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var devServer_exports = {};
 __export(devServer_exports, {
-  startDevServer: () => startDevServer,
   transformToRsbuildServerOptions: () => transformToRsbuildServerOptions
 });
 module.exports = __toCommonJS(devServer_exports);
 var import_ts_deepmerge = require("ts-deepmerge");
 var import_utils = require("@modern-js/utils");
-var import_core = require("@rsbuild/core");
-var import_prod_server = require("@modern-js/prod-server");
-const getServerOptions = (builderConfig) => {
-  var _builderConfig_output_distPath, _builderConfig_output, _builderConfig_output1, _builderConfig_output2;
-  return {
-    output: {
-      path: (_builderConfig_output = builderConfig.output) === null || _builderConfig_output === void 0 ? void 0 : (_builderConfig_output_distPath = _builderConfig_output.distPath) === null || _builderConfig_output_distPath === void 0 ? void 0 : _builderConfig_output_distPath.root,
-      assetPrefix: (_builderConfig_output1 = builderConfig.output) === null || _builderConfig_output1 === void 0 ? void 0 : _builderConfig_output1.assetPrefix,
-      distPath: (_builderConfig_output2 = builderConfig.output) === null || _builderConfig_output2 === void 0 ? void 0 : _builderConfig_output2.distPath
-    },
-    source: {
-      alias: {}
-    },
-    html: {},
-    tools: {
-      babel: {}
-    },
-    server: {},
-    runtime: {},
-    bff: {},
-    dev: {},
-    security: {}
-  };
+const transformDevSetupMiddlewares = (seuptMiddlewares) => {
+  if (seuptMiddlewares) {
+    const newSetupMiddlewares = seuptMiddlewares.map((handler) => (_, server) => {
+      handler({
+        unshift() {
+        },
+        push() {
+        }
+      }, server);
+    });
+    return newSetupMiddlewares;
+  }
+  return void 0;
 };
 const transformToRsbuildServerOptions = (dev, devServer) => {
-  var _newDevServerConfig_devMiddleware, _newDevServerConfig_before, _newDevServerConfig_after;
+  var _newDevServerConfig_devMiddleware;
   const { port = 8080, host, https, startUrl, beforeStartUrl, ...devConfig } = dev;
   var _dev_hmr;
   const newDevServerConfig = (0, import_utils.applyOptionsChain)({
@@ -88,17 +67,7 @@ const transformToRsbuildServerOptions = (dev, devServer) => {
   if (dev.progressBar === void 0) {
     rsbuildDev.progressBar = true;
   }
-  if (((_newDevServerConfig_before = newDevServerConfig.before) === null || _newDevServerConfig_before === void 0 ? void 0 : _newDevServerConfig_before.length) || ((_newDevServerConfig_after = newDevServerConfig.after) === null || _newDevServerConfig_after === void 0 ? void 0 : _newDevServerConfig_after.length)) {
-    rsbuildDev.setupMiddlewares = [
-      ...newDevServerConfig.setupMiddlewares || [],
-      (middlewares) => {
-        middlewares.unshift(...newDevServerConfig.before || []);
-        middlewares.push(...newDevServerConfig.after || []);
-      }
-    ];
-  } else if (newDevServerConfig.setupMiddlewares) {
-    rsbuildDev.setupMiddlewares = newDevServerConfig.setupMiddlewares;
-  }
+  rsbuildDev.setupMiddlewares = transformDevSetupMiddlewares(newDevServerConfig.setupMiddlewares);
   const server = (0, import_utils.isProd)() ? {
     publicDir: false,
     htmlFallback: false,
@@ -126,72 +95,7 @@ const transformToRsbuildServerOptions = (dev, devServer) => {
     server
   };
 };
-const getDevServerOptions = async ({ builderConfig, serverOptions }) => {
-  const defaultConfig = getServerOptions(builderConfig);
-  const config = serverOptions.config ? (0, import_ts_deepmerge.merge)(defaultConfig, serverOptions.config) : defaultConfig;
-  return {
-    config
-  };
-};
-async function startDevServer(rsbuild, options = {}, builderConfig) {
-  var _serverOptions_dev, _serverOptions_dev1;
-  import_core.logger.debug("create dev server");
-  if (!options.applyPlugins) {
-    options.applyPlugins = import_prod_server.applyPlugins;
-  }
-  const { createDevServer } = await Promise.resolve().then(() => __toESM(require("@modern-js/server")));
-  const rsbuildServer = await rsbuild.createDevServer({
-    ...options,
-    runCompile: !options.apiOnly
-  });
-  const { serverOptions = {} } = options;
-  const { config } = await getDevServerOptions({
-    builderConfig,
-    serverOptions
-  });
-  const rsbuildConfig = rsbuild.getNormalizedConfig();
-  var _serverOptions_dev_https;
-  const https = (_serverOptions_dev_https = (_serverOptions_dev = serverOptions.dev) === null || _serverOptions_dev === void 0 ? void 0 : _serverOptions_dev.https) !== null && _serverOptions_dev_https !== void 0 ? _serverOptions_dev_https : rsbuildConfig.server.https;
-  const { port } = rsbuildServer;
-  const { server: { host }, dev: { writeToDisk } } = rsbuildConfig;
-  var _serverOptions_dev_watch;
-  const server = await createDevServer({
-    pwd: rsbuild.context.rootPath,
-    ...serverOptions,
-    appContext: serverOptions.appContext || {},
-    rsbuild,
-    getMiddlewares: () => ({
-      middlewares: rsbuildServer.middlewares,
-      close: rsbuildServer.close,
-      onHTTPUpgrade: rsbuildServer.onHTTPUpgrade
-    }),
-    dev: {
-      watch: (_serverOptions_dev_watch = (_serverOptions_dev1 = serverOptions.dev) === null || _serverOptions_dev1 === void 0 ? void 0 : _serverOptions_dev1.watch) !== null && _serverOptions_dev_watch !== void 0 ? _serverOptions_dev_watch : true,
-      https,
-      writeToDisk
-    },
-    config
-  }, options.applyPlugins);
-  import_core.logger.debug("listen dev server");
-  return new Promise((resolve) => {
-    server.listen({
-      host,
-      port
-    }, async (err) => {
-      if (err) {
-        throw err;
-      }
-      import_core.logger.debug("listen dev server done");
-      await rsbuildServer.afterListen();
-      resolve({
-        port,
-        server
-      });
-    });
-  });
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  startDevServer,
   transformToRsbuildServerOptions
 });

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { ConfigChainWithContext, ConfigChain, DevConfig, RsbuildConfig, RsbuildTarget, Polyfill, ScriptInject, ServerConfig, RsbuildPluginAPI, OutputConfig, DistPathConfig, Rspack, RequestHandler, NodeEnv, HtmlTagDescriptor } from '@rsbuild/core';
+import type { ConfigChainWithContext, ConfigChain, DevConfig, RsbuildConfig, RsbuildTarget, Polyfill, ScriptInject, ServerConfig, RsbuildPluginAPI, OutputConfig, DistPathConfig, Rspack, RequestHandler, NodeEnv, HtmlTagDescriptor, RsbuildPlugin } from '@rsbuild/core';
 import type { PluginAssetsRetryOptions } from '@rsbuild/plugin-assets-retry';
 import type { PluginStyledComponentsOptions } from '@rsbuild/plugin-styled-components';
 import type { PluginRemOptions } from '@rsbuild/plugin-rem';
@@ -12,7 +12,6 @@ import type { PluginBabelOptions } from '@rsbuild/plugin-babel';
 import type { PluginSassOptions } from '@rsbuild/plugin-sass';
 import type { PluginLessOptions } from '@rsbuild/plugin-less';
 import type { AliasOption } from '@modern-js/utils';
-import type { StartDevServerOptions, UniBuilderStartServerResult } from './shared/devServer';
 import type { PluginSourceBuildOptions } from '@rsbuild/plugin-source-build';
 import type TerserPlugin from 'terser-webpack-plugin';
 import type { Options as HTMLPluginOptions } from 'html-webpack-plugin';
@@ -313,15 +312,9 @@ export type SriOptions = {
     hashLoading?: 'eager' | 'lazy';
 };
 export type OverridesUniBuilderInstance = {
-    addPlugins: (plugins: UniBuilderPlugin[], options?: {
+    addPlugins: (plugins: Array<UniBuilderPlugin | LooseRsbuildPlugin>, options?: {
         before?: string;
     }) => void;
-    /**
-     * should be used in conjunction with the upper-layer framework:
-     *
-     * missing route.json (required in modern server)
-     */
-    startDevServer: (options: StartDevServerOptions) => Promise<UniBuilderStartServerResult>;
 };
 export type UniBuilderContext = RsbuildPluginAPI['context'] & {
     target: RsbuildTarget[];
@@ -358,6 +351,9 @@ export type UniBuilderPlugin = {
     post?: string[];
     remove?: string[];
 };
+export type LooseRsbuildPlugin = Omit<RsbuildPlugin, 'setup'> & {
+    setup: (api: any) => Promise<void> | void;
+};
 export type DistPath = DistPathConfig & {
     server?: string;
     worker?: string;

package/dist/webpack/index.js

@@ -111,10 +111,6 @@ async function createWebpackBuilder(options) {
         });
       });
       rsbuild.addPlugins(warpedPlugins, options2);
-    },
-    startDevServer: async (options2 = {}) => {
-      const { startDevServer } = await Promise.resolve().then(() => __toESM(require("../shared/devServer")));
-      return startDevServer(rsbuild, options2, config);
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.56.1",
+  "version": "2.57.0",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -71,10 +71,8 @@
     "ts-loader": "9.4.4",
     "webpack": "^5.93.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/server": "2.56.1",
-    "@modern-js/prod-server": "2.56.1",
-    "@modern-js/utils": "2.56.1",
-    "@modern-js/babel-preset": "2.56.1"
+    "@modern-js/utils": "2.57.0",
+    "@modern-js/babel-preset": "2.57.0"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "1.0.1-beta.3",
@@ -84,8 +82,8 @@
     "react-dom": "^18.2.0",
     "terser": "^5.31.1",
     "typescript": "^5.3.0",
-    "@scripts/build": "2.56.1",
-    "@scripts/vitest-config": "2.56.1"
+    "@scripts/vitest-config": "2.57.0",
+    "@scripts/build": "2.57.0"
   },
   "publishConfig": {
     "access": "public",