@modern-js/uni-builder 2.46.0 → 2.46.1

package/dist/shared/devServer.js

@@ -53,18 +53,12 @@ const getServerOptions = (builderConfig) => {
   };
 };
 const getDevServerOptions = async ({ builderConfig, serverOptions, port }) => {
-  var _builderConfig_dev, _builderConfig_dev1, _builderConfig_dev2, _builderConfig_tools;
-  var _builderConfig_dev_hmr, _builderConfig_dev_hmr1;
+  var _builderConfig_dev, _builderConfig_tools;
   const defaultDevConfig = (0, import_shared.deepmerge)(
     {
-      hot: (_builderConfig_dev_hmr = (_builderConfig_dev = builderConfig.dev) === null || _builderConfig_dev === void 0 ? void 0 : _builderConfig_dev.hmr) !== null && _builderConfig_dev_hmr !== void 0 ? _builderConfig_dev_hmr : true,
       watch: true,
-      client: {
-        port: port.toString()
-      },
       port,
-      liveReload: (_builderConfig_dev_hmr1 = (_builderConfig_dev1 = builderConfig.dev) === null || _builderConfig_dev1 === void 0 ? void 0 : _builderConfig_dev1.hmr) !== null && _builderConfig_dev_hmr1 !== void 0 ? _builderConfig_dev_hmr1 : true,
-      https: (_builderConfig_dev2 = builderConfig.dev) === null || _builderConfig_dev2 === void 0 ? void 0 : _builderConfig_dev2.https
+      https: (_builderConfig_dev = builderConfig.dev) === null || _builderConfig_dev === void 0 ? void 0 : _builderConfig_dev.https
     },
     // merge devServerOptions from serverOptions
     serverOptions.dev || {}
@@ -127,8 +121,8 @@ async function startDevServer(rsbuild, options = {}, builderConfig) {
         port,
         routes: [
           {
-            route: "/",
-            name: "index"
+            pathname: "/",
+            entryName: "index"
           }
         ]
       });

package/dist/shared/parseCommonConfig.js

@@ -191,19 +191,32 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   if (dev.progressBar === void 0) {
     dev.progressBar = true;
   }
+  var _dev_hmr;
   const devServer = (0, import_shared.mergeChainedOptions)({
     defaults: {
       devMiddleware: {
         writeToDisk: (file) => !file.includes(".hot-update.")
+      },
+      hot: (_dev_hmr = dev === null || dev === void 0 ? void 0 : dev.hmr) !== null && _dev_hmr !== void 0 ? _dev_hmr : true,
+      liveReload: true,
+      client: {
+        path: "/webpack-hmr"
       }
     },
     options: tools.devServer,
     mergeFn: import_shared.deepmerge
   });
   dev.writeToDisk = (_devServer_devMiddleware = devServer.devMiddleware) === null || _devServer_devMiddleware === void 0 ? void 0 : _devServer_devMiddleware.writeToDisk;
-  const server = (0, import_shared.isProd)() ? {} : {
+  dev.hmr = devServer.hot;
+  dev.client = devServer.client;
+  dev.liveReload = devServer.liveReload;
+  const server = (0, import_shared.isProd)() ? {
+    publicDir: false
+  } : {
+    publicDir: false,
     port: dev.port,
-    host: dev.host
+    host: dev.host,
+    https: dev.https ? dev.https : void 0
   };
   delete tools.devServer;
   delete dev.https;

package/dist/types.d.ts

@@ -51,6 +51,7 @@ export type UniBuilderExtraConfig = {
             devMiddleware?: {
                 writeToDisk?: DevConfig['writeToDisk'];
             };
+            liveReload?: boolean;
             headers?: ServerConfig['headers'];
             historyApiFallback?: ServerConfig['historyApiFallback'];
             hot?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.46.0",
+  "version": "2.46.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.3.3",
-    "@rsbuild/core": "0.3.3",
-    "@rsbuild/plugin-assets-retry": "0.3.3",
-    "@rsbuild/plugin-babel": "0.3.3",
-    "@rsbuild/plugin-check-syntax": "0.3.3",
-    "@rsbuild/plugin-css-minimizer": "0.3.3",
-    "@rsbuild/plugin-pug": "0.3.3",
-    "@rsbuild/plugin-react": "0.3.3",
-    "@rsbuild/plugin-rem": "0.3.3",
-    "@rsbuild/plugin-source-build": "0.3.3",
-    "@rsbuild/plugin-styled-components": "0.3.3",
-    "@rsbuild/plugin-svgr": "0.3.3",
-    "@rsbuild/plugin-type-check": "0.3.3",
-    "@rsbuild/plugin-toml": "0.3.3",
-    "@rsbuild/plugin-yaml": "0.3.3",
-    "@rsbuild/shared": "0.3.3",
-    "@rsbuild/webpack": "0.3.3",
+    "@rsbuild/babel-preset": "0.3.4",
+    "@rsbuild/core": "0.3.4",
+    "@rsbuild/plugin-assets-retry": "0.3.4",
+    "@rsbuild/plugin-babel": "0.3.4",
+    "@rsbuild/plugin-check-syntax": "0.3.4",
+    "@rsbuild/plugin-css-minimizer": "0.3.4",
+    "@rsbuild/plugin-pug": "0.3.4",
+    "@rsbuild/plugin-react": "0.3.4",
+    "@rsbuild/plugin-rem": "0.3.4",
+    "@rsbuild/plugin-source-build": "0.3.4",
+    "@rsbuild/plugin-styled-components": "0.3.4",
+    "@rsbuild/plugin-svgr": "0.3.4",
+    "@rsbuild/plugin-type-check": "0.3.4",
+    "@rsbuild/plugin-toml": "0.3.4",
+    "@rsbuild/plugin-yaml": "0.3.4",
+    "@rsbuild/shared": "0.3.4",
+    "@rsbuild/webpack": "0.3.4",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -64,19 +64,19 @@
     "webpack": "^5.89.0",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "2.46.0",
-    "@modern-js/server": "2.46.0",
-    "@modern-js/prod-server": "2.46.0"
+    "@modern-js/utils": "2.46.1",
+    "@modern-js/server": "2.46.1",
+    "@modern-js/prod-server": "2.46.1"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.3.3",
+    "@rsbuild/plugin-swc": "0.3.4",
     "@types/lodash": "^4.14.202",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.46.0",
-    "@scripts/vitest-config": "2.46.0",
-    "@scripts/build": "2.46.0"
+    "@modern-js/builder-plugin-node-polyfill": "2.46.1",
+    "@scripts/build": "2.46.1",
+    "@scripts/vitest-config": "2.46.1"
   },
   "publishConfig": {
     "access": "public",