@umijs/bundler-esbuild 4.0.0-rc.1 → 4.0.0-rc.2

package/dist/build.d.ts

@@ -15,5 +15,7 @@ interface IOpts {
     extraBabelPresets?: IBabelPlugin[];
     inlineStyle?: boolean;
 }
-export declare function build(opts: IOpts): Promise<import("@umijs/bundler-utils/compiled/esbuild").BuildResult>;
+export declare function build(opts: IOpts): Promise<import("@umijs/bundler-utils/compiled/esbuild").BuildResult & {
+    metafile: import("@umijs/bundler-utils/compiled/esbuild").Metafile;
+}>;
 export {};

package/dist/plugins/less.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="less" />
 import { Plugin } from '@umijs/bundler-utils/compiled/esbuild';
 import { IConfig } from '../types';
+export declare const aliasLessImportPath: (filePath: string, alias: Record<string, string>, importer: string) => Promise<string | null>;
 declare const _default: (options?: Less.Options & {
     alias?: Record<string, string>;
     inlineStyle?: boolean;

package/dist/plugins/less.js

@@ -23,6 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.aliasLessImportPath = void 0;
 const enhanced_resolve_1 = __importDefault(require("enhanced-resolve"));
 const fs_1 = require("fs");
 const less_1 = __importDefault(require("less"));
@@ -59,7 +60,7 @@ const aliasLessImports = (ctx, alias, importer) => __awaiter(void 0, void 0, voi
     const match = ctx.match(globalImportRegex) || [];
     for (const el of match) {
         const [imp, _, filePath] = el.match(importRegex) || [];
-        let aliaPath = yield aliasLessImportPath(filePath, alias, importer);
+        let aliaPath = yield (0, exports.aliasLessImportPath)(filePath, alias, importer);
         if (aliaPath) {
             ctx = ctx.replace(imp, el.replace(filePath, aliaPath));
         }
@@ -73,16 +74,17 @@ const aliasLessImportPath = (filePath, alias, importer) => __awaiter(void 0, voi
         : filePath;
     const keys = (0, sortByAffix_1.sortByAffix)({ arr: Object.keys(alias), affix: '$' });
     for (const key of keys) {
-        const value = alias[key];
-        const filter = new RegExp(`^${key}`);
-        if (filter.test(aliaPath)) {
-            aliaPath = aliaPath.replace(filter, value);
+        const pathSegments = aliaPath.split('/');
+        if (pathSegments[0] === key) {
+            pathSegments[0] = alias[key];
+            aliaPath = pathSegments.join('/');
             aliaPath = path_1.default.extname(aliaPath) ? aliaPath : `${aliaPath}.less`;
             return yield resolve(importer, aliaPath);
         }
     }
     return null;
 });
+exports.aliasLessImportPath = aliasLessImportPath;
 exports.default = (options = {}) => {
     const { alias, inlineStyle, config } = options, lessOptions = __rest(options, ["alias", "inlineStyle", "config"]);
     return {
@@ -90,14 +92,24 @@ exports.default = (options = {}) => {
         setup({ onResolve, onLoad }) {
             onResolve({ filter: /\.less$/, namespace: 'file' }, (args) => __awaiter(this, void 0, void 0, function* () {
                 let filePath = args.path;
+                let isMatchedAlias = false;
+                // first match alias
                 if (!!alias) {
-                    filePath =
-                        (yield aliasLessImportPath(filePath, alias, args.path)) ||
-                            path_1.default.resolve(process.cwd(), path_1.default.relative(process.cwd(), args.resolveDir), args.path);
+                    const aliasMatchPath = yield (0, exports.aliasLessImportPath)(filePath, alias, args.path);
+                    if (aliasMatchPath) {
+                        isMatchedAlias = true;
+                        filePath = aliasMatchPath;
+                    }
                 }
-                else {
-                    //没有别名也要对路径进行处理
-                    filePath = path_1.default.resolve(process.cwd(), path_1.default.relative(process.cwd(), args.resolveDir), args.path);
+                // if alias not matched, identify whether import from deps (node_modules)
+                if (!isMatchedAlias) {
+                    const isImportFromDeps = !path_1.default.isAbsolute(filePath) && !filePath.startsWith('.');
+                    if (isImportFromDeps) {
+                        filePath = yield resolve(process.cwd(), filePath);
+                    }
+                    else {
+                        filePath = path_1.default.resolve(process.cwd(), path_1.default.relative(process.cwd(), args.resolveDir), args.path);
+                    }
                 }
                 return {
                     path: filePath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-esbuild",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0-rc.2",
   "description": "@umijs/bundler-esbuild",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-esbuild#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -23,14 +23,14 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-rc.1",
-    "@umijs/utils": "4.0.0-rc.1",
-    "enhanced-resolve": "5.8.3",
+    "@umijs/bundler-utils": "4.0.0-rc.2",
+    "@umijs/utils": "4.0.0-rc.2",
+    "enhanced-resolve": "5.9.0",
     "less": "4.1.2",
     "less-plugin-aliases": "^1.0.3",
-    "postcss": "^8.4.4",
+    "postcss": "^8.4.6",
     "postcss-flexbugs-fixes": "5.0.2",
-    "postcss-preset-env": "7.0.1"
+    "postcss-preset-env": "7.4.1"
   },
   "devDependencies": {
     "@alitajs/postcss-plugin-px2rem": "^0.0.1",