@umijs/mfsu 4.0.0-rc.1 → 4.0.0-rc.4

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/checkMatch.js

@@ -13,7 +13,7 @@ const isExternals_1 = require("./isExternals");
 const RE_NODE_MODULES = /node_modules/;
 const RE_UMI_LOCAL_DEV = /umi(-next)?\/packages\//;
 function isUmiLocalDev(path) {
-    return RE_UMI_LOCAL_DEV.test(path);
+    return RE_UMI_LOCAL_DEV.test((0, utils_1.winPath)(path));
 }
 function checkMatch({ value, path, opts, isExportAll, depth, cache, filename, }) {
     var _a, _b;
@@ -69,7 +69,7 @@ function checkMatch({ value, path, opts, isExportAll, depth, cache, filename, })
         isMatch = !!(opts.exportAllMembers && value in opts.exportAllMembers);
     }
     if (isMatch) {
-        replaceValue = `${remoteName}/${value}`;
+        replaceValue = `${remoteName}/${(0, utils_1.winPath)(value)}`;
     }
     // @ts-ignore
     const file = (path === null || path === void 0 ? void 0 : path.hub.file.opts.filename) || filename;

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/dep/dep.js

@@ -37,7 +37,7 @@ function resolve(context, path) {
 }
 class Dep {
     constructor(opts) {
-        this.file = opts.file;
+        this.file = (0, utils_1.winPath)(opts.file);
         this.version = opts.version;
         this.cwd = opts.cwd;
         this.shortFile = this.file;
@@ -98,7 +98,7 @@ export * from '${this.file}';
         const dep = (0, path_1.isAbsolute)(opts.dep)
             ? opts.dep
             : (0, path_1.join)(opts.cwd, 'node_modules', opts.dep);
-        const pkg = utils_1.pkgUp.sync({
+        const pkg = utils_1.pkgUp.pkgUpSync({
             cwd: dep,
         });
         (0, assert_1.default)(pkg, `package.json not found for ${opts.dep}`);

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')}
   };
@@ -299,15 +314,13 @@ ${opts.deps.map(getDepModuleStr).join(',\n')}
   `;
 }
 exports.getESBuildEntry = getESBuildEntry;
-function normalizeFile(file) {
-    return file.replace(/\//g, '_');
-}
 function getDepModuleStr(dep) {
     return `
 "./${dep.file}": function() {
   return new Promise(resolve => {
-    import('./${constants_1.MF_VA_PREFIX}${normalizeFile(dep.file)}.js').then(module => {
-      resolve(() => module);
+    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/esbuildHandlers/autoCssModules.d.ts

@@ -0,0 +1,2 @@
+import { IEsbuildLoaderHandlerParams } from '../types';
+export declare function autoCssModulesHandler(opts: IEsbuildLoaderHandlerParams): string;

package/dist/esbuildHandlers/autoCssModules.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoCssModulesHandler = void 0;
+const utils_1 = require("@umijs/utils");
+const CSS_MODULES_QUERY = '?modules';
+const QUERY_LENGTH = CSS_MODULES_QUERY.length;
+function autoCssModulesHandler(opts) {
+    let { code } = opts;
+    let offset = 0;
+    opts.imports.forEach((i) => {
+        if (i.d < 0 && (0, utils_1.isStyleFile)({ filename: i.n })) {
+            // import x from './index.less'
+            //   => import x from '
+            const importSegment = code.substring(i.ss + offset, i.s + offset);
+            // is css module
+            if (~importSegment.indexOf(' from')) {
+                code = `${code.substring(0, i.e + offset)}${CSS_MODULES_QUERY}${code.substring(i.e + offset)}`;
+                offset += QUERY_LENGTH;
+            }
+        }
+    });
+    return code;
+}
+exports.autoCssModulesHandler = autoCssModulesHandler;

package/dist/esbuildHandlers/autoExport.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 function autoExportHandler(opts) {
     if (!opts.exports.length) {
-        return `${opts.code};\nexport const __mfsu = 1;`;
+        return `${opts.code}\nexport const __mfsu = 1;`;
     }
     return opts.code;
 }

package/dist/index.d.ts

@@ -1,2 +1,4 @@
 export * from './constants';
+export * from './esbuildHandlers/autoCssModules';
+export { esbuildLoader } from './loader/esbuild';
 export * from './mfsu';

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];
@@ -10,5 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.esbuildLoader = void 0;
 __exportStar(require("./constants"), exports);
+__exportStar(require("./esbuildHandlers/autoCssModules"), exports);
+// for independent use `esbuild-loader`
+var esbuild_1 = require("./loader/esbuild");
+Object.defineProperty(exports, "esbuildLoader", { enumerable: true, get: function () { return esbuild_1.esbuildLoader; } });
 __exportStar(require("./mfsu"), exports);

package/dist/loader/esbuild.d.ts

@@ -0,0 +1,5 @@
+import type { LoaderContext } from 'webpack';
+import type { IEsbuildLoaderOpts } from '../types';
+declare function esbuildTranspiler(this: LoaderContext<IEsbuildLoaderOpts>, source: string): Promise<void>;
+export default esbuildTranspiler;
+export declare const esbuildLoader: string;

package/dist/loader/esbuild.js

@@ -0,0 +1,54 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.esbuildLoader = void 0;
+const es_module_lexer_1 = require("@umijs/bundler-utils/compiled/es-module-lexer");
+const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
+const path_1 = require("path");
+function esbuildTranspiler(source) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const done = this.async();
+        const options = this.getOptions();
+        const { handler = [], implementation } = options, otherOptions = __rest(options, ["handler", "implementation"]);
+        const transform = (implementation === null || implementation === void 0 ? void 0 : implementation.transform) || esbuild_1.transform;
+        const filePath = this.resourcePath;
+        const ext = (0, path_1.extname)(filePath).slice(1);
+        const transformOptions = Object.assign(Object.assign({}, otherOptions), { target: (_a = options.target) !== null && _a !== void 0 ? _a : 'es2015', loader: ext !== null && ext !== void 0 ? ext : 'js', sourcemap: this.sourceMap, sourcefile: filePath });
+        try {
+            let { code, map } = yield transform(source, transformOptions);
+            if (handler.length) {
+                yield es_module_lexer_1.init;
+                handler.forEach((handle) => {
+                    const [imports, exports] = (0, es_module_lexer_1.parse)(code);
+                    code = handle({ code, imports, exports, filePath });
+                });
+            }
+            done(null, code, map && JSON.parse(map));
+        }
+        catch (error) {
+            done(error);
+        }
+    });
+}
+exports.default = esbuildTranspiler;
+exports.esbuildLoader = __filename;

package/dist/mfsu.js

@@ -53,7 +53,7 @@ class MFSU {
     // swc don't support top-level await
     // ref: https://github.com/vercel/next.js/issues/31054
     asyncImport(content) {
-        return `await import('${content}');`;
+        return `await import('${(0, utils_1.winPath)(content)}');`;
         // return `(async () => await import('${content}'))();`;
     }
     setWebpackConfig(opts) {

package/dist/types.d.ts

@@ -1,4 +1,16 @@
+import type { ImportSpecifier } from '@umijs/bundler-utils/compiled/es-module-lexer';
+import type { TransformOptions } from '@umijs/bundler-utils/compiled/esbuild';
 export declare enum Mode {
     development = "development",
     production = "production"
 }
+export interface IEsbuildLoaderHandlerParams {
+    code: string;
+    filePath: string;
+    imports: readonly ImportSpecifier[];
+    exports: readonly string[];
+}
+export interface IEsbuildLoaderOpts extends Partial<TransformOptions> {
+    handler?: Array<(opts: IEsbuildLoaderHandlerParams) => string>;
+    implementation?: typeof import('@umijs/bundler-utils/compiled/esbuild');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0-rc.4",
   "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.1",
-    "@umijs/bundler-utils": "4.0.0-rc.1",
-    "@umijs/utils": "4.0.0-rc.1"
+    "@umijs/bundler-esbuild": "4.0.0-rc.4",
+    "@umijs/bundler-utils": "4.0.0-rc.4",
+    "@umijs/utils": "4.0.0-rc.4",
+    "enhanced-resolve": "5.9.1"
   },
   "devDependencies": {
     "@types/express": "4.17.13",
-    "enhanced-resolve": "5.8.3",
     "mrmime": "1.0.0",
-    "webpack": "5.64.4",
+    "webpack": "5.69.1",
     "webpack-virtual-modules": "0.4.3"
   },
   "publishConfig": {