@umijs/bundler-utoopack 4.6.65 → 4.6.67

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.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
         ])
       )
@@ -249,6 +258,12 @@ function getOverlayEntryPath(cwd, entryName) {
     )
   );
 }
+function createDynamicImportChain(imports) {
+  return `void ${imports.map(
+    (item, index) => index === 0 ? `import(${JSON.stringify(item)})` : `.then(() => import(${JSON.stringify(item)}))`
+  ).join("")};
+`;
+}
 function writeUtoopackOverlayEntry(opts) {
   const entryPath = getOverlayEntryPath(opts.cwd, opts.entryName);
   const overlayClientPath = normalizeUtoopackPath(
@@ -258,12 +273,12 @@ function writeUtoopackOverlayEntry(opts) {
   import_fs.default.copyFileSync(UTOOPACK_OVERLAY_CLIENT_ENTRY, overlayClientPath);
   import_fs.default.writeFileSync(
     entryPath,
-    [
+    createDynamicImportChain([
       getRelativeImportSpecifier(entryPath, overlayClientPath),
       ...opts.imports.map(
         (item) => getOverlayEntryImport(item, opts.cwd, entryPath)
       )
-    ].map((item) => `import ${JSON.stringify(item)};`).join("\n") + "\n",
+    ]),
     "utf-8"
   );
   return entryPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.6.65",
+  "version": "4.6.67",
   "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,8 +21,8 @@
     "resolve-url-loader": "5.0.0",
     "sass": "1.54.0",
     "sass-loader": "13.2.0",
-    "@umijs/bundler-utils": "4.6.65",
-    "@umijs/bundler-webpack": "4.6.65"
+    "@umijs/bundler-utils": "4.6.67",
+    "@umijs/bundler-webpack": "4.6.67"
   },
   "devDependencies": {
     "father": "4.1.5"