@modern-js/uni-builder 2.48.6 → 2.49.0

package/dist/shared/devServer.d.ts

@@ -1,8 +1,11 @@
+/// <reference types="node" />
 import { StartDevServerOptions as RsbuildStartDevServerOptions, StartServerResult, RsbuildInstance, DevConfig, ServerConfig } from '@rsbuild/shared';
-import type { Server, ModernDevServerOptionsNew } from '@modern-js/server';
+import type { ModernDevServerOptions } from '@modern-js/server';
+import type { Server } from 'node:http';
+import { type InitProdMiddlewares } from '@modern-js/prod-server';
 import type { UniBuilderConfig, ToolsDevServerConfig } from '../types';
-type ServerOptions = Partial<Omit<ModernDevServerOptionsNew, 'config'>> & {
-    config?: Partial<ModernDevServerOptionsNew['config']>;
+type ServerOptions = Partial<Omit<ModernDevServerOptions, 'config'>> & {
+    config?: Partial<ModernDevServerOptions['config']>;
 };
 export declare const transformToRsbuildServerOptions: (dev: NonNullable<UniBuilderConfig['dev']>, devServer: ToolsDevServerConfig) => {
     dev: DevConfig;
@@ -11,6 +14,7 @@ export declare const transformToRsbuildServerOptions: (dev: NonNullable<UniBuild
 export type StartDevServerOptions = RsbuildStartDevServerOptions & {
     apiOnly?: boolean;
     serverOptions?: ServerOptions;
+    initProdMiddlewares?: InitProdMiddlewares;
 };
 export type UniBuilderStartServerResult = Omit<StartServerResult, 'server'> & {
     server: Server;

package/dist/shared/devServer.js

@@ -33,6 +33,7 @@ __export(devServer_exports, {
 });
 module.exports = __toCommonJS(devServer_exports);
 var import_shared = require("@rsbuild/shared");
+var import_prod_server = require("@modern-js/prod-server");
 const getServerOptions = (builderConfig) => {
   var _builderConfig_output_distPath, _builderConfig_output, _builderConfig_output1, _builderConfig_output2;
   return {
@@ -123,7 +124,11 @@ const getDevServerOptions = async ({ builderConfig, serverOptions }) => {
 };
 async function startDevServer(rsbuild, options = {}, builderConfig) {
   var _serverOptions_dev, _serverOptions_dev1;
-  const { ServerForRsbuild } = await Promise.resolve().then(() => __toESM(require("@modern-js/server")));
+  (0, import_shared.debug)("create dev server");
+  if (!options.initProdMiddlewares) {
+    options.initProdMiddlewares = import_prod_server.initProdMiddlewares;
+  }
+  const { createDevServer } = await Promise.resolve().then(() => __toESM(require("@modern-js/server")));
   const rsbuildServer = await rsbuild.createDevServer({
     ...options,
     runCompile: !options.apiOnly
@@ -139,9 +144,10 @@ async function startDevServer(rsbuild, options = {}, builderConfig) {
   const { port } = rsbuildServer;
   const { server: { host }, dev: { writeToDisk } } = rsbuildConfig;
   var _serverOptions_dev_watch;
-  const server = new ServerForRsbuild({
+  const server = await createDevServer({
     pwd: rsbuild.context.rootPath,
     ...serverOptions,
+    appContext: serverOptions.appContext || {},
     rsbuild,
     getMiddlewares: () => ({
       middlewares: rsbuildServer.middlewares,
@@ -154,7 +160,7 @@ async function startDevServer(rsbuild, options = {}, builderConfig) {
       writeToDisk
     },
     config
-  });
+  }, options.initProdMiddlewares);
   const protocol = https ? "https" : "http";
   const urls = (0, import_shared.getAddressUrls)({
     protocol,
@@ -162,7 +168,6 @@ async function startDevServer(rsbuild, options = {}, builderConfig) {
     host
   });
   (0, import_shared.debug)("listen dev server");
-  await server.init();
   return new Promise((resolve) => {
     server.listen({
       host,

package/dist/shared/parseCommonConfig.js

@@ -108,10 +108,13 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   var _uniBuilderConfig_output, _uniBuilderConfig_tools;
   var _output, _output_distPath, _output_distPath1, _output1, _extraConfig, _html, _extraConfig1;
   const { cwd, frameworkConfigPath, entry, target } = options;
-  const { plugins: [...plugins] = [], performance: { ...performanceConfig } = {}, output: { disableFilenameHash, enableLatestDecorators, cssModuleLocalIdentName, enableInlineScripts, disableCssExtract, enableInlineStyles, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetFallback, disableSourceMap, convertToRem, disableMinimize, ...outputConfig } = {}, html: { disableHtmlFolder, metaByEntries, titleByEntries, faviconByEntries, injectByEntries, templateByEntries, templateParametersByEntries, tagsByEntries, tags, ...htmlConfig } = {}, source: { alias, globalVars, resolveMainFields, resolveExtensionPrefix, ...sourceConfig } = {}, dev, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, ...toolsConfig } = {} } = uniBuilderConfig;
+  const { plugins: [...plugins] = [], performance: { ...performanceConfig } = {}, output: { disableFilenameHash, enableLatestDecorators, cssModuleLocalIdentName, enableInlineScripts, disableCssExtract, enableInlineStyles, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetFallback, disableSourceMap, convertToRem, disableMinimize, polyfill, ...outputConfig } = {}, html: { disableHtmlFolder, metaByEntries, titleByEntries, faviconByEntries, injectByEntries, templateByEntries, templateParametersByEntries, tagsByEntries, tags, ...htmlConfig } = {}, source: { alias, globalVars, resolveMainFields, resolveExtensionPrefix, ...sourceConfig } = {}, dev, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, ...toolsConfig } = {} } = uniBuilderConfig;
   const rsbuildConfig = {
     plugins,
-    output: outputConfig,
+    output: {
+      polyfill: polyfill === "ua" ? "off" : polyfill,
+      ...outputConfig
+    },
     source: {
       alias,
       ...sourceConfig

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { NodeEnv, MetaOptions, ServerConfig, ScriptInject, RsbuildTarget, ChainedConfig, ChainedConfigWithUtils, InlineChunkTest, DevConfig, RequestHandler, RsbuildEntry, MaybePromise, RsbuildPluginAPI, ArrayOrNot, HtmlTagDescriptor } from '@rsbuild/shared';
+import type { NodeEnv, MetaOptions, ServerConfig, ScriptInject, RsbuildTarget, ChainedConfig, ChainedConfigWithUtils, InlineChunkTest, DevConfig, RequestHandler, RsbuildEntry, MaybePromise, RsbuildPluginAPI, ArrayOrNot, HtmlTagDescriptor, Polyfill } from '@rsbuild/shared';
 import type { RsbuildConfig } from '@rsbuild/core';
 import type { PluginAssetsRetryOptions } from '@rsbuild/plugin-assets-retry';
 import type { PluginStyledComponentsOptions } from '@rsbuild/plugin-styled-components';
@@ -324,7 +324,9 @@ export type UniBuilderPlugin = {
 export type UniBuilderConfig = {
     dev?: RsbuildConfig['dev'];
     html?: RsbuildConfig['html'];
-    output?: RsbuildConfig['output'];
+    output?: Omit<NonNullable<RsbuildConfig['output']>, 'polyfill'> & {
+        polyfill?: Polyfill | 'ua';
+    };
     performance?: RsbuildConfig['performance'];
     security?: RsbuildConfig['security'];
     tools?: RsbuildConfig['tools'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.48.6",
+  "version": "2.49.0",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,23 +26,23 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.23.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/babel-preset": "0.6.1",
-    "@rsbuild/core": "0.6.1",
-    "@rsbuild/plugin-assets-retry": "0.6.1",
-    "@rsbuild/plugin-babel": "0.6.1",
-    "@rsbuild/plugin-check-syntax": "0.6.1",
-    "@rsbuild/plugin-css-minimizer": "0.6.1",
-    "@rsbuild/plugin-pug": "0.6.1",
-    "@rsbuild/plugin-react": "0.6.1",
-    "@rsbuild/plugin-rem": "0.6.1",
-    "@rsbuild/plugin-source-build": "0.6.1",
-    "@rsbuild/plugin-styled-components": "0.6.1",
-    "@rsbuild/plugin-svgr": "0.6.1",
-    "@rsbuild/plugin-type-check": "0.6.1",
-    "@rsbuild/plugin-toml": "0.6.1",
-    "@rsbuild/plugin-yaml": "0.6.1",
-    "@rsbuild/shared": "0.6.1",
-    "@rsbuild/webpack": "0.6.1",
+    "@rsbuild/babel-preset": "0.6.3",
+    "@rsbuild/core": "0.6.3",
+    "@rsbuild/plugin-assets-retry": "0.6.3",
+    "@rsbuild/plugin-babel": "0.6.3",
+    "@rsbuild/plugin-check-syntax": "0.6.3",
+    "@rsbuild/plugin-css-minimizer": "0.6.3",
+    "@rsbuild/plugin-pug": "0.6.3",
+    "@rsbuild/plugin-react": "0.6.3",
+    "@rsbuild/plugin-rem": "0.6.3",
+    "@rsbuild/plugin-source-build": "0.6.3",
+    "@rsbuild/plugin-styled-components": "0.6.3",
+    "@rsbuild/plugin-svgr": "0.6.3",
+    "@rsbuild/plugin-type-check": "0.6.3",
+    "@rsbuild/plugin-toml": "0.6.3",
+    "@rsbuild/plugin-yaml": "0.6.3",
+    "@rsbuild/shared": "0.6.3",
+    "@rsbuild/webpack": "0.6.3",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -67,18 +67,18 @@
     "webpack": "^5.91.0",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "2.48.6",
-    "@modern-js/server": "2.48.6"
+    "@modern-js/utils": "2.49.0",
+    "@modern-js/server": "2.49.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.6.1",
+    "@rsbuild/plugin-swc": "0.6.3",
     "@types/lodash": "^4.14.202",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@scripts/build": "2.48.6",
-    "@scripts/vitest-config": "2.48.6",
-    "@modern-js/prod-server": "2.48.6"
+    "@scripts/vitest-config": "2.49.0",
+    "@modern-js/prod-server": "2.49.0",
+    "@scripts/build": "2.49.0"
   },
   "publishConfig": {
     "access": "public",