@umijs/mfsu 4.0.0-beta.15 → 4.0.0-beta.16

package/dist/babelPlugins/awaitImport/checkMatch.js

@@ -23,6 +23,8 @@ function checkMatch({ value, path, opts, isExportAll, depth, cache, }) {
     (0, assert_1.default)(depth <= 10, `endless loop detected in checkMatch, please check your alias config.`);
     opts = opts || {};
     const remoteName = opts.remoteName || 'mf';
+    // FIXME: hard code for vite mode
+    value = value.replace(/^@fs\//, '/');
     if (
     // unMatch specified libs
     ((_a = opts.unMatchLibs) === null || _a === void 0 ? void 0 : _a.includes(value)) ||

package/dist/mfsu.d.ts

@@ -27,6 +27,7 @@ export declare class MFSU {
     depBuilder: DepBuilder;
     depConfig: Configuration | null;
     constructor(opts: IOpts);
+    asyncImport(content: string): string;
     setWebpackConfig(opts: {
         config: Configuration;
         depConfig: Configuration;

package/dist/mfsu.js

@@ -47,6 +47,12 @@ class MFSU {
         this.depBuilder = new depBuilder_1.DepBuilder({ mfsu: this });
         this.depInfo.loadCache();
     }
+    // swc don't support top-level await
+    // ref: https://github.com/vercel/next.js/issues/31054
+    asyncImport(content) {
+        return `await import('${content}');`;
+        // return `(async () => await import('${content}'))();`;
+    }
     setWebpackConfig(opts) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -64,22 +70,31 @@ class MFSU {
                 const virtualPath = `./mfsu-virtual-entry/${key}.js`;
                 const virtualContent = [];
                 let index = 1;
+                let hasDefaultExport = false;
                 // @ts-ignore
                 for (const entry of opts.config.entry[key]) {
                     const content = (0, fs_1.readFileSync)(entry, 'utf-8');
                     const [_imports, exports] = yield (0, bundler_utils_1.parseModule)({ content, path: entry });
                     if (exports.length) {
-                        virtualContent.push(`const k${index} = await import('${entry}');`);
+                        virtualContent.push(`const k${index} = ${this.asyncImport(entry)}`);
                         for (const exportName of exports) {
-                            virtualContent.push(`export const ${exportName} = k${index}.${exportName}`);
+                            if (exportName === 'default') {
+                                hasDefaultExport = true;
+                                virtualContent.push(`export default k${index}.${exportName}`);
+                            }
+                            else {
+                                virtualContent.push(`export const ${exportName} = k${index}.${exportName}`);
+                            }
                         }
                     }
                     else {
-                        virtualContent.push(`await import('${entry}')`);
+                        virtualContent.push(this.asyncImport(entry));
                     }
                     index += 1;
                 }
-                virtualContent.push(`export default 1;`);
+                if (!hasDefaultExport) {
+                    virtualContent.push(`export default 1;`);
+                }
                 virtualModules[virtualPath] = virtualContent.join('\n');
                 entry[key] = virtualPath;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.0.0-beta.15",
+  "version": "4.0.0-beta.16",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -21,9 +21,9 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/bundler-esbuild": "4.0.0-beta.15",
-    "@umijs/bundler-utils": "4.0.0-beta.15",
-    "@umijs/utils": "4.0.0-beta.15"
+    "@umijs/bundler-esbuild": "4.0.0-beta.16",
+    "@umijs/bundler-utils": "4.0.0-beta.16",
+    "@umijs/utils": "4.0.0-beta.16"
   },
   "devDependencies": {
     "@types/express": "4.17.13",