@umijs/mfsu 4.0.0-rc.3 → 4.0.0-rc.6

package/dist/babelPlugins/autoExport.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/babelPlugins/awaitImport/awaitImport.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/babelPlugins/awaitImport/getAliasedPath.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAliasedPath = void 0;
-const path_1 = require("path");
 function getAliasedPath({ value, alias, }) {
     const importValue = value;
+    // equal alias
+    if (alias[value]) {
+        return alias[value];
+    }
     for (const key of Object.keys(alias)) {
         const aliasValue = alias[key];
         // exact alias
@@ -15,21 +18,13 @@ function getAliasedPath({ value, alias, }) {
             else
                 continue;
         }
-        // e.g. foo: path/to/foo
-        if (importValue === key) {
-            return aliasValue;
-        }
         // e.g. foo: path/to/foo.js
-        const slashedKey = isJSFile(aliasValue) ? key : addLastSlash(key);
-        if (importValue.startsWith(slashedKey)) {
+        if (importValue.startsWith(addLastSlash(key))) {
             return importValue.replace(key, aliasValue);
         }
     }
 }
 exports.getAliasedPath = getAliasedPath;
-function isJSFile(path) {
-    return ['.js', '.jsx', '.ts', '.tsx'].includes((0, path_1.extname)(path));
-}
 function addLastSlash(path) {
     return path.endsWith('/') ? path : `${path}/`;
 }

package/dist/babelPlugins/awaitImport/parseSpecifiers.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/depBuilder/getESBuildEntry.js

@@ -2,6 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getESBuildEntry = void 0;
 const constants_1 = require("../constants");
+// from typescript `esModuleInterop`
+const ES_INTEROP_FUNC = `__exportStar`;
+const ES_INTEROP_HELPER = `
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  o[k2] = m[k];
+}));
+var ${ES_INTEROP_FUNC} = (this && this.__exportStar) || function(m, exports) {
+  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+`;
 function getESBuildEntry(opts) {
     return `
 (function() {
@@ -266,6 +280,7 @@ function getESBuildEntry(opts) {
 var __webpack_exports__ = {};
 (function() {
   var exports = __webpack_exports__;
+${ES_INTEROP_HELPER}
   var moduleMap = {
 ${opts.deps.map(getDepModuleStr).join(',\n')}
   };
@@ -304,6 +319,7 @@ function getDepModuleStr(dep) {
 "./${dep.file}": function() {
   return new Promise(resolve => {
     import('./${constants_1.MF_VA_PREFIX}${dep.normalizedFile}.js').then(module => {
+      module.default && ${ES_INTEROP_FUNC}(module, module.default);
       resolve(() => module.default || module);
     });
   })

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.0.0-rc.3",
+  "version": "4.0.0-rc.6",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -21,15 +21,15 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/bundler-esbuild": "4.0.0-rc.3",
-    "@umijs/bundler-utils": "4.0.0-rc.3",
-    "@umijs/utils": "4.0.0-rc.3",
-    "enhanced-resolve": "5.9.0"
+    "@umijs/bundler-esbuild": "4.0.0-rc.6",
+    "@umijs/bundler-utils": "4.0.0-rc.6",
+    "@umijs/utils": "4.0.0-rc.6",
+    "enhanced-resolve": "5.9.2"
   },
   "devDependencies": {
     "@types/express": "4.17.13",
     "mrmime": "1.0.0",
-    "webpack": "5.69.1",
+    "webpack": "5.70.0",
     "webpack-virtual-modules": "0.4.3"
   },
   "publishConfig": {