@umijs/bundler-utoopack 4.6.66 → 4.6.68

package/client/client/client.js

@@ -11,6 +11,7 @@ console.log('[utoopack] connecting...');
 let hasCompileErrors = false;
 let shouldReloadOnRecovery = false;
 let overlayIframe = null;
+let isSocketConnected = false;
 
 const enableErrorOverlay =
   typeof process === 'undefined' ||
@@ -145,6 +146,7 @@ function handleSuccess() {
 function handleMessage(payload) {
   switch (payload.action) {
     case ACTIONS.TURBOPACK_CONNECTED:
+      isSocketConnected = true;
       console.log('[utoopack] connected.');
       break;
     case ACTIONS.BUILDING:
@@ -198,6 +200,11 @@ socket.addEventListener('message', ({ data }) => {
 });
 
 socket.addEventListener('close', async () => {
+  if (!isSocketConnected) {
+    console.info('[utoopack] Dev server connection failed.');
+    return;
+  }
+
   console.info('[utoopack] Dev server disconnected. Polling for restart...');
   await waitForSuccessfulPing();
   window.location.reload();

package/dist/config.d.ts

@@ -9,7 +9,7 @@ export declare function getSSRUtooPackConfig(rawOpts: IOpts & {
     useHash?: boolean;
     isDev?: boolean;
 }): Promise<BundleOptions>;
-export declare type IDevOpts = {
+export type IDevOpts = {
     afterMiddlewares?: any[];
     beforeMiddlewares?: any[];
     onDevCompileDone?: Function;

package/dist/config.js

@@ -151,9 +151,18 @@ function isSerializableBabelItem(item) {
     return false;
   }
 }
-function getExtraBabelModuleRules(opts) {
+function isReactCompilerEnabled(config) {
+  if ("reactCompiler" in config) {
+    return config.reactCompiler !== false;
+  }
+  return "forget" in config;
+}
+function shouldAddBabelLoaderRules(config) {
   var _a;
-  if (((_a = opts.config.utoopack) == null ? void 0 : _a.babelLoader) !== true) {
+  return ((_a = config.utoopack) == null ? void 0 : _a.babelLoader) === true || isReactCompilerEnabled(config);
+}
+function getExtraBabelModuleRules(opts) {
+  if (!shouldAddBabelLoaderRules(opts.config)) {
     return {};
   }
   const plugins = getExtraBabelPlugins(opts).filter((plugin) => {
@@ -197,7 +206,7 @@ function getExtraBabelModuleRules(opts) {
     module: {
       rules: Object.fromEntries(
         ["js", "mjs", "cjs", "jsx", "ts", "tsx"].map((ext) => [
-          `**/src/**/*.${ext}`,
+          `**/*.${ext}`,
           rule
         ])
       )
@@ -347,7 +356,8 @@ function getNormalizedAlias(alias, rootDir) {
         } catch (e) {
         }
       }
-      if (!isDirectory) continue;
+      if (!isDirectory)
+        continue;
     }
     newAlias[`${key}/*`] = `${value}/*`;
   }
@@ -395,11 +405,13 @@ function toWildcardExternalConfig(value) {
   }
 }
 function getExternalSubPathGlob(externalKey) {
-  if (!externalKey.includes("*")) return;
+  if (!externalKey.includes("*"))
+    return;
   const parts = externalKey.split("/");
   const packageName = externalKey.startsWith("@") ? parts.slice(0, 2).join("/") : parts[0];
   const subPathGlob = externalKey.slice(packageName.length);
-  if (!packageName || !subPathGlob.startsWith("/")) return;
+  if (!packageName || !subPathGlob.startsWith("/"))
+    return;
   return {
     packageName,
     subPathGlob
@@ -452,9 +464,11 @@ function getNormalizedExternals(externals) {
   );
   Object.entries(externals || {}).forEach(([k, v]) => {
     const externalSubPathGlob = getExternalSubPathGlob(k);
-    if (!externalSubPathGlob) return;
+    if (!externalSubPathGlob)
+      return;
     const normalized = toWildcardExternalConfig(v);
-    if (!normalized) return;
+    if (!normalized)
+      return;
     ret[externalSubPathGlob.packageName] = addWildcardSubPath(
       ret[externalSubPathGlob.packageName] && typeof ret[externalSubPathGlob.packageName] === "object" ? ret[externalSubPathGlob.packageName] : normalized,
       externalSubPathGlob.subPathGlob
@@ -706,6 +720,7 @@ async function getSSRUtooPackConfig(rawOpts) {
     target: "node",
     sourceMaps: false,
     stats: true,
+    pluginRuntimeStrategy: "childProcesses",
     nodePolyfill: false,
     optimization: {
       ...utooBundlerOpts.config.optimization,

package/dist/index.js

@@ -207,7 +207,8 @@ async function dev(opts) {
   }
   const publicPathPrefix = (() => {
     const p = opts.config.publicPath;
-    if (!p || p === "/" || p === "auto") return null;
+    if (!p || p === "/" || p === "auto")
+      return null;
     return p.startsWith("/") ? p : "/" + p;
   })();
   app.use(

package/dist/types.d.ts

@@ -1,10 +1,10 @@
 import type { IOpts as IConfigOpts } from '@umijs/bundler-webpack';
 import type { ConfigComplete } from '@utoo/pack';
-export declare type IUtoopackUserConfig = ConfigComplete & {
+export type IUtoopackUserConfig = ConfigComplete & {
     babelLoader?: boolean;
     root?: string;
 };
-export declare type IOpts = {
+export type IOpts = {
     cwd: string;
     rootDir: string;
     entry: Record<string, string>;

package/dist/util.d.ts

@@ -1,5 +1,5 @@
 import type { WebpackConfig } from '@utoo/pack';
-declare type IDevBannerOpts = {
+type IDevBannerOpts = {
     duration?: number;
     host?: string;
     ip?: string;
@@ -7,7 +7,7 @@ declare type IDevBannerOpts = {
     port?: number;
     protocol: string;
 };
-declare type IBuildBannerOpts = {
+type IBuildBannerOpts = {
     assetCount?: number;
     duration?: number;
     outputPath?: string;
@@ -20,8 +20,8 @@ export declare function getCssOutputFilenames(opts: {
     webpackConfig: WebpackConfig;
     useHash: boolean;
 }): {
-    cssChunkFilename: string;
     cssFilename?: string | undefined;
+    cssChunkFilename: string;
 };
 export declare function getSSRCssSplitChunks(config: Record<string, any>): {
     splitChunks?: undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.6.66",
+  "version": "4.6.68",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,7 +9,7 @@
     "dist"
   ],
   "dependencies": {
-    "@utoo/pack": "1.4.13",
+    "@utoo/pack": "1.4.17",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^2.0.0",
     "cors": "^2.8.5",
@@ -21,11 +21,8 @@
     "resolve-url-loader": "5.0.0",
     "sass": "1.54.0",
     "sass-loader": "13.2.0",
-    "@umijs/bundler-utils": "4.6.66",
-    "@umijs/bundler-webpack": "4.6.66"
-  },
-  "devDependencies": {
-    "father": "4.1.5"
+    "@umijs/bundler-utils": "4.6.68",
+    "@umijs/bundler-webpack": "4.6.68"
   },
   "publishConfig": {
     "access": "public"