@umijs/bundler-utoopack 4.6.71 → 4.6.73

package/dist/index.d.ts

@@ -3,6 +3,7 @@ import type { IOpts } from './types';
 export { findRootDir } from '@utoo/pack';
 export * from './config';
 export type { IUtoopackUserConfig } from './types';
+export declare function isUtoopackProxyStartupError(error: any, utooServePort: number): boolean;
 export declare function build(opts: IOpts): Promise<any>;
 export declare function buildSSR(opts: IOpts & {
     serverBuildPath: string;

package/dist/index.js

@@ -33,7 +33,8 @@ __export(src_exports, {
   build: () => build,
   buildSSR: () => buildSSR,
   dev: () => dev,
-  findRootDir: () => import_pack.findRootDir
+  findRootDir: () => import_pack.findRootDir,
+  isUtoopackProxyStartupError: () => isUtoopackProxyStartupError
 });
 module.exports = __toCommonJS(src_exports);
 var import_bundler_utils = require("@umijs/bundler-utils");
@@ -47,6 +48,9 @@ var import_config = require("./config");
 var import_util = require("./util");
 var import_pack = require("@utoo/pack");
 __reExport(src_exports, require("./config"), module.exports);
+function isUtoopackProxyStartupError(error, utooServePort) {
+  return (error == null ? void 0 : error.code) === "ECONNREFUSED" && Number(error == null ? void 0 : error.port) === utooServePort && (!(error == null ? void 0 : error.address) || error.address === "127.0.0.1");
+}
 function getUtoopackRootDir(cwd, utoopackConfig, findRootDir2) {
   const normalizedCwd = (0, import_config.normalizeUtoopackPath)(cwd);
   if (typeof (utoopackConfig == null ? void 0 : utoopackConfig.root) === "string") {
@@ -229,6 +233,23 @@ async function dev(opts) {
       },
       skipToNextHandlerFilter: function(proxyRes) {
         return proxyRes.statusCode !== 200 && proxyRes.statusCode !== 304;
+      },
+      proxyErrorHandler: function(err, res, next) {
+        if (isUtoopackProxyStartupError(err, utooServePort)) {
+          if (!res.headersSent) {
+            res.writeHead(503, { "Content-Type": "text/plain" });
+          }
+          return res.end("Utoopack dev server is starting.");
+        }
+        if ((err == null ? void 0 : err.code) === "ECONNRESET") {
+          res.setHeader(
+            "X-Timeout-Reason",
+            "express-http-proxy reset the request."
+          );
+          res.writeHead(504, { "Content-Type": "text/plain" });
+          return res.end();
+        }
+        return next(err);
       }
     })
   );
@@ -335,5 +356,6 @@ async function dev(opts) {
   buildSSR,
   dev,
   findRootDir,
+  isUtoopackProxyStartupError,
   ...require("./config")
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.6.71",
+  "version": "4.6.73",
   "description": "@umijs/bundler-utoopack",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
     "dist"
   ],
   "dependencies": {
-    "@utoo/pack": "1.4.18",
+    "@utoo/pack": "1.4.20",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^2.0.0",
     "cors": "^2.8.5",
@@ -26,8 +26,8 @@
     "resolve-url-loader": "5.0.0",
     "sass": "1.54.0",
     "sass-loader": "13.2.0",
-    "@umijs/bundler-utils": "4.6.71",
-    "@umijs/bundler-webpack": "4.6.71"
+    "@umijs/bundler-webpack": "4.6.73",
+    "@umijs/bundler-utils": "4.6.73"
   },
   "publishConfig": {
     "access": "public"