@modern-js/uni-builder 2.48.6 → 2.49.1

package/dist/rspack/index.js

@@ -36,12 +36,8 @@ var import_core = require("@rsbuild/core");
 var import_parseCommonConfig = require("../shared/parseCommonConfig");
 var import_compatLegacyPlugin = require("../shared/compatLegacyPlugin");
 async function parseConfig(uniBuilderConfig, options) {
-  var _uniBuilderConfig_output, _uniBuilderConfig_tools, _uniBuilderConfig_tools1;
+  var _uniBuilderConfig_tools, _uniBuilderConfig_tools1;
   const { rsbuildConfig, rsbuildPlugins } = await (0, import_parseCommonConfig.parseCommonConfig)(uniBuilderConfig, options);
-  if ((_uniBuilderConfig_output = uniBuilderConfig.output) === null || _uniBuilderConfig_output === void 0 ? void 0 : _uniBuilderConfig_output.enableAssetManifest) {
-    const { pluginManifest } = await Promise.resolve().then(() => __toESM(require("./plugins/manifest")));
-    rsbuildPlugins.push(pluginManifest());
-  }
   if ((_uniBuilderConfig_tools = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools === void 0 ? void 0 : _uniBuilderConfig_tools.babel) {
     var _uniBuilderConfig_tools2;
     const { pluginBabel } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-babel")));

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 {
@@ -66,7 +67,8 @@ const transformToRsbuildServerOptions = (dev, devServer) => {
       liveReload: true,
       client: {
         path: "/webpack-hmr",
-        overlay: false
+        overlay: false,
+        ...devConfig.client || {}
       }
     },
     options: devServer,
@@ -123,7 +125,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 +145,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 +161,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 +169,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, enableAssetManifest, 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
@@ -319,6 +322,10 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     pluginOptions: minifyCss
   }));
   targets.includes("web") && rsbuildPlugins.push((0, import_postcssLegacy.pluginPostcssLegacy)(overrideBrowserslist.web));
+  if (enableAssetManifest) {
+    const { pluginManifest } = await Promise.resolve().then(() => __toESM(require("./plugins/manifest")));
+    rsbuildPlugins.push(pluginManifest());
+  }
   return {
     rsbuildConfig: (0, import_core.mergeRsbuildConfig)(rsbuildConfig, extraConfig),
     rsbuildPlugins

package/dist/{rspack → shared}/plugins/manifest.js

@@ -31,7 +31,7 @@ __export(manifest_exports, {
   pluginManifest: () => pluginManifest
 });
 module.exports = __toCommonJS(manifest_exports);
-var import_manifest = require("../../shared/manifest");
+var import_manifest = require("../manifest");
 const pluginManifest = () => ({
   name: "uni-builder:manifest",
   setup(api) {

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/dist/webpack/index.js

@@ -39,7 +39,7 @@ var import_moduleScopes = require("./plugins/moduleScopes");
 var import_babel = require("./plugins/babel");
 var import_react = require("./plugins/react");
 async function parseConfig(uniBuilderConfig, options) {
-  var _uniBuilderConfig_tools, _uniBuilderConfig_performance, _uniBuilderConfig_tools1, _uniBuilderConfig_output, _uniBuilderConfig_output1, _uniBuilderConfig_security, _uniBuilderConfig_experiments, _uniBuilderConfig_tools2;
+  var _uniBuilderConfig_tools, _uniBuilderConfig_performance, _uniBuilderConfig_tools1, _uniBuilderConfig_output, _uniBuilderConfig_security, _uniBuilderConfig_experiments, _uniBuilderConfig_tools2;
   const { rsbuildConfig, rsbuildPlugins } = await (0, import_parseCommonConfig.parseCommonConfig)(uniBuilderConfig, options);
   var _uniBuilderConfig_performance_transformLodash;
   rsbuildPlugins.push((0, import_babel.pluginBabel)({
@@ -52,11 +52,7 @@ async function parseConfig(uniBuilderConfig, options) {
     const { pluginTsLoader } = await Promise.resolve().then(() => __toESM(require("./plugins/tsLoader")));
     rsbuildPlugins.push(pluginTsLoader(uniBuilderConfig.tools.tsLoader, uniBuilderConfig.tools.babel));
   }
-  if ((_uniBuilderConfig_output = uniBuilderConfig.output) === null || _uniBuilderConfig_output === void 0 ? void 0 : _uniBuilderConfig_output.enableAssetManifest) {
-    const { pluginManifest } = await Promise.resolve().then(() => __toESM(require("./plugins/manifest")));
-    rsbuildPlugins.push(pluginManifest());
-  }
-  if (!((_uniBuilderConfig_output1 = uniBuilderConfig.output) === null || _uniBuilderConfig_output1 === void 0 ? void 0 : _uniBuilderConfig_output1.disableMinimize)) {
+  if (!((_uniBuilderConfig_output = uniBuilderConfig.output) === null || _uniBuilderConfig_output === void 0 ? void 0 : _uniBuilderConfig_output.disableMinimize)) {
     var _uniBuilderConfig_tools3;
     const { pluginMinimize } = await Promise.resolve().then(() => __toESM(require("./plugins/minimize")));
     rsbuildPlugins.push(pluginMinimize((_uniBuilderConfig_tools3 = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools3 === void 0 ? void 0 : _uniBuilderConfig_tools3.terser));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.48.6",
+  "version": "2.49.1",
   "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.6",
+    "@rsbuild/core": "0.6.6",
+    "@rsbuild/plugin-assets-retry": "0.6.6",
+    "@rsbuild/plugin-babel": "0.6.6",
+    "@rsbuild/plugin-check-syntax": "0.6.6",
+    "@rsbuild/plugin-css-minimizer": "0.6.6",
+    "@rsbuild/plugin-pug": "0.6.6",
+    "@rsbuild/plugin-react": "0.6.6",
+    "@rsbuild/plugin-rem": "0.6.6",
+    "@rsbuild/plugin-source-build": "0.6.6",
+    "@rsbuild/plugin-styled-components": "0.6.6",
+    "@rsbuild/plugin-svgr": "0.6.6",
+    "@rsbuild/plugin-type-check": "0.6.6",
+    "@rsbuild/plugin-toml": "0.6.6",
+    "@rsbuild/plugin-yaml": "0.6.6",
+    "@rsbuild/shared": "0.6.6",
+    "@rsbuild/webpack": "0.6.6",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -65,20 +65,19 @@
     "terser-webpack-plugin": "5.3.10",
     "ts-loader": "9.4.4",
     "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.1",
+    "@modern-js/server": "2.49.1"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.6.1",
+    "@rsbuild/plugin-swc": "0.6.6",
     "@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"
+    "@modern-js/prod-server": "2.49.1",
+    "@scripts/build": "2.49.1",
+    "@scripts/vitest-config": "2.49.1"
   },
   "publishConfig": {
     "access": "public",

package/dist/webpack/plugins/manifest.d.ts

@@ -1,2 +0,0 @@
-import type { RsbuildPlugin } from '@rsbuild/core';
-export declare const pluginManifest: () => RsbuildPlugin;

package/dist/webpack/plugins/manifest.js

@@ -1,54 +0,0 @@
-"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)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  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 manifest_exports = {};
-__export(manifest_exports, {
-  pluginManifest: () => pluginManifest
-});
-module.exports = __toCommonJS(manifest_exports);
-var import_manifest = require("../../shared/manifest");
-const pluginManifest = () => ({
-  name: "uni-builder:manifest",
-  setup(api) {
-    api.modifyBundlerChain(async (chain, { target, CHAIN_ID }) => {
-      const { WebpackManifestPlugin } = await Promise.resolve().then(() => __toESM(require("webpack-manifest-plugin")));
-      const publicPath = chain.output.get("publicPath");
-      chain.plugin(CHAIN_ID.PLUGIN.MANIFEST).use(WebpackManifestPlugin, [
-        {
-          fileName: target === "web" ? "asset-manifest.json" : `asset-manifest-${target}.json`,
-          publicPath,
-          generate: import_manifest.generateManifest
-        }
-      ]);
-    });
-  }
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  pluginManifest
-});